Skip to content

Release/2.4.6 #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Aug 18, 2023
Merged

Release/2.4.6 #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cd938f6
replace panic to logger.Panic
gosunuts Jul 17, 2023
c99d684
Merge pull request #236 from aergoio/feature/fix-logger
gosunuts Jul 18, 2023
f0d0243
remove mutex from Lua states
kroggen Jul 18, 2023
770106e
fix build
kroggen Jul 18, 2023
ba241bb
fix gas on BF test
kroggen Jul 18, 2023
03dfc5d
load lua state according to hardfork version
kroggen Jul 27, 2023
b98769a
fix build aergoluac
kroggen Jul 27, 2023
c94e4b6
rename variable [skip ci]
kroggen Jul 27, 2023
d1b2a98
Merge pull request #237 from aergoio/topic/remove-luajit-mutex
kroggen Aug 10, 2023
f28617a
Change package path to follow versionng policy of go module
hayarobi Jul 11, 2023
e273c52
Merge pull request #238 from aergoio/fix/AMAIN-143-go-pkg
hayarobi Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ endif()

add_custom_target(build ALL DEPENDS aergocli aergosvr aergoluac brick)

add_custom_target(aergocli GO111MODULE=on GOBIN=${BIN_DIR} go install ${GCFLAGS} -ldflags \"-X github.com/aergoio/aergo/cmd/aergocli/cmd.githash=`git describe --tags`\" ./cmd/aergocli/...
add_custom_target(aergocli GO111MODULE=on GOBIN=${BIN_DIR} go install ${GCFLAGS} -ldflags \"-X github.com/aergoio/aergo/v2/cmd/aergocli/cmd.githash=`git describe --tags`\" ./cmd/aergocli/...
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
DEPENDS libtool)

Expand All @@ -28,14 +28,14 @@ add_custom_target(aergosvr GO111MODULE=on GOBIN=${BIN_DIR} go install ${GCFLAGS}
add_custom_target(polaris GO111MODULE=on GOBIN=${BIN_DIR} go install ${GCFLAGS} -ldflags \"-X main.githash=`git describe --tags`\" ./cmd/polaris/...
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})

add_custom_target(colaris GO111MODULE=on GOBIN=${BIN_DIR} go install ${GCFLAGS} -ldflags \"-X github.com/aergoio/aergo/cmd/colaris/cmd.githash=`git describe --tags`\" ./cmd/colaris/...
add_custom_target(colaris GO111MODULE=on GOBIN=${BIN_DIR} go install ${GCFLAGS} -ldflags \"-X github.com/aergoio/aergo/v2/cmd/colaris/cmd.githash=`git describe --tags`\" ./cmd/colaris/...
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})

add_custom_target(aergoluac GO111MODULE=on GOBIN=${BIN_DIR} go install ${GCFLAGS} -ldflags \"-X main.githash=`git describe --tags`\" ./cmd/aergoluac/...
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
DEPENDS libtool)

add_custom_target(brick GO111MODULE=on GOBIN=${BIN_DIR} go install ${GCFLAGS} ${GFLAG} -ldflags \"-X 'github.com/aergoio/aergo/cmd/brick/context.GitHash=`git describe --tags`'
add_custom_target(brick GO111MODULE=on GOBIN=${BIN_DIR} go install ${GCFLAGS} ${GFLAG} -ldflags \"-X 'github.com/aergoio/aergo/v2/cmd/brick/context.GitHash=`git describe --tags`'
-X 'github.com/aergoio/aergo-lib/log.defaultConfStr=`cat ./cmd/brick/arglog.toml`'\" ./cmd/brick/...
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
DEPENDS libtool)
Expand Down
14 changes: 7 additions & 7 deletions account/accountservice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (

"github.com/aergoio/aergo-actor/actor"
"github.com/aergoio/aergo-lib/log"
"github.com/aergoio/aergo/account/key"
cfg "github.com/aergoio/aergo/config"
"github.com/aergoio/aergo/contract/name"
"github.com/aergoio/aergo/message"
"github.com/aergoio/aergo/pkg/component"
"github.com/aergoio/aergo/state"
"github.com/aergoio/aergo/types"
"github.com/aergoio/aergo/v2/account/key"
cfg "github.com/aergoio/aergo/v2/config"
"github.com/aergoio/aergo/v2/contract/name"
"github.com/aergoio/aergo/v2/message"
"github.com/aergoio/aergo/v2/pkg/component"
"github.com/aergoio/aergo/v2/state"
"github.com/aergoio/aergo/v2/types"
)

type AccountService struct {
Expand Down
6 changes: 3 additions & 3 deletions account/accountservice_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"testing"

"github.com/aergoio/aergo-lib/db"
"github.com/aergoio/aergo/config"
"github.com/aergoio/aergo/state"
"github.com/aergoio/aergo/types"
"github.com/aergoio/aergo/v2/config"
"github.com/aergoio/aergo/v2/state"
"github.com/aergoio/aergo/v2/types"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions account/key/aergo_storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"strings"
"sync"

crypto "github.com/aergoio/aergo/account/key/crypto"
"github.com/aergoio/aergo/types"
crypto "github.com/aergoio/aergo/v2/account/key/crypto"
"github.com/aergoio/aergo/v2/types"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion account/key/aergo_storage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"reflect"
"testing"

crypto "github.com/aergoio/aergo/account/key/crypto"
crypto "github.com/aergoio/aergo/v2/account/key/crypto"
"github.com/btcsuite/btcd/btcec"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion account/key/badgerdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"sync"

"github.com/aergoio/aergo-lib/db"
"github.com/aergoio/aergo/types"
"github.com/aergoio/aergo/v2/types"
"github.com/btcsuite/btcd/btcec"
)

Expand Down
2 changes: 1 addition & 1 deletion account/key/badgerdb_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"reflect"
"testing"

crypto "github.com/aergoio/aergo/account/key/crypto"
crypto "github.com/aergoio/aergo/v2/account/key/crypto"
"github.com/btcsuite/btcd/btcec"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion account/key/crypto/address.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"crypto/ecdsa"
"encoding/binary"

"github.com/aergoio/aergo/types"
"github.com/aergoio/aergo/v2/types"
)

// GenerateAddress calculates the raw (not-encoded) address for a private key.
Expand Down
2 changes: 1 addition & 1 deletion account/key/crypto/address_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package key
import (
"testing"

"github.com/aergoio/aergo/types"
"github.com/aergoio/aergo/v2/types"
"github.com/btcsuite/btcd/btcec"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion account/key/crypto/v1strategy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"io"
"reflect"

"github.com/aergoio/aergo/types"
"github.com/aergoio/aergo/v2/types"
"github.com/btcsuite/btcd/btcec"
"golang.org/x/crypto/scrypt"
)
Expand Down
2 changes: 1 addition & 1 deletion account/key/sign.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package key
import (
"encoding/binary"

"github.com/aergoio/aergo/types"
"github.com/aergoio/aergo/v2/types"
"github.com/btcsuite/btcd/btcec"
sha256 "github.com/minio/sha256-simd"
)
Expand Down
4 changes: 2 additions & 2 deletions account/key/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"sync"
"time"

crypto "github.com/aergoio/aergo/account/key/crypto"
"github.com/aergoio/aergo/types"
crypto "github.com/aergoio/aergo/v2/account/key/crypto"
"github.com/aergoio/aergo/v2/types"
"github.com/btcsuite/btcd/btcec"
)

