Update the wasm builder to substrate master (#1029)

* chore: update the wasm builder to substrate master * Bump Substrate * Update weight of sending remarks ref paritytech/polkadot#3354 Co-authored-by: Hernando Castano <hernando@hcastano.com>
paritytech · Jun 25, 2021 · bcde21d · bcde21d
1 parent a8318ce
commit bcde21d
Show file tree

Hide file tree

Showing 10 changed files with 140 additions and 127 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/millau/node/Cargo.toml b/bin/millau/node/Cargo.toml
@@ -51,7 +51,7 @@ sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "mast
 substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 [build-dependencies]
-substrate-build-script-utils = "3.0.0"
+substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
 frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 [features]

diff --git a/bin/millau/node/src/service.rs b/bin/millau/node/src/service.rs
@@ -300,6 +300,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 			sync_oracle: network.clone(),
 			justification_sync_link: network.clone(),
 			block_proposal_slot_portion: SlotProportion::new(2f32 / 3f32),
+			max_block_proposal_slot_portion: None,
 			telemetry: telemetry.as_ref().map(|x| x.handle()),
 		})?;
 

diff --git a/bin/millau/runtime/Cargo.toml b/bin/millau/runtime/Cargo.toml
@@ -56,7 +56,7 @@ sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" ,
 sp-version = { git = "https://github.com/paritytech/substrate", branch = "master" , default-features = false }
 
 [build-dependencies]
-substrate-wasm-builder = "3.0.0"
+substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 [features]
 default = ["std"]

diff --git a/bin/rialto/node/Cargo.toml b/bin/rialto/node/Cargo.toml
@@ -52,7 +52,7 @@ sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "mast
 substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 [build-dependencies]
-substrate-build-script-utils = "3.0.0"
+substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
 frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 [features]

diff --git a/bin/rialto/node/src/service.rs b/bin/rialto/node/src/service.rs
@@ -304,6 +304,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 			sync_oracle: network.clone(),
 			justification_sync_link: network.clone(),
 			block_proposal_slot_portion: SlotProportion::new(2f32 / 3f32),
+			max_block_proposal_slot_portion: None,
 			telemetry: telemetry.as_ref().map(|x| x.handle()),
 		})?;
 

diff --git a/bin/rialto/runtime/Cargo.toml b/bin/rialto/runtime/Cargo.toml
@@ -68,7 +68,7 @@ sp-version = { git = "https://github.com/paritytech/substrate", branch = "master
 libsecp256k1 = { version = "0.3.4", features = ["hmac"] }
 
 [build-dependencies]
-substrate-wasm-builder = "3.0.0"
+substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 [features]
 default = ["std"]

diff --git a/modules/dispatch/src/lib.rs b/modules/dispatch/src/lib.rs
@@ -615,7 +615,7 @@ mod tests {
 					event: Event::Dispatch(call_dispatch::Event::<TestRuntime>::MessageWeightMismatch(
 						SOURCE_CHAIN_ID,
 						id,
-						1345000,
+						1038000,
 						7,
 					)),
 					topics: vec![],

diff --git a/relays/bin-substrate/src/cli/encode_message.rs b/relays/bin-substrate/src/cli/encode_message.rs
@@ -101,6 +101,6 @@ mod tests {
 		let hex = encode_message.encode().unwrap();
 
 		// then
-		assert_eq!(format!("{:?}", hex), "0x01000000e88514000000000002d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d003c040130000000000000000000000000");
+		assert_eq!(format!("{:?}", hex), "0x01000000b0d60f000000000002d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d003c040130000000000000000000000000");
 	}
 }
diff --git a/relays/bin-substrate/src/cli/send_message.rs b/relays/bin-substrate/src/cli/send_message.rs
@@ -278,7 +278,7 @@ mod tests {
 			payload,
 			MessagePayload {
 				spec_version: relay_millau_client::Millau::RUNTIME_VERSION.spec_version,
-				weight: 1345000,
+				weight: 1038000,
 				origin: CallOrigin::SourceAccount(sp_keyring::AccountKeyring::Alice.to_account_id()),
 				dispatch_fee_payment: DispatchFeePayment::AtSourceChain,
 				call: hex!("0401081234").to_vec(),
@@ -318,7 +318,7 @@ mod tests {
 			payload,
 			MessagePayload {
 				spec_version: relay_millau_client::Millau::RUNTIME_VERSION.spec_version,
-				weight: 1345000,
+				weight: 1038000,
 				origin: CallOrigin::TargetAccount(
 					sp_keyring::AccountKeyring::Alice.to_account_id(),
 					sp_keyring::AccountKeyring::Bob.into(),