Merge remote-tracking branch 'origin/master' into feat/dapp-staking-v3

AstarNetwork · Aug 30, 2023 · a64cd9b · a64cd9b
2 parents 6dbbb90 + ee95f5a
commit a64cd9b
Show file tree

Hide file tree

Showing 96 changed files with 7,726 additions and 1,159 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -467,7 +467,8 @@ jobs:
         chain=${{ matrix.chain }}
         runtime_version=$(cat $chain-compressed-info.json | jq '.core_version' | tr -d '"' | cut -d ' ' -f 1)
         echo $runtime_version
-        echo "::set-output name=runtime_version::$runtime_version"
+        echo "runtime=$(echo $runtime_version)" >> $GITHUB_ENV
+        echo "${{ matrix.chain }}=$(echo $runtime_version)" >> $GITHUB_OUTPUT
 
     - name: Upload ${{ matrix.chain }} Wasm
       uses: actions/upload-release-asset@v1
@@ -476,7 +477,7 @@ jobs:
       with:
         upload_url: ${{ needs.publish-release-draft.outputs.upload_url }}
         asset_path: ${{ matrix.chain }}_runtime.compact.compressed.wasm
-        asset_name: ${{ steps.get-runtime-version.outputs.runtime_version }}.wasm
+        asset_name: ${{ env.runtime }}.wasm
         asset_content_type: application/wasm
 
     - name: Upload ${{ matrix.chain }} Metadata
@@ -509,20 +510,20 @@ jobs:
         asset_name: ${{ matrix.chain }}-srtool-digest.json
         asset_content_type: application/json
 
+    outputs:
+      astar_runtime_version: ${{ steps.get-runtime-version.outputs.astar }}
+      shiden_runtime_version: ${{ steps.get-runtime-version.outputs.shiden }}
+      shibuya_runtime_version: ${{ steps.get-runtime-version.outputs.shibuya }}
+
   upload-evm-tracing-artifacts:
-    needs: publish-release-draft
+    needs: [publish-release-draft,upload-runtimes]
     runs-on: ubuntu-latest
     steps:
     - name: Download pre-built collator binary for evm tracing
       uses: actions/download-artifact@v3
       with:
         name: astar-evm-tracing-ubuntu-latest-x86_64-unknown-linux-gnu
         path: evm-tracing-artifacts
-
-    - name: Make evm tracing binary executable and tar gzip
-      run: |
-        cd evm-tracing-artifacts
-        chmod +x astar-collator
 
     - name: Download evm tracing runtime
       uses: actions/download-artifact@v3
@@ -542,6 +543,14 @@ jobs:
         name: shibuya-evm-tracing-runtime
         path: evm-tracing-artifacts
 
+    - name: Make evm tracing binary executable and rename
+      run: |
+        cd evm-tracing-artifacts
+        chmod +x astar-collator
+        mv astar_evm_tracing_runtime.compact.compressed.wasm ${{needs.upload-runtimes.outputs.astar_runtime_version}}_evm_tracing_runtime.compact.compressed.wasm
+        mv shiden_evm_tracing_runtime.compact.compressed.wasm ${{needs.upload-runtimes.outputs.shiden_runtime_version}}_evm_tracing_runtime.compact.compressed.wasm
+        mv shibuya_evm_tracing_runtime.compact.compressed.wasm ${{needs.upload-runtimes.outputs.shibuya_runtime_version}}_evm_tracing_runtime.compact.compressed.wasm
+
     - name: Compress folder
       run: |
         tar zcvf evm-tracing-artifacts.tar.gz evm-tracing-artifacts

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -63,12 +63,14 @@ num-traits = { version = "0.2", default-features = false }
 rand = { version = "0.8.5", default-features = false }
 bounded-collections = { version = "0.1.5", default-features = false }
 hex = { version = "0.4.3", default-features = false }
+paste = "1.0.6"
 
 # (native)
 array-bytes = "6.0.0"
 smallvec = "1.9.0"
 async-trait = "0.1.59"
 clap = { version = "4.2.5", features = ["derive"] }