Expand Down
4 changes: 2 additions & 2 deletions account/key/store_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"sync"
"testing"

crypto "github.com/aergoio/aergo/account/key/crypto"
"github.com/aergoio/aergo/types"
crypto "github.com/aergoio/aergo/v2/account/key/crypto"
"github.com/aergoio/aergo/v2/types"
"github.com/btcsuite/btcd/btcec"
"github.com/stretchr/testify/assert"
)
Expand Down
4 changes: 2 additions & 2 deletions account/signer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package account

import (
"github.com/aergoio/aergo-actor/actor"
"github.com/aergoio/aergo/account/key"
"github.com/aergoio/aergo/message"
"github.com/aergoio/aergo/v2/account/key"
"github.com/aergoio/aergo/v2/message"
)

type Signer struct {
Expand Down
2 changes: 1 addition & 1 deletion aergo-protobuf
Open in desktop
Submodule aergo-protobuf updated 10 files
+1 −1 proto/account.proto
+1 −1 proto/admin.proto
+1 −1 proto/blockchain.proto
+1 −1 proto/metric.proto
+1 −1 proto/node.proto
+1 −1 proto/p2p.proto
+1 −1 proto/pmap.proto
+1 −1 proto/polarrpc.proto
+1 −1 proto/raft.proto
+1 −1 proto/rpc.proto
8 changes: 4 additions & 4 deletions chain/blockvalidator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"errors"
"fmt"

"github.com/aergoio/aergo/internal/enc"
"github.com/aergoio/aergo/pkg/component"
"github.com/aergoio/aergo/state"
"github.com/aergoio/aergo/types"
"github.com/aergoio/aergo/v2/internal/enc"
"github.com/aergoio/aergo/v2/pkg/component"
"github.com/aergoio/aergo/v2/state"
"github.com/aergoio/aergo/v2/types"
)

