From ac376e53e02c367d26f7bc8d1c5d0187e103d640 Mon Sep 17 00:00:00 2001 From: Shivam Sharma Date: Tue, 1 Aug 2023 18:07:59 +0530 Subject: [PATCH 01/16] bump version to v0.5.0-beta-1 --- packaging/templates/package_scripts/control | 2 +- packaging/templates/package_scripts/control.arm64 | 2 +- packaging/templates/package_scripts/control.profile.amd64 | 2 +- packaging/templates/package_scripts/control.profile.arm64 | 2 +- packaging/templates/package_scripts/control.validator | 2 +- .../templates/package_scripts/control.validator.arm64 | 2 +- params/version.go | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packaging/templates/package_scripts/control b/packaging/templates/package_scripts/control index 4000915de1..a21efaab29 100644 --- a/packaging/templates/package_scripts/control +++ b/packaging/templates/package_scripts/control @@ -1,5 +1,5 @@ Source: bor -Version: 0.4.0 +Version: 0.5.0-beta-1 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.arm64 b/packaging/templates/package_scripts/control.arm64 index 94c5bf09c0..9fe8c7caaa 100644 --- a/packaging/templates/package_scripts/control.arm64 +++ b/packaging/templates/package_scripts/control.arm64 @@ -1,5 +1,5 @@ Source: bor -Version: 0.4.0 +Version: 0.5.0-beta-1 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.amd64 b/packaging/templates/package_scripts/control.profile.amd64 index 1a285a6af0..310c47893a 100644 --- a/packaging/templates/package_scripts/control.profile.amd64 +++ b/packaging/templates/package_scripts/control.profile.amd64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 0.4.0 +Version: 0.5.0-beta-1 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.arm64 b/packaging/templates/package_scripts/control.profile.arm64 index f1658add4c..17129020fb 100644 --- a/packaging/templates/package_scripts/control.profile.arm64 +++ b/packaging/templates/package_scripts/control.profile.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 0.4.0 +Version: 0.5.0-beta-1 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator b/packaging/templates/package_scripts/control.validator index 97fc1adcbd..7a32b06c6c 100644 --- a/packaging/templates/package_scripts/control.validator +++ b/packaging/templates/package_scripts/control.validator @@ -1,5 +1,5 @@ Source: bor-profile -Version: 0.4.0 +Version: 0.5.0-beta-1 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator.arm64 b/packaging/templates/package_scripts/control.validator.arm64 index f88dd5836d..ca2e71661e 100644 --- a/packaging/templates/package_scripts/control.validator.arm64 +++ b/packaging/templates/package_scripts/control.validator.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 0.4.0 +Version: 0.5.0-beta-1 Section: develop Priority: standard Maintainer: Polygon diff --git a/params/version.go b/params/version.go index 79e9f0453f..5d67567990 100644 --- a/params/version.go +++ b/params/version.go @@ -21,10 +21,10 @@ import ( ) const ( - VersionMajor = 0 // Major version component of the current release - VersionMinor = 4 // Minor version component of the current release - VersionPatch = 0 // Patch version component of the current release - VersionMeta = "" // Version metadata to append to the version string + VersionMajor = 0 // Major version component of the current release + VersionMinor = 5 // Minor version component of the current release + VersionPatch = 0 // Patch version component of the current release + VersionMeta = "beta-1" // Version metadata to append to the version string ) var GitCommit string From b7efe4d3c2724b1d8f33c18114474966dc7e062b Mon Sep 17 00:00:00 2001 From: Shivam Sharma Date: Wed, 2 Aug 2023 00:21:28 +0530 Subject: [PATCH 02/16] fix : goreleaser --- .goreleaser.yml | 5 ----- Makefile | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 6f770ba739..7cf76d388d 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -103,11 +103,6 @@ nfpms: scripts: postinstall: builder/files/bor-post-install.sh - overrides: - rpm: - replacements: - amd64: x86_64 - snapshot: name_template: "{{ .Tag }}.next" diff --git a/Makefile b/Makefile index 68998b40cc..17e7e496c7 100644 --- a/Makefile +++ b/Makefile @@ -213,7 +213,7 @@ release-dry-run: -v `pwd`:/go/src/$(PACKAGE_NAME) \ -w /go/src/$(PACKAGE_NAME) \ goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \ - --rm-dist --skip-validate --skip-publish + --clean --skip-validate --skip-publish .PHONY: release release: @@ -230,4 +230,4 @@ release: -v `pwd`:/go/src/$(PACKAGE_NAME) \ -w /go/src/$(PACKAGE_NAME) \ goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \ - --rm-dist --skip-validate + --clean --skip-validate From 4d5cdae2e6a6b08238d9e032b790ff9a6f941134 Mon Sep 17 00:00:00 2001 From: Shivam Sharma Date: Fri, 4 Aug 2023 14:52:00 +0530 Subject: [PATCH 03/16] add : mutex for stateObjects --- core/state/journal.go | 5 +++++ core/state/statedb.go | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/core/state/journal.go b/core/state/journal.go index 7d5648153c..0409df179e 100644 --- a/core/state/journal.go +++ b/core/state/journal.go @@ -148,7 +148,12 @@ type ( ) func (ch createObjectChange) revert(s *StateDB) { + s.stateObjectsMu.Lock() + delete(s.stateObjects, *ch.account) + + s.stateObjectsMu.Unlock() + delete(s.stateObjectsDirty, *ch.account) RevertWrite(s, blockstm.NewAddressKey(*ch.account)) } diff --git a/core/state/statedb.go b/core/state/statedb.go index d304ccb6b6..5c1b57de06 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -22,6 +22,7 @@ import ( "fmt" "math/big" "sort" + "sync" "time" "github.com/ethereum/go-ethereum/common" @@ -78,6 +79,7 @@ type StateDB struct { stateObjectsPending map[common.Address]struct{} // State objects finalized but not yet written to the trie stateObjectsDirty map[common.Address]struct{} // State objects modified in the current execution stateObjectsDestruct map[common.Address]struct{} // State objects destructed in the block + stateObjectsMu sync.RWMutex // Block-stm related fields mvHashmap *blockstm.MVHashMap @@ -154,6 +156,7 @@ func New(root common.Hash, db Database, snaps *snapshot.Tree) (*StateDB, error) stateObjectsPending: make(map[common.Address]struct{}), stateObjectsDirty: make(map[common.Address]struct{}), stateObjectsDestruct: make(map[common.Address]struct{}), + stateObjectsMu: sync.RWMutex{}, revertedKeys: make(map[blockstm.Key]struct{}), logs: make(map[common.Hash][]*types.Log), preimages: make(map[common.Hash][]byte), @@ -997,6 +1000,9 @@ func (s *StateDB) getDeletedStateObject(addr common.Address) *stateObject { } func (s *StateDB) setStateObject(object *stateObject) { + s.stateObjectsMu.Lock() + defer s.stateObjectsMu.Unlock() + s.stateObjects[object.Address()] = object } From 62208934adec0c5b63c04699b279d4c7974fbc2d Mon Sep 17 00:00:00 2001 From: Shivam Sharma Date: Fri, 4 Aug 2023 15:05:45 +0530 Subject: [PATCH 04/16] chg : modify stateObjectsMu --- core/state/statedb.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/state/statedb.go b/core/state/statedb.go index 5c1b57de06..62ba3a8290 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -936,6 +936,9 @@ func (s *StateDB) getStateObject(addr common.Address) *stateObject { // destructed object instead of wiping all knowledge about the state object. func (s *StateDB) getDeletedStateObject(addr common.Address) *stateObject { return MVRead(s, blockstm.NewAddressKey(addr), nil, func(s *StateDB) *stateObject { + s.stateObjectsMu.Lock() + defer s.stateObjectsMu.Unlock() + // Prefer live objects if any is available if obj := s.stateObjects[addr]; obj != nil { return obj @@ -1000,9 +1003,6 @@ func (s *StateDB) getDeletedStateObject(addr common.Address) *stateObject { } func (s *StateDB) setStateObject(object *stateObject) { - s.stateObjectsMu.Lock() - defer s.stateObjectsMu.Unlock() - s.stateObjects[object.Address()] = object } From 560620fa8936482156d1dd2c00b0c7a372a5ac32 Mon Sep 17 00:00:00 2001 From: Shivam Sharma Date: Fri, 4 Aug 2023 15:23:31 +0530 Subject: [PATCH 05/16] bump : version to 0.5.0-beta-2 --- packaging/templates/package_scripts/control | 2 +- packaging/templates/package_scripts/control.arm64 | 2 +- packaging/templates/package_scripts/control.profile.amd64 | 2 +- packaging/templates/package_scripts/control.profile.arm64 | 2 +- packaging/templates/package_scripts/control.validator | 2 +- packaging/templates/package_scripts/control.validator.arm64 | 2 +- params/version.go | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packaging/templates/package_scripts/control b/packaging/templates/package_scripts/control index a21efaab29..36b5fe09fa 100644 --- a/packaging/templates/package_scripts/control +++ b/packaging/templates/package_scripts/control @@ -1,5 +1,5 @@ Source: bor -Version: 0.5.0-beta-1 +Version: 0.5.0-beta-2 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.arm64 b/packaging/templates/package_scripts/control.arm64 index 9fe8c7caaa..ce9036ff26 100644 --- a/packaging/templates/package_scripts/control.arm64 +++ b/packaging/templates/package_scripts/control.arm64 @@ -1,5 +1,5 @@ Source: bor -Version: 0.5.0-beta-1 +Version: 0.5.0-beta-2 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.amd64 b/packaging/templates/package_scripts/control.profile.amd64 index 310c47893a..a405dde351 100644 --- a/packaging/templates/package_scripts/control.profile.amd64 +++ b/packaging/templates/package_scripts/control.profile.amd64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 0.5.0-beta-1 +Version: 0.5.0-beta-2 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.arm64 b/packaging/templates/package_scripts/control.profile.arm64 index 17129020fb..bc707faa8d 100644 --- a/packaging/templates/package_scripts/control.profile.arm64 +++ b/packaging/templates/package_scripts/control.profile.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 0.5.0-beta-1 +Version: 0.5.0-beta-2 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator b/packaging/templates/package_scripts/control.validator index 7a32b06c6c..a886578a69 100644 --- a/packaging/templates/package_scripts/control.validator +++ b/packaging/templates/package_scripts/control.validator @@ -1,5 +1,5 @@ Source: bor-profile -Version: 0.5.0-beta-1 +Version: 0.5.0-beta-2 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator.arm64 b/packaging/templates/package_scripts/control.validator.arm64 index ca2e71661e..d48a55232f 100644 --- a/packaging/templates/package_scripts/control.validator.arm64 +++ b/packaging/templates/package_scripts/control.validator.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 0.5.0-beta-1 +Version: 0.5.0-beta-2 Section: develop Priority: standard Maintainer: Polygon diff --git a/params/version.go b/params/version.go index 5d67567990..0af1dd093f 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ const ( VersionMajor = 0 // Major version component of the current release VersionMinor = 5 // Minor version component of the current release VersionPatch = 0 // Patch version component of the current release - VersionMeta = "beta-1" // Version metadata to append to the version string + VersionMeta = "beta-2" // Version metadata to append to the version string ) var GitCommit string From 75fe9c6c8453d378f7442969a4882ccc48e23a39 Mon Sep 17 00:00:00 2001 From: Jerry Date: Fri, 4 Aug 2023 12:25:27 -0700 Subject: [PATCH 06/16] Add mutex for currentState in TxPool --- core/txpool/txpool.go | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/core/txpool/txpool.go b/core/txpool/txpool.go index c739b6d15b..1d2f1aaa35 100644 --- a/core/txpool/txpool.go +++ b/core/txpool/txpool.go @@ -279,9 +279,10 @@ type TxPool struct { eip1559 atomic.Bool // Fork indicator whether we are using EIP-1559 type transactions. shanghai atomic.Bool // Fork indicator whether we are in the Shanghai stage. - currentState *state.StateDB // Current state in the blockchain head - pendingNonces *noncer // Pending state tracking virtual nonces - currentMaxGas atomic.Uint64 // Current gas limit for transaction caps + currentState *state.StateDB // Current state in the blockchain head + currentStateMutex sync.Mutex // Mutex to protect currentState + pendingNonces *noncer // Pending state tracking virtual nonces + currentMaxGas atomic.Uint64 // Current gas limit for transaction caps locals *accountSet // Set of local transaction to exempt from eviction rules journal *journal // Journal of local transaction to back up to disk @@ -745,6 +746,9 @@ func (pool *TxPool) local() map[common.Address]types.Transactions { // and does not require the pool mutex to be held. // nolint:gocognit func (pool *TxPool) validateTxBasics(tx *types.Transaction, local bool) error { + pool.currentStateMutex.Lock() + defer pool.currentStateMutex.Unlock() + // Accept only legacy transactions until EIP-2718/2930 activates. if !pool.eip2718.Load() && tx.Type() != types.LegacyTxType { return core.ErrTxTypeNotSupported @@ -1915,6 +1919,9 @@ func (pool *TxPool) promoteExecutables(accounts []common.Address) []*types.Trans balance := uint256.NewInt(0) + pool.currentStateMutex.Lock() + defer pool.currentStateMutex.Unlock() + // Iterate over all accounts and promote any executable transactions for _, addr := range accounts { list = pool.queue[addr] @@ -2252,6 +2259,9 @@ func (pool *TxPool) demoteUnexecutables() { // Iterate over all accounts and demote any non-executable transactions pool.pendingMu.RLock() + pool.currentStateMutex.Lock() + defer pool.currentStateMutex.Unlock() + for addr, list := range pool.pending { nonce := pool.currentState.GetNonce(addr) From 173a26f0c351e288ef24646667e47afcef9748c4 Mon Sep 17 00:00:00 2001 From: Jerry Date: Fri, 4 Aug 2023 12:26:06 -0700 Subject: [PATCH 07/16] Revert "chg : modify stateObjectsMu" This reverts commit 62208934adec0c5b63c04699b279d4c7974fbc2d. --- core/state/statedb.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/state/statedb.go b/core/state/statedb.go index 62ba3a8290..5c1b57de06 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -936,9 +936,6 @@ func (s *StateDB) getStateObject(addr common.Address) *stateObject { // destructed object instead of wiping all knowledge about the state object. func (s *StateDB) getDeletedStateObject(addr common.Address) *stateObject { return MVRead(s, blockstm.NewAddressKey(addr), nil, func(s *StateDB) *stateObject { - s.stateObjectsMu.Lock() - defer s.stateObjectsMu.Unlock() - // Prefer live objects if any is available if obj := s.stateObjects[addr]; obj != nil { return obj @@ -1003,6 +1000,9 @@ func (s *StateDB) getDeletedStateObject(addr common.Address) *stateObject { } func (s *StateDB) setStateObject(object *stateObject) { + s.stateObjectsMu.Lock() + defer s.stateObjectsMu.Unlock() + s.stateObjects[object.Address()] = object } From 3da36b08ff1259cdb7b26d9bc1a4aa197cf9ba9d Mon Sep 17 00:00:00 2001 From: Jerry Date: Fri, 4 Aug 2023 12:26:11 -0700 Subject: [PATCH 08/16] Revert "add : mutex for stateObjects" This reverts commit 4d5cdae2e6a6b08238d9e032b790ff9a6f941134. --- core/state/journal.go | 5 ----- core/state/statedb.go | 6 ------ 2 files changed, 11 deletions(-) diff --git a/core/state/journal.go b/core/state/journal.go index 0409df179e..7d5648153c 100644 --- a/core/state/journal.go +++ b/core/state/journal.go @@ -148,12 +148,7 @@ type ( ) func (ch createObjectChange) revert(s *StateDB) { - s.stateObjectsMu.Lock() - delete(s.stateObjects, *ch.account) - - s.stateObjectsMu.Unlock() - delete(s.stateObjectsDirty, *ch.account) RevertWrite(s, blockstm.NewAddressKey(*ch.account)) } diff --git a/core/state/statedb.go b/core/state/statedb.go index 5c1b57de06..d304ccb6b6 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -22,7 +22,6 @@ import ( "fmt" "math/big" "sort" - "sync" "time" "github.com/ethereum/go-ethereum/common" @@ -79,7 +78,6 @@ type StateDB struct { stateObjectsPending map[common.Address]struct{} // State objects finalized but not yet written to the trie stateObjectsDirty map[common.Address]struct{} // State objects modified in the current execution stateObjectsDestruct map[common.Address]struct{} // State objects destructed in the block - stateObjectsMu sync.RWMutex // Block-stm related fields mvHashmap *blockstm.MVHashMap @@ -156,7 +154,6 @@ func New(root common.Hash, db Database, snaps *snapshot.Tree) (*StateDB, error) stateObjectsPending: make(map[common.Address]struct{}), stateObjectsDirty: make(map[common.Address]struct{}), stateObjectsDestruct: make(map[common.Address]struct{}), - stateObjectsMu: sync.RWMutex{}, revertedKeys: make(map[blockstm.Key]struct{}), logs: make(map[common.Hash][]*types.Log), preimages: make(map[common.Hash][]byte), @@ -1000,9 +997,6 @@ func (s *StateDB) getDeletedStateObject(addr common.Address) *stateObject { } func (s *StateDB) setStateObject(object *stateObject) { - s.stateObjectsMu.Lock() - defer s.stateObjectsMu.Unlock() - s.stateObjects[object.Address()] = object } From 4bc2359c81ca03401ee69fc9129ef1361e0cd894 Mon Sep 17 00:00:00 2001 From: Jerry Date: Fri, 4 Aug 2023 12:27:56 -0700 Subject: [PATCH 09/16] Bump version to 0.5.0-beta-3 --- packaging/templates/package_scripts/control | 2 +- packaging/templates/package_scripts/control.arm64 | 2 +- packaging/templates/package_scripts/control.profile.amd64 | 2 +- packaging/templates/package_scripts/control.profile.arm64 | 2 +- packaging/templates/package_scripts/control.validator | 2 +- packaging/templates/package_scripts/control.validator.arm64 | 2 +- params/version.go | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packaging/templates/package_scripts/control b/packaging/templates/package_scripts/control index 36b5fe09fa..18583227ab 100644 --- a/packaging/templates/package_scripts/control +++ b/packaging/templates/package_scripts/control @@ -1,5 +1,5 @@ Source: bor -Version: 0.5.0-beta-2 +Version: 0.5.0-beta-3 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.arm64 b/packaging/templates/package_scripts/control.arm64 index ce9036ff26..61cf7c8678 100644 --- a/packaging/templates/package_scripts/control.arm64 +++ b/packaging/templates/package_scripts/control.arm64 @@ -1,5 +1,5 @@ Source: bor -Version: 0.5.0-beta-2 +Version: 0.5.0-beta-3 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.amd64 b/packaging/templates/package_scripts/control.profile.amd64 index a405dde351..c846a6d733 100644 --- a/packaging/templates/package_scripts/control.profile.amd64 +++ b/packaging/templates/package_scripts/control.profile.amd64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 0.5.0-beta-2 +Version: 0.5.0-beta-3 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.arm64 b/packaging/templates/package_scripts/control.profile.arm64 index bc707faa8d..18640c9e75 100644 --- a/packaging/templates/package_scripts/control.profile.arm64 +++ b/packaging/templates/package_scripts/control.profile.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 0.5.0-beta-2 +Version: 0.5.0-beta-3 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator b/packaging/templates/package_scripts/control.validator index a886578a69..95bbb4e7d2 100644 --- a/packaging/templates/package_scripts/control.validator +++ b/packaging/templates/package_scripts/control.validator @@ -1,5 +1,5 @@ Source: bor-profile -Version: 0.5.0-beta-2 +Version: 0.5.0-beta-3 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator.arm64 b/packaging/templates/package_scripts/control.validator.arm64 index d48a55232f..29303c724e 100644 --- a/packaging/templates/package_scripts/control.validator.arm64 +++ b/packaging/templates/package_scripts/control.validator.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 0.5.0-beta-2 +Version: 0.5.0-beta-3 Section: develop Priority: standard Maintainer: Polygon diff --git a/params/version.go b/params/version.go index 0af1dd093f..eeedf0fc13 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ const ( VersionMajor = 0 // Major version component of the current release VersionMinor = 5 // Minor version component of the current release VersionPatch = 0 // Patch version component of the current release - VersionMeta = "beta-2" // Version metadata to append to the version string + VersionMeta = "beta-3" // Version metadata to append to the version string ) var GitCommit string From 4b6f1a6fd65e64bcd3bcad5080aff168ee9811f8 Mon Sep 17 00:00:00 2001 From: Jerry Date: Mon, 7 Aug 2023 14:59:40 -0700 Subject: [PATCH 10/16] Minor fix --- core/txpool/txpool.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/txpool/txpool.go b/core/txpool/txpool.go index 1d2f1aaa35..9ced7c630d 100644 --- a/core/txpool/txpool.go +++ b/core/txpool/txpool.go @@ -854,6 +854,9 @@ func (pool *TxPool) validateTxBasics(tx *types.Transaction, local bool) error { // validateTx checks whether a transaction is valid according to the consensus // rules and adheres to some heuristic limits of the local node (price and size). func (pool *TxPool) validateTx(tx *types.Transaction, _ bool) error { + pool.currentStateMutex.Lock() + defer pool.currentStateMutex.Unlock() + // Signature has been checked already, this cannot error. from, _ := types.Sender(pool.signer, tx) // Ensure the transaction adheres to nonce ordering From a602479f721f96c687c0ca2c392767cc510e0af3 Mon Sep 17 00:00:00 2001 From: Shivam Sharma Date: Tue, 8 Aug 2023 13:34:26 +0530 Subject: [PATCH 11/16] bump : version to 0.5.0-beta-4 --- packaging/templates/package_scripts/control | 2 +- packaging/templates/package_scripts/control.arm64 | 2 +- packaging/templates/package_scripts/control.profile.amd64 | 2 +- packaging/templates/package_scripts/control.profile.arm64 | 2 +- packaging/templates/package_scripts/control.validator | 2 +- packaging/templates/package_scripts/control.validator.arm64 | 2 +- params/version.go | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packaging/templates/package_scripts/control b/packaging/templates/package_scripts/control index 18583227ab..f2430139f7 100644 --- a/packaging/templates/package_scripts/control +++ b/packaging/templates/package_scripts/control @@ -1,5 +1,5 @@ Source: bor -Version: 0.5.0-beta-3 +Version: 0.5.0-beta-4 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.arm64 b/packaging/templates/package_scripts/control.arm64 index 61cf7c8678..846fe8f4ef 100644 --- a/packaging/templates/package_scripts/control.arm64 +++ b/packaging/templates/package_scripts/control.arm64 @@ -1,5 +1,5 @@ Source: bor -Version: 0.5.0-beta-3 +Version: 0.5.0-beta-4 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.amd64 b/packaging/templates/package_scripts/control.profile.amd64 index c846a6d733..7efa755a06 100644 --- a/packaging/templates/package_scripts/control.profile.amd64 +++ b/packaging/templates/package_scripts/control.profile.amd64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 0.5.0-beta-3 +Version: 0.5.0-beta-4 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.arm64 b/packaging/templates/package_scripts/control.profile.arm64 index 18640c9e75..d3577afdf8 100644 --- a/packaging/templates/package_scripts/control.profile.arm64 +++ b/packaging/templates/package_scripts/control.profile.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 0.5.0-beta-3 +Version: 0.5.0-beta-4 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator b/packaging/templates/package_scripts/control.validator index 95bbb4e7d2..92e4a5e118 100644 --- a/packaging/templates/package_scripts/control.validator +++ b/packaging/templates/package_scripts/control.validator @@ -1,5 +1,5 @@ Source: bor-profile -Version: 0.5.0-beta-3 +Version: 0.5.0-beta-4 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator.arm64 b/packaging/templates/package_scripts/control.validator.arm64 index 29303c724e..1195262246 100644 --- a/packaging/templates/package_scripts/control.validator.arm64 +++ b/packaging/templates/package_scripts/control.validator.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 0.5.0-beta-3 +Version: 0.5.0-beta-4 Section: develop Priority: standard Maintainer: Polygon diff --git a/params/version.go b/params/version.go index eeedf0fc13..7b27390891 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ const ( VersionMajor = 0 // Major version component of the current release VersionMinor = 5 // Minor version component of the current release VersionPatch = 0 // Patch version component of the current release - VersionMeta = "beta-3" // Version metadata to append to the version string + VersionMeta = "beta-4" // Version metadata to append to the version string ) var GitCommit string From a5b1ae5d16f708e20b41c78914e2594cad218bf2 Mon Sep 17 00:00:00 2001 From: Manav Darji Date: Wed, 16 Aug 2023 18:24:23 +0530 Subject: [PATCH 12/16] metrics/prometheus: fix count field of metric (#965) --- metrics/prometheus/collector.go | 4 ++-- metrics/prometheus/collector_test.go | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/metrics/prometheus/collector.go b/metrics/prometheus/collector.go index ecd90e72d6..3f041aa1c2 100644 --- a/metrics/prometheus/collector.go +++ b/metrics/prometheus/collector.go @@ -76,7 +76,7 @@ func (c *collector) addHistogram(name string, m metrics.Histogram) { } c.writeSummarySum(name, fmt.Sprintf("%f", sum)) - c.writeSummaryCounter(name, len(ps)) + c.writeSummaryCounter(name, m.Count()) c.buff.WriteRune('\n') } @@ -97,7 +97,7 @@ func (c *collector) addTimer(name string, m metrics.Timer) { } c.writeSummarySum(name, fmt.Sprintf("%f", sum)) - c.writeSummaryCounter(name, len(ps)) + c.writeSummaryCounter(name, m.Count()) c.buff.WriteRune('\n') } diff --git a/metrics/prometheus/collector_test.go b/metrics/prometheus/collector_test.go index 1321aec383..ba3c829f1d 100644 --- a/metrics/prometheus/collector_test.go +++ b/metrics/prometheus/collector_test.go @@ -49,6 +49,7 @@ func TestCollector(t *testing.T) { timer.Update(120 * time.Millisecond) timer.Update(23 * time.Millisecond) timer.Update(24 * time.Millisecond) + timer.Update(30 * time.Millisecond) c.addTimer("test/timer", timer) resettingTimer := metrics.NewResettingTimer() @@ -58,6 +59,7 @@ func TestCollector(t *testing.T) { resettingTimer.Update(120 * time.Millisecond) resettingTimer.Update(13 * time.Millisecond) resettingTimer.Update(14 * time.Millisecond) + resettingTimer.Update(30 * time.Millisecond) c.addResettingTimer("test/resetting_timer", resettingTimer.Snapshot()) emptyResettingTimer := metrics.NewResettingTimer().Snapshot() @@ -83,27 +85,27 @@ test_histogram {quantile="0.99"} 0 test_histogram {quantile="0.999"} 0 test_histogram {quantile="0.9999"} 0 test_histogram_sum 0.000000 -test_histogram_count 6 +test_histogram_count 0 # TYPE test_meter gauge test_meter 9999999 # TYPE test_timer summary -test_timer {quantile="0.5"} 2.25e+07 -test_timer {quantile="0.75"} 4.8e+07 +test_timer {quantile="0.5"} 2.3e+07 +test_timer {quantile="0.75"} 3e+07 test_timer {quantile="0.95"} 1.2e+08 test_timer {quantile="0.99"} 1.2e+08 test_timer {quantile="0.999"} 1.2e+08 test_timer {quantile="0.9999"} 1.2e+08 -test_timer_sum 550500000.000000 -test_timer_count 6 +test_timer_sum 533000000.000000 +test_timer_count 7 # TYPE test_resetting_timer summary -test_resetting_timer {quantile="0.50"} 12000000 +test_resetting_timer {quantile="0.50"} 13000000 test_resetting_timer {quantile="0.95"} 120000000 test_resetting_timer {quantile="0.99"} 120000000 -test_resetting_timer_sum 180000000 -test_resetting_timer_count 6 +test_resetting_timer_sum 210000000 +test_resetting_timer_count 7 ` From f5c4c2e9acf2e0d16981dd39ad66e90c79983ec5 Mon Sep 17 00:00:00 2001 From: Manav Darji Date: Fri, 18 Aug 2023 11:58:00 +0530 Subject: [PATCH 13/16] bump version to 0.5.0-beta-5 --- packaging/templates/package_scripts/control | 2 +- packaging/templates/package_scripts/control.arm64 | 2 +- packaging/templates/package_scripts/control.profile.amd64 | 2 +- packaging/templates/package_scripts/control.profile.arm64 | 2 +- packaging/templates/package_scripts/control.validator | 2 +- packaging/templates/package_scripts/control.validator.arm64 | 2 +- params/version.go | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packaging/templates/package_scripts/control b/packaging/templates/package_scripts/control index f2430139f7..b6614e9e51 100644 --- a/packaging/templates/package_scripts/control +++ b/packaging/templates/package_scripts/control @@ -1,5 +1,5 @@ Source: bor -Version: 0.5.0-beta-4 +Version: 0.5.0-beta-5 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.arm64 b/packaging/templates/package_scripts/control.arm64 index 846fe8f4ef..b98a3fd6aa 100644 --- a/packaging/templates/package_scripts/control.arm64 +++ b/packaging/templates/package_scripts/control.arm64 @@ -1,5 +1,5 @@ Source: bor -Version: 0.5.0-beta-4 +Version: 0.5.0-beta-5 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.amd64 b/packaging/templates/package_scripts/control.profile.amd64 index 7efa755a06..961e8e5b00 100644 --- a/packaging/templates/package_scripts/control.profile.amd64 +++ b/packaging/templates/package_scripts/control.profile.amd64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 0.5.0-beta-4 +Version: 0.5.0-beta-5 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.arm64 b/packaging/templates/package_scripts/control.profile.arm64 index d3577afdf8..fcdf4e8704 100644 --- a/packaging/templates/package_scripts/control.profile.arm64 +++ b/packaging/templates/package_scripts/control.profile.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 0.5.0-beta-4 +Version: 0.5.0-beta-5 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator b/packaging/templates/package_scripts/control.validator index 92e4a5e118..35b23ac1f0 100644 --- a/packaging/templates/package_scripts/control.validator +++ b/packaging/templates/package_scripts/control.validator @@ -1,5 +1,5 @@ Source: bor-profile -Version: 0.5.0-beta-4 +Version: 0.5.0-beta-5 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator.arm64 b/packaging/templates/package_scripts/control.validator.arm64 index 1195262246..9e68886701 100644 --- a/packaging/templates/package_scripts/control.validator.arm64 +++ b/packaging/templates/package_scripts/control.validator.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 0.5.0-beta-4 +Version: 0.5.0-beta-5 Section: develop Priority: standard Maintainer: Polygon diff --git a/params/version.go b/params/version.go index 7b27390891..e075b1d0ee 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ const ( VersionMajor = 0 // Major version component of the current release VersionMinor = 5 // Minor version component of the current release VersionPatch = 0 // Patch version component of the current release - VersionMeta = "beta-4" // Version metadata to append to the version string + VersionMeta = "beta-5" // Version metadata to append to the version string ) var GitCommit string From 1cee4dddb7677d22370dc3ec3ffad06e89eb9a9b Mon Sep 17 00:00:00 2001 From: Shivam Sharma Date: Mon, 28 Aug 2023 17:36:54 +0530 Subject: [PATCH 14/16] fix : eth_getLogs --- cmd/utils/flags.go | 5 ++++- eth/filters/filter_system_test.go | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index d41bd77b79..efbe4550ca 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -2170,11 +2170,14 @@ func RegisterFilterAPI(stack *node.Node, backend ethapi.Backend, ethcfg *ethconf LogCacheSize: ethcfg.FilterLogCacheSize, }) + filterAPI := filters.NewFilterAPI(filterSystem, isLightClient, ethconfig.Defaults.BorLogs) stack.RegisterAPIs([]rpc.API{{ Namespace: "eth", - Service: filters.NewFilterAPI(filterSystem, isLightClient, ethconfig.Defaults.BorLogs), + Service: filterAPI, }}) + // avoiding constructor changed by introducing new method to set genesis + filterAPI.SetChainConfig(ethcfg.Genesis.Config) return filterSystem } diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go index dc88b1ba68..44c160964f 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -490,6 +490,7 @@ func TestInvalidGetLogsRequest(t *testing.T) { api = NewFilterAPI(sys, false, true) blockHash = common.HexToHash("0x1111111111111111111111111111111111111111111111111111111111111111") ) + api.SetChainConfig(params.BorUnittestChainConfig) // Reason: Cannot specify both BlockHash and FromBlock/ToBlock) testCases := []FilterCriteria{ @@ -808,6 +809,7 @@ func TestPendingLogsSubscription(t *testing.T) { <-testCases[i].sub.Err() } } + // nolint:gocognit func TestLightFilterLogs(t *testing.T) { t.Parallel() From 9eb44ad01fe61ddfd7119bb7ed05a11343fe4e73 Mon Sep 17 00:00:00 2001 From: Shivam Sharma Date: Mon, 28 Aug 2023 17:55:31 +0530 Subject: [PATCH 15/16] fix : lint --- cmd/utils/flags.go | 1 + eth/filters/filter_system_test.go | 1 + 2 files changed, 2 insertions(+) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index efbe4550ca..0313149341 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -2178,6 +2178,7 @@ func RegisterFilterAPI(stack *node.Node, backend ethapi.Backend, ethcfg *ethconf // avoiding constructor changed by introducing new method to set genesis filterAPI.SetChainConfig(ethcfg.Genesis.Config) + return filterSystem } diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go index 44c160964f..43d79f3723 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -490,6 +490,7 @@ func TestInvalidGetLogsRequest(t *testing.T) { api = NewFilterAPI(sys, false, true) blockHash = common.HexToHash("0x1111111111111111111111111111111111111111111111111111111111111111") ) + api.SetChainConfig(params.BorUnittestChainConfig) // Reason: Cannot specify both BlockHash and FromBlock/ToBlock) From d7478f726ed311c5c07b80c578a7a81c51217263 Mon Sep 17 00:00:00 2001 From: Shivam Sharma Date: Tue, 29 Aug 2023 00:01:54 +0530 Subject: [PATCH 16/16] bump : version to 0.5.0-beta-6 --- packaging/templates/package_scripts/control | 2 +- packaging/templates/package_scripts/control.arm64 | 2 +- packaging/templates/package_scripts/control.profile.amd64 | 2 +- packaging/templates/package_scripts/control.profile.arm64 | 2 +- packaging/templates/package_scripts/control.validator | 2 +- packaging/templates/package_scripts/control.validator.arm64 | 2 +- params/version.go | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packaging/templates/package_scripts/control b/packaging/templates/package_scripts/control index b6614e9e51..8ef7ddc35e 100644 --- a/packaging/templates/package_scripts/control +++ b/packaging/templates/package_scripts/control @@ -1,5 +1,5 @@ Source: bor -Version: 0.5.0-beta-5 +Version: 0.5.0-beta-6 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.arm64 b/packaging/templates/package_scripts/control.arm64 index b98a3fd6aa..16a3f5b32b 100644 --- a/packaging/templates/package_scripts/control.arm64 +++ b/packaging/templates/package_scripts/control.arm64 @@ -1,5 +1,5 @@ Source: bor -Version: 0.5.0-beta-5 +Version: 0.5.0-beta-6 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.amd64 b/packaging/templates/package_scripts/control.profile.amd64 index 961e8e5b00..26261a17ee 100644 --- a/packaging/templates/package_scripts/control.profile.amd64 +++ b/packaging/templates/package_scripts/control.profile.amd64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 0.5.0-beta-5 +Version: 0.5.0-beta-6 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.arm64 b/packaging/templates/package_scripts/control.profile.arm64 index fcdf4e8704..ad6c80dd4e 100644 --- a/packaging/templates/package_scripts/control.profile.arm64 +++ b/packaging/templates/package_scripts/control.profile.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 0.5.0-beta-5 +Version: 0.5.0-beta-6 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator b/packaging/templates/package_scripts/control.validator index 35b23ac1f0..6957844277 100644 --- a/packaging/templates/package_scripts/control.validator +++ b/packaging/templates/package_scripts/control.validator @@ -1,5 +1,5 @@ Source: bor-profile -Version: 0.5.0-beta-5 +Version: 0.5.0-beta-6 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator.arm64 b/packaging/templates/package_scripts/control.validator.arm64 index 9e68886701..f5cb2de569 100644 --- a/packaging/templates/package_scripts/control.validator.arm64 +++ b/packaging/templates/package_scripts/control.validator.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 0.5.0-beta-5 +Version: 0.5.0-beta-6 Section: develop Priority: standard Maintainer: Polygon diff --git a/params/version.go b/params/version.go index e075b1d0ee..8d9afebc4a 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ const ( VersionMajor = 0 // Major version component of the current release VersionMinor = 5 // Minor version component of the current release VersionPatch = 0 // Patch version component of the current release - VersionMeta = "beta-5" // Version metadata to append to the version string + VersionMeta = "beta-6" // Version metadata to append to the version string ) var GitCommit string