From ec3617947fedd82f0ee8f5ce40e9646b03f1fa22 Mon Sep 17 00:00:00 2001 From: kamuikatsurgi Date: Tue, 4 Mar 2025 13:45:16 +0530 Subject: [PATCH 01/11] Update version to 2.0.1-beta --- params/version.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/params/version.go b/params/version.go index 43c57b5365..ec9c77db49 100644 --- a/params/version.go +++ b/params/version.go @@ -21,10 +21,10 @@ import ( ) const ( - VersionMajor = 2 // Major version component of the current release - VersionMinor = 0 // 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 = 2 // Major version component of the current release + VersionMinor = 0 // Minor version component of the current release + VersionPatch = 1 // Patch version component of the current release + VersionMeta = "beta" // Version metadata to append to the version string ) var GitCommit string From 7e3ffd197184736278ddf06da88b17d028e05d8c Mon Sep 17 00:00:00 2001 From: kamuikatsurgi Date: Wed, 19 Mar 2025 18:05:16 +0530 Subject: [PATCH 02/11] Update version to v2.0.1 --- params/version.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/params/version.go b/params/version.go index ec9c77db49..f5d4440c99 100644 --- a/params/version.go +++ b/params/version.go @@ -21,10 +21,10 @@ import ( ) const ( - VersionMajor = 2 // Major version component of the current release - VersionMinor = 0 // Minor version component of the current release - VersionPatch = 1 // Patch version component of the current release - VersionMeta = "beta" // Version metadata to append to the version string + VersionMajor = 2 // Major version component of the current release + VersionMinor = 0 // Minor version component of the current release + VersionPatch = 1 // Patch version component of the current release + VersionMeta = "" // Version metadata to append to the version string ) var GitCommit string From e993723695213e628e6283b3b1bafee8696bf79d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Mar 2025 22:37:35 +0000 Subject: [PATCH 03/11] build(deps): bump github.com/golang-jwt/jwt/v4 from 4.5.1 to 4.5.2 Bumps [github.com/golang-jwt/jwt/v4](https://github.com/golang-jwt/jwt) from 4.5.1 to 4.5.2. - [Release notes](https://github.com/golang-jwt/jwt/releases) - [Changelog](https://github.com/golang-jwt/jwt/blob/main/VERSION_HISTORY.md) - [Commits](https://github.com/golang-jwt/jwt/compare/v4.5.1...v4.5.2) --- updated-dependencies: - dependency-name: github.com/golang-jwt/jwt/v4 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 66ec7b776a..4331225aec 100644 --- a/go.mod +++ b/go.mod @@ -34,7 +34,7 @@ require ( github.com/fsnotify/fsnotify v1.7.0 github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 github.com/gofrs/flock v0.8.1 - github.com/golang-jwt/jwt/v4 v4.5.1 + github.com/golang-jwt/jwt/v4 v4.5.2 github.com/golang/mock v1.6.0 github.com/golang/protobuf v1.5.4 github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb diff --git a/go.sum b/go.sum index ebb109449b..6ad9cf7fc4 100644 --- a/go.sum +++ b/go.sum @@ -1864,8 +1864,9 @@ github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzq github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= -github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo= github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= +github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw= github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= From 911a4b7e6acc79457d4d29d9e093a1ef31e242dd Mon Sep 17 00:00:00 2001 From: Manav Darji Date: Wed, 26 Mar 2025 16:06:35 +0530 Subject: [PATCH 04/11] params: bump version to v2.0.2-beta --- params/version.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/params/version.go b/params/version.go index cc4add1c6f..1509f606a1 100644 --- a/params/version.go +++ b/params/version.go @@ -23,10 +23,10 @@ import ( ) const ( - VersionMajor = 2 // Major version component of the current release - VersionMinor = 0 // 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 = 2 // Major version component of the current release + VersionMinor = 0 // Minor version component of the current release + VersionPatch = 2 // Patch version component of the current release + VersionMeta = "beta" // Version metadata to append to the version string ) var ( From 5973f5d3bd10c9cd6adf84eb7751856441359eb3 Mon Sep 17 00:00:00 2001 From: marcello33 Date: Thu, 10 Apr 2025 10:29:43 -0700 Subject: [PATCH 05/11] ci update --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e969f5261..220524799f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,7 +107,7 @@ jobs: - name: Test run: make test - - uses: actions/upload-artifact@v4.4.0 + - uses: PaloAltoNetworks/upload-secure-artifact@main with: name: unitTest-coverage path: cover.out @@ -158,7 +158,7 @@ jobs: - name: test-integration run: make test-integration - - uses: actions/upload-artifact@v4.4.0 + - uses: PaloAltoNetworks/upload-secure-artifact@main with: name: integrationTest-coverage path: cover.out @@ -252,7 +252,7 @@ jobs: - name: Upload logs if: always() - uses: actions/upload-artifact@v4.4.0 + uses: PaloAltoNetworks/upload-secure-artifact@main with: name: logs_${{ github.run_id }} path: | @@ -267,11 +267,11 @@ jobs: mkdir -p ${{ github.run_id }}/matic-cli sudo mv bor ${{ github.run_id }} sudo mv matic-cli/devnet ${{ github.run_id }}/matic-cli - sudo tar czf code.tar.gz ${{ github.run_id }} + sudo tar czf code.tar.gz --exclude='.git' . ${{ github.run_id }} - name: Upload code and chain data if: always() - uses: actions/upload-artifact@v4.4.0 + uses: PaloAltoNetworks/upload-secure-artifact@main with: name: code_${{ github.run_id }} path: code.tar.gz From 96f55f4ccf5a7b562864d55af25a669adb9428da Mon Sep 17 00:00:00 2001 From: marcello33 Date: Thu, 10 Apr 2025 12:49:20 -0700 Subject: [PATCH 06/11] fix path for logs --- .github/workflows/ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 220524799f..afd3997662 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -250,13 +250,17 @@ jobs: cd - timeout 60m bash bor/integration-tests/smoke_test.sh + - name: Resolve absolute path for logs + id: pathfix + run: | + echo "ABS_LOG_PATH=$(realpath matic-cli/devnet/logs)" >> $GITHUB_ENV + - name: Upload logs if: always() uses: PaloAltoNetworks/upload-secure-artifact@main with: name: logs_${{ github.run_id }} - path: | - matic-cli/devnet/logs + path: ${{ env.ABS_LOG_PATH }} - name: Package code and chain data if: always() From d7dd23424bde03204110fdd206dc9ad02ecf1aec Mon Sep 17 00:00:00 2001 From: marcello33 Date: Mon, 14 Apr 2025 17:13:35 +0200 Subject: [PATCH 07/11] no warning on package code --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index afd3997662..0ada91c147 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -271,7 +271,7 @@ jobs: mkdir -p ${{ github.run_id }}/matic-cli sudo mv bor ${{ github.run_id }} sudo mv matic-cli/devnet ${{ github.run_id }}/matic-cli - sudo tar czf code.tar.gz --exclude='.git' . ${{ github.run_id }} + sudo tar --warning=no-file-changed --exclude='.git' -czf code.tar.gz ${{ github.run_id }} - name: Upload code and chain data if: always() From 9ac9a6d19d6d434dd9dcbe5db91d85dcce36de92 Mon Sep 17 00:00:00 2001 From: Manav Darji Date: Fri, 9 May 2025 11:02:57 +0530 Subject: [PATCH 08/11] params: bump version to v2.0.2 --- params/version.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/params/version.go b/params/version.go index 1509f606a1..9fd069466e 100644 --- a/params/version.go +++ b/params/version.go @@ -23,10 +23,10 @@ import ( ) const ( - VersionMajor = 2 // Major version component of the current release - VersionMinor = 0 // Minor version component of the current release - VersionPatch = 2 // Patch version component of the current release - VersionMeta = "beta" // Version metadata to append to the version string + VersionMajor = 2 // Major version component of the current release + VersionMinor = 0 // Minor version component of the current release + VersionPatch = 2 // Patch version component of the current release + VersionMeta = "" // Version metadata to append to the version string ) var ( From a20f0aa1b67855ad6950a805a301c3292879dcda Mon Sep 17 00:00:00 2001 From: Jerry Date: Fri, 9 May 2025 10:49:50 -0700 Subject: [PATCH 09/11] [bug fix] Avoid concurrent access to hasher buffer --- core/state/reader.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/state/reader.go b/core/state/reader.go index cd960a60a8..667082439c 100644 --- a/core/state/reader.go +++ b/core/state/reader.go @@ -79,7 +79,7 @@ func newStateReader(root common.Hash, snaps *snapshot.Tree) (*stateReader, error // // The returned account might be nil if it's not existent. func (r *stateReader) Account(addr common.Address) (*types.StateAccount, error) { - ret, err := r.snap.Account(crypto.HashData(r.buff, addr.Bytes())) + ret, err := r.snap.Account(crypto.HashData(crypto.NewKeccakState(), addr.Bytes())) if err != nil { return nil, err } @@ -109,8 +109,8 @@ func (r *stateReader) Account(addr common.Address) (*types.StateAccount, error) // // The returned storage slot might be empty if it's not existent. func (r *stateReader) Storage(addr common.Address, key common.Hash) (common.Hash, error) { - addrHash := crypto.HashData(r.buff, addr.Bytes()) - slotHash := crypto.HashData(r.buff, key.Bytes()) + addrHash := crypto.HashData(crypto.NewKeccakState(), addr.Bytes()) + slotHash := crypto.HashData(crypto.NewKeccakState(), key.Bytes()) ret, err := r.snap.Storage(addrHash, slotHash) if err != nil { return common.Hash{}, err @@ -223,7 +223,7 @@ func (r *trieReader) Storage(addr common.Address, key common.Hash) (common.Hash, root = r.subRoots[addr] } var err error - tr, err = trie.NewStateTrie(trie.StorageTrieID(r.root, crypto.HashData(r.buff, addr.Bytes()), root), r.db) + tr, err = trie.NewStateTrie(trie.StorageTrieID(r.root, crypto.HashData(crypto.NewKeccakState(), addr.Bytes()), root), r.db) if err != nil { return common.Hash{}, err } From 90332426db8809dabcd8b56980fe8f70daf04c77 Mon Sep 17 00:00:00 2001 From: Jerry Date: Fri, 9 May 2025 10:55:38 -0700 Subject: [PATCH 10/11] Bump patch version to v2.0.3 --- params/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/params/version.go b/params/version.go index 9fd069466e..dbd67a255a 100644 --- a/params/version.go +++ b/params/version.go @@ -25,7 +25,7 @@ import ( const ( VersionMajor = 2 // Major version component of the current release VersionMinor = 0 // Minor version component of the current release - VersionPatch = 2 // Patch version component of the current release + VersionPatch = 3 // Patch version component of the current release VersionMeta = "" // Version metadata to append to the version string ) From 34db035d3fd3d76f6f95d1d28763bd7879710933 Mon Sep 17 00:00:00 2001 From: Manav Darji Date: Wed, 14 May 2025 14:19:54 +0530 Subject: [PATCH 11/11] consensus/bor: remove state root calculation from bor consensus (#1539) Remove call to `IntermediateRoot` in `Finalize` method of consensus while validating a remote block as it's not required and it updates a copy of header and not the actual header. --- consensus/bor/bor.go | 4 ---- consensus/bor/bor_test.go | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/consensus/bor/bor.go b/consensus/bor/bor.go index 59d7bf71af..adb9e7857b 100644 --- a/consensus/bor/bor.go +++ b/consensus/bor/bor.go @@ -878,10 +878,6 @@ func (c *Bor) Finalize(chain consensus.ChainHeaderReader, header *types.Header, return } - // No block rewards in PoA, so the state remains as is and uncles are dropped - header.Root = state.IntermediateRoot(chain.Config().IsEIP158(header.Number)) - header.UncleHash = types.CalcUncleHash(nil) - // Set state sync data to blockchain bc := chain.(*core.BlockChain) bc.SetStateSync(stateSyncData) diff --git a/consensus/bor/bor_test.go b/consensus/bor/bor_test.go index ed839d3476..628550e3b6 100644 --- a/consensus/bor/bor_test.go +++ b/consensus/bor/bor_test.go @@ -84,7 +84,7 @@ func TestGenesisContractChange(t *testing.T) { require.NoError(t, err) require.NoError(t, statedb.Database().TrieDB().Commit(root, true)) - statedb, err := state.New(h.Root, state.NewDatabase(triedb.NewDatabase(db, triedb.HashDefaults), nil)) + statedb, err := state.New(root, state.NewDatabase(triedb.NewDatabase(db, triedb.HashDefaults), nil)) require.NoError(t, err) return root, statedb