Upgrade Subxt and Forge (#1553)

* upgrade

* update subxt signer

* add back logs

* revert log

Author: claravanstaden

flake.lock

@@ -13,13 +13,13 @@ scale-info = { features = ["derive"], version = "2.11.6", default-features = fal
 hex = "0.4.3"
 hex-literal = "0.4.1"
 serde = { version = "1.0.210", features = ["derive"] }
-subxt = { version = "0.42.1" }
-subxt-signer = { version = "0.42.1" }
+subxt = { version = "0.43.0" }
+subxt-signer = { version = "0.43.0" }
 alloy = { version = "1.0.9", features = ["full"] }
 lazy_static = "1.4.0"
 sp-core = { version = "36.1.0" }
 sp-crypto-hashing = { version = "0.1.0" }
 sp-runtime = { version = "41.1.0" }
 
 [features]
-legacy-v1 = []
+legacy-v1 = []

smoketest/Cargo.lock

@@ -19,7 +19,7 @@ forge bind --module --overwrite \
 # Install subxt
 command -v subxt || cargo install subxt-cli \
     --git https://github.com/paritytech/subxt.git \
-    --tag v0.42.1
+    --tag v0.43.0
 
 eth_network="${ETH_NETWORK:-localhost}"
 polkadot_network="${POLKADOT_NETWORK:-localhost}"
@@ -36,13 +36,27 @@ else
       exit 1
   fi
   # Fetch metadata from BridgeHub and generate client
-  subxt codegen --url ws://localhost:11144 >src/parachains/bridgehub.rs
+  subxt codegen --url ws://localhost:11144 >src/parachains/bridgehub.rs \
+  --derive ::subxt::ext::subxt_core::ext::codec::Encode \
+  --derive ::subxt::ext::subxt_core::ext::codec::Decode
   subxt codegen --url ws://localhost:12144 > src/parachains/assethub.rs \
   --derive-for-type staging_xcm::v5::location::Location=Clone,recursive \
+  --derive-for-type staging_xcm::v5::location::Location=::subxt::ext::codec::Encode,recursive \
+  --derive-for-type staging_xcm::v5::location::Location=::subxt::ext::codec::Decode,recursive \
+  --derive-for-type xcm::VersionedXcm=::subxt::ext::codec::Encode,recursive \
+  --derive-for-type xcm::VersionedXcm=::subxt::ext::codec::Decode,recursive \
   --derive-for-type staging_xcm::v5::asset::AssetId=Clone,recursive \
   --derive-for-type staging_xcm::v5::asset::Assets=Clone,recursive
-  subxt codegen --url ws://localhost:9944 >src/parachains/relaychain.rs
-  subxt codegen --url ws://localhost:13144 >src/parachains/penpal.rs
+  subxt codegen --url ws://localhost:9944 >src/parachains/relaychain.rs \
+  --derive ::subxt::ext::subxt_core::ext::codec::Encode \
+  --derive ::subxt::ext::subxt_core::ext::codec::Decode
+  subxt codegen --url ws://localhost:13144 >src/parachains/penpal.rs \
+  --derive-for-type staging_xcm::v5::location::Location=Clone,recursive \
+  --derive-for-type staging_xcm::v5::asset::AssetId=Clone,recursive \
+  --derive-for-type staging_xcm::v5::asset::Assets=Clone,recursive \
+  --derive ::subxt::ext::subxt_core::ext::codec::Encode \
+  --derive ::subxt::ext::subxt_core::ext::codec::Decode
+
 fi
 
 

smoketest/Cargo.toml

@@ -233,7 +233,7 @@ pub async fn ensure_penpal_asset_exists(
 	penpal_client: &mut OnlineClient<PenpalConfig>,
 	asset: PenpalLocation,
 ) {
-	let existing_asset = penpal::api::storage().foreign_assets().asset(&asset);
+	let existing_asset = penpal::api::storage().foreign_assets().asset(asset.clone());
 	let result = penpal_client
 		.storage()
 		.at_latest()