Polkadot SDK Update

.github/workflows/parachain.yml

@@ -30,6 +30,8 @@ jobs:
       SKIP_WASM_BUILD: 1
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: 'true'
       - uses: actions/cache@v1
         with:
           path: |
@@ -61,6 +63,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: ${{ github.head_ref }}
+          submodules: 'true'
       - uses: actions/cache@v1
         with:
           path: |
@@ -80,7 +83,6 @@ jobs:
           --manifest-path parachain/Cargo.toml
           --workspace
           --features runtime-benchmarks
-          --exclude snowbridge-query-events
           --exclude snowbridge-ethereum-beacon-client
       # Run tests for beacon light client, excluding benchmark tests
       - name: Tests for beacon light client excluding benchmark tests
@@ -109,6 +111,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: ${{ github.head_ref }}
+          submodules: 'true'
       - name: setup rust toolchain
         run: rustup show
       - name: run coverage test
@@ -118,9 +121,8 @@ jobs:
           --manifest-path parachain/Cargo.toml
           --workspace
           --engine llvm
-          --out Xml
+          --out xml
           --exclude substrate-call-index
-          --exclude snowbridge-query-events
       - name: Upload coverage reports to Codecov with GitHub Action
         uses: codecov/codecov-action@v3
         with:
@@ -142,7 +144,7 @@ jobs:
       - name: check bridge-hub runtime
         run: >
           cargo check
-          --manifest-path cumulus/Cargo.toml
+          --manifest-path polkadot-sdk/Cargo.toml
           --release --verbose
           --package bridge-hub-rococo-runtime
 
@@ -158,6 +160,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: ${{ github.head_ref }}
+          submodules: 'true'
       - uses: actions/cache@v1
         with:
           path: |

.gitmodules

@@ -1,7 +1,3 @@
-[submodule "cumulus"]
-	path = cumulus
-	url = https://github.com/Snowfork/cumulus
-	branch = snowbridge
 [submodule "contracts/lib/forge-std"]
 	path = contracts/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
@@ -14,3 +10,7 @@
 [submodule "contracts/lib/canonical-weth"]
 	path = contracts/lib/canonical-weth
 	url = https://github.com/Snowfork/canonical-weth
+[submodule "polkadot-sdk"]
+	path = polkadot-sdk
+	url = https://github.com/Snowfork/polkadot-sdk.git
+	branch = polkadot-sdk-update

_typos.toml

@@ -7,7 +7,7 @@ extend-exclude = [
     "**/*ffi*.js",
     "**/*mock*.rs",
     "**/*data*.rs",
-    "cumulus/**",
+    "polkadot-sdk/**",
     "smoketest/src/parachains",
     "smoketest/src/contracts",
 ]

hooks/pre-commit

@@ -2,17 +2,6 @@
 
 set -e
 
-# checks that the cumulus submodule is in sync with our substrate dependencies
-check_duplicate_versions() {
-        local duplicates=$(grep -Ei "source = \"git.*$1" cumulus/Cargo.lock parachain/Cargo.lock | sed 's/\.git//g' | sort -u)
-        local version_count=$(echo "$duplicates" | awk -F':' '{for (i=2; i<NF; i++) printf $i " "; print $NF}' | sort -u | wc -l | xargs)
-        if [ "$version_count" != "1" ]; then
-                echo Duplicate $1 versions detected
-                echo "$duplicates"
-                exit 1
-        fi
-}
-
 # check typos
 chronic typos .
 
@@ -24,6 +13,3 @@ chronic typos .
 
 # format rust
 (cd parachain && chronic cargo +nightly-"$SNOWBRIDGE_RUST_NIGHTLY" fmt)
-
-check_duplicate_versions substrate
-check_duplicate_versions polkadot