Update Shibarium Cancun block (#40)

* Cancun HF for shibarium * Fix artifacts actions version * version update * Update minimum gas params * Fix unit-test --------- Co-authored-by: Vinayak <vinayak@shib.io>
shibaone · Dec 1, 2024 · fb554b2 · fb554b2
1 parent 3a9b559
commit fb554b2
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 32 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
         os: [ ubuntu-20.04 ] # list of os: https://github.com/actions/virtual-environments
     runs-on: ${{ matrix.os }}
     steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
         - run: |
             git submodule update --init --recursive --force
             git fetch --no-tags --prune --depth=1 origin +refs/heads/master:refs/remotes/origin/master
@@ -55,7 +55,7 @@ jobs:
         os: [ ubuntu-20.04 ] # list of os: https://github.com/actions/virtual-environments
     runs-on: ${{ matrix.os }}
     steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
         - run: |
             git submodule update --init --recursive --force
             git fetch --no-tags --prune --depth=1 origin +refs/heads/master:refs/remotes/origin/master
@@ -83,7 +83,7 @@ jobs:
         os: [ ubuntu-20.04 ] # list of os: https://github.com/actions/virtual-environments
     runs-on: ${{ matrix.os }}
     steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
         - run: |
             git submodule update --init --recursive --force
             git fetch --no-tags --prune --depth=1 origin +refs/heads/master:refs/remotes/origin/master
@@ -107,8 +107,8 @@ jobs:
 
         - name: Test
           run: make test
-        
-        - uses: actions/upload-artifact@v4
+
+        - uses: actions/upload-artifact@v4.4.0
           with:
             name: unitTest-coverage
             path: cover.out
@@ -134,7 +134,7 @@ jobs:
         os: [ ubuntu-20.04 ] # list of os: https://github.com/actions/virtual-environments
     runs-on: ${{ matrix.os }}
     steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
         - run: |
             git submodule update --init --recursive --force
             git fetch --no-tags --prune --depth=1 origin +refs/heads/master:refs/remotes/origin/master
@@ -147,7 +147,7 @@ jobs:
           if: runner.os == 'Linux'
           run: sudo apt update && sudo apt install build-essential
 
-        - uses: actions/cache@v3
+        - uses: actions/cache@v4
           with:
             path: |
               ~/.cache/go-build
@@ -159,7 +159,7 @@ jobs:
         - name: test-integration
           run: make test-integration
 
-        - uses: actions/upload-artifact@v4
+        - uses: actions/upload-artifact@v4.4.0
           with:
             name: integrationTest-coverage
             path: cover.out
@@ -173,9 +173,9 @@ jobs:
     needs: [unit-tests, integration-tests]
     steps:
         - name: Checkout
-          uses: actions/checkout@v3
+          uses: actions/checkout@v4
         - name: Download artifacts
-          uses: actions/download-artifact@v2
+          uses: actions/download-artifact@v4.1.8
         - name: Upload coverage to Codecov
           uses: codecov/codecov-action@v3
 
@@ -186,7 +186,7 @@ jobs:
         os: [ ubuntu-20.04 ] # list of os: https://github.com/actions/virtual-environments
     runs-on: ${{ matrix.os }}
     steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
           with:
             path: bor
         - name: Checkout submodules
@@ -200,7 +200,7 @@ jobs:
             go-version: 1.22.x
 
         - name: Checkout matic-cli
-          uses: actions/checkout@v3
+          uses: actions/checkout@v4
           with:
             repository: maticnetwork/matic-cli
             ref: master
@@ -259,7 +259,7 @@ jobs:
 
         - name: Upload logs
           if: always()
-          uses: actions/upload-artifact@v4
+          uses: actions/upload-artifact@v4.4.0
           with:
             name: logs_${{ github.run_id }}
             path: |
@@ -278,7 +278,7 @@ jobs:
 
         - name: Upload code and chain data
           if: always()
-          uses: actions/upload-artifact@v4
+          uses: actions/upload-artifact@v4.4.0
           with:
             name: code_${{ github.run_id }}
             path: code.tar.gz
diff --git a/builder/files/genesis-shibarium.json b/builder/files/genesis-shibarium.json
@@ -14,6 +14,7 @@
       "berlinBlock": 0,
       "londonBlock": 0,
       "shanghaiBlock": 4504704,
+      "cancunBlock": 8200512,
       "bor": {
         "jaipurBlock": 0,
         "delhiBlock": 4504576,
@@ -42,7 +43,8 @@
         },
         "burntContract": {
           "0": "0x000000000000000000000000000000000000dead",
-          "1962000": "0xc7D0445ac2947760b3dD388B8586Adf079972Bf3"
+          "1962000": "0xc7D0445ac2947760b3dD388B8586Adf079972Bf3",
+          "8200512": "0x541F60e5576764cA3957f70b6a1E60f3CE5886e0"
         },
         "blockAlloc": {
           "4504704": {
@@ -99,4 +101,4 @@
     "number": "0x0",
     "gasUsed": "0x0",
     "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-  }
+  }
diff --git a/internal/cli/server/chains/shibarium.go b/internal/cli/server/chains/shibarium.go
@@ -28,6 +28,7 @@ var shibarium = &Chain{
 			BerlinBlock:         big.NewInt(0),
 			LondonBlock:         big.NewInt(0),
 			ShanghaiBlock:       big.NewInt(4504704),
+			CancunBlock:         big.NewInt(8200512),
 			Bor: &params.BorConfig{
 				JaipurBlock: big.NewInt(0),
 				DelhiBlock:  big.NewInt(4504576),
@@ -60,6 +61,7 @@ var shibarium = &Chain{
 				BurntContract: map[string]string{
 					"0":       "0x000000000000000000000000000000000000dead",
 					"1962000": "0xc7D0445ac2947760b3dD388B8586Adf079972Bf3",
+					"8200512": "0x541F60e5576764cA3957f70b6a1E60f3CE5886e0",
 				},
 				BlockAlloc: map[string]interface{}{
 					"4504704": map[string]interface{}{

diff --git a/internal/cli/server/testdata/default.toml b/internal/cli/server/testdata/default.toml
@@ -58,7 +58,7 @@ devfakeauthor = false
   nolocals = false
   journal = "transactions.rlp"
   rejournal = "1h0m0s"
-  pricelimit = 1000000000
+  pricelimit = 0
   pricebump = 10
   accountslots = 16
   globalslots = 32768
@@ -71,7 +71,7 @@ devfakeauthor = false
   etherbase = ""
   extradata = ""
   gaslimit = 30000000
-  gasprice = "1000000000"
+  gasprice = "0"
   recommit = "2m5s"
   commitinterrupt = true
 
@@ -127,7 +127,7 @@ devfakeauthor = false
   maxheaderhistory = 1024
   maxblockhistory = 1024
   maxprice = "500000000000"
-  ignoreprice = "1000000000"
+  ignoreprice = "0"
 
 [telemetry]
   metrics = false

diff --git a/packaging/templates/package_scripts/control b/packaging/templates/package_scripts/control
@@ -1,5 +1,5 @@
 Source: bor
-Version: 1.3.7-bone-beta-3
+Version: 1.3.7-bone
 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.7-bone-beta-3
+Version: 1.3.7-bone
 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.7-bone-beta-3
+Version: 1.3.7-bone
 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.7-bone-beta-3
+Version: 1.3.7-bone
 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.7-bone-beta-3
+Version: 1.3.7-bone
 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.7-bone-beta-3
+Version: 1.3.7-bone
 Section: develop
 Priority: standard
 Maintainer: Polygon <release-team@polygon.technology>

diff --git a/params/protocol_params.go b/params/protocol_params.go
@@ -183,13 +183,13 @@ const (
 	MaxBlobGasPerBlock          = 6 * BlobTxBlobGasPerBlob // Maximum consumable blob gas for data blobs per block
 
 	// BorDefaultMinerGasPrice defines the minimum gas price for bor validators to mine a transaction.
-	BorDefaultMinerGasPrice = 1 * GWei
+	BorDefaultMinerGasPrice = 0 * GWei
 
 	// BorDefaultTxPoolPriceLimit defines the minimum gas price limit for bor to enforce txs acceptance into the pool.
-	BorDefaultTxPoolPriceLimit = 1 * GWei
+	BorDefaultTxPoolPriceLimit = 0 * GWei
 
 	// BorDefaultGpoIgnorePrice defines the minimum gas price below which bor gpo will ignore transactions.
-	BorDefaultGpoIgnorePrice = 1 * GWei
+	BorDefaultGpoIgnorePrice = 0 * GWei
 )
 
 // Gas discount table for BLS12-381 G1 and G2 multi exponentiation operations

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 = 7             // Patch version component of the current release
-	VersionMeta  = "bone-beta-3" // 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 = 7      // Patch version component of the current release
+	VersionMeta  = "bone" // Version metadata to append to the version string
 )
 
 var GitCommit string