Merge pull request #1220 from maticnetwork/master

Back-merge master branch into 'develop'
maticnetwork · Apr 15, 2024 · d8db72a · d8db72a
2 parents f6969db + 46f93b1
commit d8db72a
Show file tree

Hide file tree

Showing 12 changed files with 90 additions and 10 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -96,6 +96,9 @@ nfpms:
       - src: builder/files/genesis-testnet-v4.json
         dst: /etc/bor/genesis-testnet-v4.json
         type: config
+      - src: builder/files/genesis-amoy.json
+        dst: /etc/bor/genesis-amoy.json
+        type: config
       - src: builder/files/config.toml
         dst: /var/lib/bor/config.toml
         type: config
@@ -119,6 +122,7 @@ dockers:
     extra_files:
       - builder/files/genesis-mainnet-v1.json
       - builder/files/genesis-testnet-v4.json
+      - builder/files/genesis-amoy.json
 
   - image_templates:
       - 0xpolygon/{{ .ProjectName }}:{{ .Version }}-arm64
@@ -132,6 +136,7 @@ dockers:
     extra_files:
       - builder/files/genesis-mainnet-v1.json
       - builder/files/genesis-testnet-v4.json
+      - builder/files/genesis-amoy.json
 
 docker_manifests:
   - name_template: 0xpolygon/{{ .ProjectName }}:{{ .Version }}

diff --git a/Dockerfile.release b/Dockerfile.release
@@ -10,6 +10,7 @@ WORKDIR ${BOR_DIR}
 COPY bor /usr/bin/
 COPY builder/files/genesis-mainnet-v1.json ${BOR_DIR}
 COPY builder/files/genesis-testnet-v4.json ${BOR_DIR}
+COPY builder/files/genesis-amoy.json ${BOR_DIR}
 
 EXPOSE 8545 8546 8547 30303 30303/udp
 ENTRYPOINT ["bor"]
diff --git a/builder/files/genesis-amoy.json b/builder/files/genesis-amoy.json
diff --git a/internal/cli/server/chains/amoy.go b/internal/cli/server/chains/amoy.go
@@ -27,6 +27,7 @@ var amoyTestnet = &Chain{
 			BerlinBlock:         big.NewInt(0),
 			LondonBlock:         big.NewInt(73100),
 			ShanghaiBlock:       big.NewInt(73100),
+			CancunBlock:         big.NewInt(5423600),
 			Bor: &params.BorConfig{
 				JaipurBlock: big.NewInt(73100),
 				DelhiBlock:  big.NewInt(73100),

diff --git a/packaging/templates/package_scripts/control b/packaging/templates/package_scripts/control
@@ -1,5 +1,5 @@
 Source: bor
-Version: 1.3.0-beta-1
+Version: 1.3.0
 Section: develop
 Priority: standard
 Maintainer: Polygon <release-team@polygon.technology>

diff --git a/packaging/templates/package_scripts/control.arm64 b/packaging/templates/package_scripts/control.arm64
@@ -1,5 +1,5 @@
 Source: bor
-Version: 1.3.0-beta-1
+Version: 1.3.0
 Section: develop
 Priority: standard
 Maintainer: Polygon <release-team@polygon.technology>

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.3.0-beta-1
+Version: 1.3.0
 Section: develop
 Priority: standard
 Maintainer: Polygon <release-team@polygon.technology>

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.3.0-beta-1
+Version: 1.3.0
 Section: develop
 Priority: standard
 Maintainer: Polygon <release-team@polygon.technology>

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.3.0-beta-1
+Version: 1.3.0
 Section: develop
 Priority: standard
 Maintainer: Polygon <release-team@polygon.technology>

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.3.0-beta-1
+Version: 1.3.0
 Section: develop
 Priority: standard
 Maintainer: Polygon <release-team@polygon.technology>

diff --git a/params/config.go b/params/config.go
@@ -266,6 +266,7 @@ var (
 		BerlinBlock:         big.NewInt(0),
 		LondonBlock:         big.NewInt(73100),
 		ShanghaiBlock:       big.NewInt(73100),
+		CancunBlock:         big.NewInt(5423600),
 		Bor: &BorConfig{
 			JaipurBlock: big.NewInt(73100),
 			DelhiBlock:  big.NewInt(73100),

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 = 3        // 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
+	VersionMajor = 1  // Major version component of the current release
+	VersionMinor = 3  // 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
 )
 
 var GitCommit string