type BlockValidator struct {
Expand Down
4 changes: 2 additions & 2 deletions chain/chainanchor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
package chain

import (
"github.com/aergoio/aergo/internal/enc"
"github.com/aergoio/aergo/types"
"github.com/aergoio/aergo/v2/internal/enc"
"github.com/aergoio/aergo/v2/types"
)

type ChainAnchor []([]byte)
Expand Down
23 changes: 13 additions & 10 deletions chain/chaindb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ import (
"sync/atomic"

"github.com/aergoio/aergo-lib/db"
"github.com/aergoio/aergo/config"
"github.com/aergoio/aergo/consensus"
"github.com/aergoio/aergo/internal/common"
"github.com/aergoio/aergo/internal/enc"
"github.com/aergoio/aergo/types"
"github.com/aergoio/aergo/v2/config"
"github.com/aergoio/aergo/v2/consensus"
"github.com/aergoio/aergo/v2/internal/common"
"github.com/aergoio/aergo/v2/internal/enc"
"github.com/aergoio/aergo/v2/types"
"github.com/golang/protobuf/proto"
)

Expand Down Expand Up @@ -386,7 +386,7 @@ func (cdb *ChainDB) connectToChain(dbtx db.Transaction, block *types.Block, skip
// Save the last consensus status.
if cdb.cc != nil {
if err := cdb.cc.Save(dbtx); err != nil {
logger.Error().Err(err).Msg("failed to save DPoS status")
logger.Error().Err(err).Uint64("blockNo", blockNo).Msg("failed to save DPoS status")
}
}

Expand Down Expand Up @@ -571,11 +571,14 @@ func (cdb *ChainDB) dropBlock(dropNo types.BlockNo) error {
}

func (cdb *ChainDB) getBestBlockNo() (latestNo types.BlockNo) {
var ok bool

aopv := cdb.latest.Load()
if aopv != nil {
latestNo = aopv.(types.BlockNo)
} else {
panic("ChainDB:latest is nil")
if aopv == nil {
logger.Panic().Msg("ChainService: latest is nil")
}
if latestNo, ok = aopv.(types.BlockNo); !ok {
logger.Panic().Msg("ChainService: latest is not types.BlockNo")
}
return latestNo
}
Expand Down
12 changes: 5 additions & 7 deletions chain/chaindbForRaft.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"errors"

"github.com/aergoio/aergo-lib/db"
"github.com/aergoio/aergo/consensus"
"github.com/aergoio/aergo/types"
"github.com/aergoio/aergo/v2/consensus"
"github.com/aergoio/aergo/v2/types"
"github.com/aergoio/etcd/raft/raftpb"
"github.com/golang/protobuf/proto"
)
Expand Down Expand Up @@ -46,7 +46,7 @@ func (cdb *ChainDB) ResetWAL(hardStateInfo *types.HardStateInfo) error {

snapData := consensus.NewSnapshotData(nil, nil, snapBlock)
if snapData == nil {
panic("new snap failed")
logger.Panic().Uint64("SnapBlockNo", snapBlock.BlockNo()).Msg("new snap failed")
}

data, err := snapData.Encode()
Expand Down Expand Up @@ -129,7 +129,6 @@ func (cdb *ChainDB) WriteHardState(hardstate *raftpb.HardState) error {

if data, err = proto.Marshal(hardstate); err != nil {
logger.Panic().Msg("failed to marshal raft state")
return err
}
dbTx.Set(raftStateKey, data)
dbTx.Commit()
Expand All @@ -147,7 +146,6 @@ func (cdb *ChainDB) GetHardState() (*raftpb.HardState, error) {
state := &raftpb.HardState{}
if err := proto.Unmarshal(data, state); err != nil {
logger.Panic().Msg("failed to unmarshal raft state")
return nil, ErrInvalidHardState
}

logger.Info().Uint64("term", state.Term).Str("vote", types.Uint64ToHexaString(state.Vote)).Uint64("commit", state.Commit).Msg("load hard state")
Expand Down Expand Up @@ -199,14 +197,14 @@ func (cdb *ChainDB) WriteRaftEntry(ents []*consensus.WalEntry, blocks []*types.B

if entry.Type == consensus.EntryBlock {
if err := cdb.addBlock(dbTx, blocks[i]); err != nil {
panic("add block entry")
logger.Panic().Err(err).Uint64("BlockNo", blocks[i].BlockNo()).Msg("failed to add block entry")
}

targetNo = blocks[i].BlockNo()
}

if data, err = entry.ToBytes(); err != nil {
panic("failed to convert entry to bytes")
logger.Panic().Err(err).Uint64("BlockNo", blocks[i].BlockNo()).Uint64("index", entry.Index).Msg("failed to convert entry to bytes")
}

lastIdx = entry.Index
Expand Down
16 changes: 8 additions & 8 deletions chain/chainhandle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ import (
"fmt"
"math/big"

"github.com/aergoio/aergo/consensus"
"github.com/aergoio/aergo/contract"
"github.com/aergoio/aergo/contract/name"
"github.com/aergoio/aergo/contract/system"
"github.com/aergoio/aergo/internal/enc"
"github.com/aergoio/aergo/message"
"github.com/aergoio/aergo/state"
"github.com/aergoio/aergo/types"
"github.com/aergoio/aergo/v2/consensus"
"github.com/aergoio/aergo/v2/contract"
"github.com/aergoio/aergo/v2/contract/name"
"github.com/aergoio/aergo/v2/contract/system"
"github.com/aergoio/aergo/v2/internal/enc"
"github.com/aergoio/aergo/v2/message"
"github.com/aergoio/aergo/v2/state"
"github.com/aergoio/aergo/v2/types"
"github.com/golang/protobuf/proto"
)

Expand Down
12 changes: 6 additions & 6 deletions chain/chainhandle_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import (
"testing"

"github.com/aergoio/aergo-lib/db"
"github.com/aergoio/aergo/account/key"
"github.com/aergoio/aergo/contract"
"github.com/aergoio/aergo/contract/system"
"github.com/aergoio/aergo/internal/common"
"github.com/aergoio/aergo/state"
"github.com/aergoio/aergo/types"
"github.com/aergoio/aergo/v2/account/key"
"github.com/aergoio/aergo/v2/contract"
"github.com/aergoio/aergo/v2/contract/system"
"github.com/aergoio/aergo/v2/internal/common"
"github.com/aergoio/aergo/v2/state"
"github.com/aergoio/aergo/v2/types"
"github.com/stretchr/testify/assert"
)

Expand Down
Loading