+env_logger = "0.10.0"
 futures = { version = "0.3.26" }
 serde = { version = "1.0.151", features = ["derive"] }
 serde_json = "1.0.92"
@@ -285,6 +287,7 @@ pallet-evm-precompile-substrate-ecdsa = { path = "./precompiles/substrate-ecdsa"
 pallet-evm-precompile-xcm = { path = "./precompiles/xcm", default-features = false }
 pallet-evm-precompile-xvm = { path = "./precompiles/xvm", default-features = false }
 pallet-evm-precompile-dapps-staking = { path = "./precompiles/dapps-staking", default-features = false }
+pallet-evm-precompile-batch = { path = "./precompiles/batch", default-features = false }
 
 pallet-chain-extension-dapps-staking = { path = "./chain-extensions/dapps-staking", default-features = false }
 pallet-chain-extension-xvm = { path = "./chain-extensions/xvm", default-features = false }

diff --git a/bin/collator/Cargo.toml b/bin/collator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "astar-collator"
-version = "5.16.0"
+version = "5.18.0"
 description = "Astar collator implementation in Rust."
 build = "build.rs"
 default-run = "astar-collator"

diff --git a/bin/collator/res/rocstar.json b/bin/collator/res/rocstar.json
@@ -3,8 +3,10 @@
   "id": "shibuya",
   "chainType": "Live",
   "bootNodes": [
-    "/ip4/54.83.176.50/tcp/30333/p2p/12D3KooWKpHCwCPpRDRjHwuf2VFjXfw8jTn59x4sEGDKXdzAsMyX",
-    "/ip4/35.239.0.65/tcp/30333/p2p/12D3KooWL6HbHMNyztAe2RVvL5fmcPr9qCGK9bkSUkucL8F82V1G"
+    "/ip4/51.91.105.142/tcp/38333/p2p/12D3KooWK5A7XWnaUcajUgFMbpcUCbkveb7Lt7EUhhiESn8bHAfU",
+    "/ip4/54.38.192.54/tcp/38333/p2p/12D3KooWRFnCe3DzjfdArooWtekjoki7rG9C56Cky5RUYhQH1jgj",
+    "/dns/rocstar-bootnode-01.astar.network/tcp/443/wss/p2p/12D3KooWK5A7XWnaUcajUgFMbpcUCbkveb7Lt7EUhhiESn8bHAfU",
+    "/dns/rocstar-bootnode-02.astar.network/tcp/443/wss/p2p/12D3KooWRFnCe3DzjfdArooWtekjoki7rG9C56Cky5RUYhQH1jgj"
   ],
   "telemetryEndpoints": null,
   "protocolId": "rocstar",

diff --git a/bin/collator/res/rocstar.raw.json b/bin/collator/res/rocstar.raw.json
@@ -3,8 +3,10 @@
   "id": "shibuya",
   "chainType": "Live",
   "bootNodes": [
-    "/ip4/54.83.176.50/tcp/30333/p2p/12D3KooWKpHCwCPpRDRjHwuf2VFjXfw8jTn59x4sEGDKXdzAsMyX",
-    "/ip4/35.239.0.65/tcp/30333/p2p/12D3KooWL6HbHMNyztAe2RVvL5fmcPr9qCGK9bkSUkucL8F82V1G"
+    "/ip4/51.91.105.142/tcp/38333/p2p/12D3KooWK5A7XWnaUcajUgFMbpcUCbkveb7Lt7EUhhiESn8bHAfU",
+    "/ip4/54.38.192.54/tcp/38333/p2p/12D3KooWRFnCe3DzjfdArooWtekjoki7rG9C56Cky5RUYhQH1jgj",
+    "/dns/rocstar-bootnode-01.astar.network/tcp/443/wss/p2p/12D3KooWK5A7XWnaUcajUgFMbpcUCbkveb7Lt7EUhhiESn8bHAfU",
+    "/dns/rocstar-bootnode-02.astar.network/tcp/443/wss/p2p/12D3KooWRFnCe3DzjfdArooWtekjoki7rG9C56Cky5RUYhQH1jgj"
   ],
   "telemetryEndpoints": null,
   "protocolId": "rocstar",

diff --git a/bin/collator/res/shibuya.json b/bin/collator/res/shibuya.json
@@ -6,9 +6,9 @@
     "/ip4/65.108.46.114/tcp/38333/ws/p2p/12D3KooWLBLYreWVnWUvV5xvTgbhr5zSPn33LQhexGW28zj83GjH",
     "/ip4/103.243.173.186/tcp/30333/ws/p2p/12D3KooWDuAQkahaTsN8XHg4k7qe8rttoXrTW5jpJke275S2YA1a",
     "/ip4/80.253.161.89/tcp/30333/ws/p2p/12D3KooWNfADqVKZFtiTDvR4CYF6pro5KVXeBEKYBHh5ohLAHrqk",
-    "/dns/wss-bootnode-01.shibuya.astar.network/tcp/443/wss/p2p/12D3KooWLBLYreWVnWUvV5xvTgbhr5zSPn33LQhexGW28zj83GjH",
-    "/dns/wss-bootnode-02.shibuya.astar.network/tcp/443/wss/p2p/12D3KooWDuAQkahaTsN8XHg4k7qe8rttoXrTW5jpJke275S2YA1a",
-    "/dns/wss-bootnode-03.shibuya.astar.network/tcp/443/wss/p2p/12D3KooWNfADqVKZFtiTDvR4CYF6pro5KVXeBEKYBHh5ohLAHrqk"
+    "/dns/bootnode-01.shibuya.astar.network/tcp/443/wss/p2p/12D3KooWLBLYreWVnWUvV5xvTgbhr5zSPn33LQhexGW28zj83GjH",
+    "/dns/bootnode-02.shibuya.astar.network/tcp/443/wss/p2p/12D3KooWDuAQkahaTsN8XHg4k7qe8rttoXrTW5jpJke275S2YA1a",
+    "/dns/bootnode-03.shibuya.astar.network/tcp/443/wss/p2p/12D3KooWNfADqVKZFtiTDvR4CYF6pro5KVXeBEKYBHh5ohLAHrqk"
   ],
   "telemetryEndpoints": null,
   "protocolId": "shibuya",

