Polkadot SDK Update V2 (#972)

* adds polkadot-sdk * starts upgrade * updates cargo.tomls * fixes * fixes * fix tests * clippy * adds snowbridge to rococo bridgehub * fix tests * finishing up applying changes * fix a few issues * try to fix asset hub runtime * fixing tests * fixing tests * fix tests * adds upstream changes * fix tests * fix upgrade gateway test * fix transfer native from gateway test * add missing import * allows all networks * fmt * fixed token transfer test * fixes after rebase * fixes after rebase * fixes after rebase * correct relay network check * update polkadot-sdk * fmt * updates polkadot-sdk --------- Co-authored-by: claravanstaden <Cats 4 life!>
Snowfork · Oct 30, 2023 · 340fb14 · 340fb14
1 parent ce6a145
commit 340fb14
Show file tree

Hide file tree

Showing 56 changed files with 1,958 additions and 1,172 deletions.
diff --git a/.github/workflows/parachain.yml b/.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: |
@@ -108,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
@@ -139,7 +143,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
 
@@ -156,6 +160,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: ${{ github.head_ref }}
+          submodules: "true"
       - uses: actions/cache@v1
         with:
           path: |

diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,6 @@
-[submodule "cumulus"]
-	path = cumulus
-	url = https://github.com/Snowfork/cumulus
-	branch = snowbridge
+[submodule "polkadot-sdk"]
+	path = polkadot-sdk
+	url = https://github.com/Snowfork/polkadot-sdk.git
 [submodule "contracts/lib/forge-std"]
 	path = contracts/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std

diff --git a/_typos.toml b/_typos.toml
@@ -7,7 +7,7 @@ extend-exclude = [
     "**/*ffi*.js",
     "**/*mock*.rs",
     "**/*data*.rs",
-    "cumulus/**",
+    "polkadot-sdk/**",
     "smoketest/src/parachains",
     "smoketest/src/contracts",
 ]
diff --git a/cumulus b/cumulus
diff --git a/hooks/pre-commit b/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 .
 
 # check format of rust
 (cd parachain && chronic cargo +$RUST_NIGHTLY_VERSION fmt --check)
-
-check_duplicate_versions substrate
-check_duplicate_versions polkadot