Update to 0.9.29 (#754)

* fix runtime * fix aleph-node * bump spec version * bump versions * update runtime in aleph-client * Temporarily remove try-runtime * review nits * fix tests * reintroduce try-runtime * whitespaces Co-authored-by: Jan Koscisz <koscis.j@gmail.com> Co-authored-by: kostekIV <27210860+kostekIV@users.noreply.github.com>
Cardinal-Cryptography · Nov 24, 2022 · dee35e4 · dee35e4
1 parent 321f44b
commit dee35e4
Show file tree

Hide file tree

Showing 33 changed files with 3,075 additions and 1,678 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/aleph-client/Cargo.lock b/aleph-client/Cargo.lock
diff --git a/aleph-client/Cargo.toml b/aleph-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "aleph_client"
-version = "2.0.0"
+version = "2.1.0"
 edition = "2021"
 license = "Apache 2.0"
 
@@ -19,8 +19,8 @@ subxt = "0.24.0"
 futures = "0.3.25"
 serde = { version = "1.0", features = ["derive"] }
 
-frame-support = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.28" }
-sp-core = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.28", features = ["full_crypto"] }
-sp-runtime = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.28" }
-pallet-contracts-primitives = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.28" }
+frame-support = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.29" }
+sp-core = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.29", features = ["full_crypto"] }
+sp-runtime = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.29" }
+pallet-contracts-primitives = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.29" }
 primitives = { path = "../primitives" }
diff --git a/aleph-client/src/aleph_zero.rs b/aleph-client/src/aleph_zero.rs
diff --git a/aleph-client/src/connections.rs b/aleph-client/src/connections.rs
@@ -12,7 +12,9 @@ use subxt::{
     SubstrateConfig,
 };
 
-use crate::{api, BlockHash, Call, Client, KeyPair, TxStatus};
+use crate::{
+    api, frame_support::weights::weight_v2::Weight, BlockHash, Call, Client, KeyPair, TxStatus,
+};
 
 #[derive(Clone)]
 pub struct Connection {
@@ -39,7 +41,9 @@ pub trait SudoCall {
 impl SudoCall for RootConnection {
     async fn sudo_unchecked(&self, call: Call, status: TxStatus) -> anyhow::Result<BlockHash> {
         info!(target: "aleph-client", "sending call as sudo_unchecked {:?}", call);
-        let sudo = api::tx().sudo().sudo_unchecked_weight(call, 0);
+        let sudo = api::tx()
+            .sudo()
+            .sudo_unchecked_weight(call, Weight { ref_time: 0 });
 
         self.as_signed().send_tx(sudo, status).await
     }

diff --git a/aleph-client/src/contract/mod.rs b/aleph-client/src/contract/mod.rs
@@ -58,6 +58,7 @@ use ink_metadata::{InkProject, MetadataVersioned};
 use serde_json::{from_reader, from_value};
 
 use crate::{
+    frame_support::weights::weight_v2::Weight,
     pallets::contract::{ContractCallArgs, ContractRpc, ContractsUserApi},
     AccountId, Connection, SignedConnection, TxStatus,
 };
@@ -109,7 +110,9 @@ impl ContractInstance {
             origin: self.address.clone(),
             dest: self.address.clone(),
             value: 0,
-            gas_limit: Self::MAX_READ_GAS,
+            gas_limit: Weight {
+                ref_time: Self::MAX_READ_GAS,
+            },
             input_data: payload,
             storage_deposit_limit: None,
         };
@@ -134,7 +137,9 @@ impl ContractInstance {
         conn.call(
             self.address.clone(),
             Self::PAYABLE_VALUE as u128,
-            Self::MAX_GAS,
+            Weight {
+                ref_time: Self::MAX_GAS,
+            },
             Self::STORAGE_FEE_LIMIT,
             data,
             TxStatus::InBlock,

diff --git a/aleph-client/src/pallets/contract.rs b/aleph-client/src/pallets/contract.rs
@@ -7,16 +7,16 @@ use subxt::{
 };
 
 use crate::{
-    api, pallet_contracts::wasm::OwnerInfo, AccountId, BlockHash, Connection, SignedConnection,
-    TxStatus,
+    api, frame_support::weights::weight_v2::Weight, pallet_contracts::wasm::OwnerInfo, AccountId,
+    BlockHash, Connection, SignedConnection, TxStatus,
 };
 
 #[derive(Encode)]
 pub struct ContractCallArgs {
     pub origin: AccountId,
     pub dest: AccountId,
     pub value: Balance,
-    pub gas_limit: u64,
+    pub gas_limit: Weight,
     pub storage_deposit_limit: Option<Balance>,
     pub input_data: Vec<u8>,
 }
@@ -43,7 +43,7 @@ pub trait ContractsUserApi {
         &self,
         code_hash: BlockHash,
         balance: Balance,
-        gas_limit: u64,
+        gas_limit: Weight,
         storage_limit: Option<Compact<u128>>,
         data: Vec<u8>,
         salt: Vec<u8>,
@@ -54,7 +54,7 @@ pub trait ContractsUserApi {
         &self,
         code: Vec<u8>,
         balance: Balance,
-        gas_limit: u64,
+        gas_limit: Weight,
         storage_limit: Option<Compact<u128>>,
         data: Vec<u8>,
         salt: Vec<u8>,
@@ -64,7 +64,7 @@ pub trait ContractsUserApi {
         &self,
         destination: AccountId,
         balance: Balance,
-        gas_limit: u64,
+        gas_limit: Weight,
         storage_limit: Option<Compact<u128>>,
         data: Vec<u8>,
         status: TxStatus,
@@ -111,7 +111,7 @@ impl ContractsUserApi for SignedConnection {
         &self,
         code_hash: BlockHash,
         balance: Balance,
-        gas_limit: u64,
+        gas_limit: Weight,
         storage_limit: Option<Compact<u128>>,
         data: Vec<u8>,
         salt: Vec<u8>,
@@ -133,7 +133,7 @@ impl ContractsUserApi for SignedConnection {
         &self,
         code: Vec<u8>,
         balance: Balance,
-        gas_limit: u64,
+        gas_limit: Weight,
         storage_limit: Option<Compact<u128>>,
         data: Vec<u8>,
         salt: Vec<u8>,
@@ -155,7 +155,7 @@ impl ContractsUserApi for SignedConnection {
         &self,
         destination: AccountId,
         balance: Balance,
-        gas_limit: u64,
+        gas_limit: Weight,
         storage_limit: Option<Compact<u128>>,
         data: Vec<u8>,
         status: TxStatus,

diff --git a/aleph-client/src/pallets/multisig.rs b/aleph-client/src/pallets/multisig.rs
@@ -1,6 +1,9 @@
 use primitives::{Balance, BlockNumber};
 
-use crate::{api, api::runtime_types, AccountId, BlockHash, SignedConnection, TxStatus};
+use crate::{
+    api, api::runtime_types, frame_support::weights::weight_v2::Weight, AccountId, BlockHash,
+    SignedConnection, TxStatus,
+};
 
 pub type CallHash = [u8; 32];
 pub type Call = Vec<u8>;
@@ -14,7 +17,7 @@ pub trait MultisigUserApi {
         threshold: u16,
         other_signatories: Vec<AccountId>,
         timepoint: Option<Timepoint>,
-        max_weight: u64,
+        max_weight: Weight,
         call_hash: CallHash,
         status: TxStatus,
     ) -> anyhow::Result<BlockHash>;
@@ -35,7 +38,7 @@ impl MultisigUserApi for SignedConnection {
         threshold: u16,
         other_signatories: Vec<AccountId>,
         timepoint: Option<Timepoint>,
-        max_weight: u64,
+        max_weight: Weight,
         call_hash: CallHash,
         status: TxStatus,
     ) -> anyhow::Result<BlockHash> {

diff --git a/aleph-client/src/runtime_types.rs b/aleph-client/src/runtime_types.rs
@@ -6,6 +6,7 @@ use crate::{
         sp_consensus_aura::sr25519::app_sr25519::Public as AuraPublic,
         sp_core::{ed25519::Public as EdPublic, sr25519::Public as SrPublic},
     },
+    frame_support::weights::weight_v2::Weight,
     pallet_staking::EraRewardPoints,
 };
 
@@ -40,3 +41,9 @@ impl TryFrom<String> for SessionKeys {
         Ok(SessionKeys::from(bytes))
     }
 }
+
+impl Weight {
+    pub fn new(ref_time: u64) -> Self {
+        Self { ref_time }
+    }
+}