Merge tag 'v1.1.0' into release/polygon-1.x-fh2.3

# Conflicts: # packaging/templates/package_scripts/control # packaging/templates/package_scripts/control.arm64 # packaging/templates/package_scripts/control.profile.amd64 # packaging/templates/package_scripts/control.profile.arm64 # packaging/templates/package_scripts/control.validator # packaging/templates/package_scripts/control.validator.arm64 # params/version.go
streamingfast · Nov 15, 2023 · ee9db11 · ee9db11
2 parents b428b22 + cf18ecc
commit ee9db11
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 12 deletions.
diff --git a/builder/files/genesis-mainnet-v1.json b/builder/files/genesis-mainnet-v1.json
diff --git a/internal/cli/server/chains/mainnet.go b/internal/cli/server/chains/mainnet.go
diff --git a/packaging/templates/package_scripts/control b/packaging/templates/package_scripts/control
@@ -1,5 +1,5 @@
 Source: bor
-Version: 1.1.0-beta4
+Version: 1.1.0
 Section: develop
 Priority: standard
 Maintainer: Polygon <[email protected]>

diff --git a/packaging/templates/package_scripts/control.arm64 b/packaging/templates/package_scripts/control.arm64
@@ -1,5 +1,5 @@
 Source: bor
-Version: 1.1.0-beta4
+Version: 1.1.0
 Section: develop
 Priority: standard
 Maintainer: Polygon <[email protected]>

diff --git a/packaging/templates/package_scripts/control.profile.amd64 b/packaging/templates/package_scripts/control.profile.amd64
@@ -1,5 +1,5 @@
 Source: bor-profile
-Version: 1.1.0-beta4
+Version: 1.1.0
 Section: develop
 Priority: standard
 Maintainer: Polygon <[email protected]>

diff --git a/packaging/templates/package_scripts/control.profile.arm64 b/packaging/templates/package_scripts/control.profile.arm64
@@ -1,5 +1,5 @@
 Source: bor-profile
-Version: 1.1.0-beta4
+Version: 1.1.0
 Section: develop
 Priority: standard
 Maintainer: Polygon <[email protected]>

diff --git a/packaging/templates/package_scripts/control.validator b/packaging/templates/package_scripts/control.validator
@@ -1,5 +1,5 @@
 Source: bor-profile
-Version: 1.1.0-beta4
+Version: 1.1.0
 Section: develop
 Priority: standard
 Maintainer: Polygon <[email protected]>

diff --git a/packaging/templates/package_scripts/control.validator.arm64 b/packaging/templates/package_scripts/control.validator.arm64
@@ -1,5 +1,5 @@
 Source: bor-profile
-Version: 1.1.0-beta4
+Version: 1.1.0
 Section: develop
 Priority: standard
 Maintainer: Polygon <[email protected]>

diff --git a/params/config.go b/params/config.go
diff --git a/params/version.go b/params/version.go
@@ -21,10 +21,10 @@ import (
 )
 
 const (
-	VersionMajor = 1             // Major version component of the current release
-	VersionMinor = 1             // Minor version component of the current release
-	VersionPatch = 0             // Patch version component of the current release
-	VersionMeta  = "beta4-fh2.3" // Version metadata to append to the version string
+	VersionMajor = 1       // Major version component of the current release
+	VersionMinor = 1       // Minor version component of the current release
+	VersionPatch = 0       // Patch version component of the current release
+	VersionMeta  = "fh2.3" // Version metadata to append to the version string
 
 	FirehoseVersionMajor = 2
 	FirehoseVersionMinor = 3

diff --git a/tests/bor/helper.go b/tests/bor/helper.go
@@ -221,7 +221,11 @@ func buildNextBlock(t *testing.T, _bor consensus.Engine, chain *core.BlockChain,
 	ctx := context.Background()
 
 	// Finalize and seal the block
-	block, _ := _bor.FinalizeAndAssemble(ctx, chain, b.header, state, b.txs, nil, b.receipts, []*types.Withdrawal{})
+	block, err := _bor.FinalizeAndAssemble(ctx, chain, b.header, state, b.txs, nil, b.receipts, nil)
+
+	if err != nil {
+		panic(fmt.Sprintf("error finalizing block: %v", err))
+	}
 
 	// Write state changes to db
 	root, err := state.Commit(chain.Config().IsEIP158(b.header.Number))