diff --git a/bin/collator/res/shibuya.raw.json b/bin/collator/res/shibuya.raw.json
@@ -6,9 +6,9 @@
     "/ip4/65.108.46.114/tcp/38333/ws/p2p/12D3KooWLBLYreWVnWUvV5xvTgbhr5zSPn33LQhexGW28zj83GjH",
     "/ip4/103.243.173.186/tcp/30333/ws/p2p/12D3KooWDuAQkahaTsN8XHg4k7qe8rttoXrTW5jpJke275S2YA1a",
     "/ip4/80.253.161.89/tcp/30333/ws/p2p/12D3KooWNfADqVKZFtiTDvR4CYF6pro5KVXeBEKYBHh5ohLAHrqk",
-    "/dns/wss-bootnode-01.shibuya.astar.network/tcp/443/wss/p2p/12D3KooWLBLYreWVnWUvV5xvTgbhr5zSPn33LQhexGW28zj83GjH",
-    "/dns/wss-bootnode-02.shibuya.astar.network/tcp/443/wss/p2p/12D3KooWDuAQkahaTsN8XHg4k7qe8rttoXrTW5jpJke275S2YA1a",
-    "/dns/wss-bootnode-03.shibuya.astar.network/tcp/443/wss/p2p/12D3KooWNfADqVKZFtiTDvR4CYF6pro5KVXeBEKYBHh5ohLAHrqk"
+    "/dns/bootnode-01.shibuya.astar.network/tcp/443/wss/p2p/12D3KooWLBLYreWVnWUvV5xvTgbhr5zSPn33LQhexGW28zj83GjH",
+    "/dns/bootnode-02.shibuya.astar.network/tcp/443/wss/p2p/12D3KooWDuAQkahaTsN8XHg4k7qe8rttoXrTW5jpJke275S2YA1a",
+    "/dns/bootnode-03.shibuya.astar.network/tcp/443/wss/p2p/12D3KooWNfADqVKZFtiTDvR4CYF6pro5KVXeBEKYBHh5ohLAHrqk"
   ],
   "telemetryEndpoints": null,
   "protocolId": "shibuya",

