Bridges update subtree (#2625)

Cargo.lock

@@ -4625,15 +4625,16 @@ dependencies = [
 
 [[package]]
 name = "ed25519-dalek"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980"
+checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0"
 dependencies = [
  "curve25519-dalek 4.0.0",
  "ed25519",
  "rand_core 0.6.4",
  "serde",
  "sha2 0.10.7",
+ "subtle 2.4.1",
  "zeroize",
 ]
 

bridges/primitives/test-utils/Cargo.toml

@@ -12,7 +12,7 @@ bp-parachains = { path = "../parachains", default-features = false }
 bp-polkadot-core = { path = "../polkadot-core", default-features = false }
 bp-runtime = { path = "../runtime", default-features = false }
 codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
-ed25519-dalek = { version = "2.0", default-features = false }
+ed25519-dalek = { version = "2.1", default-features = false }
 finality-grandpa = { version = "0.16.2", default-features = false }
 sp-application-crypto = { path = "../../../substrate/primitives/application-crypto", default-features = false }
 sp-consensus-grandpa = { path = "../../../substrate/primitives/consensus/grandpa", default-features = false }

bridges/zombienet/helpers/native-assets-balance-increased.js

+async function run(nodeName, networkInfo, args) {
+    const {wsUri, userDefinedTypes} = networkInfo.nodesByName[nodeName];
+    const api = await zombie.connect(wsUri, userDefinedTypes);
+
+    const accountAddress = args[0];
+    const initialAccountData = await api.query.system.account(accountAddress);
+    const initialAccountBalance = initialAccountData.data['free'];
+    while (true) {
+        const accountData = await api.query.system.account(accountAddress);
+        const accountBalance = accountData.data['free'];
+        if (accountBalance > initialAccountBalance) {
+            return accountBalance;
+        }
+
+        // else sleep and retry
+        await new Promise((resolve) => setTimeout(resolve, 12000));
+    }
+}
+
+module.exports = { run }

bridges/zombienet/run-tests.sh

@@ -14,6 +14,9 @@ export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=$POLKADOT_PARACHAIN_B
 export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=$POLKADOT_PARACHAIN_BINARY_PATH
 export ZOMBIENET_BINARY_PATH=~/local_bridge_testing/bin/zombienet-linux
 
+# check if `wait` supports -p flag
+if [ `printf "$BASH_VERSION\n5.1" | sort -V | head -n 1` = "5.1" ]; then IS_BASH_5_1=1; else IS_BASH_5_1=0; fi
+
 # bridge configuration
 export LANE_ID="00000002"
 
@@ -66,12 +69,19 @@ do
     # wait until all tests are completed
     relay_exited=0
     for n in `seq 1 $TEST_COPROCS_COUNT`; do
-        wait -n -p COPROC_PID
-        exit_code=$?
-        coproc_name=${TEST_COPROCS[$COPROC_PID, 0]}
-        coproc_log=${TEST_COPROCS[$COPROC_PID, 1]}
-        coproc_stdout=$(cat $coproc_log)
-        relay_exited=$(expr "${coproc_name}" == "relay")
+        if [ "$IS_BASH_5_1" -eq 1 ]; then
+            wait -n -p COPROC_PID
+            exit_code=$?
+            coproc_name=${TEST_COPROCS[$COPROC_PID, 0]}
+            coproc_log=${TEST_COPROCS[$COPROC_PID, 1]}
+            coproc_stdout=$(cat $coproc_log)
+            relay_exited=$(expr "${coproc_name}" == "relay")
+        else
+            wait -n
+            exit_code=$?
+            coproc_name="<unknown>"
+            coproc_stdout="<unknown>"
+        fi
         echo "Process $coproc_name has finished with exit code: $exit_code"
 
         # if exit code is not zero, exit

bridges/zombienet/tests/0001-asset-transfer-works-rococo-to-westend.zndsl

-Description: User is able to transfer ROC from Rococo Asset Hub to Westend Asset Hub
+Description: User is able to transfer ROC from Rococo Asset Hub to Westend Asset Hub and back
 Network: ../../../cumulus/zombienet/bridge-hubs/bridge_hub_westend_local_network.toml
 Creds: config
 
-# step 1: initialize Westend asset hub
+# step 1: initialize Westend AH
 asset-hub-westend-collator1: run ../scripts/invoke-script.sh with "init-asset-hub-westend-local" within 240 seconds
 asset-hub-westend-collator1: js-script ../helpers/wait-hrmp-channel-opened.js with "1002" within 400 seconds
 
@@ -12,15 +12,23 @@ bridge-hub-westend-collator1: run ../scripts/invoke-script.sh with "init-bridge-
 # step 3: relay is started elsewhere - let's wait until with-Rococo GRANPDA pallet is initialized at Westend
 bridge-hub-westend-collator1: js-script ../helpers/best-finalized-header-at-bridged-chain.js with "Rococo,0" within 400 seconds
 
-# step 2: send WOC to Rococo
+# step 4: send WND to //Alice on Rococo AH
+# (that's a required part of a sibling 0001-asset-transfer-works-westend-to-rococo.zndsl test)
 asset-hub-westend-collator1: run ../scripts/invoke-script.sh with "reserve-transfer-assets-from-asset-hub-westend-local" within 60 seconds
 
-# step 3: elsewhere Rococo has sent ROC to //Alice - let's wait for it
+# step 5: elsewhere Rococo has sent ROC to //Alice - let's wait for it
 asset-hub-westend-collator1: js-script ../helpers/wrapped-assets-balance.js with "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY,0,Rococo" within 600 seconds
 
-# step 4: check that the relayer //Charlie is rewarded by both our AH and target AH
+# step 6: check that the relayer //Charlie is rewarded by both our AH and target AH
 bridge-hub-westend-collator1: js-script ../helpers/relayer-rewards.js with "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y,0x00000002,0x6268726f,BridgedChain,0" within 300 seconds
 bridge-hub-westend-collator1: js-script ../helpers/relayer-rewards.js with "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y,0x00000002,0x6268726F,ThisChain,0" within 300 seconds
 
+# step 7: send wROC back to Alice at Rococo AH
+asset-hub-westend-collator1: run ../scripts/invoke-script.sh with "withdraw-reserve-assets-from-asset-hub-westend-local" within 60 seconds
+
+# step 8: elsewhere Rococo has sent wWND to //Alice - let's wait for it
+# (we wait until //Alice account increases here - there are no other transactionc that may increase it)
+asset-hub-westend-collator1: js-script ../helpers/native-assets-balance-increased.js with "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY" within 600 seconds
+
 # wait until other network test has completed OR exit with an error too
 asset-hub-westend-collator1: run ../scripts/sync-exit.sh within 600 seconds

bridges/zombienet/tests/0001-asset-transfer-works-westend-to-rococo.zndsl

-Description: User is able to transfer WOC from Westend Asset Hub to Rococo Asset Hub
+Description: User is able to transfer WND from Westend Asset Hub to Rococo Asset Hub and back
 Network: ../../../cumulus/zombienet/bridge-hubs/bridge_hub_rococo_local_network.toml
 Creds: config
 
-# step 1: initialize Rococo asset hub
+# step 1: initialize Rococo AH
 asset-hub-rococo-collator1: run ../scripts/invoke-script.sh with "init-asset-hub-rococo-local" within 240 seconds
 asset-hub-rococo-collator1: js-script ../helpers/wait-hrmp-channel-opened.js with "1013" within 400 seconds
 
@@ -12,15 +12,23 @@ bridge-hub-rococo-collator1: run ../scripts/invoke-script.sh with "init-bridge-h
 # step 3: relay is started elsewhere - let's wait until with-Westend GRANPDA pallet is initialized at Rococo
 bridge-hub-rococo-collator1: js-script ../helpers/best-finalized-header-at-bridged-chain.js with "Westend,0" within 400 seconds
 
-# step 4: send ROC to Westend
+# step 4: send ROC to //Alice on Westend AH
+# (that's a required part of a sibling 0001-asset-transfer-works-rococo-to-westend.zndsl test)
 asset-hub-rococo-collator1: run ../scripts/invoke-script.sh with "reserve-transfer-assets-from-asset-hub-rococo-local" within 60 seconds
 
-# step 5: elsewhere Westend has sent WOC to //Alice - let's wait for it
+# step 5: elsewhere Westend has sent WND to //Alice - let's wait for it
 asset-hub-rococo-collator1: js-script ../helpers/wrapped-assets-balance.js with "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY,0,Westend" within 600 seconds
 
 # step 6: check that the relayer //Charlie is rewarded by both our AH and target AH
 bridge-hub-rococo-collator1: js-script ../helpers/relayer-rewards.js with "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y,0x00000002,0x62687764,BridgedChain,0" within 300 seconds
 bridge-hub-rococo-collator1: js-script ../helpers/relayer-rewards.js with "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y,0x00000002,0x62687764,ThisChain,0" within 300 seconds
 
+# step 7: send wWND back to Alice at Westend AH
+asset-hub-rococo-collator1: run ../scripts/invoke-script.sh with "withdraw-reserve-assets-from-asset-hub-rococo-local" within 60 seconds
+
+# step 8: elsewhere Westend has sent wROC to //Alice - let's wait for it
+# (we wait until //Alice account increases here - there are no other transactionc that may increase it)
+asset-hub-rococo-collator1: js-script ../helpers/native-assets-balance-increased.js with "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY" within 600 seconds
+
 # wait until other network test has completed OR exit with an error too
 asset-hub-rococo-collator1: run ../scripts/sync-exit.sh within 600 seconds

substrate/client/authority-discovery/Cargo.toml

@@ -23,8 +23,8 @@ futures-timer = "3.0.1"
 ip_network = "0.4.1"
 libp2p = { version = "0.51.3", features = ["ed25519", "kad"] }
 multihash = { version = "0.18.1", default-features = false, features = [
-  "sha2",
-  "std",
+	"sha2",
+	"std",
 ] }
 log = "0.4.17"
 prost = "0.11"
@@ -41,9 +41,9 @@ sp-keystore = { path = "../../primitives/keystore" }
 sp-runtime = { path = "../../primitives/runtime" }
 async-trait = "0.1.56"
 multihash-codetable = { version = "0.1.1", features = [
-  "serde",
-  "sha2",
-  "digest",
+	"digest",
+	"serde",
+	"sha2",
 ] }
 
 [dev-dependencies]