Merge branch 'master' into feat/account-unification

.github/workflows/base_checks.yaml

@@ -6,17 +6,11 @@ on:
     tags-ignore:
     - v[0-9]+.[0-9]+.[0-9]+*
   workflow_dispatch:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+
 jobs:
-  clean-up-actions:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cancel Previous Runs
-        # Only cancel non-master branch runs
-        if: ${{ github.ref != 'refs/heads/master' }}
-        uses: styfle/[email protected]
-        with:
-          access_token: ${{ github.token }}
-
   compile-and-check:
     runs-on: ubuntu-latest
     steps:

.github/workflows/coverage.yaml

@@ -3,17 +3,11 @@ on:
   pull_request:
     types: [opened, reopened, synchronize, ready_for_review]
   workflow_dispatch:
-jobs:
-  clean-up-actions:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cancel Previous Runs
-        # Only cancel non-master branch runs
-        if: ${{ github.ref != 'refs/heads/master' }}
-        uses: styfle/[email protected]
-        with:
-          access_token: ${{ github.token }}
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
 
+jobs:
   coverage:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest

.github/workflows/stale.yml

@@ -16,3 +16,4 @@ jobs:
           days-before-pr-stale: 60
           days-before-issue-close: 7
           days-before-pr-close: 14
+          exempt-issue-labels: 'project'

.github/workflows/static-analysis.yml

@@ -1,16 +1,10 @@
 name: Static Analysis
 on: [push, workflow_dispatch]
-jobs:
-  clean-up-actions:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cancel Previous Runs
-        # Only cancel non-master branch runs
-        if: ${{ github.ref != 'refs/heads/master' }}
-        uses: styfle/[email protected]
-        with:
-          access_token: ${{ github.token }}
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
 
+jobs:
   fmt:
     if: github.event.pull_request.draft == false
     runs-on: [self-hosted, Linux, X64]

.github/workflows/tests.yaml

@@ -6,17 +6,11 @@ on:
     tags-ignore:
     - v[0-9]+.[0-9]+.[0-9]+*
   workflow_dispatch:
-jobs:
-  clean-up-actions:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cancel Previous Runs
-        # Only cancel non-master branch runs
-        if: ${{ github.ref != 'refs/heads/master' }}
-        uses: styfle/[email protected]
-        with:
-          access_token: ${{ github.token }}
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
 
+jobs:
   test-runtimes:
     runs-on: ubuntu-latest
     steps:

Cargo.toml

@@ -70,6 +70,7 @@ 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"
@@ -272,7 +273,6 @@ orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-modu
 # (wasm)
 pallet-block-reward = { path = "./pallets/block-reward", default-features = false }
 pallet-collator-selection = { path = "./pallets/collator-selection", default-features = false }
-pallet-custom-signatures = { path = "./pallets/custom-signatures", default-features = false }
 pallet-dapps-staking = { path = "./pallets/dapps-staking", default-features = false }
 pallet-xc-asset-config = { path = "./pallets/xc-asset-config", default-features = false }
 pallet-xvm = { path = "./pallets/xvm", default-features = false }

bin/collator/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "astar-collator"
-version = "5.17.0"
+version = "5.18.1"
 description = "Astar collator implementation in Rust."
 build = "build.rs"
 default-run = "astar-collator"

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",

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",

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",

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",