diff --git a/bin/collator/res/shiden.json b/bin/collator/res/shiden.json
@@ -6,8 +6,8 @@
     "/ip4/199.85.208.173/tcp/30333/ws/p2p/12D3KooWFPzN2cH31unDY8Wx7x2XpnsYBJWfFJNL9HGLida1dZY1",
     "/ip4/51.89.41.58/tcp/30333/ws/p2p/12D3KooWJwbUzXmA46QA71UkzgVnvSd9Nx4HhY48HLCwWcHYiC9d",
     "/ip4/131.153.79.58/tcp/30333/ws/p2p/12D3KooWCzR5i4pYhc1SXEEwViasCmn8HkTwo1zK7h8TiUUp2eLX",
-    "/dns/bootnode-01.shiden.astar.network/tcp/443/wss/p2p/12D3KooWDYfspdMj1tQJZuiecmKKaQjGuSX2cy5rExtqcMqmiNrR",
-    "/dns/bootnode-02.shiden.astar.network/tcp/443/wss/p2p/12D3KooWAgdZ27WhBzLRinaE7iTR1pXxKTsSJniXYu1xAEJD7LzS",
+    "/dns/bootnode-01.shiden.astar.network/tcp/443/wss/p2p/12D3KooWFPzN2cH31unDY8Wx7x2XpnsYBJWfFJNL9HGLida1dZY1",
+    "/dns/bootnode-02.shiden.astar.network/tcp/443/wss/p2p/12D3KooWJwbUzXmA46QA71UkzgVnvSd9Nx4HhY48HLCwWcHYiC9d",
     "/dns/bootnode-03.shiden.astar.network/tcp/443/wss/p2p/12D3KooWCzR5i4pYhc1SXEEwViasCmn8HkTwo1zK7h8TiUUp2eLX"
   ],
   "telemetryEndpoints": null,

diff --git a/bin/collator/res/shiden.raw.json b/bin/collator/res/shiden.raw.json
@@ -6,8 +6,8 @@
     "/ip4/199.85.208.173/tcp/30333/ws/p2p/12D3KooWFPzN2cH31unDY8Wx7x2XpnsYBJWfFJNL9HGLida1dZY1",
     "/ip4/51.89.41.58/tcp/30333/ws/p2p/12D3KooWJwbUzXmA46QA71UkzgVnvSd9Nx4HhY48HLCwWcHYiC9d",
     "/ip4/131.153.79.58/tcp/30333/ws/p2p/12D3KooWCzR5i4pYhc1SXEEwViasCmn8HkTwo1zK7h8TiUUp2eLX",
-    "/dns/bootnode-01.shiden.astar.network/tcp/443/wss/p2p/12D3KooWDYfspdMj1tQJZuiecmKKaQjGuSX2cy5rExtqcMqmiNrR",
-    "/dns/bootnode-02.shiden.astar.network/tcp/443/wss/p2p/12D3KooWAgdZ27WhBzLRinaE7iTR1pXxKTsSJniXYu1xAEJD7LzS",
+    "/dns/bootnode-01.shiden.astar.network/tcp/443/wss/p2p/12D3KooWFPzN2cH31unDY8Wx7x2XpnsYBJWfFJNL9HGLida1dZY1",
+    "/dns/bootnode-02.shiden.astar.network/tcp/443/wss/p2p/12D3KooWJwbUzXmA46QA71UkzgVnvSd9Nx4HhY48HLCwWcHYiC9d",
     "/dns/bootnode-03.shiden.astar.network/tcp/443/wss/p2p/12D3KooWCzR5i4pYhc1SXEEwViasCmn8HkTwo1zK7h8TiUUp2eLX"
   ],
   "telemetryEndpoints": null,