From 0ff157bec59fc95de05438c6c6fc0ea358e3c561 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Thu, 26 Dec 2024 10:40:03 +0200 Subject: [PATCH 01/41] Added endpoint to complete setup for Fee-Market Signed-off-by: Andrei Baltariu --- fee-market/src/lib.rs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fee-market/src/lib.rs b/fee-market/src/lib.rs index 4cca4631..ae52f9be 100644 --- a/fee-market/src/lib.rs +++ b/fee-market/src/lib.rs @@ -37,4 +37,12 @@ pub trait FeeMarket: self.price_aggregator_address() .set(price_aggregator_address); } + + #[only_owner] + fn complete_setup_phase(&self, header_verifier_address: ManagedAddress) { + require!( + !self.esdt_safe_address().is_empty(), + "The ESDT-Safe address is not set" + ); + } } From 29a06f8a03dc0803e86b2c948687e63b9ef193d3 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Thu, 26 Dec 2024 10:44:26 +0200 Subject: [PATCH 02/41] Added setup phase logic Signed-off-by: Andrei Baltariu --- Cargo.lock | 1 + fee-market/Cargo.toml | 3 +++ fee-market/src/lib.rs | 13 +++++++++++++ 3 files changed, 17 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 1971f644..80141110 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -641,6 +641,7 @@ dependencies = [ "multiversx-sc-scenario", "num-bigint", "proxies", + "setup-phase", "transaction", "utils", ] diff --git a/fee-market/Cargo.toml b/fee-market/Cargo.toml index ee51e0c7..cafc17be 100644 --- a/fee-market/Cargo.toml +++ b/fee-market/Cargo.toml @@ -17,6 +17,9 @@ path = "../common/transaction" [dependencies.proxies] path = "../common/proxies" +[dependencies.setup-phase] +path = "../common/setup-phase" + [dependencies.multiversx-sc] version = "=0.54.5" diff --git a/fee-market/src/lib.rs b/fee-market/src/lib.rs index ae52f9be..a14b252f 100644 --- a/fee-market/src/lib.rs +++ b/fee-market/src/lib.rs @@ -16,6 +16,7 @@ pub trait FeeMarket: + subtract_fee::SubtractFeeModule + price_aggregator::PriceAggregatorModule + utils::UtilsModule + + setup_phase::SetupPhaseModule { #[init] fn init(&self, esdt_safe_address: ManagedAddress, fee: Option>) { @@ -40,9 +41,21 @@ pub trait FeeMarket: #[only_owner] fn complete_setup_phase(&self, header_verifier_address: ManagedAddress) { + if self.is_setup_phase_complete() { + return; + } + require!( !self.esdt_safe_address().is_empty(), "The ESDT-Safe address is not set" ); + + self.tx() + .to(ESDTSystemSCAddress) + .typed(UserBuiltinProxy) + .change_owner_address(&header_verifier_address) + .sync_call(); + + self.setup_phase_complete().set(true); } } From bba7414fb61815832f6bab8ec072c25f232f73bd Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Thu, 26 Dec 2024 10:45:49 +0200 Subject: [PATCH 03/41] Build + proxy Signed-off-by: Andrei Baltariu --- .../wasm-enshrine-esdt-safe-full/Cargo.lock | 3 ++- .../wasm-enshrine-esdt-safe-view/Cargo.lock | 3 ++- enshrine-esdt-safe/wasm/Cargo.lock | 3 ++- esdt-safe/wasm-esdt-safe-full/Cargo.lock | 3 ++- esdt-safe/wasm-esdt-safe-view/Cargo.lock | 3 ++- esdt-safe/wasm/Cargo.lock | 3 ++- fee-market/wasm-fee-market-view/Cargo.lock | 10 +++++++++- fee-market/wasm-fee-market/Cargo.lock | 10 +++++++++- fee-market/wasm/Cargo.lock | 10 +++++++++- sovereign-forge/wasm-sovereign-forge-full/Cargo.lock | 1 + sovereign-forge/wasm-soveriegn-forge-view/Cargo.lock | 1 + sovereign-forge/wasm/Cargo.lock | 1 + 12 files changed, 42 insertions(+), 9 deletions(-) diff --git a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/Cargo.lock b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/Cargo.lock index 9c9627c2..445b34ef 100644 --- a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/Cargo.lock +++ b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -80,6 +80,7 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "proxies", + "setup-phase", "transaction", "utils", ] diff --git a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-view/Cargo.lock b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-view/Cargo.lock index d7375f07..b149aae6 100644 --- a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-view/Cargo.lock +++ b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-view/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -80,6 +80,7 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "proxies", + "setup-phase", "transaction", "utils", ] diff --git a/enshrine-esdt-safe/wasm/Cargo.lock b/enshrine-esdt-safe/wasm/Cargo.lock index 4412ebd7..b33cfe95 100644 --- a/enshrine-esdt-safe/wasm/Cargo.lock +++ b/enshrine-esdt-safe/wasm/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -80,6 +80,7 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "proxies", + "setup-phase", "transaction", "utils", ] diff --git a/esdt-safe/wasm-esdt-safe-full/Cargo.lock b/esdt-safe/wasm-esdt-safe-full/Cargo.lock index faee3be8..eb91b78b 100644 --- a/esdt-safe/wasm-esdt-safe-full/Cargo.lock +++ b/esdt-safe/wasm-esdt-safe-full/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -57,6 +57,7 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "proxies", + "setup-phase", "transaction", "utils", ] diff --git a/esdt-safe/wasm-esdt-safe-view/Cargo.lock b/esdt-safe/wasm-esdt-safe-view/Cargo.lock index aee268f2..c7778b1e 100644 --- a/esdt-safe/wasm-esdt-safe-view/Cargo.lock +++ b/esdt-safe/wasm-esdt-safe-view/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -57,6 +57,7 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "proxies", + "setup-phase", "transaction", "utils", ] diff --git a/esdt-safe/wasm/Cargo.lock b/esdt-safe/wasm/Cargo.lock index c26e8563..03739410 100644 --- a/esdt-safe/wasm/Cargo.lock +++ b/esdt-safe/wasm/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -57,6 +57,7 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "proxies", + "setup-phase", "transaction", "utils", ] diff --git a/fee-market/wasm-fee-market-view/Cargo.lock b/fee-market/wasm-fee-market-view/Cargo.lock index 41c355ee..896ae142 100644 --- a/fee-market/wasm-fee-market-view/Cargo.lock +++ b/fee-market/wasm-fee-market-view/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -32,6 +32,7 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "proxies", + "setup-phase", "transaction", "utils", ] @@ -181,6 +182,13 @@ dependencies = [ "nibble_vec", ] +[[package]] +name = "setup-phase" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "smallvec" version = "1.13.2" diff --git a/fee-market/wasm-fee-market/Cargo.lock b/fee-market/wasm-fee-market/Cargo.lock index a434f3c4..4ee48168 100644 --- a/fee-market/wasm-fee-market/Cargo.lock +++ b/fee-market/wasm-fee-market/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -32,6 +32,7 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "proxies", + "setup-phase", "transaction", "utils", ] @@ -181,6 +182,13 @@ dependencies = [ "nibble_vec", ] +[[package]] +name = "setup-phase" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "smallvec" version = "1.13.2" diff --git a/fee-market/wasm/Cargo.lock b/fee-market/wasm/Cargo.lock index a434f3c4..4ee48168 100644 --- a/fee-market/wasm/Cargo.lock +++ b/fee-market/wasm/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -32,6 +32,7 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "proxies", + "setup-phase", "transaction", "utils", ] @@ -181,6 +182,13 @@ dependencies = [ "nibble_vec", ] +[[package]] +name = "setup-phase" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "smallvec" version = "1.13.2" diff --git a/sovereign-forge/wasm-sovereign-forge-full/Cargo.lock b/sovereign-forge/wasm-sovereign-forge-full/Cargo.lock index f46cced9..5731f127 100644 --- a/sovereign-forge/wasm-sovereign-forge-full/Cargo.lock +++ b/sovereign-forge/wasm-sovereign-forge-full/Cargo.lock @@ -71,6 +71,7 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "proxies", + "setup-phase", "transaction", "utils", ] diff --git a/sovereign-forge/wasm-soveriegn-forge-view/Cargo.lock b/sovereign-forge/wasm-soveriegn-forge-view/Cargo.lock index 5dcedc03..49f1b464 100644 --- a/sovereign-forge/wasm-soveriegn-forge-view/Cargo.lock +++ b/sovereign-forge/wasm-soveriegn-forge-view/Cargo.lock @@ -71,6 +71,7 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "proxies", + "setup-phase", "transaction", "utils", ] diff --git a/sovereign-forge/wasm/Cargo.lock b/sovereign-forge/wasm/Cargo.lock index bbb98c75..22b92cf2 100644 --- a/sovereign-forge/wasm/Cargo.lock +++ b/sovereign-forge/wasm/Cargo.lock @@ -71,6 +71,7 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "proxies", + "setup-phase", "transaction", "utils", ] From 17b7d918487653c9c6afec6b815f4f1f1c416d09 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Thu, 26 Dec 2024 11:03:53 +0200 Subject: [PATCH 04/41] Added file for aliases Signed-off-by: Andrei Baltariu --- common/transaction/src/aliases.rs | 30 +++++++++++++++++++++++++++++ common/transaction/src/lib.rs | 32 ++++++------------------------- 2 files changed, 36 insertions(+), 26 deletions(-) create mode 100644 common/transaction/src/aliases.rs diff --git a/common/transaction/src/aliases.rs b/common/transaction/src/aliases.rs new file mode 100644 index 00000000..ca0ddbaf --- /dev/null +++ b/common/transaction/src/aliases.rs @@ -0,0 +1,30 @@ +use crate::TransferData; + +multiversx_sc::imports!(); +multiversx_sc::derive_imports!(); + +pub type BatchId = u64; +pub type TxId = u64; +pub type GasLimit = u64; +pub type TxNonce = u64; + +pub type BlockNonce = u64; +pub type SenderAddress = ManagedAddress; +pub type ReceiverAddress = ManagedAddress; +pub type TxAsMultiValue = MultiValue7< + BlockNonce, + TxNonce, + SenderAddress, + ReceiverAddress, + ManagedVec>, + ManagedVec>, + Option>, +>; +pub type PaymentsVec = ManagedVec>; +pub type EventPaymentTuple = MultiValue3, u64, EsdtTokenData>; +pub type TxBatchSplitInFields = MultiValue2>>; +pub type ExtractedFeeResult = + MultiValue2>, ManagedVec>>; +pub type OptionalValueTransferDataTuple = + OptionalValue, ManagedVec>>>; +pub type StakeMultiArg = MultiValue2, BigUint>; diff --git a/common/transaction/src/lib.rs b/common/transaction/src/lib.rs index b17fca1e..9f5a2311 100644 --- a/common/transaction/src/lib.rs +++ b/common/transaction/src/lib.rs @@ -1,39 +1,19 @@ #![no_std] +use aliases::{ + BlockNonce, EventPaymentTuple, GasLimit, OptionalValueTransferDataTuple, TxAsMultiValue, TxId, + TxNonce, +}; + multiversx_sc::imports!(); multiversx_sc::derive_imports!(); +pub mod aliases; pub mod transaction_status; // revert protection pub const MIN_BLOCKS_FOR_FINALITY: u64 = 10; -pub type BatchId = u64; -pub type TxId = u64; -pub type GasLimit = u64; -pub type TxNonce = u64; - -pub type BlockNonce = u64; -pub type SenderAddress = ManagedAddress; -pub type ReceiverAddress = ManagedAddress; -pub type TxAsMultiValue = MultiValue7< - BlockNonce, - TxNonce, - SenderAddress, - ReceiverAddress, - ManagedVec>, - ManagedVec>, - Option>, ->; -pub type PaymentsVec = ManagedVec>; -pub type EventPaymentTuple = MultiValue3, u64, EsdtTokenData>; -pub type TxBatchSplitInFields = MultiValue2>>; -pub type ExtractedFeeResult = - MultiValue2>, ManagedVec>>; -pub type OptionalValueTransferDataTuple = - OptionalValue, ManagedVec>>>; -pub type StakeMultiArg = MultiValue2, BigUint>; - #[type_abi] #[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, ManagedVecItem, Clone)] pub struct Operation { From ef292c9768cea1372ec14125b1ef0a1abca58852 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Thu, 26 Dec 2024 11:21:51 +0200 Subject: [PATCH 05/41] Removed unused aliases Signed-off-by: Andrei Baltariu --- common/transaction/src/aliases.rs | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/common/transaction/src/aliases.rs b/common/transaction/src/aliases.rs index ca0ddbaf..fd860375 100644 --- a/common/transaction/src/aliases.rs +++ b/common/transaction/src/aliases.rs @@ -11,18 +11,7 @@ pub type TxNonce = u64; pub type BlockNonce = u64; pub type SenderAddress = ManagedAddress; pub type ReceiverAddress = ManagedAddress; -pub type TxAsMultiValue = MultiValue7< - BlockNonce, - TxNonce, - SenderAddress, - ReceiverAddress, - ManagedVec>, - ManagedVec>, - Option>, ->; -pub type PaymentsVec = ManagedVec>; pub type EventPaymentTuple = MultiValue3, u64, EsdtTokenData>; -pub type TxBatchSplitInFields = MultiValue2>>; pub type ExtractedFeeResult = MultiValue2>, ManagedVec>>; pub type OptionalValueTransferDataTuple = From 93274dbb8b1eb88bc1e2ef612153da1580718b1a Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Thu, 26 Dec 2024 11:47:54 +0200 Subject: [PATCH 06/41] More cleanup Signed-off-by: Andrei Baltariu --- Cargo.lock | 1 + chain-config/src/lib.rs | 2 +- chain-factory/src/factory.rs | 2 +- chain-factory/tests/chain_factory_tests.rs | 2 +- common/transaction/src/aliases.rs | 5 +- common/transaction/src/lib.rs | 52 +------------------ common/transaction/src/transaction_status.rs | 13 ----- common/tx-batch-module/src/lib.rs | 2 +- common/utils/Cargo.toml | 3 ++ common/utils/src/lib.rs | 4 +- .../src/enshrine_esdt_safe_interactor.rs | 10 +--- .../enshrine-esdt-safe_interactor_tests.rs | 1 + enshrine-esdt-safe/src/lib.rs | 2 +- .../src/to_sovereign/create_tx.rs | 3 +- .../tests/enshrine_esdt_safe_blackbox_test.rs | 9 ++-- .../interactor/src/esdt_safe_interactor.rs | 15 +++--- .../src/from_sovereign/transfer_tokens.rs | 4 +- esdt-safe/src/lib.rs | 2 +- esdt-safe/src/to_sovereign/create_tx.rs | 4 +- fee-market/src/subtract_fee.rs | 2 +- sovereign-forge/src/common/sc_deploy.rs | 2 +- sovereign-forge/src/phases.rs | 2 +- .../tests/sovereign_forge_unit_tests.rs | 2 +- token-handler/src/transfer_tokens.rs | 3 +- 24 files changed, 42 insertions(+), 105 deletions(-) delete mode 100644 common/transaction/src/transaction_status.rs diff --git a/Cargo.lock b/Cargo.lock index 1971f644..700a3906 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2520,6 +2520,7 @@ name = "utils" version = "0.0.0" dependencies = [ "multiversx-sc", + "transaction", ] [[package]] diff --git a/chain-config/src/lib.rs b/chain-config/src/lib.rs index e7cb54f0..7f1c73f0 100644 --- a/chain-config/src/lib.rs +++ b/chain-config/src/lib.rs @@ -1,7 +1,7 @@ #![no_std] use multiversx_sc_modules::only_admin; -use transaction::StakeMultiArg; +use transaction::aliases::StakeMultiArg; use validator_rules::TokenIdAmountPair; multiversx_sc::imports!(); diff --git a/chain-factory/src/factory.rs b/chain-factory/src/factory.rs index 3021d809..cac8cdcd 100644 --- a/chain-factory/src/factory.rs +++ b/chain-factory/src/factory.rs @@ -7,7 +7,7 @@ use proxies::{ fee_market_proxy::{FeeMarketProxy, FeeStruct}, header_verifier_proxy::HeaderverifierProxy, }; -use transaction::StakeMultiArg; +use transaction::aliases::StakeMultiArg; multiversx_sc::derive_imports!(); #[multiversx_sc::module] diff --git a/chain-factory/tests/chain_factory_tests.rs b/chain-factory/tests/chain_factory_tests.rs index d2618810..689d1a29 100644 --- a/chain-factory/tests/chain_factory_tests.rs +++ b/chain-factory/tests/chain_factory_tests.rs @@ -9,7 +9,7 @@ use multiversx_sc_scenario::{ use proxies::{ chain_config_proxy::ChainConfigContractProxy, chain_factory_proxy::ChainFactoryContractProxy, }; -use transaction::StakeMultiArg; +use transaction::aliases::StakeMultiArg; const FACTORY_ADDRESS: TestSCAddress = TestSCAddress::new("chain-factory"); const CODE_PATH: MxscPath = MxscPath::new("output/chain-factory.mxsc.json"); diff --git a/common/transaction/src/aliases.rs b/common/transaction/src/aliases.rs index fd860375..5f240ebe 100644 --- a/common/transaction/src/aliases.rs +++ b/common/transaction/src/aliases.rs @@ -1,5 +1,3 @@ -use crate::TransferData; - multiversx_sc::imports!(); multiversx_sc::derive_imports!(); @@ -12,8 +10,11 @@ pub type BlockNonce = u64; pub type SenderAddress = ManagedAddress; pub type ReceiverAddress = ManagedAddress; pub type EventPaymentTuple = MultiValue3, u64, EsdtTokenData>; +pub type PaymentsVec = ManagedVec>; pub type ExtractedFeeResult = MultiValue2>, ManagedVec>>; pub type OptionalValueTransferDataTuple = OptionalValue, ManagedVec>>>; pub type StakeMultiArg = MultiValue2, BigUint>; +pub type OptionalTransferData = + OptionalValue, ManagedVec>>>; diff --git a/common/transaction/src/lib.rs b/common/transaction/src/lib.rs index 9f5a2311..ffdcf0fa 100644 --- a/common/transaction/src/lib.rs +++ b/common/transaction/src/lib.rs @@ -1,15 +1,11 @@ #![no_std] -use aliases::{ - BlockNonce, EventPaymentTuple, GasLimit, OptionalValueTransferDataTuple, TxAsMultiValue, TxId, - TxNonce, -}; +use aliases::{EventPaymentTuple, GasLimit, OptionalValueTransferDataTuple, TxId}; multiversx_sc::imports!(); multiversx_sc::derive_imports!(); pub mod aliases; -pub mod transaction_status; // revert protection pub const MIN_BLOCKS_FOR_FINALITY: u64 = 10; @@ -209,49 +205,3 @@ impl Default for OperationEsdtPayment { } } } - -#[type_abi] -#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, ManagedVecItem, Clone)] -pub struct Transaction { - pub block_nonce: BlockNonce, - pub nonce: TxNonce, - pub from: ManagedAddress, - pub to: ManagedAddress, - pub tokens: ManagedVec>, - pub token_data: ManagedVec>, - pub opt_transfer_data: Option>, - pub is_refund_tx: bool, -} - -impl From> for Transaction { - fn from(tx_as_multiresult: TxAsMultiValue) -> Self { - let (block_nonce, nonce, from, to, tokens, token_data, opt_transfer_data) = - tx_as_multiresult.into_tuple(); - - Transaction { - block_nonce, - nonce, - from, - to, - tokens, - token_data, - opt_transfer_data, - is_refund_tx: false, - } - } -} - -impl Transaction { - pub fn into_multiresult(self) -> TxAsMultiValue { - ( - self.block_nonce, - self.nonce, - self.from, - self.to, - self.tokens, - self.token_data, - self.opt_transfer_data, - ) - .into() - } -} diff --git a/common/transaction/src/transaction_status.rs b/common/transaction/src/transaction_status.rs deleted file mode 100644 index b7bc9c91..00000000 --- a/common/transaction/src/transaction_status.rs +++ /dev/null @@ -1,13 +0,0 @@ -multiversx_sc::imports!(); -multiversx_sc::derive_imports!(); - -#[derive( - TopEncode, TopDecode, NestedEncode, NestedDecode, PartialEq, Clone, Copy, ManagedVecItem, -)] -pub enum TransactionStatus { - None, - Pending, - InProgress, - Executed, - Rejected, -} diff --git a/common/tx-batch-module/src/lib.rs b/common/tx-batch-module/src/lib.rs index 6e94ebe7..2f843d09 100644 --- a/common/tx-batch-module/src/lib.rs +++ b/common/tx-batch-module/src/lib.rs @@ -3,7 +3,7 @@ multiversx_sc::imports!(); multiversx_sc::derive_imports!(); -use transaction::TxNonce; +use transaction::aliases::TxNonce; #[multiversx_sc::module] pub trait TxBatchModule { diff --git a/common/utils/Cargo.toml b/common/utils/Cargo.toml index 741268db..427fb0fc 100644 --- a/common/utils/Cargo.toml +++ b/common/utils/Cargo.toml @@ -7,6 +7,9 @@ edition = "2021" [lib] path = "src/lib.rs" +[dependencies.transaction] +path = "../transaction" + [dependencies.multiversx-sc] version = "=0.54.5" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/utils/src/lib.rs b/common/utils/src/lib.rs index 6700e77e..f61abd36 100644 --- a/common/utils/src/lib.rs +++ b/common/utils/src/lib.rs @@ -1,8 +1,8 @@ #![no_std] -multiversx_sc::imports!(); +use transaction::aliases::PaymentsVec; -pub type PaymentsVec = ManagedVec>; +multiversx_sc::imports!(); static ERR_EMPTY_PAYMENTS: &[u8] = b"No payments"; const DASH: u8 = b'-'; diff --git a/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs b/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs index 2a673bef..4d1c2114 100644 --- a/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs +++ b/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs @@ -1,6 +1,7 @@ #![allow(non_snake_case)] #![allow(unused)] +use aliases::{OptionalTransferData, PaymentsVec}; use fee_market_proxy::*; use interactor::constants::{TOKEN_ID, WHITELIST_TOKEN_ID}; use interactor::interactor_config::Config; @@ -14,9 +15,6 @@ const HEADER_VERIFIER_CODE_PATH: &str = "../header-verifier/output/header-verifi const ENSHRINE_ESDT_SAFE_CODE_PATH: &str = "output/enshrine-esdt-safe.mxsc.json"; const TOKEN_HANDLER_CODE_PATH: &str = "../token-handler/output/token-handler.mxsc.json"; -type OptionalTransferData = - OptionalValue, ManagedVec>>>; - pub async fn enshrine_esdt_safe_cli() { env_logger::init(); @@ -33,11 +31,7 @@ pub async fn enshrine_esdt_safe_cli() { "setHeaderVerifierAddress" => interact.set_header_verifier_address().await, "setMaxTxGasLimit" => interact.set_max_user_tx_gas_limit().await, "setBannedEndpoint" => interact.set_banned_endpoint().await, - "deposit" => { - interact - .deposit(OptionalTransferData::None, Option::None) - .await - } + "deposit" => interact.deposit(None.into(), Option::None).await, "executeBridgeOps" => interact.execute_operations().await, "registerNewTokenID" => interact.register_new_token_id().await, "setMaxBridgedAmount" => interact.set_max_bridged_amount().await, diff --git a/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs b/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs index 6ec9d646..57a8eb37 100644 --- a/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs +++ b/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs @@ -1,5 +1,6 @@ use std::vec; +use aliases::{GasLimit, PaymentsVec}; use enshrine_esdt_safe_interactor::ContractInteract; use interactor::constants::{TOKEN_ID, WHITELIST_TOKEN_ID}; use interactor::interactor_config::Config; diff --git a/enshrine-esdt-safe/src/lib.rs b/enshrine-esdt-safe/src/lib.rs index 750cce35..bea2e946 100644 --- a/enshrine-esdt-safe/src/lib.rs +++ b/enshrine-esdt-safe/src/lib.rs @@ -1,7 +1,7 @@ #![no_std] use multiversx_sc::imports::*; -use transaction::GasLimit; +use transaction::aliases::GasLimit; pub mod common; pub mod from_sovereign; diff --git a/enshrine-esdt-safe/src/to_sovereign/create_tx.rs b/enshrine-esdt-safe/src/to_sovereign/create_tx.rs index da03c345..fb5d8343 100644 --- a/enshrine-esdt-safe/src/to_sovereign/create_tx.rs +++ b/enshrine-esdt-safe/src/to_sovereign/create_tx.rs @@ -1,7 +1,8 @@ use crate::common; use proxies::fee_market_proxy::FeeMarketProxy; use transaction::{ - EventPayment, GasLimit, OperationData, OptionalValueTransferDataTuple, TransferData, + aliases::{GasLimit, OptionalValueTransferDataTuple}, + EventPayment, OperationData, TransferData, }; use multiversx_sc::imports::*; diff --git a/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs b/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs index 85f8a3d5..1d6dd629 100644 --- a/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs +++ b/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs @@ -1,5 +1,5 @@ use multiversx_sc::codec::TopEncode; -use multiversx_sc::imports::{MultiValue3, OptionalValue}; +use multiversx_sc::imports::OptionalValue; use multiversx_sc::types::{ Address, BigUint, EsdtTokenData, EsdtTokenPayment, ManagedBuffer, ManagedVec, MultiValueEncoded, TestAddress, TestSCAddress, TestTokenIdentifier, TokenIdentifier, @@ -12,8 +12,8 @@ use proxies::enshrine_esdt_safe_proxy::EnshrineEsdtSafeProxy; use proxies::fee_market_proxy::{FeeMarketProxy, FeeStruct, FeeType}; use proxies::header_verifier_proxy::HeaderverifierProxy; use proxies::token_handler_proxy::TokenHandlerProxy; -use transaction::{GasLimit, Operation, OperationData, OperationEsdtPayment}; -use utils::PaymentsVec; +use transaction::aliases::{GasLimit, OptionalTransferData, PaymentsVec}; +use transaction::{Operation, OperationData, OperationEsdtPayment}; const ENSHRINE_ESDT_ADDRESS: TestSCAddress = TestSCAddress::new("enshrine-esdt"); const ENSHRINE_ESDT_CODE_PATH: MxscPath = MxscPath::new("output/enshrine-esdt-safe.mxsc-json"); @@ -47,9 +47,6 @@ const WEGLD_IDENTIFIER: TestTokenIdentifier = TestTokenIdentifier::new("WEGLD-12 const WEGLD_BALANCE: u128 = 100_000_000_000_000_000; const SOVEREIGN_TOKEN_PREFIX: &str = "sov"; -type OptionalTransferData = - OptionalValue, ManagedVec>>>; - fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); diff --git a/esdt-safe/interactor/src/esdt_safe_interactor.rs b/esdt-safe/interactor/src/esdt_safe_interactor.rs index c19afc95..f4aa661c 100644 --- a/esdt-safe/interactor/src/esdt_safe_interactor.rs +++ b/esdt-safe/interactor/src/esdt_safe_interactor.rs @@ -12,7 +12,8 @@ use proxies::esdt_safe_proxy::EsdtSafeProxy; use proxies::fee_market_proxy::{FeeMarketProxy, FeeStruct, FeeType}; use proxies::header_verifier_proxy::HeaderverifierProxy; use proxies::testing_sc_proxy::TestingScProxy; -use transaction::{GasLimit, Operation, OperationData, PaymentsVec}; +use transaction::aliases::{OptionalTransferData, PaymentsVec}; +use transaction::{Operation, OperationData}; use transaction::{OperationEsdtPayment, TransferData}; const FEE_MARKET_CODE_PATH: &str = "../../fee-market/output/fee-market.mxsc.json"; @@ -20,9 +21,6 @@ const HEADER_VERIFIER_CODE_PATH: &str = "../../header-verifier/output/header-ver const ESDT_SAFE_CODE_PATH: &str = "../output/esdt-safe.mxsc.json"; const TESTING_SC_CODE_PATH: &str = "../../testing-sc/output/testing-sc.mxsc.json"; -type OptionalTransferData = - OptionalValue, ManagedVec>>>; - pub async fn esdt_safe_cli() { env_logger::init(); @@ -36,7 +34,7 @@ pub async fn esdt_safe_cli() { "upgrade" => interact.upgrade().await, "setFeeMarketAddress" => interact.set_fee_market_address().await, "setHeaderVerifierAddress" => interact.set_header_verifier_address().await, - "deposit" => interact.deposit(OptionalTransferData::None, None).await, + "deposit" => interact.deposit(None.into(), None).await, "registerToken" => interact.register_token().await, "setMaxBridgedAmount" => interact.set_max_bridged_amount().await, "getMaxBridgedAmount" => interact.max_bridged_amount().await, @@ -112,9 +110,10 @@ impl ContractInteract { .await; let new_address_bech32 = bech32::encode(&new_address); - self.state.set_esdt_safe_address(Bech32Address::from_bech32_string( - new_address_bech32.clone(), - )); + self.state + .set_esdt_safe_address(Bech32Address::from_bech32_string( + new_address_bech32.clone(), + )); println!("new address: {new_address_bech32}"); } diff --git a/esdt-safe/src/from_sovereign/transfer_tokens.rs b/esdt-safe/src/from_sovereign/transfer_tokens.rs index ca1b3bc6..1cac854a 100644 --- a/esdt-safe/src/from_sovereign/transfer_tokens.rs +++ b/esdt-safe/src/from_sovereign/transfer_tokens.rs @@ -1,6 +1,8 @@ use multiversx_sc::api::ESDT_MULTI_TRANSFER_FUNC_NAME; use proxies::header_verifier_proxy::HeaderverifierProxy; -use transaction::{GasLimit, Operation, OperationData, OperationEsdtPayment, OperationTuple}; +use transaction::{ + aliases::GasLimit, Operation, OperationData, OperationEsdtPayment, OperationTuple, +}; use crate::to_sovereign; diff --git a/esdt-safe/src/lib.rs b/esdt-safe/src/lib.rs index 49b9ec56..33039e33 100644 --- a/esdt-safe/src/lib.rs +++ b/esdt-safe/src/lib.rs @@ -1,6 +1,6 @@ #![no_std] -use transaction::GasLimit; +use transaction::aliases::GasLimit; multiversx_sc::imports!(); multiversx_sc::derive_imports!(); diff --git a/esdt-safe/src/to_sovereign/create_tx.rs b/esdt-safe/src/to_sovereign/create_tx.rs index fa4a8552..86f1aa4a 100644 --- a/esdt-safe/src/to_sovereign/create_tx.rs +++ b/esdt-safe/src/to_sovereign/create_tx.rs @@ -2,8 +2,8 @@ use crate::from_sovereign::token_mapping; use multiversx_sc::storage::StorageKey; use proxies::fee_market_proxy::FeeMarketProxy; use transaction::{ - EventPaymentTuple, ExtractedFeeResult, GasLimit, OperationData, OptionalValueTransferDataTuple, - TransferData, + aliases::{EventPaymentTuple, ExtractedFeeResult, GasLimit, OptionalValueTransferDataTuple}, + OperationData, TransferData, }; multiversx_sc::imports!(); diff --git a/fee-market/src/subtract_fee.rs b/fee-market/src/subtract_fee.rs index 287cd700..582adc2a 100644 --- a/fee-market/src/subtract_fee.rs +++ b/fee-market/src/subtract_fee.rs @@ -1,4 +1,4 @@ -use transaction::GasLimit; +use transaction::aliases::GasLimit; use crate::fee_type::FeeType; diff --git a/sovereign-forge/src/common/sc_deploy.rs b/sovereign-forge/src/common/sc_deploy.rs index 765013de..b2f44d5b 100644 --- a/sovereign-forge/src/common/sc_deploy.rs +++ b/sovereign-forge/src/common/sc_deploy.rs @@ -1,7 +1,7 @@ use crate::err_msg; use multiversx_sc::types::{MultiValueEncoded, ReturnsResult}; use proxies::{chain_factory_proxy::ChainFactoryContractProxy, fee_market_proxy::FeeStruct}; -use transaction::StakeMultiArg; +use transaction::aliases::StakeMultiArg; #[multiversx_sc::module] pub trait ScDeployModule: super::utils::UtilsModule + super::storage::StorageModule { diff --git a/sovereign-forge/src/phases.rs b/sovereign-forge/src/phases.rs index 777a69a4..f39f35bf 100644 --- a/sovereign-forge/src/phases.rs +++ b/sovereign-forge/src/phases.rs @@ -1,9 +1,9 @@ use crate::err_msg; use core::ops::Deref; use proxies::fee_market_proxy::FeeStruct; -use transaction::StakeMultiArg; use multiversx_sc::{require, types::MultiValueEncoded}; +use transaction::aliases::StakeMultiArg; use crate::common::{ self, diff --git a/sovereign-forge/tests/sovereign_forge_unit_tests.rs b/sovereign-forge/tests/sovereign_forge_unit_tests.rs index c6af19e5..c735d6d8 100644 --- a/sovereign-forge/tests/sovereign_forge_unit_tests.rs +++ b/sovereign-forge/tests/sovereign_forge_unit_tests.rs @@ -16,7 +16,7 @@ use sovereign_forge::common::{ storage::StorageModule, utils::{ScArray, UtilsModule}, }; -use transaction::StakeMultiArg; +use transaction::aliases::StakeMultiArg; const FORGE_ADDRESS: TestSCAddress = TestSCAddress::new("sovereign-forge"); const FORGE_CODE_PATH: MxscPath = MxscPath::new("output/sovereign-forge.mxsc.json"); diff --git a/token-handler/src/transfer_tokens.rs b/token-handler/src/transfer_tokens.rs index 49070932..b903a2ab 100644 --- a/token-handler/src/transfer_tokens.rs +++ b/token-handler/src/transfer_tokens.rs @@ -5,7 +5,8 @@ use multiversx_sc::types::{ system_proxy, EsdtTokenPayment, ManagedArgBuffer, MultiValueEncoded, ToSelf, }; use multiversx_sc::types::{ManagedVec, TokenIdentifier}; -use transaction::{GasLimit, OperationEsdtPayment, TransferData}; +use transaction::aliases::GasLimit; +use transaction::{OperationEsdtPayment, TransferData}; use crate::common_storage; From d30d89e6ace70a040dfa9cb2fada75fd7306a09b Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Thu, 26 Dec 2024 11:58:21 +0200 Subject: [PATCH 07/41] Renamed `transaction` module to `operation` Signed-off-by: Andrei Baltariu --- Cargo.lock | 40 +++++++++---------- chain-config/Cargo.toml | 4 +- chain-config/src/lib.rs | 2 +- .../wasm-chain-config-full/Cargo.lock | 18 ++++----- .../wasm-chain-config-view/Cargo.lock | 18 ++++----- chain-config/wasm/Cargo.lock | 18 ++++----- chain-factory/Cargo.toml | 4 +- chain-factory/src/factory.rs | 2 +- chain-factory/tests/chain_factory_tests.rs | 2 +- .../wasm-chain-factory-full/Cargo.lock | 25 ++++++------ .../wasm-chain-factory-view/Cargo.lock | 25 ++++++------ chain-factory/wasm/Cargo.lock | 25 ++++++------ common/{transaction => operation}/Cargo.toml | 2 +- .../{transaction => operation}/src/aliases.rs | 0 common/{transaction => operation}/src/lib.rs | 0 common/proxies/Cargo.toml | 4 +- .../proxies/src/enshrine_esdt_safe_proxy.rs | 2 +- common/proxies/src/esdt_safe_proxy.rs | 2 +- common/proxies/src/token_handler_proxy.rs | 4 +- common/tx-batch-module/Cargo.toml | 4 +- common/tx-batch-module/src/lib.rs | 2 +- common/utils/Cargo.toml | 4 +- common/utils/src/lib.rs | 2 +- enshrine-esdt-safe/Cargo.toml | 4 +- enshrine-esdt-safe/interactor/Cargo.toml | 4 +- .../src/enshrine_esdt_safe_interactor.rs | 2 +- .../enshrine-esdt-safe_interactor_tests.rs | 2 +- enshrine-esdt-safe/src/common/storage.rs | 2 +- .../src/from_sovereign/transfer_tokens.rs | 2 +- enshrine-esdt-safe/src/lib.rs | 2 +- .../src/to_sovereign/create_tx.rs | 2 +- enshrine-esdt-safe/src/to_sovereign/events.rs | 2 +- .../tests/enshrine_esdt_safe_blackbox_test.rs | 4 +- .../wasm-enshrine-esdt-safe-full/Cargo.lock | 33 +++++++-------- .../wasm-enshrine-esdt-safe-view/Cargo.lock | 33 +++++++-------- enshrine-esdt-safe/wasm/Cargo.lock | 33 +++++++-------- esdt-safe/Cargo.toml | 4 +- esdt-safe/interactor/Cargo.toml | 4 +- .../interactor/src/esdt_safe_interactor.rs | 6 +-- .../src/from_sovereign/transfer_tokens.rs | 2 +- esdt-safe/src/lib.rs | 2 +- esdt-safe/src/to_sovereign/create_tx.rs | 2 +- esdt-safe/src/to_sovereign/events.rs | 2 +- esdt-safe/tests/bridge_blackbox_tests.rs | 2 +- esdt-safe/wasm-esdt-safe-full/Cargo.lock | 27 +++++++------ esdt-safe/wasm-esdt-safe-view/Cargo.lock | 27 +++++++------ esdt-safe/wasm/Cargo.lock | 27 +++++++------ fee-market/Cargo.toml | 4 +- fee-market/src/subtract_fee.rs | 2 +- fee-market/wasm-fee-market-view/Cargo.lock | 23 ++++++----- fee-market/wasm-fee-market/Cargo.lock | 23 ++++++----- fee-market/wasm/Cargo.lock | 23 ++++++----- header-verifier/Cargo.toml | 4 +- .../wasm-header-verifier-full/Cargo.lock | 22 +++++----- header-verifier/wasm-multisig-view/Cargo.lock | 22 +++++----- header-verifier/wasm/Cargo.lock | 22 +++++----- sovereign-forge/Cargo.toml | 4 +- sovereign-forge/src/common/sc_deploy.rs | 2 +- sovereign-forge/src/phases.rs | 2 +- .../tests/sovereign_forge_unit_tests.rs | 2 +- .../wasm-sovereign-forge-full/Cargo.lock | 31 +++++++------- .../wasm-soveriegn-forge-view/Cargo.lock | 31 +++++++------- sovereign-forge/wasm/Cargo.lock | 31 +++++++------- token-handler/Cargo.toml | 4 +- token-handler/src/transfer_tokens.rs | 4 +- .../tests/token_handler_blackbox_tests.rs | 2 +- .../wasm-token-handler-full/Cargo.lock | 27 +++++++------ .../wasm-token-handler-view/Cargo.lock | 27 +++++++------ token-handler/wasm/Cargo.lock | 27 +++++++------ 69 files changed, 398 insertions(+), 380 deletions(-) rename common/{transaction => operation}/Cargo.toml (89%) rename common/{transaction => operation}/src/aliases.rs (100%) rename common/{transaction => operation}/src/lib.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 700a3906..137cc61e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -234,8 +234,8 @@ dependencies = [ "multiversx-sc-modules", "multiversx-sc-scenario", "num-bigint", + "operation", "setup-phase", - "transaction", ] [[package]] @@ -255,8 +255,8 @@ dependencies = [ "multiversx-sc-modules", "multiversx-sc-scenario", "num-bigint", + "operation", "proxies", - "transaction", "utils", ] @@ -501,11 +501,11 @@ dependencies = [ "multiversx-sc-scenario", "num-bigint", "num-traits", + "operation", "proxies", "setup-phase", "token-handler", "token-whitelist", - "transaction", "tx-batch-module", "utils", ] @@ -530,13 +530,13 @@ dependencies = [ "max-bridged-amount-module", "multiversx-sc", "multiversx-sc-snippets", + "operation", "proxies", "serde", "setup-phase", "token-handler", "token-whitelist", "toml", - "transaction", "tx-batch-module", "utils", ] @@ -593,10 +593,10 @@ dependencies = [ "multiversx-sc-scenario", "num-bigint", "num-traits", + "operation", "proxies", "setup-phase", "token-whitelist", - "transaction", "tx-batch-module", "utils", ] @@ -612,10 +612,10 @@ dependencies = [ "multiversx-sc", "multiversx-sc-scenario", "multiversx-sc-snippets", + "operation", "proxies", "serde", "toml", - "transaction", "tx-batch-module", ] @@ -640,8 +640,8 @@ dependencies = [ "multiversx-sc", "multiversx-sc-scenario", "num-bigint", + "operation", "proxies", - "transaction", "utils", ] @@ -841,9 +841,9 @@ dependencies = [ "multiversx-sc", "multiversx-sc-scenario", "num-bigint", + "operation", "proxies", "setup-phase", - "transaction", ] [[package]] @@ -1633,6 +1633,13 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "operation" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "parking_lot" version = "0.12.3" @@ -1750,7 +1757,7 @@ name = "proxies" version = "0.1.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", "tx-batch-module", ] @@ -2160,9 +2167,9 @@ dependencies = [ "multiversx-sc-modules", "multiversx-sc-scenario", "num-bigint", + "operation", "proxies", "setup-phase", - "transaction", ] [[package]] @@ -2304,8 +2311,8 @@ dependencies = [ "multiversx-sc", "multiversx-sc-scenario", "num-bigint", + "operation", "proxies", - "transaction", ] [[package]] @@ -2425,13 +2432,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "transaction" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - [[package]] name = "try-lock" version = "0.2.5" @@ -2444,7 +2444,7 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "multiversx-sc-scenario", - "transaction", + "operation", ] [[package]] @@ -2520,7 +2520,7 @@ name = "utils" version = "0.0.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", ] [[package]] diff --git a/chain-config/Cargo.toml b/chain-config/Cargo.toml index 9f735c71..50f98abf 100644 --- a/chain-config/Cargo.toml +++ b/chain-config/Cargo.toml @@ -20,8 +20,8 @@ version = "=0.54.5" [dependencies.multiversx-sc-modules] version = "=0.54.5" -[dependencies.transaction] -path = "../common/transaction" +[dependencies.operation] +path = "../common/operation" [dependencies.setup-phase] path = "../common/setup-phase" diff --git a/chain-config/src/lib.rs b/chain-config/src/lib.rs index 7f1c73f0..c34fb988 100644 --- a/chain-config/src/lib.rs +++ b/chain-config/src/lib.rs @@ -1,7 +1,7 @@ #![no_std] use multiversx_sc_modules::only_admin; -use transaction::aliases::StakeMultiArg; +use operation::aliases::StakeMultiArg; use validator_rules::TokenIdAmountPair; multiversx_sc::imports!(); diff --git a/chain-config/wasm-chain-config-full/Cargo.lock b/chain-config/wasm-chain-config-full/Cargo.lock index 4c4742d6..fd9b31d1 100644 --- a/chain-config/wasm-chain-config-full/Cargo.lock +++ b/chain-config/wasm-chain-config-full/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -26,8 +26,8 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "multiversx-sc-modules", + "operation", "setup-phase", - "transaction", ] [[package]] @@ -153,6 +153,13 @@ dependencies = [ "autocfg", ] +[[package]] +name = "operation" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -205,13 +212,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "transaction" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - [[package]] name = "unicode-ident" version = "1.0.12" diff --git a/chain-config/wasm-chain-config-view/Cargo.lock b/chain-config/wasm-chain-config-view/Cargo.lock index 7bf0f8b4..b3c8a513 100644 --- a/chain-config/wasm-chain-config-view/Cargo.lock +++ b/chain-config/wasm-chain-config-view/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -26,8 +26,8 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "multiversx-sc-modules", + "operation", "setup-phase", - "transaction", ] [[package]] @@ -153,6 +153,13 @@ dependencies = [ "autocfg", ] +[[package]] +name = "operation" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -205,13 +212,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "transaction" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - [[package]] name = "unicode-ident" version = "1.0.12" diff --git a/chain-config/wasm/Cargo.lock b/chain-config/wasm/Cargo.lock index 55031d67..0718ea0e 100644 --- a/chain-config/wasm/Cargo.lock +++ b/chain-config/wasm/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -26,8 +26,8 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "multiversx-sc-modules", + "operation", "setup-phase", - "transaction", ] [[package]] @@ -153,6 +153,13 @@ dependencies = [ "autocfg", ] +[[package]] +name = "operation" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -205,13 +212,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "transaction" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - [[package]] name = "unicode-ident" version = "1.0.13" diff --git a/chain-factory/Cargo.toml b/chain-factory/Cargo.toml index f77c14e9..40e54845 100644 --- a/chain-factory/Cargo.toml +++ b/chain-factory/Cargo.toml @@ -29,5 +29,5 @@ path = "../chain-config" [dependencies.proxies] path = "../common/proxies" -[dependencies.transaction] -path = "../common/transaction" +[dependencies.operation] +path = "../common/operation" diff --git a/chain-factory/src/factory.rs b/chain-factory/src/factory.rs index cac8cdcd..c6a1dbb3 100644 --- a/chain-factory/src/factory.rs +++ b/chain-factory/src/factory.rs @@ -7,7 +7,7 @@ use proxies::{ fee_market_proxy::{FeeMarketProxy, FeeStruct}, header_verifier_proxy::HeaderverifierProxy, }; -use transaction::aliases::StakeMultiArg; +use operation::aliases::StakeMultiArg; multiversx_sc::derive_imports!(); #[multiversx_sc::module] diff --git a/chain-factory/tests/chain_factory_tests.rs b/chain-factory/tests/chain_factory_tests.rs index 689d1a29..f26144fd 100644 --- a/chain-factory/tests/chain_factory_tests.rs +++ b/chain-factory/tests/chain_factory_tests.rs @@ -9,7 +9,7 @@ use multiversx_sc_scenario::{ use proxies::{ chain_config_proxy::ChainConfigContractProxy, chain_factory_proxy::ChainFactoryContractProxy, }; -use transaction::aliases::StakeMultiArg; +use operation::aliases::StakeMultiArg; const FACTORY_ADDRESS: TestSCAddress = TestSCAddress::new("chain-factory"); const CODE_PATH: MxscPath = MxscPath::new("output/chain-factory.mxsc.json"); diff --git a/chain-factory/wasm-chain-factory-full/Cargo.lock b/chain-factory/wasm-chain-factory-full/Cargo.lock index 0059c506..eb8bad67 100644 --- a/chain-factory/wasm-chain-factory-full/Cargo.lock +++ b/chain-factory/wasm-chain-factory-full/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -26,8 +26,8 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "multiversx-sc-modules", + "operation", "setup-phase", - "transaction", ] [[package]] @@ -37,8 +37,8 @@ dependencies = [ "chain-config", "multiversx-sc", "multiversx-sc-modules", + "operation", "proxies", - "transaction", "utils", ] @@ -165,6 +165,13 @@ dependencies = [ "autocfg", ] +[[package]] +name = "operation" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -179,7 +186,7 @@ name = "proxies" version = "0.1.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", "tx-batch-module", ] @@ -226,19 +233,12 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "transaction" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - [[package]] name = "tx-batch-module" version = "0.0.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", ] [[package]] @@ -258,4 +258,5 @@ name = "utils" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", ] diff --git a/chain-factory/wasm-chain-factory-view/Cargo.lock b/chain-factory/wasm-chain-factory-view/Cargo.lock index b2d77b84..7381a6d8 100644 --- a/chain-factory/wasm-chain-factory-view/Cargo.lock +++ b/chain-factory/wasm-chain-factory-view/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -26,8 +26,8 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "multiversx-sc-modules", + "operation", "setup-phase", - "transaction", ] [[package]] @@ -37,8 +37,8 @@ dependencies = [ "chain-config", "multiversx-sc", "multiversx-sc-modules", + "operation", "proxies", - "transaction", "utils", ] @@ -165,6 +165,13 @@ dependencies = [ "autocfg", ] +[[package]] +name = "operation" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -179,7 +186,7 @@ name = "proxies" version = "0.1.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", "tx-batch-module", ] @@ -226,19 +233,12 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "transaction" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - [[package]] name = "tx-batch-module" version = "0.0.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", ] [[package]] @@ -258,4 +258,5 @@ name = "utils" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", ] diff --git a/chain-factory/wasm/Cargo.lock b/chain-factory/wasm/Cargo.lock index beb1bcdc..f04b05b9 100644 --- a/chain-factory/wasm/Cargo.lock +++ b/chain-factory/wasm/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -26,8 +26,8 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "multiversx-sc-modules", + "operation", "setup-phase", - "transaction", ] [[package]] @@ -37,8 +37,8 @@ dependencies = [ "chain-config", "multiversx-sc", "multiversx-sc-modules", + "operation", "proxies", - "transaction", "utils", ] @@ -165,6 +165,13 @@ dependencies = [ "autocfg", ] +[[package]] +name = "operation" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -179,7 +186,7 @@ name = "proxies" version = "0.1.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", "tx-batch-module", ] @@ -226,19 +233,12 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "transaction" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - [[package]] name = "tx-batch-module" version = "0.0.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", ] [[package]] @@ -258,4 +258,5 @@ name = "utils" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", ] diff --git a/common/transaction/Cargo.toml b/common/operation/Cargo.toml similarity index 89% rename from common/transaction/Cargo.toml rename to common/operation/Cargo.toml index de5f41dc..feb9a410 100644 --- a/common/transaction/Cargo.toml +++ b/common/operation/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "transaction" +name = "operation" version = "0.0.0" authors = ["dorin-iancu "] edition = "2018" diff --git a/common/transaction/src/aliases.rs b/common/operation/src/aliases.rs similarity index 100% rename from common/transaction/src/aliases.rs rename to common/operation/src/aliases.rs diff --git a/common/transaction/src/lib.rs b/common/operation/src/lib.rs similarity index 100% rename from common/transaction/src/lib.rs rename to common/operation/src/lib.rs diff --git a/common/proxies/Cargo.toml b/common/proxies/Cargo.toml index 5bcaa7b3..b9482de8 100644 --- a/common/proxies/Cargo.toml +++ b/common/proxies/Cargo.toml @@ -6,8 +6,8 @@ edition = "2021" [dependencies.multiversx-sc] version = "=0.54.5" -[dependencies.transaction] -path = "../transaction" +[dependencies.operation] +path = "../operation" [dependencies.tx-batch-module] path = "../tx-batch-module" diff --git a/common/proxies/src/enshrine_esdt_safe_proxy.rs b/common/proxies/src/enshrine_esdt_safe_proxy.rs index a87a274a..6a136022 100644 --- a/common/proxies/src/enshrine_esdt_safe_proxy.rs +++ b/common/proxies/src/enshrine_esdt_safe_proxy.rs @@ -163,7 +163,7 @@ where pub fn execute_operations< Arg0: ProxyArg>, - Arg1: ProxyArg>, + Arg1: ProxyArg>, >( self, hash_of_hashes: Arg0, diff --git a/common/proxies/src/esdt_safe_proxy.rs b/common/proxies/src/esdt_safe_proxy.rs index 6bbef655..cf8f4797 100644 --- a/common/proxies/src/esdt_safe_proxy.rs +++ b/common/proxies/src/esdt_safe_proxy.rs @@ -178,7 +178,7 @@ where pub fn execute_operations< Arg0: ProxyArg>, - Arg1: ProxyArg>, + Arg1: ProxyArg>, >( self, hash_of_hashes: Arg0, diff --git a/common/proxies/src/token_handler_proxy.rs b/common/proxies/src/token_handler_proxy.rs index 319f4ad4..73dc9715 100644 --- a/common/proxies/src/token_handler_proxy.rs +++ b/common/proxies/src/token_handler_proxy.rs @@ -95,9 +95,9 @@ where } pub fn transfer_tokens< - Arg0: ProxyArg>>, + Arg0: ProxyArg>>, Arg1: ProxyArg>, - Arg2: ProxyArg>>, + Arg2: ProxyArg>>, >( self, opt_transfer_data: Arg0, diff --git a/common/tx-batch-module/Cargo.toml b/common/tx-batch-module/Cargo.toml index c8b594f7..2be371b9 100644 --- a/common/tx-batch-module/Cargo.toml +++ b/common/tx-batch-module/Cargo.toml @@ -7,8 +7,8 @@ edition = "2018" [dependencies.multiversx-sc] version = "=0.54.5" -[dependencies.transaction] -path = "../transaction" +[dependencies.operation] +path = "../operation" [dev-dependencies.multiversx-sc-scenario] version = "=0.54.5" diff --git a/common/tx-batch-module/src/lib.rs b/common/tx-batch-module/src/lib.rs index 2f843d09..718ce170 100644 --- a/common/tx-batch-module/src/lib.rs +++ b/common/tx-batch-module/src/lib.rs @@ -3,7 +3,7 @@ multiversx_sc::imports!(); multiversx_sc::derive_imports!(); -use transaction::aliases::TxNonce; +use operation::aliases::TxNonce; #[multiversx_sc::module] pub trait TxBatchModule { diff --git a/common/utils/Cargo.toml b/common/utils/Cargo.toml index 427fb0fc..87ef8dff 100644 --- a/common/utils/Cargo.toml +++ b/common/utils/Cargo.toml @@ -7,8 +7,8 @@ edition = "2021" [lib] path = "src/lib.rs" -[dependencies.transaction] -path = "../transaction" +[dependencies.operation] +path = "../operation" [dependencies.multiversx-sc] version = "=0.54.5" diff --git a/common/utils/src/lib.rs b/common/utils/src/lib.rs index f61abd36..104e0e8e 100644 --- a/common/utils/src/lib.rs +++ b/common/utils/src/lib.rs @@ -1,6 +1,6 @@ #![no_std] -use transaction::aliases::PaymentsVec; +use operation::aliases::PaymentsVec; multiversx_sc::imports!(); diff --git a/enshrine-esdt-safe/Cargo.toml b/enshrine-esdt-safe/Cargo.toml index 97e48255..94d2ad7d 100644 --- a/enshrine-esdt-safe/Cargo.toml +++ b/enshrine-esdt-safe/Cargo.toml @@ -8,8 +8,8 @@ publish = false [lib] path = "src/lib.rs" -[dependencies.transaction] -path = "../common/transaction" +[dependencies.operation] +path = "../common/operation" [dependencies.tx-batch-module] path = "../common/tx-batch-module" diff --git a/enshrine-esdt-safe/interactor/Cargo.toml b/enshrine-esdt-safe/interactor/Cargo.toml index a269581a..4d79ad7c 100644 --- a/enshrine-esdt-safe/interactor/Cargo.toml +++ b/enshrine-esdt-safe/interactor/Cargo.toml @@ -18,8 +18,8 @@ toml = "0.8.6" [dependencies.enshrine-esdt-safe] path = ".." -[dependencies.transaction] -path = "../../common/transaction" +[dependencies.operation] +path = "../../common/operation" [dependencies.tx-batch-module] path = "../../common/tx-batch-module" diff --git a/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs b/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs index 4d1c2114..56f6bb98 100644 --- a/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs +++ b/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs @@ -8,7 +8,7 @@ use interactor::interactor_config::Config; use interactor::interactor_state::State; use multiversx_sc_snippets::imports::*; use proxies::*; -use transaction::*; +use operation::*; const FEE_MARKET_CODE_PATH: &str = "../fee-market/output/fee-market.mxsc.json"; const HEADER_VERIFIER_CODE_PATH: &str = "../header-verifier/output/header-verifier.mxsc.json"; diff --git a/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs b/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs index 57a8eb37..8ccab55a 100644 --- a/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs +++ b/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs @@ -6,7 +6,7 @@ use interactor::constants::{TOKEN_ID, WHITELIST_TOKEN_ID}; use interactor::interactor_config::Config; use multiversx_sc_snippets::imports::*; use proxies::*; -use transaction::*; +use operation::*; type OptionalTransferData = OptionalValue, ManagedVec>>>; diff --git a/enshrine-esdt-safe/src/common/storage.rs b/enshrine-esdt-safe/src/common/storage.rs index 7c56d22b..46d1fda6 100644 --- a/enshrine-esdt-safe/src/common/storage.rs +++ b/enshrine-esdt-safe/src/common/storage.rs @@ -1,5 +1,5 @@ use multiversx_sc::imports::*; -use transaction::OperationEsdtPayment; +use operation::OperationEsdtPayment; #[multiversx_sc::module] pub trait CommonStorage { diff --git a/enshrine-esdt-safe/src/from_sovereign/transfer_tokens.rs b/enshrine-esdt-safe/src/from_sovereign/transfer_tokens.rs index cd65defb..0fd1aafe 100644 --- a/enshrine-esdt-safe/src/from_sovereign/transfer_tokens.rs +++ b/enshrine-esdt-safe/src/from_sovereign/transfer_tokens.rs @@ -1,7 +1,7 @@ use crate::{common, to_sovereign}; use multiversx_sc::imports::*; use proxies::{header_verifier_proxy::HeaderverifierProxy, token_handler_proxy::TokenHandlerProxy}; -use transaction::{Operation, OperationData, OperationEsdtPayment, OperationTuple}; +use operation::{Operation, OperationData, OperationEsdtPayment, OperationTuple}; const DEFAULT_ISSUE_COST: u64 = 50_000_000_000_000_000; // 0.05 * 10^18 diff --git a/enshrine-esdt-safe/src/lib.rs b/enshrine-esdt-safe/src/lib.rs index bea2e946..2f056d02 100644 --- a/enshrine-esdt-safe/src/lib.rs +++ b/enshrine-esdt-safe/src/lib.rs @@ -1,7 +1,7 @@ #![no_std] use multiversx_sc::imports::*; -use transaction::aliases::GasLimit; +use operation::aliases::GasLimit; pub mod common; pub mod from_sovereign; diff --git a/enshrine-esdt-safe/src/to_sovereign/create_tx.rs b/enshrine-esdt-safe/src/to_sovereign/create_tx.rs index fb5d8343..bb02a869 100644 --- a/enshrine-esdt-safe/src/to_sovereign/create_tx.rs +++ b/enshrine-esdt-safe/src/to_sovereign/create_tx.rs @@ -1,6 +1,6 @@ use crate::common; use proxies::fee_market_proxy::FeeMarketProxy; -use transaction::{ +use operation::{ aliases::{GasLimit, OptionalValueTransferDataTuple}, EventPayment, OperationData, TransferData, }; diff --git a/enshrine-esdt-safe/src/to_sovereign/events.rs b/enshrine-esdt-safe/src/to_sovereign/events.rs index 15439c68..fe9b68b9 100644 --- a/enshrine-esdt-safe/src/to_sovereign/events.rs +++ b/enshrine-esdt-safe/src/to_sovereign/events.rs @@ -1,4 +1,4 @@ -use transaction::OperationData; +use operation::OperationData; multiversx_sc::imports!(); multiversx_sc::derive_imports!(); diff --git a/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs b/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs index 1d6dd629..225b01d7 100644 --- a/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs +++ b/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs @@ -12,8 +12,8 @@ use proxies::enshrine_esdt_safe_proxy::EnshrineEsdtSafeProxy; use proxies::fee_market_proxy::{FeeMarketProxy, FeeStruct, FeeType}; use proxies::header_verifier_proxy::HeaderverifierProxy; use proxies::token_handler_proxy::TokenHandlerProxy; -use transaction::aliases::{GasLimit, OptionalTransferData, PaymentsVec}; -use transaction::{Operation, OperationData, OperationEsdtPayment}; +use operation::aliases::{GasLimit, OptionalTransferData, PaymentsVec}; +use operation::{Operation, OperationData, OperationEsdtPayment}; const ENSHRINE_ESDT_ADDRESS: TestSCAddress = TestSCAddress::new("enshrine-esdt"); const ENSHRINE_ESDT_CODE_PATH: MxscPath = MxscPath::new("output/enshrine-esdt-safe.mxsc-json"); diff --git a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/Cargo.lock b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/Cargo.lock index 9c9627c2..5b62bbb0 100644 --- a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/Cargo.lock +++ b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -26,8 +26,8 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "multiversx-sc-modules", + "operation", "setup-phase", - "transaction", ] [[package]] @@ -37,8 +37,8 @@ dependencies = [ "chain-config", "multiversx-sc", "multiversx-sc-modules", + "operation", "proxies", - "transaction", "utils", ] @@ -57,11 +57,11 @@ dependencies = [ "max-bridged-amount-module", "multiversx-sc", "multiversx-sc-modules", + "operation", "proxies", "setup-phase", "token-handler", "token-whitelist", - "transaction", "tx-batch-module", "utils", ] @@ -79,8 +79,8 @@ name = "fee-market" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", "proxies", - "transaction", "utils", ] @@ -89,9 +89,9 @@ name = "header-verifier" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", "proxies", "setup-phase", - "transaction", ] [[package]] @@ -210,6 +210,13 @@ dependencies = [ "autocfg", ] +[[package]] +name = "operation" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -224,7 +231,7 @@ name = "proxies" version = "0.1.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", "tx-batch-module", ] @@ -277,8 +284,8 @@ version = "0.0.0" dependencies = [ "chain-factory", "multiversx-sc", + "operation", "proxies", - "transaction", ] [[package]] @@ -290,19 +297,12 @@ dependencies = [ "utils", ] -[[package]] -name = "transaction" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - [[package]] name = "tx-batch-module" version = "0.0.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", ] [[package]] @@ -322,4 +322,5 @@ name = "utils" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", ] diff --git a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-view/Cargo.lock b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-view/Cargo.lock index d7375f07..1f7c3535 100644 --- a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-view/Cargo.lock +++ b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-view/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -26,8 +26,8 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "multiversx-sc-modules", + "operation", "setup-phase", - "transaction", ] [[package]] @@ -37,8 +37,8 @@ dependencies = [ "chain-config", "multiversx-sc", "multiversx-sc-modules", + "operation", "proxies", - "transaction", "utils", ] @@ -57,11 +57,11 @@ dependencies = [ "max-bridged-amount-module", "multiversx-sc", "multiversx-sc-modules", + "operation", "proxies", "setup-phase", "token-handler", "token-whitelist", - "transaction", "tx-batch-module", "utils", ] @@ -79,8 +79,8 @@ name = "fee-market" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", "proxies", - "transaction", "utils", ] @@ -89,9 +89,9 @@ name = "header-verifier" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", "proxies", "setup-phase", - "transaction", ] [[package]] @@ -210,6 +210,13 @@ dependencies = [ "autocfg", ] +[[package]] +name = "operation" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -224,7 +231,7 @@ name = "proxies" version = "0.1.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", "tx-batch-module", ] @@ -277,8 +284,8 @@ version = "0.0.0" dependencies = [ "chain-factory", "multiversx-sc", + "operation", "proxies", - "transaction", ] [[package]] @@ -290,19 +297,12 @@ dependencies = [ "utils", ] -[[package]] -name = "transaction" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - [[package]] name = "tx-batch-module" version = "0.0.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", ] [[package]] @@ -322,4 +322,5 @@ name = "utils" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", ] diff --git a/enshrine-esdt-safe/wasm/Cargo.lock b/enshrine-esdt-safe/wasm/Cargo.lock index 4412ebd7..422904ec 100644 --- a/enshrine-esdt-safe/wasm/Cargo.lock +++ b/enshrine-esdt-safe/wasm/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -26,8 +26,8 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "multiversx-sc-modules", + "operation", "setup-phase", - "transaction", ] [[package]] @@ -37,8 +37,8 @@ dependencies = [ "chain-config", "multiversx-sc", "multiversx-sc-modules", + "operation", "proxies", - "transaction", "utils", ] @@ -57,11 +57,11 @@ dependencies = [ "max-bridged-amount-module", "multiversx-sc", "multiversx-sc-modules", + "operation", "proxies", "setup-phase", "token-handler", "token-whitelist", - "transaction", "tx-batch-module", "utils", ] @@ -79,8 +79,8 @@ name = "fee-market" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", "proxies", - "transaction", "utils", ] @@ -89,9 +89,9 @@ name = "header-verifier" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", "proxies", "setup-phase", - "transaction", ] [[package]] @@ -210,6 +210,13 @@ dependencies = [ "autocfg", ] +[[package]] +name = "operation" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -224,7 +231,7 @@ name = "proxies" version = "0.1.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", "tx-batch-module", ] @@ -277,8 +284,8 @@ version = "0.0.0" dependencies = [ "chain-factory", "multiversx-sc", + "operation", "proxies", - "transaction", ] [[package]] @@ -290,19 +297,12 @@ dependencies = [ "utils", ] -[[package]] -name = "transaction" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - [[package]] name = "tx-batch-module" version = "0.0.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", ] [[package]] @@ -322,4 +322,5 @@ name = "utils" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", ] diff --git a/esdt-safe/Cargo.toml b/esdt-safe/Cargo.toml index f6cde367..f808157a 100644 --- a/esdt-safe/Cargo.toml +++ b/esdt-safe/Cargo.toml @@ -8,8 +8,8 @@ publish = false [lib] path = "src/lib.rs" -[dependencies.transaction] -path = "../common/transaction" +[dependencies.operation] +path = "../common/operation" [dependencies.tx-batch-module] path = "../common/tx-batch-module" diff --git a/esdt-safe/interactor/Cargo.toml b/esdt-safe/interactor/Cargo.toml index c3ee7b51..f4a58e5f 100644 --- a/esdt-safe/interactor/Cargo.toml +++ b/esdt-safe/interactor/Cargo.toml @@ -18,8 +18,8 @@ toml = "0.8.6" [dependencies.esdt-safe] path = ".." -[dependencies.transaction] -path = "../../common/transaction" +[dependencies.operation] +path = "../../common/operation" [dependencies.proxies] path = "../../common/proxies" diff --git a/esdt-safe/interactor/src/esdt_safe_interactor.rs b/esdt-safe/interactor/src/esdt_safe_interactor.rs index f4aa661c..43581c90 100644 --- a/esdt-safe/interactor/src/esdt_safe_interactor.rs +++ b/esdt-safe/interactor/src/esdt_safe_interactor.rs @@ -12,9 +12,9 @@ use proxies::esdt_safe_proxy::EsdtSafeProxy; use proxies::fee_market_proxy::{FeeMarketProxy, FeeStruct, FeeType}; use proxies::header_verifier_proxy::HeaderverifierProxy; use proxies::testing_sc_proxy::TestingScProxy; -use transaction::aliases::{OptionalTransferData, PaymentsVec}; -use transaction::{Operation, OperationData}; -use transaction::{OperationEsdtPayment, TransferData}; +use operation::aliases::{OptionalTransferData, PaymentsVec}; +use operation::{Operation, OperationData}; +use operation::{OperationEsdtPayment, TransferData}; const FEE_MARKET_CODE_PATH: &str = "../../fee-market/output/fee-market.mxsc.json"; const HEADER_VERIFIER_CODE_PATH: &str = "../../header-verifier/output/header-verifier.mxsc.json"; diff --git a/esdt-safe/src/from_sovereign/transfer_tokens.rs b/esdt-safe/src/from_sovereign/transfer_tokens.rs index 1cac854a..c56c3cb7 100644 --- a/esdt-safe/src/from_sovereign/transfer_tokens.rs +++ b/esdt-safe/src/from_sovereign/transfer_tokens.rs @@ -1,6 +1,6 @@ use multiversx_sc::api::ESDT_MULTI_TRANSFER_FUNC_NAME; use proxies::header_verifier_proxy::HeaderverifierProxy; -use transaction::{ +use operation::{ aliases::GasLimit, Operation, OperationData, OperationEsdtPayment, OperationTuple, }; diff --git a/esdt-safe/src/lib.rs b/esdt-safe/src/lib.rs index 33039e33..c9de40ad 100644 --- a/esdt-safe/src/lib.rs +++ b/esdt-safe/src/lib.rs @@ -1,6 +1,6 @@ #![no_std] -use transaction::aliases::GasLimit; +use operation::aliases::GasLimit; multiversx_sc::imports!(); multiversx_sc::derive_imports!(); diff --git a/esdt-safe/src/to_sovereign/create_tx.rs b/esdt-safe/src/to_sovereign/create_tx.rs index 86f1aa4a..968455e3 100644 --- a/esdt-safe/src/to_sovereign/create_tx.rs +++ b/esdt-safe/src/to_sovereign/create_tx.rs @@ -1,7 +1,7 @@ use crate::from_sovereign::token_mapping; use multiversx_sc::storage::StorageKey; use proxies::fee_market_proxy::FeeMarketProxy; -use transaction::{ +use operation::{ aliases::{EventPaymentTuple, ExtractedFeeResult, GasLimit, OptionalValueTransferDataTuple}, OperationData, TransferData, }; diff --git a/esdt-safe/src/to_sovereign/events.rs b/esdt-safe/src/to_sovereign/events.rs index 15439c68..fe9b68b9 100644 --- a/esdt-safe/src/to_sovereign/events.rs +++ b/esdt-safe/src/to_sovereign/events.rs @@ -1,4 +1,4 @@ -use transaction::OperationData; +use operation::OperationData; multiversx_sc::imports!(); multiversx_sc::derive_imports!(); diff --git a/esdt-safe/tests/bridge_blackbox_tests.rs b/esdt-safe/tests/bridge_blackbox_tests.rs index 1f77d6ac..f5d8d287 100644 --- a/esdt-safe/tests/bridge_blackbox_tests.rs +++ b/esdt-safe/tests/bridge_blackbox_tests.rs @@ -14,7 +14,7 @@ use multiversx_sc_scenario::{ use proxies::esdt_safe_proxy::EsdtSafeProxy; use proxies::fee_market_proxy::{FeeMarketProxy, FeeStruct, FeeType}; use proxies::header_verifier_proxy::HeaderverifierProxy; -use transaction::{Operation, OperationData, OperationEsdtPayment}; +use operation::{Operation, OperationData, OperationEsdtPayment}; const BRIDGE_ADDRESS: TestSCAddress = TestSCAddress::new("bridge"); const BRIDGE_CODE_PATH: MxscPath = MxscPath::new("output/esdt-safe.mxsc.json"); diff --git a/esdt-safe/wasm-esdt-safe-full/Cargo.lock b/esdt-safe/wasm-esdt-safe-full/Cargo.lock index faee3be8..b6293dcb 100644 --- a/esdt-safe/wasm-esdt-safe-full/Cargo.lock +++ b/esdt-safe/wasm-esdt-safe-full/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -35,10 +35,10 @@ dependencies = [ "max-bridged-amount-module", "multiversx-sc", "multiversx-sc-modules", + "operation", "proxies", "setup-phase", "token-whitelist", - "transaction", "tx-batch-module", "utils", ] @@ -56,8 +56,8 @@ name = "fee-market" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", "proxies", - "transaction", "utils", ] @@ -66,9 +66,9 @@ name = "header-verifier" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", "proxies", "setup-phase", - "transaction", ] [[package]] @@ -187,6 +187,13 @@ dependencies = [ "autocfg", ] +[[package]] +name = "operation" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -201,7 +208,7 @@ name = "proxies" version = "0.1.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", "tx-batch-module", ] @@ -257,19 +264,12 @@ dependencies = [ "utils", ] -[[package]] -name = "transaction" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - [[package]] name = "tx-batch-module" version = "0.0.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", ] [[package]] @@ -289,4 +289,5 @@ name = "utils" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", ] diff --git a/esdt-safe/wasm-esdt-safe-view/Cargo.lock b/esdt-safe/wasm-esdt-safe-view/Cargo.lock index aee268f2..fc8e3cd7 100644 --- a/esdt-safe/wasm-esdt-safe-view/Cargo.lock +++ b/esdt-safe/wasm-esdt-safe-view/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -35,10 +35,10 @@ dependencies = [ "max-bridged-amount-module", "multiversx-sc", "multiversx-sc-modules", + "operation", "proxies", "setup-phase", "token-whitelist", - "transaction", "tx-batch-module", "utils", ] @@ -56,8 +56,8 @@ name = "fee-market" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", "proxies", - "transaction", "utils", ] @@ -66,9 +66,9 @@ name = "header-verifier" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", "proxies", "setup-phase", - "transaction", ] [[package]] @@ -187,6 +187,13 @@ dependencies = [ "autocfg", ] +[[package]] +name = "operation" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -201,7 +208,7 @@ name = "proxies" version = "0.1.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", "tx-batch-module", ] @@ -257,19 +264,12 @@ dependencies = [ "utils", ] -[[package]] -name = "transaction" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - [[package]] name = "tx-batch-module" version = "0.0.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", ] [[package]] @@ -289,4 +289,5 @@ name = "utils" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", ] diff --git a/esdt-safe/wasm/Cargo.lock b/esdt-safe/wasm/Cargo.lock index c26e8563..550d873c 100644 --- a/esdt-safe/wasm/Cargo.lock +++ b/esdt-safe/wasm/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -35,10 +35,10 @@ dependencies = [ "max-bridged-amount-module", "multiversx-sc", "multiversx-sc-modules", + "operation", "proxies", "setup-phase", "token-whitelist", - "transaction", "tx-batch-module", "utils", ] @@ -56,8 +56,8 @@ name = "fee-market" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", "proxies", - "transaction", "utils", ] @@ -66,9 +66,9 @@ name = "header-verifier" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", "proxies", "setup-phase", - "transaction", ] [[package]] @@ -187,6 +187,13 @@ dependencies = [ "autocfg", ] +[[package]] +name = "operation" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -201,7 +208,7 @@ name = "proxies" version = "0.1.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", "tx-batch-module", ] @@ -257,19 +264,12 @@ dependencies = [ "utils", ] -[[package]] -name = "transaction" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - [[package]] name = "tx-batch-module" version = "0.0.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", ] [[package]] @@ -289,4 +289,5 @@ name = "utils" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", ] diff --git a/fee-market/Cargo.toml b/fee-market/Cargo.toml index ee51e0c7..637e0b8d 100644 --- a/fee-market/Cargo.toml +++ b/fee-market/Cargo.toml @@ -11,8 +11,8 @@ path = "src/lib.rs" [dependencies.utils] path = "../common/utils" -[dependencies.transaction] -path = "../common/transaction" +[dependencies.operation] +path = "../common/operation" [dependencies.proxies] path = "../common/proxies" diff --git a/fee-market/src/subtract_fee.rs b/fee-market/src/subtract_fee.rs index 582adc2a..b46681ce 100644 --- a/fee-market/src/subtract_fee.rs +++ b/fee-market/src/subtract_fee.rs @@ -1,4 +1,4 @@ -use transaction::aliases::GasLimit; +use operation::aliases::GasLimit; use crate::fee_type::FeeType; diff --git a/fee-market/wasm-fee-market-view/Cargo.lock b/fee-market/wasm-fee-market-view/Cargo.lock index 41c355ee..13e00c9a 100644 --- a/fee-market/wasm-fee-market-view/Cargo.lock +++ b/fee-market/wasm-fee-market-view/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -31,8 +31,8 @@ name = "fee-market" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", "proxies", - "transaction", "utils", ] @@ -144,6 +144,13 @@ dependencies = [ "autocfg", ] +[[package]] +name = "operation" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -158,7 +165,7 @@ name = "proxies" version = "0.1.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", "tx-batch-module", ] @@ -198,19 +205,12 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "transaction" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - [[package]] name = "tx-batch-module" version = "0.0.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", ] [[package]] @@ -230,4 +230,5 @@ name = "utils" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", ] diff --git a/fee-market/wasm-fee-market/Cargo.lock b/fee-market/wasm-fee-market/Cargo.lock index a434f3c4..1261eba4 100644 --- a/fee-market/wasm-fee-market/Cargo.lock +++ b/fee-market/wasm-fee-market/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -31,8 +31,8 @@ name = "fee-market" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", "proxies", - "transaction", "utils", ] @@ -144,6 +144,13 @@ dependencies = [ "autocfg", ] +[[package]] +name = "operation" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -158,7 +165,7 @@ name = "proxies" version = "0.1.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", "tx-batch-module", ] @@ -198,19 +205,12 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "transaction" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - [[package]] name = "tx-batch-module" version = "0.0.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", ] [[package]] @@ -230,4 +230,5 @@ name = "utils" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", ] diff --git a/fee-market/wasm/Cargo.lock b/fee-market/wasm/Cargo.lock index a434f3c4..1261eba4 100644 --- a/fee-market/wasm/Cargo.lock +++ b/fee-market/wasm/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -31,8 +31,8 @@ name = "fee-market" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", "proxies", - "transaction", "utils", ] @@ -144,6 +144,13 @@ dependencies = [ "autocfg", ] +[[package]] +name = "operation" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -158,7 +165,7 @@ name = "proxies" version = "0.1.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", "tx-batch-module", ] @@ -198,19 +205,12 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "transaction" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - [[package]] name = "tx-batch-module" version = "0.0.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", ] [[package]] @@ -230,4 +230,5 @@ name = "utils" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", ] diff --git a/header-verifier/Cargo.toml b/header-verifier/Cargo.toml index d7f2a163..58b3e227 100644 --- a/header-verifier/Cargo.toml +++ b/header-verifier/Cargo.toml @@ -11,8 +11,8 @@ path = "src/lib.rs" [dependencies.multiversx-sc] version = "=0.54.5" -[dependencies.transaction] -path = "../common/transaction" +[dependencies.operation] +path = "../common/operation" [dependencies.proxies] path = "../common/proxies" diff --git a/header-verifier/wasm-header-verifier-full/Cargo.lock b/header-verifier/wasm-header-verifier-full/Cargo.lock index cf87ea22..00eefc1e 100644 --- a/header-verifier/wasm-header-verifier-full/Cargo.lock +++ b/header-verifier/wasm-header-verifier-full/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -31,9 +31,9 @@ name = "header-verifier" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", "proxies", "setup-phase", - "transaction", ] [[package]] @@ -144,6 +144,13 @@ dependencies = [ "autocfg", ] +[[package]] +name = "operation" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -158,7 +165,7 @@ name = "proxies" version = "0.1.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", "tx-batch-module", ] @@ -205,19 +212,12 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "transaction" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - [[package]] name = "tx-batch-module" version = "0.0.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", ] [[package]] diff --git a/header-verifier/wasm-multisig-view/Cargo.lock b/header-verifier/wasm-multisig-view/Cargo.lock index 44446d83..8c1acc67 100644 --- a/header-verifier/wasm-multisig-view/Cargo.lock +++ b/header-verifier/wasm-multisig-view/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -31,9 +31,9 @@ name = "header-verifier" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", "proxies", "setup-phase", - "transaction", ] [[package]] @@ -144,6 +144,13 @@ dependencies = [ "autocfg", ] +[[package]] +name = "operation" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -158,7 +165,7 @@ name = "proxies" version = "0.1.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", "tx-batch-module", ] @@ -205,19 +212,12 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "transaction" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - [[package]] name = "tx-batch-module" version = "0.0.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", ] [[package]] diff --git a/header-verifier/wasm/Cargo.lock b/header-verifier/wasm/Cargo.lock index 3859caf6..5bf9a73d 100644 --- a/header-verifier/wasm/Cargo.lock +++ b/header-verifier/wasm/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -31,9 +31,9 @@ name = "header-verifier" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", "proxies", "setup-phase", - "transaction", ] [[package]] @@ -144,6 +144,13 @@ dependencies = [ "autocfg", ] +[[package]] +name = "operation" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -158,7 +165,7 @@ name = "proxies" version = "0.1.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", "tx-batch-module", ] @@ -205,19 +212,12 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "transaction" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - [[package]] name = "tx-batch-module" version = "0.0.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", ] [[package]] diff --git a/sovereign-forge/Cargo.toml b/sovereign-forge/Cargo.toml index 6ed26821..98e89365 100644 --- a/sovereign-forge/Cargo.toml +++ b/sovereign-forge/Cargo.toml @@ -32,8 +32,8 @@ path = "../esdt-safe" [dependencies.proxies] path = "../common/proxies" -[dependencies.transaction] -path = "../common/transaction" +[dependencies.operation] +path = "../common/operation" [dependencies.setup-phase] path = "../common/setup-phase" diff --git a/sovereign-forge/src/common/sc_deploy.rs b/sovereign-forge/src/common/sc_deploy.rs index b2f44d5b..bfbc5bbe 100644 --- a/sovereign-forge/src/common/sc_deploy.rs +++ b/sovereign-forge/src/common/sc_deploy.rs @@ -1,7 +1,7 @@ use crate::err_msg; use multiversx_sc::types::{MultiValueEncoded, ReturnsResult}; use proxies::{chain_factory_proxy::ChainFactoryContractProxy, fee_market_proxy::FeeStruct}; -use transaction::aliases::StakeMultiArg; +use operation::aliases::StakeMultiArg; #[multiversx_sc::module] pub trait ScDeployModule: super::utils::UtilsModule + super::storage::StorageModule { diff --git a/sovereign-forge/src/phases.rs b/sovereign-forge/src/phases.rs index f39f35bf..0f292019 100644 --- a/sovereign-forge/src/phases.rs +++ b/sovereign-forge/src/phases.rs @@ -3,7 +3,7 @@ use core::ops::Deref; use proxies::fee_market_proxy::FeeStruct; use multiversx_sc::{require, types::MultiValueEncoded}; -use transaction::aliases::StakeMultiArg; +use operation::aliases::StakeMultiArg; use crate::common::{ self, diff --git a/sovereign-forge/tests/sovereign_forge_unit_tests.rs b/sovereign-forge/tests/sovereign_forge_unit_tests.rs index c735d6d8..72699919 100644 --- a/sovereign-forge/tests/sovereign_forge_unit_tests.rs +++ b/sovereign-forge/tests/sovereign_forge_unit_tests.rs @@ -16,7 +16,7 @@ use sovereign_forge::common::{ storage::StorageModule, utils::{ScArray, UtilsModule}, }; -use transaction::aliases::StakeMultiArg; +use operation::aliases::StakeMultiArg; const FORGE_ADDRESS: TestSCAddress = TestSCAddress::new("sovereign-forge"); const FORGE_CODE_PATH: MxscPath = MxscPath::new("output/sovereign-forge.mxsc.json"); diff --git a/sovereign-forge/wasm-sovereign-forge-full/Cargo.lock b/sovereign-forge/wasm-sovereign-forge-full/Cargo.lock index f46cced9..2fd47725 100644 --- a/sovereign-forge/wasm-sovereign-forge-full/Cargo.lock +++ b/sovereign-forge/wasm-sovereign-forge-full/Cargo.lock @@ -26,8 +26,8 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "multiversx-sc-modules", + "operation", "setup-phase", - "transaction", ] [[package]] @@ -37,8 +37,8 @@ dependencies = [ "chain-config", "multiversx-sc", "multiversx-sc-modules", + "operation", "proxies", - "transaction", "utils", ] @@ -57,10 +57,10 @@ dependencies = [ "max-bridged-amount-module", "multiversx-sc", "multiversx-sc-modules", + "operation", "proxies", "setup-phase", "token-whitelist", - "transaction", "tx-batch-module", "utils", ] @@ -70,8 +70,8 @@ name = "fee-market" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", "proxies", - "transaction", "utils", ] @@ -80,9 +80,9 @@ name = "header-verifier" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", "proxies", "setup-phase", - "transaction", ] [[package]] @@ -201,6 +201,13 @@ dependencies = [ "autocfg", ] +[[package]] +name = "operation" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -215,7 +222,7 @@ name = "proxies" version = "0.1.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", "tx-batch-module", ] @@ -262,9 +269,9 @@ dependencies = [ "header-verifier", "multiversx-sc", "multiversx-sc-modules", + "operation", "proxies", "setup-phase", - "transaction", ] [[package]] @@ -295,19 +302,12 @@ dependencies = [ "utils", ] -[[package]] -name = "transaction" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - [[package]] name = "tx-batch-module" version = "0.0.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", ] [[package]] @@ -327,4 +327,5 @@ name = "utils" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", ] diff --git a/sovereign-forge/wasm-soveriegn-forge-view/Cargo.lock b/sovereign-forge/wasm-soveriegn-forge-view/Cargo.lock index 5dcedc03..d02b8c85 100644 --- a/sovereign-forge/wasm-soveriegn-forge-view/Cargo.lock +++ b/sovereign-forge/wasm-soveriegn-forge-view/Cargo.lock @@ -26,8 +26,8 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "multiversx-sc-modules", + "operation", "setup-phase", - "transaction", ] [[package]] @@ -37,8 +37,8 @@ dependencies = [ "chain-config", "multiversx-sc", "multiversx-sc-modules", + "operation", "proxies", - "transaction", "utils", ] @@ -57,10 +57,10 @@ dependencies = [ "max-bridged-amount-module", "multiversx-sc", "multiversx-sc-modules", + "operation", "proxies", "setup-phase", "token-whitelist", - "transaction", "tx-batch-module", "utils", ] @@ -70,8 +70,8 @@ name = "fee-market" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", "proxies", - "transaction", "utils", ] @@ -80,9 +80,9 @@ name = "header-verifier" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", "proxies", "setup-phase", - "transaction", ] [[package]] @@ -201,6 +201,13 @@ dependencies = [ "autocfg", ] +[[package]] +name = "operation" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -215,7 +222,7 @@ name = "proxies" version = "0.1.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", "tx-batch-module", ] @@ -262,9 +269,9 @@ dependencies = [ "header-verifier", "multiversx-sc", "multiversx-sc-modules", + "operation", "proxies", "setup-phase", - "transaction", ] [[package]] @@ -295,19 +302,12 @@ dependencies = [ "utils", ] -[[package]] -name = "transaction" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - [[package]] name = "tx-batch-module" version = "0.0.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", ] [[package]] @@ -327,4 +327,5 @@ name = "utils" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", ] diff --git a/sovereign-forge/wasm/Cargo.lock b/sovereign-forge/wasm/Cargo.lock index bbb98c75..7b84889e 100644 --- a/sovereign-forge/wasm/Cargo.lock +++ b/sovereign-forge/wasm/Cargo.lock @@ -26,8 +26,8 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "multiversx-sc-modules", + "operation", "setup-phase", - "transaction", ] [[package]] @@ -37,8 +37,8 @@ dependencies = [ "chain-config", "multiversx-sc", "multiversx-sc-modules", + "operation", "proxies", - "transaction", "utils", ] @@ -57,10 +57,10 @@ dependencies = [ "max-bridged-amount-module", "multiversx-sc", "multiversx-sc-modules", + "operation", "proxies", "setup-phase", "token-whitelist", - "transaction", "tx-batch-module", "utils", ] @@ -70,8 +70,8 @@ name = "fee-market" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", "proxies", - "transaction", "utils", ] @@ -80,9 +80,9 @@ name = "header-verifier" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", "proxies", "setup-phase", - "transaction", ] [[package]] @@ -201,6 +201,13 @@ dependencies = [ "autocfg", ] +[[package]] +name = "operation" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -215,7 +222,7 @@ name = "proxies" version = "0.1.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", "tx-batch-module", ] @@ -262,9 +269,9 @@ dependencies = [ "header-verifier", "multiversx-sc", "multiversx-sc-modules", + "operation", "proxies", "setup-phase", - "transaction", ] [[package]] @@ -295,19 +302,12 @@ dependencies = [ "utils", ] -[[package]] -name = "transaction" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - [[package]] name = "tx-batch-module" version = "0.0.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", ] [[package]] @@ -327,4 +327,5 @@ name = "utils" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", ] diff --git a/token-handler/Cargo.toml b/token-handler/Cargo.toml index d8f290f1..bf633e80 100644 --- a/token-handler/Cargo.toml +++ b/token-handler/Cargo.toml @@ -8,8 +8,8 @@ publish = false [lib] path = "src/lib.rs" -[dependencies.transaction] -path = "../common/transaction" +[dependencies.operation] +path = "../common/operation" [dependencies.proxies] path = "../common/proxies" diff --git a/token-handler/src/transfer_tokens.rs b/token-handler/src/transfer_tokens.rs index b903a2ab..af3624cb 100644 --- a/token-handler/src/transfer_tokens.rs +++ b/token-handler/src/transfer_tokens.rs @@ -5,8 +5,8 @@ use multiversx_sc::types::{ system_proxy, EsdtTokenPayment, ManagedArgBuffer, MultiValueEncoded, ToSelf, }; use multiversx_sc::types::{ManagedVec, TokenIdentifier}; -use transaction::aliases::GasLimit; -use transaction::{OperationEsdtPayment, TransferData}; +use operation::aliases::GasLimit; +use operation::{OperationEsdtPayment, TransferData}; use crate::common_storage; diff --git a/token-handler/tests/token_handler_blackbox_tests.rs b/token-handler/tests/token_handler_blackbox_tests.rs index b92a288b..7ce2c454 100644 --- a/token-handler/tests/token_handler_blackbox_tests.rs +++ b/token-handler/tests/token_handler_blackbox_tests.rs @@ -6,7 +6,7 @@ use multiversx_sc_scenario::{api::StaticApi, imports::MxscPath, ScenarioWorld}; use multiversx_sc_scenario::{ExpectError, ScenarioTxRun}; use proxies::chain_factory_proxy::ChainFactoryContractProxy; use proxies::token_handler_proxy::TokenHandlerProxy; -use transaction::{OperationEsdtPayment, TransferData}; +use operation::{OperationEsdtPayment, TransferData}; const TOKEN_HANDLER_ADDRESS: TestSCAddress = TestSCAddress::new("token-handler"); const TOKEN_HANDLER_CODE_PATH: MxscPath = MxscPath::new("output/token-handler.mxsc.json"); diff --git a/token-handler/wasm-token-handler-full/Cargo.lock b/token-handler/wasm-token-handler-full/Cargo.lock index 8f224a75..4c809959 100644 --- a/token-handler/wasm-token-handler-full/Cargo.lock +++ b/token-handler/wasm-token-handler-full/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -26,8 +26,8 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "multiversx-sc-modules", + "operation", "setup-phase", - "transaction", ] [[package]] @@ -37,8 +37,8 @@ dependencies = [ "chain-config", "multiversx-sc", "multiversx-sc-modules", + "operation", "proxies", - "transaction", "utils", ] @@ -157,6 +157,13 @@ dependencies = [ "autocfg", ] +[[package]] +name = "operation" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -171,7 +178,7 @@ name = "proxies" version = "0.1.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", "tx-batch-module", ] @@ -224,8 +231,8 @@ version = "0.0.0" dependencies = [ "chain-factory", "multiversx-sc", + "operation", "proxies", - "transaction", ] [[package]] @@ -236,19 +243,12 @@ dependencies = [ "token-handler", ] -[[package]] -name = "transaction" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - [[package]] name = "tx-batch-module" version = "0.0.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", ] [[package]] @@ -268,4 +268,5 @@ name = "utils" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", ] diff --git a/token-handler/wasm-token-handler-view/Cargo.lock b/token-handler/wasm-token-handler-view/Cargo.lock index 13b9442c..3d133735 100644 --- a/token-handler/wasm-token-handler-view/Cargo.lock +++ b/token-handler/wasm-token-handler-view/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -26,8 +26,8 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "multiversx-sc-modules", + "operation", "setup-phase", - "transaction", ] [[package]] @@ -37,8 +37,8 @@ dependencies = [ "chain-config", "multiversx-sc", "multiversx-sc-modules", + "operation", "proxies", - "transaction", "utils", ] @@ -157,6 +157,13 @@ dependencies = [ "autocfg", ] +[[package]] +name = "operation" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -171,7 +178,7 @@ name = "proxies" version = "0.1.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", "tx-batch-module", ] @@ -224,8 +231,8 @@ version = "0.0.0" dependencies = [ "chain-factory", "multiversx-sc", + "operation", "proxies", - "transaction", ] [[package]] @@ -236,19 +243,12 @@ dependencies = [ "token-handler", ] -[[package]] -name = "transaction" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - [[package]] name = "tx-batch-module" version = "0.0.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", ] [[package]] @@ -268,4 +268,5 @@ name = "utils" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", ] diff --git a/token-handler/wasm/Cargo.lock b/token-handler/wasm/Cargo.lock index f5c6a7b6..0218b3bc 100644 --- a/token-handler/wasm/Cargo.lock +++ b/token-handler/wasm/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arrayvec" @@ -26,8 +26,8 @@ version = "0.0.0" dependencies = [ "multiversx-sc", "multiversx-sc-modules", + "operation", "setup-phase", - "transaction", ] [[package]] @@ -37,8 +37,8 @@ dependencies = [ "chain-config", "multiversx-sc", "multiversx-sc-modules", + "operation", "proxies", - "transaction", "utils", ] @@ -157,6 +157,13 @@ dependencies = [ "autocfg", ] +[[package]] +name = "operation" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -171,7 +178,7 @@ name = "proxies" version = "0.1.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", "tx-batch-module", ] @@ -224,8 +231,8 @@ version = "0.0.0" dependencies = [ "chain-factory", "multiversx-sc", + "operation", "proxies", - "transaction", ] [[package]] @@ -236,19 +243,12 @@ dependencies = [ "token-handler", ] -[[package]] -name = "transaction" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - [[package]] name = "tx-batch-module" version = "0.0.0" dependencies = [ "multiversx-sc", - "transaction", + "operation", ] [[package]] @@ -268,4 +268,5 @@ name = "utils" version = "0.0.0" dependencies = [ "multiversx-sc", + "operation", ] From de0378805eb0462f9e12edc745bfa4f872fce07a Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Thu, 2 Jan 2025 11:16:24 +0200 Subject: [PATCH 08/41] Added struct for bridge configuration Signed-off-by: Andrei Baltariu --- common/transaction/src/lib.rs | 21 +++++++++++++++++++ enshrine-esdt-safe/src/lib.rs | 17 ++++++++++++++- .../src/to_sovereign/create_tx.rs | 6 +++++- .../wasm-enshrine-esdt-safe-full/src/lib.rs | 5 +++-- enshrine-esdt-safe/wasm/src/lib.rs | 5 +++-- 5 files changed, 48 insertions(+), 6 deletions(-) diff --git a/common/transaction/src/lib.rs b/common/transaction/src/lib.rs index b17fca1e..31c4061b 100644 --- a/common/transaction/src/lib.rs +++ b/common/transaction/src/lib.rs @@ -34,6 +34,27 @@ pub type OptionalValueTransferDataTuple = OptionalValue, ManagedVec>>>; pub type StakeMultiArg = MultiValue2, BigUint>; +#[type_abi] +#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, ManagedVecItem, Clone)] +pub struct BridgeConfig { + pub token_whitelist: ManagedVec>, + pub token_blacklist: ManagedVec>, + pub max_tx_gas_limit: GasLimit, + pub banned_endpoints: ManagedVec>, +} + +impl BridgeConfig { + #[inline] + pub fn default() -> Self { + BridgeConfig { + token_whitelist: ManagedVec::new(), + token_blacklist: ManagedVec::new(), + max_tx_gas_limit: 0, + banned_endpoints: ManagedVec::new(), + } + } +} + #[type_abi] #[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, ManagedVecItem, Clone)] pub struct Operation { diff --git a/enshrine-esdt-safe/src/lib.rs b/enshrine-esdt-safe/src/lib.rs index 750cce35..3ecd6a50 100644 --- a/enshrine-esdt-safe/src/lib.rs +++ b/enshrine-esdt-safe/src/lib.rs @@ -1,7 +1,7 @@ #![no_std] use multiversx_sc::imports::*; -use transaction::GasLimit; +use transaction::{BridgeConfig, GasLimit}; pub mod common; pub mod from_sovereign; @@ -29,6 +29,7 @@ pub trait EnshrineEsdtSafe: token_handler_address: ManagedAddress, opt_wegld_identifier: Option, opt_sov_token_prefix: Option, + config: BridgeConfig, ) { self.is_sovereign_chain().set(is_sovereign_chain); self.set_paused(true); @@ -58,6 +59,20 @@ pub trait EnshrineEsdtSafe: let caller = self.blockchain().get_caller(); self.initiator_address().set(caller); + + self.config().set(config); + } + + #[only_owner] + #[endpoint(updateConfiguration)] + fn update_configuration(&self, new_config: BridgeConfig) { + let config_mapper = self.config(); + require!( + config_mapper.is_empty(), + "There is no configuration set in this contract" + ); + + config_mapper.set(new_config); } #[only_owner] diff --git a/enshrine-esdt-safe/src/to_sovereign/create_tx.rs b/enshrine-esdt-safe/src/to_sovereign/create_tx.rs index da03c345..f74409ed 100644 --- a/enshrine-esdt-safe/src/to_sovereign/create_tx.rs +++ b/enshrine-esdt-safe/src/to_sovereign/create_tx.rs @@ -1,7 +1,8 @@ use crate::common; use proxies::fee_market_proxy::FeeMarketProxy; use transaction::{ - EventPayment, GasLimit, OperationData, OptionalValueTransferDataTuple, TransferData, + BridgeConfig, EventPayment, GasLimit, OperationData, OptionalValueTransferDataTuple, + TransferData, }; use multiversx_sc::imports::*; @@ -186,6 +187,9 @@ pub trait CreateTxModule: #[storage_mapper("bannedEndpointNames")] fn banned_endpoint_names(&self) -> UnorderedSetMapper; + #[storage_mapper("config")] + fn config(&self) -> SingleValueMapper>; + #[storage_mapper_from_address("feeEnabledFlag")] fn external_fee_enabled( &self, diff --git a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/src/lib.rs b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/src/lib.rs index 67e4823a..25a75104 100644 --- a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/src/lib.rs +++ b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/src/lib.rs @@ -6,9 +6,9 @@ // Init: 1 // Upgrade: 1 -// Endpoints: 18 +// Endpoints: 19 // Async Callback: 1 -// Total number of exported functions: 21 +// Total number of exported functions: 22 #![no_std] @@ -20,6 +20,7 @@ multiversx_sc_wasm_adapter::endpoints! { ( init => init upgrade => upgrade + updateConfiguration => update_configuration setFeeMarketAddress => set_fee_market_address setHeaderVerifierAddress => set_header_verifier_address setMaxTxGasLimit => set_max_user_tx_gas_limit diff --git a/enshrine-esdt-safe/wasm/src/lib.rs b/enshrine-esdt-safe/wasm/src/lib.rs index 67e4823a..25a75104 100644 --- a/enshrine-esdt-safe/wasm/src/lib.rs +++ b/enshrine-esdt-safe/wasm/src/lib.rs @@ -6,9 +6,9 @@ // Init: 1 // Upgrade: 1 -// Endpoints: 18 +// Endpoints: 19 // Async Callback: 1 -// Total number of exported functions: 21 +// Total number of exported functions: 22 #![no_std] @@ -20,6 +20,7 @@ multiversx_sc_wasm_adapter::endpoints! { ( init => init upgrade => upgrade + updateConfiguration => update_configuration setFeeMarketAddress => set_fee_market_address setHeaderVerifierAddress => set_header_verifier_address setMaxTxGasLimit => set_max_user_tx_gas_limit From fd9fac19e2f52fafceecadae5bb16511834578bd Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Thu, 2 Jan 2025 11:19:48 +0200 Subject: [PATCH 09/41] Added needed config struct for enshrine-esdt deployment Signed-off-by: Andrei Baltariu --- chain-factory/src/factory.rs | 4 +++- common/proxies/src/chain_factory_proxy.rs | 3 +++ common/proxies/src/enshrine_esdt_safe_proxy.rs | 16 ++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/chain-factory/src/factory.rs b/chain-factory/src/factory.rs index 3021d809..8b5749ea 100644 --- a/chain-factory/src/factory.rs +++ b/chain-factory/src/factory.rs @@ -7,7 +7,7 @@ use proxies::{ fee_market_proxy::{FeeMarketProxy, FeeStruct}, header_verifier_proxy::HeaderverifierProxy, }; -use transaction::StakeMultiArg; +use transaction::{BridgeConfig, StakeMultiArg}; multiversx_sc::derive_imports!(); #[multiversx_sc::module] @@ -68,6 +68,7 @@ pub trait FactoryModule: only_admin::OnlyAdminModule { token_handler_address: ManagedAddress, wegld_identifier: TokenIdentifier, sov_token_prefix: ManagedBuffer, + config: BridgeConfig, ) -> ManagedAddress { let source_address = self.enshrine_esdt_safe_template().get(); let metadata = self.blockchain().get_code_metadata(&source_address); @@ -79,6 +80,7 @@ pub trait FactoryModule: only_admin::OnlyAdminModule { token_handler_address, Some(wegld_identifier), Some(sov_token_prefix), + config, ) .gas(60_000_000) .from_source(source_address) diff --git a/common/proxies/src/chain_factory_proxy.rs b/common/proxies/src/chain_factory_proxy.rs index f586d96c..34d2af89 100644 --- a/common/proxies/src/chain_factory_proxy.rs +++ b/common/proxies/src/chain_factory_proxy.rs @@ -137,12 +137,14 @@ where Arg1: ProxyArg>, Arg2: ProxyArg>, Arg3: ProxyArg>, + Arg4: ProxyArg>, >( self, is_sovereign_chain: Arg0, token_handler_address: Arg1, wegld_identifier: Arg2, sov_token_prefix: Arg3, + config: Arg4, ) -> TxTypedCall> { self.wrapped_tx .payment(NotPayable) @@ -151,6 +153,7 @@ where .argument(&token_handler_address) .argument(&wegld_identifier) .argument(&sov_token_prefix) + .argument(&config) .original_result() } diff --git a/common/proxies/src/enshrine_esdt_safe_proxy.rs b/common/proxies/src/enshrine_esdt_safe_proxy.rs index a87a274a..8c06727b 100644 --- a/common/proxies/src/enshrine_esdt_safe_proxy.rs +++ b/common/proxies/src/enshrine_esdt_safe_proxy.rs @@ -48,12 +48,14 @@ where Arg1: ProxyArg>, Arg2: ProxyArg>>, Arg3: ProxyArg>>, + Arg4: ProxyArg>, >( self, is_sovereign_chain: Arg0, token_handler_address: Arg1, opt_wegld_identifier: Arg2, opt_sov_token_prefix: Arg3, + config: Arg4, ) -> TxTypedDeploy { self.wrapped_tx .payment(NotPayable) @@ -62,6 +64,7 @@ where .argument(&token_handler_address) .argument(&opt_wegld_identifier) .argument(&opt_sov_token_prefix) + .argument(&config) .original_result() } } @@ -94,6 +97,19 @@ where To: TxTo, Gas: TxGas, { + pub fn update_configuration< + Arg0: ProxyArg>, + >( + self, + new_config: Arg0, + ) -> TxTypedCall { + self.wrapped_tx + .payment(NotPayable) + .raw_call("updateConfiguration") + .argument(&new_config) + .original_result() + } + pub fn set_fee_market_address< Arg0: ProxyArg>, >( From f3f16e3940715b5cbf19b5944f9ee67e83874cc7 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Thu, 2 Jan 2025 11:23:41 +0200 Subject: [PATCH 10/41] Fixed test setup Signed-off-by: Andrei Baltariu --- .../interactor/src/enshrine_esdt_safe_interactor.rs | 13 +++++++------ .../tests/enshrine-esdt-safe_interactor_tests.rs | 12 ++++++------ .../tests/enshrine_esdt_safe_blackbox_test.rs | 5 ++++- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs b/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs index 2a673bef..b7824a7f 100644 --- a/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs +++ b/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs @@ -27,7 +27,7 @@ pub async fn enshrine_esdt_safe_cli() { let config = Config::load_config(); let mut interact = ContractInteract::new(config).await; match cmd.as_str() { - "deploy" => interact.deploy(false).await, + "deploy" => interact.deploy(false, BridgeConfig::default()).await, "upgrade" => interact.upgrade().await, "setFeeMarketAddress" => interact.set_fee_market_address().await, "setHeaderVerifierAddress" => interact.set_header_verifier_address().await, @@ -97,7 +97,7 @@ impl ContractInteract { } } - pub async fn deploy(&mut self, is_sovereign_chain: bool) { + pub async fn deploy(&mut self, is_sovereign_chain: bool, config: BridgeConfig) { let opt_wegld_identifier = Option::Some(TokenIdentifier::from_esdt_bytes(WHITELIST_TOKEN_ID)); let opt_sov_token_prefix = Option::Some(ManagedBuffer::new_from_bytes(&b"sov"[..])); @@ -116,6 +116,7 @@ impl ContractInteract { token_handler_address, opt_wegld_identifier, opt_sov_token_prefix, + config, ) .code(code_path) .returns(ReturnsNewAddress) @@ -208,17 +209,17 @@ impl ContractInteract { println!("new token_handler_address: {new_address_bech32}"); } - pub async fn deploy_all(&mut self, is_sov_chain: bool) { + pub async fn deploy_all(&mut self, is_sov_chain: bool, config: BridgeConfig) { self.deploy_token_handler().await; - self.deploy(is_sov_chain).await; + self.deploy(is_sov_chain, config).await; self.deploy_header_verifier().await; self.deploy_fee_market().await; self.unpause_endpoint().await; } - pub async fn deploy_setup(&mut self) { + pub async fn deploy_setup(&mut self, config: BridgeConfig) { self.deploy_token_handler().await; - self.deploy(false).await; + self.deploy(false, config).await; self.unpause_endpoint().await; } diff --git a/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs b/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs index 6ec9d646..8d6bb39d 100644 --- a/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs +++ b/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs @@ -15,7 +15,7 @@ type OptionalTransferData = async fn test_deposit_paused() { let mut interact = ContractInteract::new(Config::load_config()).await; interact.deploy_token_handler().await; - interact.deploy(false).await; + interact.deploy(false, BridgeConfig::default()).await; interact .deposit( OptionalTransferData::None, @@ -33,7 +33,7 @@ async fn test_deposit_no_payment() { let to_contract = interact.state.esdt_safe_address().clone(); let transfer_data = OptionalTransferData::None; - interact.deploy_setup().await; + interact.deploy_setup(BridgeConfig::default()).await; interact .interactor @@ -63,7 +63,7 @@ async fn test_deposit_too_many_payments() { ); let payments = ManagedVec::from(vec![payment; 11]); - interact.deploy_setup().await; + interact.deploy_setup(BridgeConfig::default()).await; interact .interactor @@ -83,7 +83,7 @@ async fn test_deposit_too_many_payments() { #[ignore] async fn test_deposit_not_whitelisted() { let mut interact = ContractInteract::new(Config::load_config()).await; - interact.deploy_setup().await; + interact.deploy_setup(BridgeConfig::default()).await; interact.deploy_fee_market().await; interact.add_tokens_to_whitelist(WHITELIST_TOKEN_ID).await; interact.set_fee_market_address().await; @@ -94,7 +94,7 @@ async fn test_deposit_not_whitelisted() { #[ignore] async fn test_deposit_happy_path() { let mut interact = ContractInteract::new(Config::load_config()).await; - interact.deploy_setup().await; + interact.deploy_setup(BridgeConfig::default()).await; interact.deploy_fee_market().await; interact.add_tokens_to_whitelist(TOKEN_ID).await; interact.set_fee_market_address().await; @@ -118,7 +118,7 @@ async fn test_deposit_sov_chain() { 0, BigUint::from(30u64), )); - interact.deploy_all(true).await; + interact.deploy_all(true, BridgeConfig::default()).await; interact.add_tokens_to_whitelist(TOKEN_ID).await; interact.set_fee_market_address().await; interact diff --git a/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs b/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs index 85f8a3d5..66c882de 100644 --- a/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs +++ b/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs @@ -12,7 +12,7 @@ use proxies::enshrine_esdt_safe_proxy::EnshrineEsdtSafeProxy; use proxies::fee_market_proxy::{FeeMarketProxy, FeeStruct, FeeType}; use proxies::header_verifier_proxy::HeaderverifierProxy; use proxies::token_handler_proxy::TokenHandlerProxy; -use transaction::{GasLimit, Operation, OperationData, OperationEsdtPayment}; +use transaction::{BridgeConfig, GasLimit, Operation, OperationData, OperationEsdtPayment}; use utils::PaymentsVec; const ENSHRINE_ESDT_ADDRESS: TestSCAddress = TestSCAddress::new("enshrine-esdt"); @@ -125,6 +125,7 @@ impl EnshrineTestState { is_sovereign_chain: bool, wegld_identifier: Option>, sovereign_token_prefix: Option>, + config: BridgeConfig, ) -> &mut Self { self.world .tx() @@ -135,6 +136,7 @@ impl EnshrineTestState { TOKEN_HANDLER_ADDRESS, wegld_identifier, sovereign_token_prefix, + config, ) .code(ENSHRINE_ESDT_CODE_PATH) .new_address(ENSHRINE_ESDT_ADDRESS) @@ -200,6 +202,7 @@ impl EnshrineTestState { is_sovereign_chain, Some(TokenIdentifier::from(WEGLD_IDENTIFIER)), Some(SOVEREIGN_TOKEN_PREFIX.into()), + BridgeConfig::default(), ); self.deploy_header_verifier_contract(); self.deploy_token_handler_contract(); From 0e0658b85b7f2ca787e9c80efb63cb6dc46a2ba6 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Thu, 2 Jan 2025 11:36:20 +0200 Subject: [PATCH 11/41] Moved storage to common storage module Signed-off-by: Andrei Baltariu --- enshrine-esdt-safe/src/common/storage.rs | 27 ++++++++++++++++--- .../src/from_sovereign/transfer_tokens.rs | 6 ----- .../src/to_sovereign/create_tx.rs | 24 +---------------- 3 files changed, 25 insertions(+), 32 deletions(-) diff --git a/enshrine-esdt-safe/src/common/storage.rs b/enshrine-esdt-safe/src/common/storage.rs index 7c56d22b..62610db8 100644 --- a/enshrine-esdt-safe/src/common/storage.rs +++ b/enshrine-esdt-safe/src/common/storage.rs @@ -1,5 +1,5 @@ use multiversx_sc::imports::*; -use transaction::OperationEsdtPayment; +use transaction::{BridgeConfig, GasLimit}; #[multiversx_sc::module] pub trait CommonStorage { @@ -15,6 +15,27 @@ pub trait CommonStorage { #[storage_mapper("tokenHandlerAddress")] fn token_handler_address(&self) -> SingleValueMapper; - #[storage_mapper("mintedTokens")] - fn minted_tokens(&self) -> VecMapper>; + #[storage_mapper("feeMarketAddress")] + fn fee_market_address(&self) -> SingleValueMapper; + + #[storage_mapper("maxUserTxGasLimit")] + fn max_user_tx_gas_limit(&self) -> SingleValueMapper; + + #[storage_mapper("bannedEndpointNames")] + fn banned_endpoint_names(&self) -> UnorderedSetMapper; + + #[storage_mapper("config")] + fn config(&self) -> SingleValueMapper>; + + #[storage_mapper("headerVerifierAddress")] + fn header_verifier_address(&self) -> SingleValueMapper; + + #[storage_mapper("paidIssuedTokens")] + fn paid_issued_tokens(&self) -> UnorderedSetMapper>; + + #[storage_mapper_from_address("feeEnabledFlag")] + fn external_fee_enabled( + &self, + sc_address: ManagedAddress, + ) -> SingleValueMapper; } diff --git a/enshrine-esdt-safe/src/from_sovereign/transfer_tokens.rs b/enshrine-esdt-safe/src/from_sovereign/transfer_tokens.rs index cd65defb..ee9ed31b 100644 --- a/enshrine-esdt-safe/src/from_sovereign/transfer_tokens.rs +++ b/enshrine-esdt-safe/src/from_sovereign/transfer_tokens.rs @@ -194,10 +194,4 @@ pub trait TransferTokensModule: fn is_wegld(&self, token_id: &TokenIdentifier) -> bool { token_id.eq(&self.wegld_identifier().get()) } - - #[storage_mapper("headerVerifierAddress")] - fn header_verifier_address(&self) -> SingleValueMapper; - - #[storage_mapper("paidIssuedTokens")] - fn paid_issued_tokens(&self) -> UnorderedSetMapper>; } diff --git a/enshrine-esdt-safe/src/to_sovereign/create_tx.rs b/enshrine-esdt-safe/src/to_sovereign/create_tx.rs index f74409ed..c58a5785 100644 --- a/enshrine-esdt-safe/src/to_sovereign/create_tx.rs +++ b/enshrine-esdt-safe/src/to_sovereign/create_tx.rs @@ -1,8 +1,7 @@ use crate::common; use proxies::fee_market_proxy::FeeMarketProxy; use transaction::{ - BridgeConfig, EventPayment, GasLimit, OperationData, OptionalValueTransferDataTuple, - TransferData, + EventPayment, GasLimit, OperationData, OptionalValueTransferDataTuple, TransferData, }; use multiversx_sc::imports::*; @@ -174,25 +173,4 @@ pub trait CreateTxModule: "Banned endpoint name" ); } - - #[storage_mapper("feeMarketAddress")] - fn fee_market_address(&self) -> SingleValueMapper; - - #[storage_mapper("maxUserTxGasLimit")] - fn max_user_tx_gas_limit(&self) -> SingleValueMapper; - - #[storage_mapper("burnTokens")] - fn burn_tokens(&self) -> UnorderedSetMapper; - - #[storage_mapper("bannedEndpointNames")] - fn banned_endpoint_names(&self) -> UnorderedSetMapper; - - #[storage_mapper("config")] - fn config(&self) -> SingleValueMapper>; - - #[storage_mapper_from_address("feeEnabledFlag")] - fn external_fee_enabled( - &self, - sc_address: ManagedAddress, - ) -> SingleValueMapper; } From f35ce2b592465d11eed697ea7bf2b2a15fce7c93 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Thu, 2 Jan 2025 11:38:00 +0200 Subject: [PATCH 12/41] Renamed default function Signed-off-by: Andrei Baltariu --- common/transaction/src/lib.rs | 2 +- .../interactor/src/enshrine_esdt_safe_interactor.rs | 2 +- enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/transaction/src/lib.rs b/common/transaction/src/lib.rs index 31c4061b..7ee613b9 100644 --- a/common/transaction/src/lib.rs +++ b/common/transaction/src/lib.rs @@ -45,7 +45,7 @@ pub struct BridgeConfig { impl BridgeConfig { #[inline] - pub fn default() -> Self { + pub fn empty_config() -> Self { BridgeConfig { token_whitelist: ManagedVec::new(), token_blacklist: ManagedVec::new(), diff --git a/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs b/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs index b7824a7f..d8589072 100644 --- a/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs +++ b/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs @@ -27,7 +27,7 @@ pub async fn enshrine_esdt_safe_cli() { let config = Config::load_config(); let mut interact = ContractInteract::new(config).await; match cmd.as_str() { - "deploy" => interact.deploy(false, BridgeConfig::default()).await, + "deploy" => interact.deploy(false, BridgeConfig::empty_config()).await, "upgrade" => interact.upgrade().await, "setFeeMarketAddress" => interact.set_fee_market_address().await, "setHeaderVerifierAddress" => interact.set_header_verifier_address().await, diff --git a/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs b/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs index 66c882de..8561f965 100644 --- a/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs +++ b/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs @@ -202,7 +202,7 @@ impl EnshrineTestState { is_sovereign_chain, Some(TokenIdentifier::from(WEGLD_IDENTIFIER)), Some(SOVEREIGN_TOKEN_PREFIX.into()), - BridgeConfig::default(), + BridgeConfig::empty_config(), ); self.deploy_header_verifier_contract(); self.deploy_token_handler_contract(); From 55b504112eefacf1eccae3dce413b019e4654850 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Thu, 2 Jan 2025 11:44:22 +0200 Subject: [PATCH 13/41] Added correct function for `BridgeConfig` default value Signed-off-by: Andrei Baltariu --- .../tests/enshrine-esdt-safe_interactor_tests.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs b/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs index 8d6bb39d..87d9b581 100644 --- a/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs +++ b/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs @@ -15,7 +15,7 @@ type OptionalTransferData = async fn test_deposit_paused() { let mut interact = ContractInteract::new(Config::load_config()).await; interact.deploy_token_handler().await; - interact.deploy(false, BridgeConfig::default()).await; + interact.deploy(false, BridgeConfig::empty_config()).await; interact .deposit( OptionalTransferData::None, @@ -33,7 +33,7 @@ async fn test_deposit_no_payment() { let to_contract = interact.state.esdt_safe_address().clone(); let transfer_data = OptionalTransferData::None; - interact.deploy_setup(BridgeConfig::default()).await; + interact.deploy_setup(BridgeConfig::empty_config()).await; interact .interactor @@ -63,7 +63,7 @@ async fn test_deposit_too_many_payments() { ); let payments = ManagedVec::from(vec![payment; 11]); - interact.deploy_setup(BridgeConfig::default()).await; + interact.deploy_setup(BridgeConfig::empty_config()).await; interact .interactor @@ -83,7 +83,7 @@ async fn test_deposit_too_many_payments() { #[ignore] async fn test_deposit_not_whitelisted() { let mut interact = ContractInteract::new(Config::load_config()).await; - interact.deploy_setup(BridgeConfig::default()).await; + interact.deploy_setup(BridgeConfig::empty_config()).await; interact.deploy_fee_market().await; interact.add_tokens_to_whitelist(WHITELIST_TOKEN_ID).await; interact.set_fee_market_address().await; @@ -94,7 +94,7 @@ async fn test_deposit_not_whitelisted() { #[ignore] async fn test_deposit_happy_path() { let mut interact = ContractInteract::new(Config::load_config()).await; - interact.deploy_setup(BridgeConfig::default()).await; + interact.deploy_setup(BridgeConfig::empty_config()).await; interact.deploy_fee_market().await; interact.add_tokens_to_whitelist(TOKEN_ID).await; interact.set_fee_market_address().await; @@ -118,7 +118,9 @@ async fn test_deposit_sov_chain() { 0, BigUint::from(30u64), )); - interact.deploy_all(true, BridgeConfig::default()).await; + interact + .deploy_all(true, BridgeConfig::empty_config()) + .await; interact.add_tokens_to_whitelist(TOKEN_ID).await; interact.set_fee_market_address().await; interact From 45dac79df44d085073698d8e9d0db2f3518503a3 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Thu, 2 Jan 2025 12:14:15 +0200 Subject: [PATCH 14/41] Modified require condition Signed-off-by: Andrei Baltariu --- enshrine-esdt-safe/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enshrine-esdt-safe/src/lib.rs b/enshrine-esdt-safe/src/lib.rs index 3ecd6a50..0249c21f 100644 --- a/enshrine-esdt-safe/src/lib.rs +++ b/enshrine-esdt-safe/src/lib.rs @@ -68,7 +68,7 @@ pub trait EnshrineEsdtSafe: fn update_configuration(&self, new_config: BridgeConfig) { let config_mapper = self.config(); require!( - config_mapper.is_empty(), + !config_mapper.is_empty(), "There is no configuration set in this contract" ); From 2a40db2efb7a930e1a48bce5a499006fa9269d7e Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Fri, 3 Jan 2025 11:03:02 +0200 Subject: [PATCH 15/41] Added chain-factory as admin in Token-Handler SC Signed-off-by: Andrei Baltariu --- Cargo.lock | 1 + common/proxies/src/token_handler_proxy.rs | 54 +++++++++++++++++- .../src/enshrine_esdt_safe_interactor.rs | 3 +- .../tests/enshrine_esdt_safe_blackbox_test.rs | 4 +- .../wasm-enshrine-esdt-safe-full/Cargo.lock | 1 + .../wasm-enshrine-esdt-safe-view/Cargo.lock | 1 + enshrine-esdt-safe/wasm/Cargo.lock | 1 + token-handler/Cargo.toml | 3 + token-handler/src/lib.rs | 11 +++- .../tests/token_handler_blackbox_tests.rs | 57 +++++++------------ .../wasm-token-handler-full/Cargo.lock | 1 + .../wasm-token-handler-full/src/lib.rs | 8 ++- .../wasm-token-handler-view/Cargo.lock | 1 + token-handler/wasm/Cargo.lock | 1 + token-handler/wasm/src/lib.rs | 8 ++- 15 files changed, 109 insertions(+), 46 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b78cb150..d3da0909 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2302,6 +2302,7 @@ version = "0.0.0" dependencies = [ "chain-factory", "multiversx-sc", + "multiversx-sc-modules", "multiversx-sc-scenario", "num-bigint", "proxies", diff --git a/common/proxies/src/token_handler_proxy.rs b/common/proxies/src/token_handler_proxy.rs index 319f4ad4..8e27c2a4 100644 --- a/common/proxies/src/token_handler_proxy.rs +++ b/common/proxies/src/token_handler_proxy.rs @@ -43,12 +43,16 @@ where From: TxFrom, Gas: TxGas, { - pub fn init( + pub fn init< + Arg0: ProxyArg>, + >( self, + chain_factory_master: Arg0, ) -> TxTypedDeploy { self.wrapped_tx .payment(NotPayable) .raw_deploy() + .argument(&chain_factory_master) .original_result() } } @@ -111,4 +115,52 @@ where .argument(&tokens) .original_result() } + + pub fn is_admin< + Arg0: ProxyArg>, + >( + self, + address: Arg0, + ) -> TxTypedCall { + self.wrapped_tx + .payment(NotPayable) + .raw_call("isAdmin") + .argument(&address) + .original_result() + } + + pub fn add_admin< + Arg0: ProxyArg>, + >( + self, + address: Arg0, + ) -> TxTypedCall { + self.wrapped_tx + .payment(NotPayable) + .raw_call("addAdmin") + .argument(&address) + .original_result() + } + + pub fn remove_admin< + Arg0: ProxyArg>, + >( + self, + address: Arg0, + ) -> TxTypedCall { + self.wrapped_tx + .payment(NotPayable) + .raw_call("removeAdmin") + .argument(&address) + .original_result() + } + + pub fn admins( + self, + ) -> TxTypedCall>> { + self.wrapped_tx + .payment(NotPayable) + .raw_call("getAdmins") + .original_result() + } } diff --git a/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs b/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs index 2a673bef..7d342d44 100644 --- a/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs +++ b/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs @@ -188,6 +188,7 @@ impl ContractInteract { pub async fn deploy_token_handler(&mut self) { let token_handler_code_path = MxscPath::new(&self.token_handler_code); + let chain_factory_address = Bech32Address::from_bech32_string("chain_factory".to_string()); let new_address = self .interactor @@ -195,7 +196,7 @@ impl ContractInteract { .from(&self.wallet_address) .gas(100_000_000u64) .typed(token_handler_proxy::TokenHandlerProxy) - .init() + .init(chain_factory_address) .code(token_handler_code_path) .returns(ReturnsNewAddress) .run() diff --git a/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs b/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs index 85f8a3d5..c8a629f0 100644 --- a/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs +++ b/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs @@ -183,7 +183,7 @@ impl EnshrineTestState { .tx() .from(ENSHRINE_ESDT_OWNER_ADDRESS) .typed(TokenHandlerProxy) - .init() + .init(ENSHRINE_ESDT_ADDRESS) .code(TOKEN_HANDLER_CODE_PATH) .new_address(TOKEN_HANDLER_ADDRESS) .run(); @@ -391,7 +391,7 @@ impl EnshrineTestState { fn propose_whitelist_enshrine_esdt(&mut self) { self.world .tx() - .from(ENSHRINE_ESDT_OWNER_ADDRESS) + .from(ENSHRINE_ESDT_ADDRESS) .to(TOKEN_HANDLER_ADDRESS) .typed(TokenHandlerProxy) .whitelist_enshrine_esdt(ENSHRINE_ESDT_ADDRESS) diff --git a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/Cargo.lock b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/Cargo.lock index 5d4e4e6f..def5794b 100644 --- a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/Cargo.lock +++ b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/Cargo.lock @@ -277,6 +277,7 @@ version = "0.0.0" dependencies = [ "chain-factory", "multiversx-sc", + "multiversx-sc-modules", "proxies", "transaction", ] diff --git a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-view/Cargo.lock b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-view/Cargo.lock index 0a11f9d8..8650b5b8 100644 --- a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-view/Cargo.lock +++ b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-view/Cargo.lock @@ -277,6 +277,7 @@ version = "0.0.0" dependencies = [ "chain-factory", "multiversx-sc", + "multiversx-sc-modules", "proxies", "transaction", ] diff --git a/enshrine-esdt-safe/wasm/Cargo.lock b/enshrine-esdt-safe/wasm/Cargo.lock index b2aec657..56b8fc5f 100644 --- a/enshrine-esdt-safe/wasm/Cargo.lock +++ b/enshrine-esdt-safe/wasm/Cargo.lock @@ -277,6 +277,7 @@ version = "0.0.0" dependencies = [ "chain-factory", "multiversx-sc", + "multiversx-sc-modules", "proxies", "transaction", ] diff --git a/token-handler/Cargo.toml b/token-handler/Cargo.toml index cb76598b..c2ee9be1 100644 --- a/token-handler/Cargo.toml +++ b/token-handler/Cargo.toml @@ -20,6 +20,9 @@ path = "../chain-factory" [dependencies.multiversx-sc] version = "=0.54.6" +[dependencies.multiversx-sc-modules] +version = "=0.54.6" + [dev-dependencies] num-bigint = "0.4" diff --git a/token-handler/src/lib.rs b/token-handler/src/lib.rs index b2738694..85dfe5e7 100644 --- a/token-handler/src/lib.rs +++ b/token-handler/src/lib.rs @@ -2,21 +2,26 @@ #[allow(unused_imports)] use multiversx_sc::imports::*; +use multiversx_sc_modules::only_admin; pub mod common_storage; pub mod transfer_tokens; #[multiversx_sc::contract] pub trait TokenHandler: - transfer_tokens::TransferTokensModule + common_storage::CommonStorage + transfer_tokens::TransferTokensModule + common_storage::CommonStorage + only_admin::OnlyAdminModule { #[init] - fn init(&self) {} + fn init(&self, chain_factory_master: ManagedAddress) { + self.blockchain().is_smart_contract(&chain_factory_master); + + self.add_admin(chain_factory_master); + } #[upgrade] fn upgrade(&self) {} - #[only_owner] + #[only_admin] #[endpoint(whitelistEnshrineEsdt)] fn whitelist_enshrine_esdt(&self, enshrine_esdt_address: ManagedAddress) { require!( diff --git a/token-handler/tests/token_handler_blackbox_tests.rs b/token-handler/tests/token_handler_blackbox_tests.rs index b92a288b..a10bd679 100644 --- a/token-handler/tests/token_handler_blackbox_tests.rs +++ b/token-handler/tests/token_handler_blackbox_tests.rs @@ -25,11 +25,6 @@ const _PREFIX_NFT_TOKEN_ID: TestTokenIdentifier = TestTokenIdentifier::new("sov- const WEGLD_BALANCE: u128 = 100_000_000_000_000_000; -pub struct ErrorStatus<'a> { - code: u64, - message: &'a str, -} - fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); @@ -71,7 +66,7 @@ impl TokenHandlerTestState { .tx() .from(OWNER_ADDRESS) .typed(TokenHandlerProxy) - .init() + .init(FACTORY_ADDRESS) .code(TOKEN_HANDLER_CODE_PATH) .new_address(TOKEN_HANDLER_ADDRESS) .run(); @@ -131,28 +126,21 @@ impl TokenHandlerTestState { fn propose_whitelist_caller( &mut self, - caller: TestAddress, enshrine_address: TestSCAddress, - error: Option, + error: Option, ) { - match error { - None => self - .world - .tx() - .to(TOKEN_HANDLER_ADDRESS) - .from(caller) - .typed(TokenHandlerProxy) - .whitelist_enshrine_esdt(enshrine_address) - .run(), - Some(error_status) => self - .world - .tx() - .to(TOKEN_HANDLER_ADDRESS) - .from(caller) - .typed(TokenHandlerProxy) - .whitelist_enshrine_esdt(enshrine_address) - .returns(ExpectError(error_status.code, error_status.message)) - .run(), + let transaction = self + .world + .tx() + .to(TOKEN_HANDLER_ADDRESS) + .from(enshrine_address) + .typed(TokenHandlerProxy) + .whitelist_enshrine_esdt(enshrine_address); + + if let Some(error) = error { + transaction.returns(error).run(); + } else { + transaction.run(); } } @@ -186,23 +174,22 @@ fn test_deploy() { } #[test] -fn test_whitelist_ensrhine_esdt_caller_not_owner() { +fn test_whitelist_enshrine_esdt_caller_not_admin() { let mut state = TokenHandlerTestState::new(); - let error = ErrorStatus { - code: 4, - message: "Endpoint can only be called by owner", - }; + let error = ExpectError(4, "Endpoint can only be called by admins"); state.propose_deploy_token_handler(); - state.propose_whitelist_caller(USER_ADDRESS, FACTORY_ADDRESS, Some(error)); + state.propose_deploy_factory_sc(); + state.propose_whitelist_caller(TOKEN_HANDLER_ADDRESS, Some(error)); } #[test] -fn test_whitelist_ensrhine() { +fn test_whitelist_enshrine() { let mut state = TokenHandlerTestState::new(); state.propose_deploy_token_handler(); - state.propose_whitelist_caller(OWNER_ADDRESS, FACTORY_ADDRESS, None); + state.propose_deploy_factory_sc(); + state.propose_whitelist_caller(FACTORY_ADDRESS, None); } // NOTE: @@ -226,7 +213,7 @@ fn test_transfer_tokens_no_payment() { .world .set_esdt_balance(FACTORY_ADDRESS, b"FUNGIBLE_TOKEN_ID", 100); - state.propose_whitelist_caller(OWNER_ADDRESS, FACTORY_ADDRESS, None); + state.propose_whitelist_caller(FACTORY_ADDRESS, None); state.world.set_esdt_local_roles( TOKEN_HANDLER_ADDRESS, diff --git a/token-handler/wasm-token-handler-full/Cargo.lock b/token-handler/wasm-token-handler-full/Cargo.lock index a4ab4c4e..9dc04a79 100644 --- a/token-handler/wasm-token-handler-full/Cargo.lock +++ b/token-handler/wasm-token-handler-full/Cargo.lock @@ -224,6 +224,7 @@ version = "0.0.0" dependencies = [ "chain-factory", "multiversx-sc", + "multiversx-sc-modules", "proxies", "transaction", ] diff --git a/token-handler/wasm-token-handler-full/src/lib.rs b/token-handler/wasm-token-handler-full/src/lib.rs index f03013a9..76eb9820 100644 --- a/token-handler/wasm-token-handler-full/src/lib.rs +++ b/token-handler/wasm-token-handler-full/src/lib.rs @@ -6,9 +6,9 @@ // Init: 1 // Upgrade: 1 -// Endpoints: 2 +// Endpoints: 6 // Async Callback (empty): 1 -// Total number of exported functions: 5 +// Total number of exported functions: 9 #![no_std] @@ -22,6 +22,10 @@ multiversx_sc_wasm_adapter::endpoints! { upgrade => upgrade whitelistEnshrineEsdt => whitelist_enshrine_esdt transferTokens => transfer_tokens + isAdmin => is_admin + addAdmin => add_admin + removeAdmin => remove_admin + getAdmins => admins ) } diff --git a/token-handler/wasm-token-handler-view/Cargo.lock b/token-handler/wasm-token-handler-view/Cargo.lock index 873bd496..c09c712a 100644 --- a/token-handler/wasm-token-handler-view/Cargo.lock +++ b/token-handler/wasm-token-handler-view/Cargo.lock @@ -224,6 +224,7 @@ version = "0.0.0" dependencies = [ "chain-factory", "multiversx-sc", + "multiversx-sc-modules", "proxies", "transaction", ] diff --git a/token-handler/wasm/Cargo.lock b/token-handler/wasm/Cargo.lock index fe395276..9859b2f6 100644 --- a/token-handler/wasm/Cargo.lock +++ b/token-handler/wasm/Cargo.lock @@ -224,6 +224,7 @@ version = "0.0.0" dependencies = [ "chain-factory", "multiversx-sc", + "multiversx-sc-modules", "proxies", "transaction", ] diff --git a/token-handler/wasm/src/lib.rs b/token-handler/wasm/src/lib.rs index f03013a9..76eb9820 100644 --- a/token-handler/wasm/src/lib.rs +++ b/token-handler/wasm/src/lib.rs @@ -6,9 +6,9 @@ // Init: 1 // Upgrade: 1 -// Endpoints: 2 +// Endpoints: 6 // Async Callback (empty): 1 -// Total number of exported functions: 5 +// Total number of exported functions: 9 #![no_std] @@ -22,6 +22,10 @@ multiversx_sc_wasm_adapter::endpoints! { upgrade => upgrade whitelistEnshrineEsdt => whitelist_enshrine_esdt transferTokens => transfer_tokens + isAdmin => is_admin + addAdmin => add_admin + removeAdmin => remove_admin + getAdmins => admins ) } From 59a815bf9afee4ea90486e4ef5164926d466b323 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Fri, 3 Jan 2025 11:06:03 +0200 Subject: [PATCH 16/41] Added the stable version of sc actions Signed-off-by: Andrei Baltariu --- .github/workflows/actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index c1f12bae..f19ab7fc 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -20,7 +20,7 @@ permissions: jobs: contracts: name: Contracts - uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@79d7ac76e34b3208fbe07559ac276d0ea48be4da + uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v4.2.0 with: rust-toolchain: stable coverage-args: --ignore-filename-regex='/.cargo/git' --output ./coverage.md From a458b9aaed9db1c5ddc41b33bb08bc79c407ccd9 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Fri, 3 Jan 2025 11:48:09 +0200 Subject: [PATCH 17/41] Added use of `ReturnsResultHandledOrError` for unit tests Signed-off-by: Andrei Baltariu --- .../tests/token_handler_blackbox_tests.rs | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/token-handler/tests/token_handler_blackbox_tests.rs b/token-handler/tests/token_handler_blackbox_tests.rs index a10bd679..cd9b0a5c 100644 --- a/token-handler/tests/token_handler_blackbox_tests.rs +++ b/token-handler/tests/token_handler_blackbox_tests.rs @@ -3,7 +3,7 @@ use multiversx_sc::types::{ MultiValueEncoded, TestAddress, TestSCAddress, TestTokenIdentifier, }; use multiversx_sc_scenario::{api::StaticApi, imports::MxscPath, ScenarioWorld}; -use multiversx_sc_scenario::{ExpectError, ScenarioTxRun}; +use multiversx_sc_scenario::{ExpectError, ReturnsHandledOrError, ScenarioTxRun}; use proxies::chain_factory_proxy::ChainFactoryContractProxy; use proxies::token_handler_proxy::TokenHandlerProxy; use transaction::{OperationEsdtPayment, TransferData}; @@ -127,20 +127,23 @@ impl TokenHandlerTestState { fn propose_whitelist_caller( &mut self, enshrine_address: TestSCAddress, - error: Option, + error_message: Option<&str>, ) { - let transaction = self + let response = self .world .tx() .to(TOKEN_HANDLER_ADDRESS) .from(enshrine_address) .typed(TokenHandlerProxy) - .whitelist_enshrine_esdt(enshrine_address); + .whitelist_enshrine_esdt(enshrine_address) + .returns(ReturnsHandledOrError::new()) + .run(); - if let Some(error) = error { - transaction.returns(error).run(); - } else { - transaction.run(); + if let Some(message) = error_message { + match response { + Err(error) => assert_eq!(message, error.message), + _ => {} + } } } @@ -176,11 +179,11 @@ fn test_deploy() { #[test] fn test_whitelist_enshrine_esdt_caller_not_admin() { let mut state = TokenHandlerTestState::new(); - let error = ExpectError(4, "Endpoint can only be called by admins"); + let error_message = "Endpoint can only be called by admins"; state.propose_deploy_token_handler(); state.propose_deploy_factory_sc(); - state.propose_whitelist_caller(TOKEN_HANDLER_ADDRESS, Some(error)); + state.propose_whitelist_caller(TOKEN_HANDLER_ADDRESS, Some(error_message)); } #[test] From c9ba5d4fff36ca671356a66af4c81bee1d424c63 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Fri, 3 Jan 2025 11:55:48 +0200 Subject: [PATCH 18/41] Added `if let` to fix clippy error Signed-off-by: Andrei Baltariu --- token-handler/tests/token_handler_blackbox_tests.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/token-handler/tests/token_handler_blackbox_tests.rs b/token-handler/tests/token_handler_blackbox_tests.rs index cd9b0a5c..36e57561 100644 --- a/token-handler/tests/token_handler_blackbox_tests.rs +++ b/token-handler/tests/token_handler_blackbox_tests.rs @@ -140,9 +140,8 @@ impl TokenHandlerTestState { .run(); if let Some(message) = error_message { - match response { - Err(error) => assert_eq!(message, error.message), - _ => {} + if let Err(error) = response { + assert_eq!(message, error.message) } } } From b11f2fc1ec4e6e4ddd50a8fc2136eb8a850a3e53 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Fri, 3 Jan 2025 12:05:23 +0200 Subject: [PATCH 19/41] Removed first `if let` Signed-off-by: Andrei Baltariu --- token-handler/tests/token_handler_blackbox_tests.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/token-handler/tests/token_handler_blackbox_tests.rs b/token-handler/tests/token_handler_blackbox_tests.rs index 36e57561..d74c5a54 100644 --- a/token-handler/tests/token_handler_blackbox_tests.rs +++ b/token-handler/tests/token_handler_blackbox_tests.rs @@ -139,10 +139,8 @@ impl TokenHandlerTestState { .returns(ReturnsHandledOrError::new()) .run(); - if let Some(message) = error_message { - if let Err(error) = response { - assert_eq!(message, error.message) - } + if let Err(error) = response { + assert_eq!(error_message, Some(error.message.as_str())) } } From 95f0c71c1e770b3d0f98a59a743fc3b24fc62fa1 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Fri, 3 Jan 2025 15:57:31 +0200 Subject: [PATCH 20/41] Updated Sovereign-Forge unit tests to use `ReturnsHandledOrError` Signed-off-by: Andrei Baltariu --- .../tests/sovereign_forge_unit_tests.rs | 40 +++++++++---------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/sovereign-forge/tests/sovereign_forge_unit_tests.rs b/sovereign-forge/tests/sovereign_forge_unit_tests.rs index c6af19e5..0ee5d15e 100644 --- a/sovereign-forge/tests/sovereign_forge_unit_tests.rs +++ b/sovereign-forge/tests/sovereign_forge_unit_tests.rs @@ -1,7 +1,7 @@ use multiversx_sc::types::{BigUint, ManagedBuffer, MultiValueEncoded, TestAddress, TestSCAddress}; use multiversx_sc_scenario::{ - api::StaticApi, imports::MxscPath, ExpectError, ScenarioTxRun, ScenarioTxWhitebox, - ScenarioWorld, + api::StaticApi, imports::MxscPath, ExpectError, ReturnsHandledOrError, ScenarioTxRun, + ScenarioTxWhitebox, ScenarioWorld, }; use proxies::{ chain_config_proxy::ChainConfigContractProxy, @@ -170,24 +170,25 @@ impl SovereignForgeTestState { self } + fn register_token_handler( &mut self, shard_id: u32, token_handler_address: TestSCAddress, - expected_result: Option, + error_message: Option<&str>, ) { - let transaction = self + let response = self .world .tx() .from(OWNER_ADDRESS) .to(FORGE_ADDRESS) .typed(SovereignForgeProxy) - .register_token_handler(shard_id, token_handler_address); + .register_token_handler(shard_id, token_handler_address) + .returns(ReturnsHandledOrError::new()) + .run(); - if let Some(error) = expected_result { - transaction.returns(error).run(); - } else { - transaction.run(); + if let Err(error) = response { + assert_eq!(error_message, Some(error.message.as_str())) } } @@ -270,21 +271,21 @@ impl SovereignForgeTestState { fn deploy_phase_two( &mut self, - expected_result: Option, + error_message: Option<&str>, bls_keys: &MultiValueEncoded>, ) { - let transaction = self + let response = self .world .tx() .from(OWNER_ADDRESS) .to(FORGE_ADDRESS) .typed(SovereignForgeProxy) - .deploy_phase_two(bls_keys); + .deploy_phase_two(bls_keys) + .returns(ReturnsHandledOrError::new()) + .run(); - if let Some(error) = expected_result { - transaction.returns(error).run(); - } else { - transaction.run(); + if let Err(error) = response { + assert_eq!(error_message, Some(error.message.as_str())) } } @@ -500,10 +501,7 @@ fn deploy_phase_two_without_first_phase() { let bls_keys = MultiValueEncoded::>::new(); state.deploy_phase_two( - Some(ExpectError( - 4, - "The current caller has not deployed any Sovereign Chain", - )), + Some("The current caller has not deployed any Sovereign Chain"), &bls_keys, ); } @@ -572,7 +570,7 @@ fn deploy_phase_two_header_already_deployed() { state.deploy_phase_two(None, &bls_keys); state.deploy_phase_two( - Some(ExpectError(4, "The Header-Verifier SC is already deployed")), + Some("The Header-Verifier SC is already deployed"), &bls_keys, ); } From 8a33e4405482fd7934888e6049779e646e117e75 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Fri, 3 Jan 2025 16:01:18 +0200 Subject: [PATCH 21/41] Updated Header-Verifier tests to use `ReturnsHandledOrError` Signed-off-by: Andrei Baltariu --- .../tests/header_verifier_blackbox_test.rs | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/header-verifier/tests/header_verifier_blackbox_test.rs b/header-verifier/tests/header_verifier_blackbox_test.rs index 0a01ac5b..8429e986 100644 --- a/header-verifier/tests/header_verifier_blackbox_test.rs +++ b/header-verifier/tests/header_verifier_blackbox_test.rs @@ -4,9 +4,10 @@ use multiversx_sc::{ api::ManagedTypeApi, types::{BigUint, MultiValueEncoded, TestAddress, TestSCAddress}, }; +use multiversx_sc_scenario::ReturnsHandledOrError; use multiversx_sc_scenario::{ api::StaticApi, imports::MxscPath, multiversx_chain_vm::crypto_functions::sha256, DebugApi, - ExpectError, ScenarioTxRun, ScenarioTxWhitebox, ScenarioWorld, + ScenarioTxRun, ScenarioTxWhitebox, ScenarioWorld, }; use proxies::header_verifier_proxy::HeaderverifierProxy; @@ -98,19 +99,20 @@ impl HeaderVerifierTestState { caller: TestAddress, hash_of_hashes: &ManagedBuffer, operation_hash: &ManagedBuffer, - expected_result: Option>, + error_message: Option<&str>, ) { - let transaction = self + let response = self .world .tx() .from(caller) .to(HEADER_VERIFIER_ADDRESS) .typed(HeaderverifierProxy) - .remove_executed_hash(hash_of_hashes, operation_hash); + .remove_executed_hash(hash_of_hashes, operation_hash) + .returns(ReturnsHandledOrError::new()) + .run(); - match expected_result { - Some(error) => transaction.returns(error).run(), - None => transaction.run(), + if let Err(error) = response { + assert_eq!(error_message, Some(error.message.as_str())) } } @@ -119,19 +121,20 @@ impl HeaderVerifierTestState { caller: TestAddress, hash_of_hashes: &ManagedBuffer, operation_hash: &ManagedBuffer, - expected_result: Option>, + error_message: Option<&str>, ) { - let transaction = self + let response = self .world .tx() .from(caller) .to(HEADER_VERIFIER_ADDRESS) .typed(HeaderverifierProxy) - .lock_operation_hash(hash_of_hashes, operation_hash); + .lock_operation_hash(hash_of_hashes, operation_hash) + .returns(ReturnsHandledOrError::new()) + .run(); - match expected_result { - Some(error) => transaction.returns(error).run(), - None => transaction.run(), + if let Err(error) = response { + assert_eq!(error_message, Some(error.message.as_str())) } } @@ -271,10 +274,7 @@ fn test_remove_executed_hash_caller_not_esdt_address() { OWNER, &operation.bridge_operation_hash, &operation_1, - Some(ExpectError( - 4, - "Only ESDT Safe contract can call this endpoint", - )), + Some("Only ESDT Safe contract can call this endpoint"), ); } @@ -295,7 +295,7 @@ fn test_remove_executed_hash_no_esdt_address_registered() { ENSHRINE_ADDRESS, &operation.bridge_operation_hash, &operation_1, - Some(ExpectError(4, "There is no registered ESDT address")), + Some("There is no registered ESDT address"), ); } @@ -406,7 +406,7 @@ fn test_lock_operation_not_registered() { ENSHRINE_ADDRESS, &operation.bridge_operation_hash, &operation_1, - Some(ExpectError(4, "The current operation is not registered")), + Some("The current operation is not registered"), ); } From 8d6f59602aa0ee4d8ddab944d6e0b9ef20426623 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Fri, 3 Jan 2025 16:04:41 +0200 Subject: [PATCH 22/41] Updated Fee-Market tests to use `ReturnsHandledOrError` Signed-off-by: Andrei Baltariu --- fee-market/tests/fee_market_blackbox_test.rs | 55 +++++++------------- 1 file changed, 20 insertions(+), 35 deletions(-) diff --git a/fee-market/tests/fee_market_blackbox_test.rs b/fee-market/tests/fee_market_blackbox_test.rs index d4766732..79af991e 100644 --- a/fee-market/tests/fee_market_blackbox_test.rs +++ b/fee-market/tests/fee_market_blackbox_test.rs @@ -1,12 +1,13 @@ use multiversx_sc::{ imports::OptionalValue, types::{ - BigUint, EsdtTokenPayment, ManagedVec, MultiValueEncoded, ReturnsResultUnmanaged, - TestAddress, TestSCAddress, TestTokenIdentifier, + BigUint, EsdtTokenPayment, ManagedVec, MultiValueEncoded, TestAddress, TestSCAddress, + TestTokenIdentifier, }, }; use multiversx_sc_scenario::{ - api::StaticApi, imports::MxscPath, ExpectError, ScenarioTxRun, ScenarioWorld, + api::StaticApi, imports::MxscPath, ExpectError, ReturnsHandledOrError, ScenarioTxRun, + ScenarioWorld, }; use proxies::fee_market_proxy::{FeeMarketProxy, FeeStruct, FeeType}; @@ -83,7 +84,7 @@ impl FeeMarketTestState { self } - fn substract_fee(&mut self, payment_wanted: &str, error_status: Option) { + fn substract_fee(&mut self, payment_wanted: &str, error_message: Option<&str>) { let payment: EsdtTokenPayment = match payment_wanted { "Correct" => { EsdtTokenPayment::new(TOKEN_ID.to_token_identifier(), 0u64, BigUint::from(200u64)) @@ -106,29 +107,19 @@ impl FeeMarketTestState { } }; - match error_status { - Some(error) => { - self.world - .tx() - .from(ESDT_SAFE_ADDRESS) - .to(FEE_MARKET_ADDRESS) - .typed(FeeMarketProxy) - .subtract_fee(USER_ADDRESS, 1u8, OptionalValue::Some(30u64)) - .payment(payment) - .returns(error) - .run(); - } - None => { - self.world - .tx() - .from(ESDT_SAFE_ADDRESS) - .to(FEE_MARKET_ADDRESS) - .typed(FeeMarketProxy) - .subtract_fee(USER_ADDRESS, 1u8, OptionalValue::Some(30u64)) - .payment(payment) - .returns(ReturnsResultUnmanaged) - .run(); - } + let response = self + .world + .tx() + .from(ESDT_SAFE_ADDRESS) + .to(FEE_MARKET_ADDRESS) + .typed(FeeMarketProxy) + .subtract_fee(USER_ADDRESS, 1u8, OptionalValue::Some(30u64)) + .payment(payment) + .returns(ReturnsHandledOrError::new()) + .run(); + + if let Err(error) = response { + assert_eq!(error_message, Some(error.message.as_str())) } } @@ -309,10 +300,7 @@ fn test_substract_fee_invalid_payment_token() { state.deploy_fee_market(); - state.substract_fee( - "InvalidToken", - Some(ExpectError(4, "Token not accepted as fee")), - ); + state.substract_fee("InvalidToken", Some("Token not accepted as fee")); state.check_balance_sc(ESDT_SAFE_ADDRESS, 1000); state.check_account(USER_ADDRESS, 1000); @@ -336,10 +324,7 @@ fn test_substract_fixed_fee_payment_not_covered() { state.deploy_fee_market(); - state.substract_fee( - "Less than fee", - Some(ExpectError(4, "Payment does not cover fee")), - ); + state.substract_fee("Less than fee", Some("Payment does not cover fee")); state.check_balance_sc(ESDT_SAFE_ADDRESS, 1000); state.check_account(USER_ADDRESS, 1000); From c19d0b1b7a94ccf87f9c71df55d692f30041d047 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Fri, 3 Jan 2025 16:07:18 +0200 Subject: [PATCH 23/41] Updated Enshrine-Esdt-Safe test to use `ReturnsHandledOrError` Signed-off-by: Andrei Baltariu --- .../tests/enshrine_esdt_safe_blackbox_test.rs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs b/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs index c8a629f0..14d98df3 100644 --- a/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs +++ b/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs @@ -7,7 +7,7 @@ use multiversx_sc::types::{ use multiversx_sc_scenario::api::StaticApi; use multiversx_sc_scenario::multiversx_chain_vm::crypto_functions::sha256; use multiversx_sc_scenario::{imports::MxscPath, ScenarioWorld}; -use multiversx_sc_scenario::{managed_address, ExpectError, ScenarioTxRun}; +use multiversx_sc_scenario::{managed_address, ExpectError, ReturnsHandledOrError, ScenarioTxRun}; use proxies::enshrine_esdt_safe_proxy::EnshrineEsdtSafeProxy; use proxies::fee_market_proxy::{FeeMarketProxy, FeeStruct, FeeType}; use proxies::header_verifier_proxy::HeaderverifierProxy; @@ -225,7 +225,7 @@ impl EnshrineTestState { fn propose_execute_operation( &mut self, - expected_result: Option>, + error_message: Option<&str>, tokens: &Vec, ) { let (tokens, data) = self.setup_payments(tokens); @@ -235,17 +235,18 @@ impl EnshrineTestState { let hash_of_hashes: ManagedBuffer = ManagedBuffer::from(&sha256(&operation_hash.to_vec())); - let transaction = self + let response = self .world .tx() .from(USER_ADDRESS) .to(ENSHRINE_ESDT_ADDRESS) .typed(EnshrineEsdtSafeProxy) - .execute_operations(hash_of_hashes, operation); + .execute_operations(hash_of_hashes, operation) + .returns(ReturnsHandledOrError::new()) + .run(); - match expected_result { - Some(error) => transaction.returns(error).run(), - None => transaction.run(), + if let Err(error) = response { + assert_eq!(error_message, Some(error.message.as_str())) } } @@ -482,7 +483,7 @@ fn test_sovereign_prefix_no_prefix() { state.propose_register_operation(&token_vec); state.propose_register_esdt_in_header_verifier(); state.propose_whitelist_enshrine_esdt(); - state.propose_execute_operation(Some(ExpectError(10, "action is not allowed")), &token_vec); + state.propose_execute_operation(Some("action is not allowed"), &token_vec); } #[test] From e82b422378a64b8779d9aa72bd45c19e1d9d9755 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Fri, 3 Jan 2025 16:09:37 +0200 Subject: [PATCH 24/41] Updated Chain-Factory tests to use `ReturnsHandledOrError` Signed-off-by: Andrei Baltariu --- chain-factory/tests/chain_factory_tests.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/chain-factory/tests/chain_factory_tests.rs b/chain-factory/tests/chain_factory_tests.rs index d2618810..4cd14984 100644 --- a/chain-factory/tests/chain_factory_tests.rs +++ b/chain-factory/tests/chain_factory_tests.rs @@ -4,7 +4,8 @@ use multiversx_sc::types::{ BigUint, CodeMetadata, MultiValueEncoded, TestAddress, TestSCAddress, TokenIdentifier, }; use multiversx_sc_scenario::{ - api::StaticApi, imports::MxscPath, managed_biguint, ExpectError, ScenarioTxRun, ScenarioWorld, + api::StaticApi, imports::MxscPath, managed_biguint, ReturnsHandledOrError, ScenarioTxRun, + ScenarioWorld, }; use proxies::{ chain_config_proxy::ChainConfigContractProxy, chain_factory_proxy::ChainFactoryContractProxy, @@ -88,9 +89,9 @@ impl ChainFactoryTestState { max_validators: usize, min_stake: BigUint, additional_stake_required: MultiValueEncoded>, - expected_result: Option>, + error_message: Option<&str>, ) { - let transaction = self + let response = self .world .tx() .from(CONFIG_ADDRESS) @@ -101,13 +102,12 @@ impl ChainFactoryTestState { max_validators, min_stake, additional_stake_required, - ); + ) + .returns(ReturnsHandledOrError::new()) + .run(); - match expected_result { - Some(error) => { - transaction.returns(error).run(); - } - None => transaction.run(), + if let Err(error) = response { + assert_eq!(error_message, Some(error.message.as_str())) } } } From d03eea5186c1934d7c02b86cb2ed5adb197e0e22 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Fri, 3 Jan 2025 16:12:09 +0200 Subject: [PATCH 25/41] More updates to the Sovereign-Forge tests Signed-off-by: Andrei Baltariu --- .../tests/sovereign_forge_unit_tests.rs | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/sovereign-forge/tests/sovereign_forge_unit_tests.rs b/sovereign-forge/tests/sovereign_forge_unit_tests.rs index 0ee5d15e..e09ea10a 100644 --- a/sovereign-forge/tests/sovereign_forge_unit_tests.rs +++ b/sovereign-forge/tests/sovereign_forge_unit_tests.rs @@ -196,20 +196,20 @@ impl SovereignForgeTestState { &mut self, shard_id: u32, chain_factory_address: TestSCAddress, - expected_result: Option, + error_message: Option<&str>, ) { - let transaction = self + let response = self .world .tx() .from(OWNER_ADDRESS) .to(FORGE_ADDRESS) .typed(SovereignForgeProxy) - .register_chain_factory(shard_id, chain_factory_address); + .register_chain_factory(shard_id, chain_factory_address) + .returns(ReturnsHandledOrError::new()) + .run(); - if let Some(error) = expected_result { - transaction.returns(error).run(); - } else { - transaction.run(); + if let Err(error) = response { + assert_eq!(error_message, Some(error.message.as_str())) } } @@ -246,9 +246,9 @@ impl SovereignForgeTestState { max_validators: u64, min_stake: BigUint, additional_stake_required: MultiValueEncoded>, - expected_result: Option, + error_message: Option<&str>, ) { - let transaction = self + let response = self .world .tx() .from(OWNER_ADDRESS) @@ -260,12 +260,12 @@ impl SovereignForgeTestState { min_stake, additional_stake_required, ) - .egld(payment); + .egld(payment) + .returns(ReturnsHandledOrError::new()) + .run(); - if let Some(error) = expected_result { - transaction.returns(error).run(); - } else { - transaction.run(); + if let Err(error) = response { + assert_eq!(error_message, Some(error.message.as_str())) } } @@ -308,20 +308,20 @@ impl SovereignForgeTestState { fn deploy_phase_four( &mut self, fee: Option>, - expect_error: Option, + error_message: Option<&str>, ) { - let transaction = self + let response = self .world .tx() .from(OWNER_ADDRESS) .to(FORGE_ADDRESS) .typed(SovereignForgeProxy) - .deploy_phase_four(fee); + .deploy_phase_four(fee) + .returns(ReturnsHandledOrError::new()) + .run(); - if let Some(error) = expect_error { - transaction.returns(error).run(); - } else { - transaction.run(); + if let Err(error) = response { + assert_eq!(error_message, Some(error.message.as_str())) } } } From 0f5845d56b1648dd600178d551bede2ab4588998 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Fri, 3 Jan 2025 16:21:24 +0200 Subject: [PATCH 26/41] Updates on Sovereign-Forge tests Signed-off-by: Andrei Baltariu --- .../tests/sovereign_forge_unit_tests.rs | 49 ++++++------------- 1 file changed, 14 insertions(+), 35 deletions(-) diff --git a/sovereign-forge/tests/sovereign_forge_unit_tests.rs b/sovereign-forge/tests/sovereign_forge_unit_tests.rs index e09ea10a..1ebea606 100644 --- a/sovereign-forge/tests/sovereign_forge_unit_tests.rs +++ b/sovereign-forge/tests/sovereign_forge_unit_tests.rs @@ -289,19 +289,19 @@ impl SovereignForgeTestState { } } - fn deploy_phase_three(&mut self, is_sovereign_chain: bool, expect_error: Option) { - let transaction = self + fn deploy_phase_three(&mut self, is_sovereign_chain: bool, error_message: Option<&str>) { + let response = self .world .tx() .from(OWNER_ADDRESS) .to(FORGE_ADDRESS) .typed(SovereignForgeProxy) - .deploy_phase_three(is_sovereign_chain); + .deploy_phase_three(is_sovereign_chain) + .returns(ReturnsHandledOrError::new()) + .run(); - if let Some(error) = expect_error { - transaction.returns(error).run(); - } else { - transaction.run(); + if let Err(error) = response { + assert_eq!(error_message, Some(error.message.as_str())) } } @@ -418,10 +418,7 @@ fn deploy_phase_one_deploy_cost_too_low() { 2, BigUint::from(2u32), MultiValueEncoded::new(), - Some(ExpectError( - 4, - "The given deploy cost is not equal to the standard amount", - )), + Some("The given deploy cost is not equal to the standard amount"), ); } @@ -450,10 +447,7 @@ fn deploy_phase_one_chain_config_already_deployed() { 2, BigUint::from(2u32), MultiValueEncoded::new(), - Some(ExpectError( - 4, - "The Chain-Config contract is already deployed", - )), + Some("The Chain-Config contract is already deployed"), ); } @@ -626,10 +620,7 @@ fn deploy_phase_three_without_phase_one() { state.deploy_phase_three( false, - Some(ExpectError( - 4, - "The Header-Verifier SC is not deployed, you skipped the second phase", - )), + Some("The Header-Verifier SC is not deployed, you skipped the second phase"), ); } @@ -657,10 +648,7 @@ fn deploy_phase_three_without_phase_two() { state.deploy_phase_three( false, - Some(ExpectError( - 4, - "The Header-Verifier SC is not deployed, you skipped the second phase", - )), + Some("The Header-Verifier SC is not deployed, you skipped the second phase"), ); } @@ -692,10 +680,7 @@ fn deploy_phase_three_already_deployed() { state.deploy_phase_two(None, &bls_keys); state.deploy_phase_three(false, None); - state.deploy_phase_three( - false, - Some(ExpectError(4, "The ESDT-Safe SC is already deployed")), - ); + state.deploy_phase_three(false, Some("The ESDT-Safe SC is already deployed")); } #[test] @@ -771,10 +756,7 @@ fn deploy_phase_four_without_previous_phase() { state.deploy_phase_two(None, &bls_keys); state.deploy_phase_four( None, - Some(ExpectError( - 4, - "The ESDT-Safe SC is not deployed, you skipped the third phase", - )), + Some("The ESDT-Safe SC is not deployed, you skipped the third phase"), ); } @@ -808,8 +790,5 @@ fn deploy_phase_four_fee_market_already_deployed() { state.deploy_phase_two(None, &bls_keys); state.deploy_phase_three(false, None); state.deploy_phase_four(None, None); - state.deploy_phase_four( - None, - Some(ExpectError(4, "The Fee-Market SC is already deployed")), - ); + state.deploy_phase_four(None, Some("The Fee-Market SC is already deployed")); } From c690cffa49758e32d0c8a2e32c529703ca00450e Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Fri, 3 Jan 2025 16:38:51 +0200 Subject: [PATCH 27/41] Updated tests Signed-off-by: Andrei Baltariu --- .../tests/enshrine_esdt_safe_blackbox_test.rs | 64 +++++++++---------- fee-market/tests/fee_market_blackbox_test.rs | 63 ++++++------------ .../tests/sovereign_forge_unit_tests.rs | 28 ++++---- 3 files changed, 66 insertions(+), 89 deletions(-) diff --git a/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs b/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs index 14d98df3..73e10f51 100644 --- a/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs +++ b/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs @@ -7,7 +7,7 @@ use multiversx_sc::types::{ use multiversx_sc_scenario::api::StaticApi; use multiversx_sc_scenario::multiversx_chain_vm::crypto_functions::sha256; use multiversx_sc_scenario::{imports::MxscPath, ScenarioWorld}; -use multiversx_sc_scenario::{managed_address, ExpectError, ReturnsHandledOrError, ScenarioTxRun}; +use multiversx_sc_scenario::{managed_address, ReturnsHandledOrError, ScenarioTxRun}; use proxies::enshrine_esdt_safe_proxy::EnshrineEsdtSafeProxy; use proxies::fee_market_proxy::{FeeMarketProxy, FeeStruct, FeeType}; use proxies::header_verifier_proxy::HeaderverifierProxy; @@ -214,10 +214,10 @@ impl EnshrineTestState { fn propose_set_fee( &mut self, fee_struct: Option<&FeeStruct>, - expected_result: Option>, + error_message: Option<&str>, ) -> &mut Self { if let Some(fee) = fee_struct { - self.propose_add_fee_token(fee, expected_result); + self.propose_add_fee_token(fee, error_message); } self @@ -303,7 +303,7 @@ impl EnshrineTestState { sender: &TestAddress, fee_payment: EsdtTokenPayment, tokens_to_register: Vec, - expected_result: Option>, + error_message: Option<&str>, ) { let mut managed_token_ids: MultiValueEncoded> = MultiValueEncoded::new(); @@ -312,18 +312,19 @@ impl EnshrineTestState { managed_token_ids.push(TokenIdentifier::from(token_id)) } - let transaction = self + let response = self .world .tx() .from(*sender) .to(ENSHRINE_ESDT_ADDRESS) .typed(EnshrineEsdtSafeProxy) .register_new_token_id(managed_token_ids) - .esdt(fee_payment); + .esdt(fee_payment) + .returns(ReturnsHandledOrError::new()) + .run(); - match expected_result { - Some(error) => transaction.returns(error).run(), - None => transaction.run(), + if let Err(error) = response { + assert_eq!(error_message, Some(error.message.as_str())) } } @@ -333,39 +334,41 @@ impl EnshrineTestState { to: TestAddress, payment: PaymentsVec, deposit_args: OptionalTransferData, - expected_result: Option>, + error_message: Option<&str>, ) { - let transaction = self + let response = self .world .tx() .from(from) .to(ENSHRINE_ESDT_ADDRESS) .typed(EnshrineEsdtSafeProxy) .deposit(to, deposit_args) - .payment(payment); + .payment(payment) + .returns(ReturnsHandledOrError::new()) + .run(); - match expected_result { - Some(error) => transaction.returns(error).run(), - None => transaction.run(), + if let Err(error) = response { + assert_eq!(error_message, Some(error.message.as_str())) } } fn propose_add_fee_token( &mut self, fee_struct: &FeeStruct, - expected_result: Option>, + error_message: Option<&str>, ) { - let transaction = self + let response = self .world .tx() .from(ENSHRINE_ESDT_OWNER_ADDRESS) .to(FEE_MARKET_ADDRESS) .typed(FeeMarketProxy) - .set_fee(fee_struct); + .set_fee(fee_struct) + .returns(ReturnsHandledOrError::new()) + .run(); - match expected_result { - Some(error) => transaction.returns(error).run(), - None => transaction.run(), + if let Err(error) = response { + assert_eq!(error_message, Some(error.message.as_str())) } } @@ -510,7 +513,7 @@ fn test_register_tokens_insufficient_funds() { &USER_ADDRESS, payment, token_vec, - Some(ExpectError(10, "insufficient funds")), + Some("insufficient funds"), ); } @@ -526,10 +529,7 @@ fn test_register_tokens_wrong_token_as_fee() { &ENSHRINE_ESDT_OWNER_ADDRESS, payment, token_vec, - Some(ExpectError( - 4, - "WEGLD is the only token accepted as register fee", - )), + Some("WEGLD is the only token accepted as register fee"), ); } @@ -565,7 +565,7 @@ fn test_register_tokens_insufficient_wegld() { &ENSHRINE_ESDT_OWNER_ADDRESS, payment, token_vec, - Some(ExpectError(4, "WEGLD fee amount is not met")), + Some("WEGLD fee amount is not met"), ); } @@ -613,7 +613,7 @@ fn test_deposit_token_nothing_to_transfer_fee_enabled() { USER_ADDRESS, payments, OptionalValue::None, - Some(ExpectError(4, "Nothing to transfer")), + Some("Nothing to transfer"), ); } @@ -631,7 +631,7 @@ fn test_deposit_max_transfers_exceeded() { USER_ADDRESS, payments, OptionalValue::None, - Some(ExpectError(4, "Too many tokens")), + Some("Too many tokens"), ); } @@ -714,7 +714,7 @@ fn test_deposit_with_transfer_data_gas_limit_too_high() { USER_ADDRESS, payments, transfer_data, - Some(ExpectError(4, "Gas limit too high")), + Some("Gas limit too high"), ); } @@ -744,7 +744,7 @@ fn test_deposit_with_transfer_data_banned_endpoint() { USER_ADDRESS, payments, transfer_data, - Some(ExpectError(4, "Banned endpoint name")), + Some("Banned endpoint name"), ); } @@ -848,7 +848,7 @@ fn test_deposit_with_transfer_data_not_enough_for_fee() { USER_ADDRESS, payments, transfer_data, - Some(ExpectError(4, "Payment does not cover fee")), + Some("Payment does not cover fee"), ); } diff --git a/fee-market/tests/fee_market_blackbox_test.rs b/fee-market/tests/fee_market_blackbox_test.rs index 79af991e..52cd6155 100644 --- a/fee-market/tests/fee_market_blackbox_test.rs +++ b/fee-market/tests/fee_market_blackbox_test.rs @@ -6,8 +6,7 @@ use multiversx_sc::{ }, }; use multiversx_sc_scenario::{ - api::StaticApi, imports::MxscPath, ExpectError, ReturnsHandledOrError, ScenarioTxRun, - ScenarioWorld, + api::StaticApi, imports::MxscPath, ReturnsHandledOrError, ScenarioTxRun, ScenarioWorld, }; use proxies::fee_market_proxy::{FeeMarketProxy, FeeStruct, FeeType}; @@ -137,7 +136,7 @@ impl FeeMarketTestState { &mut self, token_id: TestTokenIdentifier, fee_type: &str, - error_status: Option, + error_message: Option<&str>, ) { let fee_struct: FeeStruct = match fee_type { "None" => { @@ -185,26 +184,18 @@ impl FeeMarketTestState { } }; - match error_status { - Some(error) => { - self.world - .tx() - .from(OWNER_ADDRESS) - .to(FEE_MARKET_ADDRESS) - .typed(FeeMarketProxy) - .set_fee(fee_struct) - .returns(error) - .run(); - } - None => { - self.world - .tx() - .from(OWNER_ADDRESS) - .to(FEE_MARKET_ADDRESS) - .typed(FeeMarketProxy) - .set_fee(fee_struct) - .run(); - } + let response = self + .world + .tx() + .from(OWNER_ADDRESS) + .to(FEE_MARKET_ADDRESS) + .typed(FeeMarketProxy) + .set_fee(fee_struct) + .returns(ReturnsHandledOrError::new()) + .run(); + + if let Err(error) = response { + assert_eq!(error_message, Some(error.message.as_str())) } } @@ -247,25 +238,13 @@ fn test_add_fee_wrong_params() { state.deploy_fee_market(); - state.add_fee( - WRONG_TOKEN_ID, - "Fixed", - Some(ExpectError(4, "Invalid token ID")), - ); - - state.add_fee(TOKEN_ID, "None", Some(ExpectError(4, "Invalid fee type"))); - - state.add_fee( - DIFFERENT_TOKEN_ID, - "Fixed", - Some(ExpectError(4, "Invalid fee")), - ); - - state.add_fee( - TOKEN_ID, - "AnyTokenWrong", - Some(ExpectError(4, "Invalid token ID")), - ); + state.add_fee(WRONG_TOKEN_ID, "Fixed", Some("Invalid token ID")); + + state.add_fee(TOKEN_ID, "None", Some("Invalid fee type")); + + state.add_fee(DIFFERENT_TOKEN_ID, "Fixed", Some("Invalid fee")); + + state.add_fee(TOKEN_ID, "AnyTokenWrong", Some("Invalid token ID")); } #[test] diff --git a/sovereign-forge/tests/sovereign_forge_unit_tests.rs b/sovereign-forge/tests/sovereign_forge_unit_tests.rs index 1ebea606..71d871a8 100644 --- a/sovereign-forge/tests/sovereign_forge_unit_tests.rs +++ b/sovereign-forge/tests/sovereign_forge_unit_tests.rs @@ -1,7 +1,7 @@ use multiversx_sc::types::{BigUint, ManagedBuffer, MultiValueEncoded, TestAddress, TestSCAddress}; use multiversx_sc_scenario::{ - api::StaticApi, imports::MxscPath, ExpectError, ReturnsHandledOrError, ScenarioTxRun, - ScenarioTxWhitebox, ScenarioWorld, + api::StaticApi, imports::MxscPath, ReturnsHandledOrError, ScenarioTxRun, ScenarioTxWhitebox, + ScenarioWorld, }; use proxies::{ chain_config_proxy::ChainConfigContractProxy, @@ -213,19 +213,19 @@ impl SovereignForgeTestState { } } - fn complete_setup_phase(&mut self, expected_result: Option) { - let transaction = self + fn complete_setup_phase(&mut self, error_message: Option<&str>) { + let response = self .world .tx() .from(OWNER_ADDRESS) .to(FORGE_ADDRESS) .typed(SovereignForgeProxy) - .complete_setup_phase(); + .complete_setup_phase() + .returns(ReturnsHandledOrError::new()) + .run(); - if let Some(error) = expected_result { - transaction.returns(error).run(); - } else { - transaction.run(); + if let Err(error) = response { + assert_eq!(error_message, Some(error.message.as_str())) } } @@ -370,10 +370,9 @@ fn complete_setup_phase_no_chain_config_registered() { let mut state = SovereignForgeTestState::new(); state.deploy_sovereign_forge(); - state.complete_setup_phase(Some(ExpectError( - 4, + state.complete_setup_phase(Some( "There is no Chain-Factory contract assigned for shard 1", - ))); + )); } #[test] @@ -382,10 +381,9 @@ fn complete_setup_phase_no_token_handler_registered() { state.deploy_sovereign_forge(); state.register_chain_factory(1, FACTORY_ADDRESS, None); - state.complete_setup_phase(Some(ExpectError( - 4, + state.complete_setup_phase(Some( "There is no Token-Handler contract assigned for shard 1", - ))); + )); } #[test] From 4f78befc48fb6a444f92994627e53bd9920c0558 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Wed, 8 Jan 2025 10:50:16 +0200 Subject: [PATCH 28/41] Updated Cargo.lock files Signed-off-by: Andrei Baltariu --- Cargo.lock | 1 - enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/Cargo.lock | 3 +-- enshrine-esdt-safe/wasm-enshrine-esdt-safe-view/Cargo.lock | 3 +-- enshrine-esdt-safe/wasm/Cargo.lock | 3 +-- esdt-safe/wasm-esdt-safe-full/Cargo.lock | 1 - esdt-safe/wasm-esdt-safe-view/Cargo.lock | 1 - esdt-safe/wasm/Cargo.lock | 1 - fee-market/wasm-fee-market-view/Cargo.lock | 1 - fee-market/wasm-fee-market/Cargo.lock | 1 - fee-market/wasm/Cargo.lock | 1 - sovereign-forge/wasm-sovereign-forge-full/Cargo.lock | 1 - sovereign-forge/wasm-soveriegn-forge-view/Cargo.lock | 1 - sovereign-forge/wasm/Cargo.lock | 1 - token-handler/wasm-token-handler-full/Cargo.lock | 2 +- token-handler/wasm-token-handler-view/Cargo.lock | 2 +- token-handler/wasm/Cargo.lock | 2 +- 16 files changed, 6 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 27963216..6930ade6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -643,7 +643,6 @@ dependencies = [ "operation", "proxies", "setup-phase", - "transaction", "utils", ] diff --git a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/Cargo.lock b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/Cargo.lock index 446549ae..46e96fad 100644 --- a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/Cargo.lock +++ b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/Cargo.lock @@ -82,7 +82,6 @@ dependencies = [ "operation", "proxies", "setup-phase", - "transaction", "utils", ] @@ -286,8 +285,8 @@ version = "0.0.0" dependencies = [ "chain-factory", "multiversx-sc", - "operation", "multiversx-sc-modules", + "operation", "proxies", ] diff --git a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-view/Cargo.lock b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-view/Cargo.lock index 37c6da81..3aed28de 100644 --- a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-view/Cargo.lock +++ b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-view/Cargo.lock @@ -82,7 +82,6 @@ dependencies = [ "operation", "proxies", "setup-phase", - "transaction", "utils", ] @@ -286,8 +285,8 @@ version = "0.0.0" dependencies = [ "chain-factory", "multiversx-sc", - "operation", "multiversx-sc-modules", + "operation", "proxies", ] diff --git a/enshrine-esdt-safe/wasm/Cargo.lock b/enshrine-esdt-safe/wasm/Cargo.lock index de85e6ab..7fbe49fc 100644 --- a/enshrine-esdt-safe/wasm/Cargo.lock +++ b/enshrine-esdt-safe/wasm/Cargo.lock @@ -82,7 +82,6 @@ dependencies = [ "operation", "proxies", "setup-phase", - "transaction", "utils", ] @@ -286,8 +285,8 @@ version = "0.0.0" dependencies = [ "chain-factory", "multiversx-sc", - "operation", "multiversx-sc-modules", + "operation", "proxies", ] diff --git a/esdt-safe/wasm-esdt-safe-full/Cargo.lock b/esdt-safe/wasm-esdt-safe-full/Cargo.lock index 2fb892b6..fa5e4fae 100644 --- a/esdt-safe/wasm-esdt-safe-full/Cargo.lock +++ b/esdt-safe/wasm-esdt-safe-full/Cargo.lock @@ -59,7 +59,6 @@ dependencies = [ "operation", "proxies", "setup-phase", - "transaction", "utils", ] diff --git a/esdt-safe/wasm-esdt-safe-view/Cargo.lock b/esdt-safe/wasm-esdt-safe-view/Cargo.lock index 792f635e..083dbcaa 100644 --- a/esdt-safe/wasm-esdt-safe-view/Cargo.lock +++ b/esdt-safe/wasm-esdt-safe-view/Cargo.lock @@ -59,7 +59,6 @@ dependencies = [ "operation", "proxies", "setup-phase", - "transaction", "utils", ] diff --git a/esdt-safe/wasm/Cargo.lock b/esdt-safe/wasm/Cargo.lock index f951d05d..3fd73e2b 100644 --- a/esdt-safe/wasm/Cargo.lock +++ b/esdt-safe/wasm/Cargo.lock @@ -59,7 +59,6 @@ dependencies = [ "operation", "proxies", "setup-phase", - "transaction", "utils", ] diff --git a/fee-market/wasm-fee-market-view/Cargo.lock b/fee-market/wasm-fee-market-view/Cargo.lock index 50cbc8a9..ae20d54b 100644 --- a/fee-market/wasm-fee-market-view/Cargo.lock +++ b/fee-market/wasm-fee-market-view/Cargo.lock @@ -34,7 +34,6 @@ dependencies = [ "operation", "proxies", "setup-phase", - "transaction", "utils", ] diff --git a/fee-market/wasm-fee-market/Cargo.lock b/fee-market/wasm-fee-market/Cargo.lock index f596270a..6b0ecadb 100644 --- a/fee-market/wasm-fee-market/Cargo.lock +++ b/fee-market/wasm-fee-market/Cargo.lock @@ -34,7 +34,6 @@ dependencies = [ "operation", "proxies", "setup-phase", - "transaction", "utils", ] diff --git a/fee-market/wasm/Cargo.lock b/fee-market/wasm/Cargo.lock index f596270a..6b0ecadb 100644 --- a/fee-market/wasm/Cargo.lock +++ b/fee-market/wasm/Cargo.lock @@ -34,7 +34,6 @@ dependencies = [ "operation", "proxies", "setup-phase", - "transaction", "utils", ] diff --git a/sovereign-forge/wasm-sovereign-forge-full/Cargo.lock b/sovereign-forge/wasm-sovereign-forge-full/Cargo.lock index f9dda96a..de35174c 100644 --- a/sovereign-forge/wasm-sovereign-forge-full/Cargo.lock +++ b/sovereign-forge/wasm-sovereign-forge-full/Cargo.lock @@ -73,7 +73,6 @@ dependencies = [ "operation", "proxies", "setup-phase", - "transaction", "utils", ] diff --git a/sovereign-forge/wasm-soveriegn-forge-view/Cargo.lock b/sovereign-forge/wasm-soveriegn-forge-view/Cargo.lock index b68e5abb..f1997c65 100644 --- a/sovereign-forge/wasm-soveriegn-forge-view/Cargo.lock +++ b/sovereign-forge/wasm-soveriegn-forge-view/Cargo.lock @@ -73,7 +73,6 @@ dependencies = [ "operation", "proxies", "setup-phase", - "transaction", "utils", ] diff --git a/sovereign-forge/wasm/Cargo.lock b/sovereign-forge/wasm/Cargo.lock index 22518a2d..b8c27dad 100644 --- a/sovereign-forge/wasm/Cargo.lock +++ b/sovereign-forge/wasm/Cargo.lock @@ -73,7 +73,6 @@ dependencies = [ "operation", "proxies", "setup-phase", - "transaction", "utils", ] diff --git a/token-handler/wasm-token-handler-full/Cargo.lock b/token-handler/wasm-token-handler-full/Cargo.lock index 81622042..92d9b364 100644 --- a/token-handler/wasm-token-handler-full/Cargo.lock +++ b/token-handler/wasm-token-handler-full/Cargo.lock @@ -231,8 +231,8 @@ version = "0.0.0" dependencies = [ "chain-factory", "multiversx-sc", - "operation", "multiversx-sc-modules", + "operation", "proxies", ] diff --git a/token-handler/wasm-token-handler-view/Cargo.lock b/token-handler/wasm-token-handler-view/Cargo.lock index 7d34d183..7b7ef58a 100644 --- a/token-handler/wasm-token-handler-view/Cargo.lock +++ b/token-handler/wasm-token-handler-view/Cargo.lock @@ -231,8 +231,8 @@ version = "0.0.0" dependencies = [ "chain-factory", "multiversx-sc", - "operation", "multiversx-sc-modules", + "operation", "proxies", ] diff --git a/token-handler/wasm/Cargo.lock b/token-handler/wasm/Cargo.lock index 3b3a7617..fc343720 100644 --- a/token-handler/wasm/Cargo.lock +++ b/token-handler/wasm/Cargo.lock @@ -231,8 +231,8 @@ version = "0.0.0" dependencies = [ "chain-factory", "multiversx-sc", - "operation", "multiversx-sc-modules", + "operation", "proxies", ] From 031e527cf2f30f31b770c0a2bc9ad375c3ae1e58 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Wed, 8 Jan 2025 11:25:20 +0200 Subject: [PATCH 29/41] Fixed merging errors Signed-off-by: Andrei Baltariu --- chain-factory/src/factory.rs | 2 +- common/proxies/src/chain_factory_proxy.rs | 2 +- common/proxies/src/enshrine_esdt_safe_proxy.rs | 4 ++-- enshrine-esdt-safe/src/common/storage.rs | 2 +- enshrine-esdt-safe/src/lib.rs | 2 +- enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/chain-factory/src/factory.rs b/chain-factory/src/factory.rs index 8b5749ea..44fee781 100644 --- a/chain-factory/src/factory.rs +++ b/chain-factory/src/factory.rs @@ -1,5 +1,6 @@ use multiversx_sc::imports::*; use multiversx_sc_modules::only_admin; +use operation::{aliases::StakeMultiArg, BridgeConfig}; use proxies::{ chain_config_proxy::ChainConfigContractProxy, enshrine_esdt_safe_proxy::EnshrineEsdtSafeProxy, @@ -7,7 +8,6 @@ use proxies::{ fee_market_proxy::{FeeMarketProxy, FeeStruct}, header_verifier_proxy::HeaderverifierProxy, }; -use transaction::{BridgeConfig, StakeMultiArg}; multiversx_sc::derive_imports!(); #[multiversx_sc::module] diff --git a/common/proxies/src/chain_factory_proxy.rs b/common/proxies/src/chain_factory_proxy.rs index 34d2af89..8a8bec30 100644 --- a/common/proxies/src/chain_factory_proxy.rs +++ b/common/proxies/src/chain_factory_proxy.rs @@ -137,7 +137,7 @@ where Arg1: ProxyArg>, Arg2: ProxyArg>, Arg3: ProxyArg>, - Arg4: ProxyArg>, + Arg4: ProxyArg>, >( self, is_sovereign_chain: Arg0, diff --git a/common/proxies/src/enshrine_esdt_safe_proxy.rs b/common/proxies/src/enshrine_esdt_safe_proxy.rs index 73c36852..9eb422e4 100644 --- a/common/proxies/src/enshrine_esdt_safe_proxy.rs +++ b/common/proxies/src/enshrine_esdt_safe_proxy.rs @@ -48,7 +48,7 @@ where Arg1: ProxyArg>, Arg2: ProxyArg>>, Arg3: ProxyArg>>, - Arg4: ProxyArg>, + Arg4: ProxyArg>, >( self, is_sovereign_chain: Arg0, @@ -98,7 +98,7 @@ where Gas: TxGas, { pub fn update_configuration< - Arg0: ProxyArg>, + Arg0: ProxyArg>, >( self, new_config: Arg0, diff --git a/enshrine-esdt-safe/src/common/storage.rs b/enshrine-esdt-safe/src/common/storage.rs index 62610db8..eef252b9 100644 --- a/enshrine-esdt-safe/src/common/storage.rs +++ b/enshrine-esdt-safe/src/common/storage.rs @@ -1,5 +1,5 @@ use multiversx_sc::imports::*; -use transaction::{BridgeConfig, GasLimit}; +use operation::{aliases::GasLimit, BridgeConfig}; #[multiversx_sc::module] pub trait CommonStorage { diff --git a/enshrine-esdt-safe/src/lib.rs b/enshrine-esdt-safe/src/lib.rs index 0249c21f..eb41c5af 100644 --- a/enshrine-esdt-safe/src/lib.rs +++ b/enshrine-esdt-safe/src/lib.rs @@ -1,7 +1,7 @@ #![no_std] use multiversx_sc::imports::*; -use transaction::{BridgeConfig, GasLimit}; +use operation::{aliases::GasLimit, BridgeConfig}; pub mod common; pub mod from_sovereign; diff --git a/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs b/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs index 8c448e9d..58d87775 100644 --- a/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs +++ b/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs @@ -8,12 +8,12 @@ use multiversx_sc_scenario::api::StaticApi; use multiversx_sc_scenario::multiversx_chain_vm::crypto_functions::sha256; use multiversx_sc_scenario::{imports::MxscPath, ScenarioWorld}; use multiversx_sc_scenario::{managed_address, ReturnsHandledOrError, ScenarioTxRun}; +use operation::aliases::{GasLimit, OptionalTransferData, PaymentsVec}; +use operation::{BridgeConfig, Operation, OperationData, OperationEsdtPayment}; use proxies::enshrine_esdt_safe_proxy::EnshrineEsdtSafeProxy; use proxies::fee_market_proxy::{FeeMarketProxy, FeeStruct, FeeType}; use proxies::header_verifier_proxy::HeaderverifierProxy; use proxies::token_handler_proxy::TokenHandlerProxy; -use transaction::{BridgeConfig, GasLimit, Operation, OperationData, OperationEsdtPayment}; -use utils::PaymentsVec; const ENSHRINE_ESDT_ADDRESS: TestSCAddress = TestSCAddress::new("enshrine-esdt"); const ENSHRINE_ESDT_CODE_PATH: MxscPath = MxscPath::new("output/enshrine-esdt-safe.mxsc-json"); From 3b50e98ada4bf9cd85de1da425f75102c7a440c2 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Wed, 8 Jan 2025 11:28:21 +0200 Subject: [PATCH 30/41] Renamed function and added constant for max tx gas limit Signed-off-by: Andrei Baltariu --- common/operation/src/lib.rs | 5 +++-- .../src/enshrine_esdt_safe_interactor.rs | 4 ++-- .../tests/enshrine-esdt-safe_interactor_tests.rs | 14 +++++++------- .../tests/enshrine_esdt_safe_blackbox_test.rs | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/common/operation/src/lib.rs b/common/operation/src/lib.rs index e17c913a..87bbc9a3 100644 --- a/common/operation/src/lib.rs +++ b/common/operation/src/lib.rs @@ -9,6 +9,7 @@ pub mod aliases; // revert protection pub const MIN_BLOCKS_FOR_FINALITY: u64 = 10; +const DEFAULT_MAX_TX_GAS_LIMIT: u64 = 300_000_000; #[type_abi] #[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, ManagedVecItem, Clone)] @@ -21,11 +22,11 @@ pub struct BridgeConfig { impl BridgeConfig { #[inline] - pub fn empty_config() -> Self { + pub fn default_config() -> Self { BridgeConfig { token_whitelist: ManagedVec::new(), token_blacklist: ManagedVec::new(), - max_tx_gas_limit: 0, + max_tx_gas_limit: DEFAULT_MAX_TX_GAS_LIMIT, banned_endpoints: ManagedVec::new(), } } diff --git a/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs b/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs index 477861a8..e31a694b 100644 --- a/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs +++ b/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs @@ -7,8 +7,8 @@ use interactor::constants::{TOKEN_ID, WHITELIST_TOKEN_ID}; use interactor::interactor_config::Config; use interactor::interactor_state::State; use multiversx_sc_snippets::imports::*; -use proxies::*; use operation::*; +use proxies::*; const FEE_MARKET_CODE_PATH: &str = "../fee-market/output/fee-market.mxsc.json"; const HEADER_VERIFIER_CODE_PATH: &str = "../header-verifier/output/header-verifier.mxsc.json"; @@ -25,7 +25,7 @@ pub async fn enshrine_esdt_safe_cli() { let config = Config::load_config(); let mut interact = ContractInteract::new(config).await; match cmd.as_str() { - "deploy" => interact.deploy(false, BridgeConfig::empty_config()).await, + "deploy" => interact.deploy(false, BridgeConfig::default_config()).await, "upgrade" => interact.upgrade().await, "setFeeMarketAddress" => interact.set_fee_market_address().await, "setHeaderVerifierAddress" => interact.set_header_verifier_address().await, diff --git a/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs b/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs index fc506adc..d50a05b0 100644 --- a/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs +++ b/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs @@ -5,8 +5,8 @@ use enshrine_esdt_safe_interactor::ContractInteract; use interactor::constants::{TOKEN_ID, WHITELIST_TOKEN_ID}; use interactor::interactor_config::Config; use multiversx_sc_snippets::imports::*; -use proxies::*; use operation::*; +use proxies::*; type OptionalTransferData = OptionalValue, ManagedVec>>>; @@ -16,7 +16,7 @@ type OptionalTransferData = async fn test_deposit_paused() { let mut interact = ContractInteract::new(Config::load_config()).await; interact.deploy_token_handler().await; - interact.deploy(false, BridgeConfig::empty_config()).await; + interact.deploy(false, BridgeConfig::default_config()).await; interact .deposit( OptionalTransferData::None, @@ -34,7 +34,7 @@ async fn test_deposit_no_payment() { let to_contract = interact.state.esdt_safe_address().clone(); let transfer_data = OptionalTransferData::None; - interact.deploy_setup(BridgeConfig::empty_config()).await; + interact.deploy_setup(BridgeConfig::default_config()).await; interact .interactor @@ -64,7 +64,7 @@ async fn test_deposit_too_many_payments() { ); let payments = ManagedVec::from(vec![payment; 11]); - interact.deploy_setup(BridgeConfig::empty_config()).await; + interact.deploy_setup(BridgeConfig::default_config()).await; interact .interactor @@ -84,7 +84,7 @@ async fn test_deposit_too_many_payments() { #[ignore] async fn test_deposit_not_whitelisted() { let mut interact = ContractInteract::new(Config::load_config()).await; - interact.deploy_setup(BridgeConfig::empty_config()).await; + interact.deploy_setup(BridgeConfig::default_config()).await; interact.deploy_fee_market().await; interact.add_tokens_to_whitelist(WHITELIST_TOKEN_ID).await; interact.set_fee_market_address().await; @@ -95,7 +95,7 @@ async fn test_deposit_not_whitelisted() { #[ignore] async fn test_deposit_happy_path() { let mut interact = ContractInteract::new(Config::load_config()).await; - interact.deploy_setup(BridgeConfig::empty_config()).await; + interact.deploy_setup(BridgeConfig::default_config()).await; interact.deploy_fee_market().await; interact.add_tokens_to_whitelist(TOKEN_ID).await; interact.set_fee_market_address().await; @@ -120,7 +120,7 @@ async fn test_deposit_sov_chain() { BigUint::from(30u64), )); interact - .deploy_all(true, BridgeConfig::empty_config()) + .deploy_all(true, BridgeConfig::default_config()) .await; interact.add_tokens_to_whitelist(TOKEN_ID).await; interact.set_fee_market_address().await; diff --git a/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs b/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs index 58d87775..ad7991e2 100644 --- a/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs +++ b/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs @@ -199,7 +199,7 @@ impl EnshrineTestState { is_sovereign_chain, Some(TokenIdentifier::from(WEGLD_IDENTIFIER)), Some(SOVEREIGN_TOKEN_PREFIX.into()), - BridgeConfig::empty_config(), + BridgeConfig::default_config(), ); self.deploy_header_verifier_contract(); self.deploy_token_handler_contract(); From c9295e6caf00e8ae5e72927ac8b3eb9c0413ab25 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Wed, 8 Jan 2025 11:33:31 +0200 Subject: [PATCH 31/41] Added optional value for `BridgeConfig` in `init` Signed-off-by: Andrei Baltariu --- enshrine-esdt-safe/src/lib.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/enshrine-esdt-safe/src/lib.rs b/enshrine-esdt-safe/src/lib.rs index eb41c5af..e36ade0b 100644 --- a/enshrine-esdt-safe/src/lib.rs +++ b/enshrine-esdt-safe/src/lib.rs @@ -29,7 +29,7 @@ pub trait EnshrineEsdtSafe: token_handler_address: ManagedAddress, opt_wegld_identifier: Option, opt_sov_token_prefix: Option, - config: BridgeConfig, + opt_config: Option>, ) { self.is_sovereign_chain().set(is_sovereign_chain); self.set_paused(true); @@ -60,7 +60,8 @@ pub trait EnshrineEsdtSafe: let caller = self.blockchain().get_caller(); self.initiator_address().set(caller); - self.config().set(config); + self.config() + .set(opt_config.unwrap_or_else(|| BridgeConfig::default_config())); } #[only_owner] From 7a305f26b9d8decbb6ea98df11122b0f420a7b67 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Wed, 8 Jan 2025 11:34:26 +0200 Subject: [PATCH 32/41] Removed `require` inside `update_configuration` endpoint Signed-off-by: Andrei Baltariu --- enshrine-esdt-safe/src/lib.rs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/enshrine-esdt-safe/src/lib.rs b/enshrine-esdt-safe/src/lib.rs index e36ade0b..ff223ddb 100644 --- a/enshrine-esdt-safe/src/lib.rs +++ b/enshrine-esdt-safe/src/lib.rs @@ -67,13 +67,7 @@ pub trait EnshrineEsdtSafe: #[only_owner] #[endpoint(updateConfiguration)] fn update_configuration(&self, new_config: BridgeConfig) { - let config_mapper = self.config(); - require!( - !config_mapper.is_empty(), - "There is no configuration set in this contract" - ); - - config_mapper.set(new_config); + self.config().set(new_config); } #[only_owner] From 2c993d2c240f849fad0025724f02737382cd3f7e Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Wed, 8 Jan 2025 11:35:23 +0200 Subject: [PATCH 33/41] Removed unused storage mappers Signed-off-by: Andrei Baltariu --- enshrine-esdt-safe/src/common/storage.rs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/enshrine-esdt-safe/src/common/storage.rs b/enshrine-esdt-safe/src/common/storage.rs index eef252b9..bf031ce7 100644 --- a/enshrine-esdt-safe/src/common/storage.rs +++ b/enshrine-esdt-safe/src/common/storage.rs @@ -1,5 +1,5 @@ use multiversx_sc::imports::*; -use operation::{aliases::GasLimit, BridgeConfig}; +use operation::BridgeConfig; #[multiversx_sc::module] pub trait CommonStorage { @@ -18,12 +18,6 @@ pub trait CommonStorage { #[storage_mapper("feeMarketAddress")] fn fee_market_address(&self) -> SingleValueMapper; - #[storage_mapper("maxUserTxGasLimit")] - fn max_user_tx_gas_limit(&self) -> SingleValueMapper; - - #[storage_mapper("bannedEndpointNames")] - fn banned_endpoint_names(&self) -> UnorderedSetMapper; - #[storage_mapper("config")] fn config(&self) -> SingleValueMapper>; From 92248f2635abf65fcde3e4ae2383eadb7bf80f03 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Wed, 8 Jan 2025 11:42:49 +0200 Subject: [PATCH 34/41] Removed uses of old mappers Signed-off-by: Andrei Baltariu --- enshrine-esdt-safe/src/lib.rs | 14 +------------- enshrine-esdt-safe/src/to_sovereign/create_tx.rs | 8 ++++---- .../wasm-enshrine-esdt-safe-full/src/lib.rs | 6 ++---- enshrine-esdt-safe/wasm/src/lib.rs | 6 ++---- 4 files changed, 9 insertions(+), 25 deletions(-) diff --git a/enshrine-esdt-safe/src/lib.rs b/enshrine-esdt-safe/src/lib.rs index ff223ddb..1d1ee725 100644 --- a/enshrine-esdt-safe/src/lib.rs +++ b/enshrine-esdt-safe/src/lib.rs @@ -1,7 +1,7 @@ #![no_std] use multiversx_sc::imports::*; -use operation::{aliases::GasLimit, BridgeConfig}; +use operation::BridgeConfig; pub mod common; pub mod from_sovereign; @@ -86,18 +86,6 @@ pub trait EnshrineEsdtSafe: self.header_verifier_address().set(&header_verifier_address); } - #[only_owner] - #[endpoint(setMaxTxGasLimit)] - fn set_max_user_tx_gas_limit(&self, max_user_tx_gas_limit: GasLimit) { - self.max_user_tx_gas_limit().set(max_user_tx_gas_limit); - } - - #[only_owner] - #[endpoint(setBannedEndpoint)] - fn set_banned_endpoint(&self, endpoint_name: ManagedBuffer) { - self.banned_endpoint_names().insert(endpoint_name); - } - #[upgrade] fn upgrade(&self) {} } diff --git a/enshrine-esdt-safe/src/to_sovereign/create_tx.rs b/enshrine-esdt-safe/src/to_sovereign/create_tx.rs index c99069c7..d26a3693 100644 --- a/enshrine-esdt-safe/src/to_sovereign/create_tx.rs +++ b/enshrine-esdt-safe/src/to_sovereign/create_tx.rs @@ -1,9 +1,9 @@ use crate::common; -use proxies::fee_market_proxy::FeeMarketProxy; use operation::{ aliases::{GasLimit, OptionalValueTransferDataTuple}, EventPayment, OperationData, TransferData, }; +use proxies::fee_market_proxy::FeeMarketProxy; use multiversx_sc::imports::*; @@ -164,13 +164,13 @@ pub trait CreateTxModule: } fn require_gas_limit_under_limit(&self, gas_limit: GasLimit) { - let max_gas_limit = self.max_user_tx_gas_limit().get(); - require!(gas_limit <= max_gas_limit, "Gas limit too high"); + let config = self.config().get(); + require!(gas_limit <= config.max_tx_gas_limit, "Gas limit too high"); } fn require_endpoint_not_banned(&self, function: &ManagedBuffer) { require!( - !self.banned_endpoint_names().contains(function), + !self.config().get().banned_endpoints.contains(function), "Banned endpoint name" ); } diff --git a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/src/lib.rs b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/src/lib.rs index 25a75104..a3f49189 100644 --- a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/src/lib.rs +++ b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/src/lib.rs @@ -6,9 +6,9 @@ // Init: 1 // Upgrade: 1 -// Endpoints: 19 +// Endpoints: 17 // Async Callback: 1 -// Total number of exported functions: 22 +// Total number of exported functions: 20 #![no_std] @@ -23,8 +23,6 @@ multiversx_sc_wasm_adapter::endpoints! { updateConfiguration => update_configuration setFeeMarketAddress => set_fee_market_address setHeaderVerifierAddress => set_header_verifier_address - setMaxTxGasLimit => set_max_user_tx_gas_limit - setBannedEndpoint => set_banned_endpoint deposit => deposit executeBridgeOps => execute_operations registerNewTokenID => register_new_token_id diff --git a/enshrine-esdt-safe/wasm/src/lib.rs b/enshrine-esdt-safe/wasm/src/lib.rs index 25a75104..a3f49189 100644 --- a/enshrine-esdt-safe/wasm/src/lib.rs +++ b/enshrine-esdt-safe/wasm/src/lib.rs @@ -6,9 +6,9 @@ // Init: 1 // Upgrade: 1 -// Endpoints: 19 +// Endpoints: 17 // Async Callback: 1 -// Total number of exported functions: 22 +// Total number of exported functions: 20 #![no_std] @@ -23,8 +23,6 @@ multiversx_sc_wasm_adapter::endpoints! { updateConfiguration => update_configuration setFeeMarketAddress => set_fee_market_address setHeaderVerifierAddress => set_header_verifier_address - setMaxTxGasLimit => set_max_user_tx_gas_limit - setBannedEndpoint => set_banned_endpoint deposit => deposit executeBridgeOps => execute_operations registerNewTokenID => register_new_token_id From 3d2578802cf1264d6fd6d95fcc261874ebd10095 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Wed, 8 Jan 2025 12:03:46 +0200 Subject: [PATCH 35/41] Added `new` function for `BridgeConfig` struct Signed-off-by: Andrei Baltariu --- common/operation/src/lib.rs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/common/operation/src/lib.rs b/common/operation/src/lib.rs index 87bbc9a3..5ecb5078 100644 --- a/common/operation/src/lib.rs +++ b/common/operation/src/lib.rs @@ -30,6 +30,20 @@ impl BridgeConfig { banned_endpoints: ManagedVec::new(), } } + + pub fn new( + token_whitelist: ManagedVec>, + token_blacklist: ManagedVec>, + max_tx_gas_limit: GasLimit, + banned_endpoints: ManagedVec>, + ) -> Self { + BridgeConfig { + token_whitelist, + token_blacklist, + max_tx_gas_limit, + banned_endpoints, + } + } } #[type_abi] From 8ee18f17b4bf538aa82003bc006d4385f04b82c0 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Wed, 8 Jan 2025 12:03:59 +0200 Subject: [PATCH 36/41] Added optional parameter for endpoint Signed-off-by: Andrei Baltariu --- chain-factory/src/factory.rs | 4 +-- common/proxies/src/chain_factory_proxy.rs | 6 ++-- .../proxies/src/enshrine_esdt_safe_proxy.rs | 32 ++----------------- 3 files changed, 8 insertions(+), 34 deletions(-) diff --git a/chain-factory/src/factory.rs b/chain-factory/src/factory.rs index 44fee781..43e71434 100644 --- a/chain-factory/src/factory.rs +++ b/chain-factory/src/factory.rs @@ -68,7 +68,7 @@ pub trait FactoryModule: only_admin::OnlyAdminModule { token_handler_address: ManagedAddress, wegld_identifier: TokenIdentifier, sov_token_prefix: ManagedBuffer, - config: BridgeConfig, + opt_config: Option>, ) -> ManagedAddress { let source_address = self.enshrine_esdt_safe_template().get(); let metadata = self.blockchain().get_code_metadata(&source_address); @@ -80,7 +80,7 @@ pub trait FactoryModule: only_admin::OnlyAdminModule { token_handler_address, Some(wegld_identifier), Some(sov_token_prefix), - config, + opt_config, ) .gas(60_000_000) .from_source(source_address) diff --git a/common/proxies/src/chain_factory_proxy.rs b/common/proxies/src/chain_factory_proxy.rs index 8a8bec30..7028c00c 100644 --- a/common/proxies/src/chain_factory_proxy.rs +++ b/common/proxies/src/chain_factory_proxy.rs @@ -137,14 +137,14 @@ where Arg1: ProxyArg>, Arg2: ProxyArg>, Arg3: ProxyArg>, - Arg4: ProxyArg>, + Arg4: ProxyArg>>, >( self, is_sovereign_chain: Arg0, token_handler_address: Arg1, wegld_identifier: Arg2, sov_token_prefix: Arg3, - config: Arg4, + opt_config: Arg4, ) -> TxTypedCall> { self.wrapped_tx .payment(NotPayable) @@ -153,7 +153,7 @@ where .argument(&token_handler_address) .argument(&wegld_identifier) .argument(&sov_token_prefix) - .argument(&config) + .argument(&opt_config) .original_result() } diff --git a/common/proxies/src/enshrine_esdt_safe_proxy.rs b/common/proxies/src/enshrine_esdt_safe_proxy.rs index 9eb422e4..925ab0ff 100644 --- a/common/proxies/src/enshrine_esdt_safe_proxy.rs +++ b/common/proxies/src/enshrine_esdt_safe_proxy.rs @@ -48,14 +48,14 @@ where Arg1: ProxyArg>, Arg2: ProxyArg>>, Arg3: ProxyArg>>, - Arg4: ProxyArg>, + Arg4: ProxyArg>>, >( self, is_sovereign_chain: Arg0, token_handler_address: Arg1, opt_wegld_identifier: Arg2, opt_sov_token_prefix: Arg3, - config: Arg4, + opt_config: Arg4, ) -> TxTypedDeploy { self.wrapped_tx .payment(NotPayable) @@ -64,7 +64,7 @@ where .argument(&token_handler_address) .argument(&opt_wegld_identifier) .argument(&opt_sov_token_prefix) - .argument(&config) + .argument(&opt_config) .original_result() } } @@ -136,32 +136,6 @@ where .original_result() } - pub fn set_max_user_tx_gas_limit< - Arg0: ProxyArg, - >( - self, - max_user_tx_gas_limit: Arg0, - ) -> TxTypedCall { - self.wrapped_tx - .payment(NotPayable) - .raw_call("setMaxTxGasLimit") - .argument(&max_user_tx_gas_limit) - .original_result() - } - - pub fn set_banned_endpoint< - Arg0: ProxyArg>, - >( - self, - endpoint_name: Arg0, - ) -> TxTypedCall { - self.wrapped_tx - .payment(NotPayable) - .raw_call("setBannedEndpoint") - .argument(&endpoint_name) - .original_result() - } - pub fn deposit< Arg0: ProxyArg>, Arg1: ProxyArg, ManagedVec>>>>, From 06c17a39ee5643ef728debaac8cbd5f703d99983 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Wed, 8 Jan 2025 12:04:06 +0200 Subject: [PATCH 37/41] Fixed failing tests Signed-off-by: Andrei Baltariu --- .../src/enshrine_esdt_safe_interactor.rs | 60 ++++--------- .../enshrine-esdt-safe_interactor_tests.rs | 14 ++- .../tests/enshrine_esdt_safe_blackbox_test.rs | 85 ++++++++----------- 3 files changed, 58 insertions(+), 101 deletions(-) diff --git a/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs b/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs index e31a694b..a93c678f 100644 --- a/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs +++ b/enshrine-esdt-safe/interactor/src/enshrine_esdt_safe_interactor.rs @@ -25,12 +25,10 @@ pub async fn enshrine_esdt_safe_cli() { let config = Config::load_config(); let mut interact = ContractInteract::new(config).await; match cmd.as_str() { - "deploy" => interact.deploy(false, BridgeConfig::default_config()).await, + "deploy" => interact.deploy(false, None).await, "upgrade" => interact.upgrade().await, "setFeeMarketAddress" => interact.set_fee_market_address().await, "setHeaderVerifierAddress" => interact.set_header_verifier_address().await, - "setMaxTxGasLimit" => interact.set_max_user_tx_gas_limit().await, - "setBannedEndpoint" => interact.set_banned_endpoint().await, "deposit" => interact.deposit(None.into(), Option::None).await, "executeBridgeOps" => interact.execute_operations().await, "registerNewTokenID" => interact.register_new_token_id().await, @@ -91,7 +89,11 @@ impl ContractInteract { } } - pub async fn deploy(&mut self, is_sovereign_chain: bool, config: BridgeConfig) { + pub async fn deploy( + &mut self, + is_sovereign_chain: bool, + opt_config: Option>, + ) { let opt_wegld_identifier = Option::Some(TokenIdentifier::from_esdt_bytes(WHITELIST_TOKEN_ID)); let opt_sov_token_prefix = Option::Some(ManagedBuffer::new_from_bytes(&b"sov"[..])); @@ -110,7 +112,7 @@ impl ContractInteract { token_handler_address, opt_wegld_identifier, opt_sov_token_prefix, - config, + opt_config, ) .code(code_path) .returns(ReturnsNewAddress) @@ -204,17 +206,21 @@ impl ContractInteract { println!("new token_handler_address: {new_address_bech32}"); } - pub async fn deploy_all(&mut self, is_sov_chain: bool, config: BridgeConfig) { + pub async fn deploy_all( + &mut self, + is_sov_chain: bool, + opt_config: Option>, + ) { self.deploy_token_handler().await; - self.deploy(is_sov_chain, config).await; + self.deploy(is_sov_chain, opt_config).await; self.deploy_header_verifier().await; self.deploy_fee_market().await; self.unpause_endpoint().await; } - pub async fn deploy_setup(&mut self, config: BridgeConfig) { + pub async fn deploy_setup(&mut self, opt_config: Option>) { self.deploy_token_handler().await; - self.deploy(false, config).await; + self.deploy(false, opt_config).await; self.unpause_endpoint().await; } @@ -273,42 +279,6 @@ impl ContractInteract { println!("Result: {response:?}"); } - pub async fn set_max_user_tx_gas_limit(&mut self) { - let max_user_tx_gas_limit = 0u64; - - let response = self - .interactor - .tx() - .from(&self.wallet_address) - .to(self.state.esdt_safe_address()) - .gas(30_000_000u64) - .typed(enshrine_esdt_safe_proxy::EnshrineEsdtSafeProxy) - .set_max_user_tx_gas_limit(max_user_tx_gas_limit) - .returns(ReturnsResultUnmanaged) - .run() - .await; - - println!("Result: {response:?}"); - } - - pub async fn set_banned_endpoint(&mut self) { - let endpoint_name = ManagedBuffer::new_from_bytes(&b""[..]); - - let response = self - .interactor - .tx() - .from(&self.wallet_address) - .to(self.state.esdt_safe_address()) - .gas(30_000_000u64) - .typed(enshrine_esdt_safe_proxy::EnshrineEsdtSafeProxy) - .set_banned_endpoint(endpoint_name) - .returns(ReturnsResultUnmanaged) - .run() - .await; - - println!("Result: {response:?}"); - } - pub async fn deposit( &mut self, transfer_data: OptionalTransferData, diff --git a/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs b/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs index d50a05b0..00f426cd 100644 --- a/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs +++ b/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs @@ -16,7 +16,7 @@ type OptionalTransferData = async fn test_deposit_paused() { let mut interact = ContractInteract::new(Config::load_config()).await; interact.deploy_token_handler().await; - interact.deploy(false, BridgeConfig::default_config()).await; + interact.deploy(false, None).await; interact .deposit( OptionalTransferData::None, @@ -34,7 +34,7 @@ async fn test_deposit_no_payment() { let to_contract = interact.state.esdt_safe_address().clone(); let transfer_data = OptionalTransferData::None; - interact.deploy_setup(BridgeConfig::default_config()).await; + interact.deploy_setup(None).await; interact .interactor @@ -64,7 +64,7 @@ async fn test_deposit_too_many_payments() { ); let payments = ManagedVec::from(vec![payment; 11]); - interact.deploy_setup(BridgeConfig::default_config()).await; + interact.deploy_setup(None).await; interact .interactor @@ -84,7 +84,7 @@ async fn test_deposit_too_many_payments() { #[ignore] async fn test_deposit_not_whitelisted() { let mut interact = ContractInteract::new(Config::load_config()).await; - interact.deploy_setup(BridgeConfig::default_config()).await; + interact.deploy_setup(None).await; interact.deploy_fee_market().await; interact.add_tokens_to_whitelist(WHITELIST_TOKEN_ID).await; interact.set_fee_market_address().await; @@ -95,7 +95,7 @@ async fn test_deposit_not_whitelisted() { #[ignore] async fn test_deposit_happy_path() { let mut interact = ContractInteract::new(Config::load_config()).await; - interact.deploy_setup(BridgeConfig::default_config()).await; + interact.deploy_setup(None).await; interact.deploy_fee_market().await; interact.add_tokens_to_whitelist(TOKEN_ID).await; interact.set_fee_market_address().await; @@ -119,9 +119,7 @@ async fn test_deposit_sov_chain() { 0, BigUint::from(30u64), )); - interact - .deploy_all(true, BridgeConfig::default_config()) - .await; + interact.deploy_all(true, None).await; interact.add_tokens_to_whitelist(TOKEN_ID).await; interact.set_fee_market_address().await; interact diff --git a/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs b/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs index ad7991e2..523f0155 100644 --- a/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs +++ b/enshrine-esdt-safe/tests/enshrine_esdt_safe_blackbox_test.rs @@ -122,7 +122,7 @@ impl EnshrineTestState { is_sovereign_chain: bool, wegld_identifier: Option>, sovereign_token_prefix: Option>, - config: BridgeConfig, + opt_config: Option>, ) -> &mut Self { self.world .tx() @@ -133,7 +133,7 @@ impl EnshrineTestState { TOKEN_HANDLER_ADDRESS, wegld_identifier, sovereign_token_prefix, - config, + opt_config, ) .code(ENSHRINE_ESDT_CODE_PATH) .new_address(ENSHRINE_ESDT_ADDRESS) @@ -194,12 +194,13 @@ impl EnshrineTestState { &mut self, is_sovereign_chain: bool, fee_struct: Option<&FeeStruct>, + opt_config: Option>, ) -> &mut Self { self.deploy_enshrine_esdt_contract( is_sovereign_chain, Some(TokenIdentifier::from(WEGLD_IDENTIFIER)), Some(SOVEREIGN_TOKEN_PREFIX.into()), - BridgeConfig::default_config(), + opt_config, ); self.deploy_header_verifier_contract(); self.deploy_token_handler_contract(); @@ -372,26 +373,6 @@ impl EnshrineTestState { } } - fn propose_set_max_user_tx_gas_limit(&mut self, max_gas_limit: GasLimit) { - self.world - .tx() - .from(ENSHRINE_ESDT_OWNER_ADDRESS) - .to(ENSHRINE_ESDT_ADDRESS) - .typed(EnshrineEsdtSafeProxy) - .set_max_user_tx_gas_limit(max_gas_limit) - .run(); - } - - fn propose_set_banned_endpoint(&mut self, endpoint_name: ManagedBuffer) { - self.world - .tx() - .from(ENSHRINE_ESDT_OWNER_ADDRESS) - .to(ENSHRINE_ESDT_ADDRESS) - .typed(EnshrineEsdtSafeProxy) - .set_banned_endpoint(endpoint_name) - .run(); - } - fn propose_whitelist_enshrine_esdt(&mut self) { self.world .tx() @@ -474,7 +455,7 @@ impl EnshrineTestState { fn test_deploy() { let mut state = EnshrineTestState::new(); - state.propose_setup_contracts(false, None); + state.propose_setup_contracts(false, None, None); } #[test] @@ -482,7 +463,7 @@ fn test_sovereign_prefix_no_prefix() { let mut state = EnshrineTestState::new(); let token_vec = Vec::from([NFT_TOKEN_ID, CROWD_TOKEN_ID]); - state.propose_setup_contracts(false, None); + state.propose_setup_contracts(false, None, None); state.propose_register_operation(&token_vec); state.propose_register_esdt_in_header_verifier(); state.propose_whitelist_enshrine_esdt(); @@ -494,7 +475,7 @@ fn test_sovereign_prefix_has_prefix() { let mut state = EnshrineTestState::new(); let token_vec = Vec::from([PREFIX_NFT_TOKEN_ID, CROWD_TOKEN_ID]); - state.propose_setup_contracts(false, None); + state.propose_setup_contracts(false, None, None); state.propose_register_operation(&token_vec); state.propose_register_esdt_in_header_verifier(); state.propose_whitelist_enshrine_esdt(); @@ -508,7 +489,7 @@ fn test_register_tokens_insufficient_funds() { let payment_amount = BigUint::from(DEFAULT_ISSUE_COST * token_vec.len() as u64); let payment = EsdtTokenPayment::new(WEGLD_IDENTIFIER.into(), 0, payment_amount); - state.propose_setup_contracts(false, None); + state.propose_setup_contracts(false, None, None); state.propose_register_tokens( &USER_ADDRESS, payment, @@ -524,7 +505,7 @@ fn test_register_tokens_wrong_token_as_fee() { let payment_amount = BigUint::from(DEFAULT_ISSUE_COST * token_vec.len() as u64); let payment = EsdtTokenPayment::new(CROWD_TOKEN_ID.into(), 0, payment_amount); - state.propose_setup_contracts(false, None); + state.propose_setup_contracts(false, None, None); state.propose_register_tokens( &ENSHRINE_ESDT_OWNER_ADDRESS, payment, @@ -540,7 +521,7 @@ fn test_register_tokens() { let payment_amount = BigUint::from(DEFAULT_ISSUE_COST * token_vec.len() as u64); let payment = EsdtTokenPayment::new(WEGLD_IDENTIFIER.into(), 0, payment_amount); - state.propose_setup_contracts(false, None); + state.propose_setup_contracts(false, None, None); state.propose_register_tokens(&ENSHRINE_ESDT_OWNER_ADDRESS, payment, token_vec, None); state .world @@ -560,7 +541,7 @@ fn test_register_tokens_insufficient_wegld() { let payment_amount = BigUint::from(DEFAULT_ISSUE_COST + token_vec.len() as u64); let payment = EsdtTokenPayment::new(WEGLD_IDENTIFIER.into(), 0, payment_amount); - state.propose_setup_contracts(false, None); + state.propose_setup_contracts(false, None, None); state.propose_register_tokens( &ENSHRINE_ESDT_OWNER_ADDRESS, payment, @@ -578,7 +559,7 @@ fn test_deposit_no_fee() { payments.push(wegld_payment); - state.propose_setup_contracts(false, None); + state.propose_setup_contracts(false, None, None); state.propose_set_fee(None, None); state.propose_deposit( ENSHRINE_ESDT_OWNER_ADDRESS, @@ -606,7 +587,7 @@ fn test_deposit_token_nothing_to_transfer_fee_enabled() { payments.push(wegld_payment); - state.propose_setup_contracts(false, Some(&fee_struct)); + state.propose_setup_contracts(false, Some(&fee_struct), None); state.propose_set_fee(Some(&fee_struct), None); state.propose_deposit( ENSHRINE_ESDT_OWNER_ADDRESS, @@ -625,7 +606,7 @@ fn test_deposit_max_transfers_exceeded() { let mut payments = PaymentsVec::new(); payments.extend(std::iter::repeat(wegld_payment).take(11)); - state.propose_setup_contracts(false, None); + state.propose_setup_contracts(false, None, None); state.propose_deposit( ENSHRINE_ESDT_OWNER_ADDRESS, USER_ADDRESS, @@ -660,7 +641,7 @@ fn test_deposit_no_transfer_data() { &fee_amount_per_gas, ); - state.propose_setup_contracts(false, Some(&fee_struct)); + state.propose_setup_contracts(false, Some(&fee_struct), None); state.propose_add_token_to_whitelist(tokens_whitelist); state.propose_set_fee(Some(&fee_struct), None); state.propose_deposit( @@ -708,7 +689,7 @@ fn test_deposit_with_transfer_data_gas_limit_too_high() { payments.push(wegld_payment); payments.push(crowd_payment); - state.propose_setup_contracts(false, None); + state.propose_setup_contracts(false, None, None); state.propose_deposit( ENSHRINE_ESDT_OWNER_ADDRESS, USER_ADDRESS, @@ -726,19 +707,27 @@ fn test_deposit_with_transfer_data_banned_endpoint() { let crowd_payment = EsdtTokenPayment::new(CROWD_TOKEN_ID.into(), 0, amount); let mut payments = PaymentsVec::new(); let gas_limit = 1000000000; - let function = ManagedBuffer::from("some_function"); + let banned_endpoint = ManagedBuffer::from("some_function"); let arg = ManagedBuffer::from("arg"); let mut args = ManagedVec::new(); args.push(arg); - let transfer_data = state.setup_transfer_data(gas_limit, function.clone(), args); + let transfer_data = state.setup_transfer_data(gas_limit, banned_endpoint.clone(), args); payments.push(wegld_payment); payments.push(crowd_payment); - state.propose_setup_contracts(false, None); - state.propose_set_max_user_tx_gas_limit(gas_limit); - state.propose_set_banned_endpoint(function); + state.propose_setup_contracts( + false, + None, + Some(BridgeConfig::new( + ManagedVec::new(), + ManagedVec::new(), + 300_000_000_000, + ManagedVec::from(vec![banned_endpoint]), + )), + ); + state.propose_deposit( ENSHRINE_ESDT_OWNER_ADDRESS, USER_ADDRESS, @@ -756,7 +745,7 @@ fn test_deposit_with_transfer_data_enough_for_fee() { let fungible_payment = EsdtTokenPayment::new(FUNGIBLE_TOKEN_ID.into(), 0, amount.clone()); let crowd_payment = EsdtTokenPayment::new(CROWD_TOKEN_ID.into(), 0, amount.clone()); let mut payments = PaymentsVec::new(); - let gas_limit = 1000000000; + let gas_limit = 10000000; let function = ManagedBuffer::from("some_function"); let arg = ManagedBuffer::from("arg"); let mut args = ManagedVec::new(); @@ -780,8 +769,8 @@ fn test_deposit_with_transfer_data_enough_for_fee() { &fee_amount_per_gas, ); - state.propose_setup_contracts(false, Some(&fee_struct)); - state.propose_set_max_user_tx_gas_limit(gas_limit); + state.propose_setup_contracts(false, Some(&fee_struct), None); + // state.propose_set_max_user_tx_gas_limit(gas_limit); state.propose_set_fee(Some(&fee_struct), None); state.propose_deposit( ENSHRINE_ESDT_OWNER_ADDRESS, @@ -819,7 +808,7 @@ fn test_deposit_with_transfer_data_not_enough_for_fee() { let fungible_payment = EsdtTokenPayment::new(FUNGIBLE_TOKEN_ID.into(), 0, amount.clone()); let crowd_payment = EsdtTokenPayment::new(CROWD_TOKEN_ID.into(), 0, amount.clone()); let mut payments = PaymentsVec::new(); - let gas_limit = 1000000000000000; + let gas_limit = 10000000; let function = ManagedBuffer::from("some_function"); let arg = ManagedBuffer::from("arg"); let mut args = ManagedVec::new(); @@ -840,8 +829,8 @@ fn test_deposit_with_transfer_data_not_enough_for_fee() { &fee_amount_per_gas, ); - state.propose_setup_contracts(false, Some(&fee_struct)); - state.propose_set_max_user_tx_gas_limit(gas_limit); + state.propose_setup_contracts(false, Some(&fee_struct), None); + // state.propose_set_max_user_tx_gas_limit(gas_limit); state.propose_set_fee(Some(&fee_struct), None); state.propose_deposit( ENSHRINE_ESDT_OWNER_ADDRESS, @@ -867,7 +856,7 @@ fn test_deposit_refund_non_whitelisted_tokens_fee_disabled() { payments.push(fungible_payment); payments.push(crowd_payment); - state.propose_setup_contracts(false, None); + state.propose_setup_contracts(false, None, None); state.propose_add_token_to_whitelist(token_whitelist); state.propose_deposit( ENSHRINE_ESDT_OWNER_ADDRESS, @@ -914,7 +903,7 @@ fn test_deposit_refund_non_whitelisted_tokens_fee_enabled() { &fee_amount_per_gas, ); - state.propose_setup_contracts(false, Some(&fee_struct)); + state.propose_setup_contracts(false, Some(&fee_struct), None); state.propose_add_token_to_whitelist(token_whitelist); state.propose_set_fee(Some(&fee_struct), None); state.propose_deposit( From 4a761a59556c9357ef9cf24dcd395dddeabcb5cb Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Wed, 8 Jan 2025 12:32:29 +0200 Subject: [PATCH 38/41] Clippy fix Signed-off-by: Andrei Baltariu --- enshrine-esdt-safe/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enshrine-esdt-safe/src/lib.rs b/enshrine-esdt-safe/src/lib.rs index 1d1ee725..bdc9c7ed 100644 --- a/enshrine-esdt-safe/src/lib.rs +++ b/enshrine-esdt-safe/src/lib.rs @@ -61,7 +61,7 @@ pub trait EnshrineEsdtSafe: self.initiator_address().set(caller); self.config() - .set(opt_config.unwrap_or_else(|| BridgeConfig::default_config())); + .set(opt_config.unwrap_or_else(BridgeConfig::default_config)); } #[only_owner] From 7fa065d6acef2a69397951c8d4dd5a45e1322572 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Thu, 9 Jan 2025 11:12:25 +0200 Subject: [PATCH 39/41] FW upgrade + syntax fixes Signed-off-by: Andrei Baltariu --- Cargo.lock | 228 ++++++------------ chain-config/Cargo.toml | 6 +- chain-config/meta/Cargo.toml | 2 +- .../wasm-chain-config-full/Cargo.lock | 40 +-- .../wasm-chain-config-full/Cargo.toml | 2 +- .../wasm-chain-config-view/Cargo.lock | 40 +-- .../wasm-chain-config-view/Cargo.toml | 2 +- chain-config/wasm/Cargo.lock | 40 +-- chain-config/wasm/Cargo.toml | 2 +- chain-factory/Cargo.toml | 6 +- chain-factory/meta/Cargo.toml | 2 +- .../wasm-chain-factory-full/Cargo.lock | 40 +-- .../wasm-chain-factory-full/Cargo.toml | 2 +- .../wasm-chain-factory-view/Cargo.lock | 40 +-- .../wasm-chain-factory-view/Cargo.toml | 2 +- chain-factory/wasm/Cargo.lock | 40 +-- chain-factory/wasm/Cargo.toml | 2 +- common/interactor/Cargo.toml | 4 +- common/max-bridged-amount-module/Cargo.toml | 4 +- common/operation/Cargo.toml | 2 +- common/operation/src/lib.rs | 9 +- common/proxies/Cargo.toml | 2 +- common/setup-phase/Cargo.toml | 4 +- common/token-whitelist/Cargo.toml | 4 +- common/tx-batch-module/Cargo.toml | 4 +- common/utils/Cargo.toml | 2 +- common/utils/src/lib.rs | 12 +- enshrine-esdt-safe/Cargo.toml | 6 +- enshrine-esdt-safe/interactor/Cargo.toml | 4 +- .../enshrine-esdt-safe_interactor_tests.rs | 7 +- enshrine-esdt-safe/meta/Cargo.toml | 2 +- .../src/from_sovereign/transfer_tokens.rs | 6 +- .../src/to_sovereign/create_tx.rs | 14 +- .../wasm-enshrine-esdt-safe-full/Cargo.lock | 40 +-- .../wasm-enshrine-esdt-safe-full/Cargo.toml | 2 +- .../wasm-enshrine-esdt-safe-view/Cargo.lock | 40 +-- .../wasm-enshrine-esdt-safe-view/Cargo.toml | 2 +- enshrine-esdt-safe/wasm/Cargo.lock | 40 +-- enshrine-esdt-safe/wasm/Cargo.toml | 2 +- esdt-safe/Cargo.toml | 6 +- esdt-safe/interactor/Cargo.toml | 6 +- esdt-safe/meta/Cargo.toml | 2 +- esdt-safe/src/from_sovereign/token_mapping.rs | 2 +- .../src/from_sovereign/transfer_tokens.rs | 12 +- esdt-safe/src/to_sovereign/create_tx.rs | 18 +- esdt-safe/wasm-esdt-safe-full/Cargo.lock | 40 +-- esdt-safe/wasm-esdt-safe-full/Cargo.toml | 2 +- esdt-safe/wasm-esdt-safe-view/Cargo.lock | 40 +-- esdt-safe/wasm-esdt-safe-view/Cargo.toml | 2 +- esdt-safe/wasm/Cargo.lock | 40 +-- esdt-safe/wasm/Cargo.toml | 2 +- fee-market/Cargo.toml | 4 +- fee-market/meta/Cargo.toml | 2 +- fee-market/src/subtract_fee.rs | 4 +- fee-market/wasm-fee-market-view/Cargo.lock | 36 +-- fee-market/wasm-fee-market-view/Cargo.toml | 2 +- fee-market/wasm-fee-market/Cargo.lock | 36 +-- fee-market/wasm-fee-market/Cargo.toml | 2 +- fee-market/wasm/Cargo.lock | 36 +-- fee-market/wasm/Cargo.toml | 2 +- header-verifier/Cargo.toml | 4 +- header-verifier/meta/Cargo.toml | 2 +- .../wasm-header-verifier-full/Cargo.lock | 36 +-- .../wasm-header-verifier-full/Cargo.toml | 2 +- header-verifier/wasm-multisig-view/Cargo.lock | 36 +-- header-verifier/wasm-multisig-view/Cargo.toml | 2 +- header-verifier/wasm/Cargo.lock | 36 +-- header-verifier/wasm/Cargo.toml | 2 +- sovereign-forge/Cargo.toml | 6 +- sovereign-forge/interactor/Cargo.toml | 4 +- sovereign-forge/meta/Cargo.toml | 2 +- sovereign-forge/src/phases.rs | 2 +- .../wasm-sovereign-forge-full/Cargo.lock | 40 +-- .../wasm-sovereign-forge-full/Cargo.toml | 2 +- .../wasm-soveriegn-forge-view/Cargo.lock | 40 +-- .../wasm-soveriegn-forge-view/Cargo.toml | 2 +- sovereign-forge/wasm/Cargo.lock | 40 +-- sovereign-forge/wasm/Cargo.toml | 2 +- testing-sc/Cargo.toml | 4 +- testing-sc/meta/Cargo.toml | 2 +- testing-sc/wasm-testing-sc-full/Cargo.lock | 36 +-- testing-sc/wasm-testing-sc-full/Cargo.toml | 2 +- testing-sc/wasm-testing-view/Cargo.lock | 36 +-- testing-sc/wasm-testing-view/Cargo.toml | 2 +- testing-sc/wasm/Cargo.lock | 36 +-- testing-sc/wasm/Cargo.toml | 2 +- token-handler/Cargo.toml | 6 +- token-handler/meta/Cargo.toml | 2 +- token-handler/src/transfer_tokens.rs | 8 +- .../wasm-token-handler-full/Cargo.lock | 40 +-- .../wasm-token-handler-full/Cargo.toml | 2 +- .../wasm-token-handler-view/Cargo.lock | 40 +-- .../wasm-token-handler-view/Cargo.toml | 2 +- token-handler/wasm/Cargo.lock | 40 +-- token-handler/wasm/Cargo.toml | 2 +- 95 files changed, 730 insertions(+), 796 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6930ade6..a82bf055 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,18 +28,6 @@ dependencies = [ "cpufeatures", ] -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - [[package]] name = "aho-corasick" version = "1.1.3" @@ -128,7 +116,7 @@ dependencies = [ "miniz_oxide", "object", "rustc-demangle", - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -326,12 +314,12 @@ checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "colored" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" dependencies = [ "lazy_static", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -666,6 +654,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f" + [[package]] name = "foreign-types" version = "0.3.2" @@ -821,20 +815,14 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "hashbrown" -version = "0.14.5" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" dependencies = [ - "ahash", + "foldhash", "serde", ] -[[package]] -name = "hashbrown" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" - [[package]] name = "header-verifier" version = "0.0.0" @@ -1135,12 +1123,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown 0.15.1", + "hashbrown", "serde", ] @@ -1177,9 +1165,9 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" dependencies = [ "either", ] @@ -1297,9 +1285,9 @@ dependencies = [ [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -1322,9 +1310,9 @@ dependencies = [ [[package]] name = "multiversx-chain-vm" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb84ccafc930d8a9d84de56758cef7070bfce951475d3f751be447acd4404d7a" +checksum = "fe375a1d18089d8ff2dca2db84167163e7f9d55de4827a0e1dc6b383d414e69d" dependencies = [ "bitflags", "colored", @@ -1344,15 +1332,15 @@ dependencies = [ [[package]] name = "multiversx-chain-vm-executor" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f" +checksum = "51cce7ae386960fbf5e85afe40ca16d63f926f0620ed1a36b019212b28e17219" [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -1365,9 +1353,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -1377,9 +1365,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -1389,9 +1377,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -1402,9 +1390,9 @@ dependencies = [ [[package]] name = "multiversx-sc-meta-lib" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d57ef0d09a32d98b7305e1a385bdd588926f40444a663bb4fde327168181271" +checksum = "d5dbc80b398ead0c43b735b7a4422dc9af5c9eed96620a417a2a58f6ee109146" dependencies = [ "clap", "colored", @@ -1417,25 +1405,25 @@ dependencies = [ "serde", "serde_json", "toml", - "wasmparser 0.216.0", + "wasmparser 0.223.0", "wasmprinter", "wat", ] [[package]] name = "multiversx-sc-modules" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67bf42a5cd6319a619e7d9915e0ae6837f693696bc55f3d1ac6b09b01cb48c4" +checksum = "efa55a68bd4eb79f38bb8d526fb0fb6e9146b0a7195a92efd030fefa4341dad7" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-scenario" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8187f3c37fcc5dbceadcebf99e256e7194f0aa1ba8a5e2e595ecac64b3b639" +checksum = "c1d2dcd3fb2836b067d7e16c7b384cf1c0b069e3b2696eebbb73ee32d1c5f318" dependencies = [ "base64", "bech32", @@ -1459,9 +1447,9 @@ dependencies = [ [[package]] name = "multiversx-sc-snippets" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb06482c7bfb286fbebb1b03c67aa87348db1a773e4eb8b2f41df5bcc3db5500" +checksum = "43ab3c6a2154bb07101555a80857e29d06ed1cb31187a917aa658473feda430b" dependencies = [ "anyhow", "base64", @@ -1473,14 +1461,15 @@ dependencies = [ "multiversx-sc-scenario", "multiversx-sdk", "multiversx-sdk-http", + "serde_json", "tokio", ] [[package]] name = "multiversx-sdk" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b387599e2d904c311edc8f7c9bddacd7102f9bc5e8fc3dd649f7e9d9b604ff2d" +checksum = "096f6069200a0aa1db46ecac92d5e0e5191593c99b442f5dec19691513a8ad93" dependencies = [ "aes", "anyhow", @@ -1508,9 +1497,9 @@ dependencies = [ [[package]] name = "multiversx-sdk-http" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08809666d2cfdf3c57e487a1749a18464898ade2cbab73c02e3ea7bbc55026f8" +checksum = "78c59877fa819bf969ae1b174528deb14a4a85dbf2bf85b740cba87421e466c8" dependencies = [ "anyhow", "hex", @@ -1661,7 +1650,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -1746,9 +1735,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -1764,9 +1753,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -2211,9 +2200,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", @@ -2640,37 +2629,36 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.216.0" +version = "0.220.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcdee6bea3619d311fb4b299721e89a986c3470f804b6d534340e412589028e3" +checksum = "e246c2772ce3ebc83f89a2d4487ac5794cad6c309b2071818a88c7db7c36d87b" dependencies = [ - "ahash", "bitflags", - "hashbrown 0.14.5", "indexmap", - "semver", - "serde", ] [[package]] name = "wasmparser" -version = "0.220.0" +version = "0.223.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e246c2772ce3ebc83f89a2d4487ac5794cad6c309b2071818a88c7db7c36d87b" +checksum = "d5a99faceb1a5a84dd6084ec4bfa4b2ab153b5793b43fd8f58b89232634afc35" dependencies = [ "bitflags", + "hashbrown", "indexmap", + "semver", + "serde", ] [[package]] name = "wasmprinter" -version = "0.216.0" +version = "0.223.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f82916f3892e53620639217d6ec78fe15c678352a3fbf3f3745b6417d0bd70f" +checksum = "9235722b8cdb6c1c6daa537d4be4e230e76ce3ce0e4ba991956a1c6aed50305a" dependencies = [ "anyhow", "termcolor", - "wasmparser 0.216.0", + "wasmparser 0.223.0", ] [[package]] @@ -2722,7 +2710,7 @@ checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" dependencies = [ "windows-result", "windows-strings", - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -2731,7 +2719,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" dependencies = [ - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -2741,16 +2729,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" dependencies = [ "windows-result", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", + "windows-targets", ] [[package]] @@ -2759,7 +2738,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -2768,22 +2747,7 @@ version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", + "windows-targets", ] [[package]] @@ -2792,46 +2756,28 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -2844,48 +2790,24 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" diff --git a/chain-config/Cargo.toml b/chain-config/Cargo.toml index ab406fcd..9dafdd63 100644 --- a/chain-config/Cargo.toml +++ b/chain-config/Cargo.toml @@ -12,13 +12,13 @@ path = "src/lib.rs" num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.54.6" +version = "=0.55.0" [dependencies.multiversx-sc] -version = "=0.54.6" +version = "=0.55.0" [dependencies.multiversx-sc-modules] -version = "=0.54.6" +version = "=0.55.0" [dependencies.operation] path = "../common/operation" diff --git a/chain-config/meta/Cargo.toml b/chain-config/meta/Cargo.toml index cb2f3743..63f4bf21 100644 --- a/chain-config/meta/Cargo.toml +++ b/chain-config/meta/Cargo.toml @@ -11,4 +11,4 @@ authors = ["you"] path = ".." [dependencies.multiversx-sc-meta-lib] -version = "=0.54.6" +version = "=0.55.0" diff --git a/chain-config/wasm-chain-config-full/Cargo.lock b/chain-config/wasm-chain-config-full/Cargo.lock index 5a256c49..4b571d71 100644 --- a/chain-config/wasm-chain-config-full/Cargo.lock +++ b/chain-config/wasm-chain-config-full/Cargo.lock @@ -58,9 +58,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -68,9 +68,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -83,9 +83,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -94,9 +94,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -106,9 +106,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -119,18 +119,18 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67bf42a5cd6319a619e7d9915e0ae6837f693696bc55f3d1ac6b09b01cb48c4" +checksum = "efa55a68bd4eb79f38bb8d526fb0fb6e9146b0a7195a92efd030fefa4341dad7" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -162,18 +162,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -203,9 +203,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/chain-config/wasm-chain-config-full/Cargo.toml b/chain-config/wasm-chain-config-full/Cargo.toml index 90c6b796..fd2fb473 100644 --- a/chain-config/wasm-chain-config-full/Cargo.toml +++ b/chain-config/wasm-chain-config-full/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/chain-config/wasm-chain-config-view/Cargo.lock b/chain-config/wasm-chain-config-view/Cargo.lock index 10fd0cfa..f19ecc92 100644 --- a/chain-config/wasm-chain-config-view/Cargo.lock +++ b/chain-config/wasm-chain-config-view/Cargo.lock @@ -58,9 +58,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -68,9 +68,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -83,9 +83,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -94,9 +94,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -106,9 +106,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -119,18 +119,18 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67bf42a5cd6319a619e7d9915e0ae6837f693696bc55f3d1ac6b09b01cb48c4" +checksum = "efa55a68bd4eb79f38bb8d526fb0fb6e9146b0a7195a92efd030fefa4341dad7" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -162,18 +162,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -203,9 +203,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/chain-config/wasm-chain-config-view/Cargo.toml b/chain-config/wasm-chain-config-view/Cargo.toml index 91ca41a4..e7fd2101 100644 --- a/chain-config/wasm-chain-config-view/Cargo.toml +++ b/chain-config/wasm-chain-config-view/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/chain-config/wasm/Cargo.lock b/chain-config/wasm/Cargo.lock index d59281b8..dc81851f 100644 --- a/chain-config/wasm/Cargo.lock +++ b/chain-config/wasm/Cargo.lock @@ -58,9 +58,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -68,9 +68,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -83,9 +83,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -94,9 +94,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -106,9 +106,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -119,18 +119,18 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67bf42a5cd6319a619e7d9915e0ae6837f693696bc55f3d1ac6b09b01cb48c4" +checksum = "efa55a68bd4eb79f38bb8d526fb0fb6e9146b0a7195a92efd030fefa4341dad7" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -162,18 +162,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -203,9 +203,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/chain-config/wasm/Cargo.toml b/chain-config/wasm/Cargo.toml index 50035ef2..f8b80969 100644 --- a/chain-config/wasm/Cargo.toml +++ b/chain-config/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/chain-factory/Cargo.toml b/chain-factory/Cargo.toml index 8f8b2987..c84c78ff 100644 --- a/chain-factory/Cargo.toml +++ b/chain-factory/Cargo.toml @@ -12,13 +12,13 @@ path = "src/lib.rs" num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.54.6" +version = "=0.55.0" [dependencies.multiversx-sc] -version = "=0.54.6" +version = "=0.55.0" [dependencies.multiversx-sc-modules] -version = "=0.54.6" +version = "=0.55.0" [dependencies.utils] path = "../common/utils" diff --git a/chain-factory/meta/Cargo.toml b/chain-factory/meta/Cargo.toml index fd0195b7..88a6e394 100644 --- a/chain-factory/meta/Cargo.toml +++ b/chain-factory/meta/Cargo.toml @@ -11,4 +11,4 @@ authors = ["you"] path = ".." [dependencies.multiversx-sc-meta-lib] -version = "=0.54.6" +version = "=0.55.0" diff --git a/chain-factory/wasm-chain-factory-full/Cargo.lock b/chain-factory/wasm-chain-factory-full/Cargo.lock index 22268f52..41992d75 100644 --- a/chain-factory/wasm-chain-factory-full/Cargo.lock +++ b/chain-factory/wasm-chain-factory-full/Cargo.lock @@ -70,9 +70,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -80,9 +80,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -95,9 +95,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -106,9 +106,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -118,9 +118,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -131,18 +131,18 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67bf42a5cd6319a619e7d9915e0ae6837f693696bc55f3d1ac6b09b01cb48c4" +checksum = "efa55a68bd4eb79f38bb8d526fb0fb6e9146b0a7195a92efd030fefa4341dad7" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -174,9 +174,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -192,9 +192,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -224,9 +224,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/chain-factory/wasm-chain-factory-full/Cargo.toml b/chain-factory/wasm-chain-factory-full/Cargo.toml index e246f436..6d429c56 100644 --- a/chain-factory/wasm-chain-factory-full/Cargo.toml +++ b/chain-factory/wasm-chain-factory-full/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/chain-factory/wasm-chain-factory-view/Cargo.lock b/chain-factory/wasm-chain-factory-view/Cargo.lock index bacd5bcd..d9b61f02 100644 --- a/chain-factory/wasm-chain-factory-view/Cargo.lock +++ b/chain-factory/wasm-chain-factory-view/Cargo.lock @@ -70,9 +70,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -80,9 +80,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -95,9 +95,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -106,9 +106,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -118,9 +118,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -131,18 +131,18 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67bf42a5cd6319a619e7d9915e0ae6837f693696bc55f3d1ac6b09b01cb48c4" +checksum = "efa55a68bd4eb79f38bb8d526fb0fb6e9146b0a7195a92efd030fefa4341dad7" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -174,9 +174,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -192,9 +192,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -224,9 +224,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/chain-factory/wasm-chain-factory-view/Cargo.toml b/chain-factory/wasm-chain-factory-view/Cargo.toml index 7771fd6f..6660905b 100644 --- a/chain-factory/wasm-chain-factory-view/Cargo.toml +++ b/chain-factory/wasm-chain-factory-view/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/chain-factory/wasm/Cargo.lock b/chain-factory/wasm/Cargo.lock index 0ffcb83b..dfb94d2e 100644 --- a/chain-factory/wasm/Cargo.lock +++ b/chain-factory/wasm/Cargo.lock @@ -70,9 +70,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -80,9 +80,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -95,9 +95,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -106,9 +106,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -118,9 +118,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -131,18 +131,18 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67bf42a5cd6319a619e7d9915e0ae6837f693696bc55f3d1ac6b09b01cb48c4" +checksum = "efa55a68bd4eb79f38bb8d526fb0fb6e9146b0a7195a92efd030fefa4341dad7" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -174,9 +174,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -192,9 +192,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -224,9 +224,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/chain-factory/wasm/Cargo.toml b/chain-factory/wasm/Cargo.toml index a390211f..8a8c2977 100644 --- a/chain-factory/wasm/Cargo.toml +++ b/chain-factory/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/common/interactor/Cargo.toml b/common/interactor/Cargo.toml index 4cb348be..21604f69 100644 --- a/common/interactor/Cargo.toml +++ b/common/interactor/Cargo.toml @@ -10,10 +10,10 @@ path = "src/lib.rs" toml = "0.8.6" [dependencies.multiversx-sc] -version = "=0.54.6" +version = "=0.55.0" [dependencies.multiversx-sc-snippets] -version = "=0.54.6" +version = "=0.55.0" [dependencies.serde] version = "1.0" diff --git a/common/max-bridged-amount-module/Cargo.toml b/common/max-bridged-amount-module/Cargo.toml index 3add652b..7755ebc3 100644 --- a/common/max-bridged-amount-module/Cargo.toml +++ b/common/max-bridged-amount-module/Cargo.toml @@ -5,7 +5,7 @@ authors = ["dorin-iancu "] edition = "2018" [dependencies.multiversx-sc] -version = "=0.54.6" +version = "=0.55.0" [dev-dependencies.multiversx-sc-scenario] -version = "=0.54.6" +version = "=0.55.0" diff --git a/common/operation/Cargo.toml b/common/operation/Cargo.toml index 47bfa68b..4dc76036 100644 --- a/common/operation/Cargo.toml +++ b/common/operation/Cargo.toml @@ -8,4 +8,4 @@ edition = "2018" path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.54.6" +version = "=0.55.0" diff --git a/common/operation/src/lib.rs b/common/operation/src/lib.rs index ffdcf0fa..fb7b076a 100644 --- a/common/operation/src/lib.rs +++ b/common/operation/src/lib.rs @@ -34,7 +34,14 @@ impl Operation { let mut tuples = MultiValueEncoded::new(); for token in &self.tokens { - tuples.push((token.token_identifier, token.token_nonce, token.token_data).into()); + tuples.push( + ( + token.token_identifier.clone(), + token.token_nonce, + token.token_data.clone(), + ) + .into(), + ); } tuples diff --git a/common/proxies/Cargo.toml b/common/proxies/Cargo.toml index 1a40ae89..ce0bae3c 100644 --- a/common/proxies/Cargo.toml +++ b/common/proxies/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies.multiversx-sc] -version = "=0.54.6" +version = "=0.55.0" [dependencies.operation] path = "../operation" diff --git a/common/setup-phase/Cargo.toml b/common/setup-phase/Cargo.toml index b73106b9..79c888af 100644 --- a/common/setup-phase/Cargo.toml +++ b/common/setup-phase/Cargo.toml @@ -5,7 +5,7 @@ authors = ["dorin-iancu "] edition = "2018" [dependencies.multiversx-sc] -version = "=0.54.6" +version = "=0.55.0" [dev-dependencies.multiversx-sc-scenario] -version = "=0.54.6" +version = "=0.55.0" diff --git a/common/token-whitelist/Cargo.toml b/common/token-whitelist/Cargo.toml index 9792036f..5bf5b56d 100644 --- a/common/token-whitelist/Cargo.toml +++ b/common/token-whitelist/Cargo.toml @@ -11,7 +11,7 @@ path = "../setup-phase" path = "../utils" [dependencies.multiversx-sc] -version = "=0.54.6" +version = "=0.55.0" [dev-dependencies.multiversx-sc-scenario] -version = "=0.54.6" +version = "=0.55.0" diff --git a/common/tx-batch-module/Cargo.toml b/common/tx-batch-module/Cargo.toml index b4895bcd..e64cabd7 100644 --- a/common/tx-batch-module/Cargo.toml +++ b/common/tx-batch-module/Cargo.toml @@ -5,10 +5,10 @@ authors = ["dorin-iancu "] edition = "2018" [dependencies.multiversx-sc] -version = "=0.54.6" +version = "=0.55.0" [dependencies.operation] path = "../operation" [dev-dependencies.multiversx-sc-scenario] -version = "=0.54.6" +version = "=0.55.0" diff --git a/common/utils/Cargo.toml b/common/utils/Cargo.toml index 418d5994..62390a0b 100644 --- a/common/utils/Cargo.toml +++ b/common/utils/Cargo.toml @@ -11,5 +11,5 @@ path = "src/lib.rs" path = "../operation" [dependencies.multiversx-sc] -version = "=0.54.6" +version = "=0.55.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/utils/src/lib.rs b/common/utils/src/lib.rs index 104e0e8e..d75619ea 100644 --- a/common/utils/src/lib.rs +++ b/common/utils/src/lib.rs @@ -37,14 +37,16 @@ pub trait UtilsModule { fn pop_first_payment( &self, - payments: &mut PaymentsVec, - ) -> EsdtTokenPayment { + payments: PaymentsVec, + ) -> (EsdtTokenPayment, PaymentsVec) { require!(!payments.is_empty(), ERR_EMPTY_PAYMENTS); - let first_payment = payments.get(0); - payments.remove(0); + let mut new_payments = payments; - first_payment + let first_payment = new_payments.get(0).clone(); + new_payments.remove(0); + + (first_payment.clone(), new_payments) } fn has_prefix(&self, token_id: &TokenIdentifier) -> bool { diff --git a/enshrine-esdt-safe/Cargo.toml b/enshrine-esdt-safe/Cargo.toml index c085198a..039276fe 100644 --- a/enshrine-esdt-safe/Cargo.toml +++ b/enshrine-esdt-safe/Cargo.toml @@ -39,10 +39,10 @@ path = "../header-verifier" path = "../token-handler" [dependencies.multiversx-sc] -version = "=0.54.6" +version = "=0.55.0" [dependencies.multiversx-sc-modules] -version = "=0.54.6" +version = "=0.55.0" [dev-dependencies] num-bigint = "0.4.2" @@ -50,4 +50,4 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.54.6" +version = "=0.55.0" diff --git a/enshrine-esdt-safe/interactor/Cargo.toml b/enshrine-esdt-safe/interactor/Cargo.toml index b90da4bb..f0abc75f 100644 --- a/enshrine-esdt-safe/interactor/Cargo.toml +++ b/enshrine-esdt-safe/interactor/Cargo.toml @@ -52,10 +52,10 @@ path = "../../token-handler" path = "../../common/proxies" [dependencies.multiversx-sc-snippets] -version = "=0.54.6" +version = "=0.55.0" [dependencies.multiversx-sc] -version = "=0.54.6" +version = "=0.55.0" [dependencies.clap] version = "4.4.7" diff --git a/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs b/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs index 8ccab55a..8bb95a17 100644 --- a/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs +++ b/enshrine-esdt-safe/interactor/tests/enshrine-esdt-safe_interactor_tests.rs @@ -5,8 +5,8 @@ use enshrine_esdt_safe_interactor::ContractInteract; use interactor::constants::{TOKEN_ID, WHITELIST_TOKEN_ID}; use interactor::interactor_config::Config; use multiversx_sc_snippets::imports::*; -use proxies::*; use operation::*; +use proxies::*; type OptionalTransferData = OptionalValue, ManagedVec>>>; @@ -57,12 +57,13 @@ async fn test_deposit_too_many_payments() { let from = interact.wallet_address.clone(); let to_contract = interact.state.esdt_safe_address().clone(); let transfer_data = OptionalTransferData::None; - let payment = EsdtTokenPayment::new( + let payment: EsdtTokenPayment = EsdtTokenPayment::new( TokenIdentifier::from_esdt_bytes(TOKEN_ID), 0u64, BigUint::from(10u64), ); - let payments = ManagedVec::from(vec![payment; 11]); + let payments: ManagedVec> = + ManagedVec::from(vec![payment; 11]); interact.deploy_setup().await; diff --git a/enshrine-esdt-safe/meta/Cargo.toml b/enshrine-esdt-safe/meta/Cargo.toml index 1f5a450b..593a2089 100644 --- a/enshrine-esdt-safe/meta/Cargo.toml +++ b/enshrine-esdt-safe/meta/Cargo.toml @@ -8,5 +8,5 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "=0.54.6" +version = "=0.55.0" default-features = false diff --git a/enshrine-esdt-safe/src/from_sovereign/transfer_tokens.rs b/enshrine-esdt-safe/src/from_sovereign/transfer_tokens.rs index 0fd1aafe..6ffb0be3 100644 --- a/enshrine-esdt-safe/src/from_sovereign/transfer_tokens.rs +++ b/enshrine-esdt-safe/src/from_sovereign/transfer_tokens.rs @@ -1,7 +1,7 @@ use crate::{common, to_sovereign}; use multiversx_sc::imports::*; -use proxies::{header_verifier_proxy::HeaderverifierProxy, token_handler_proxy::TokenHandlerProxy}; use operation::{Operation, OperationData, OperationEsdtPayment, OperationTuple}; +use proxies::{header_verifier_proxy::HeaderverifierProxy, token_handler_proxy::TokenHandlerProxy}; const DEFAULT_ISSUE_COST: u64 = 50_000_000_000_000_000; // 0.05 * 10^18 @@ -106,7 +106,7 @@ pub trait TransferTokensModule: for token in tokens.iter() { if !self.has_sov_prefix(&token.token_identifier, &sov_prefix) { - non_sov_tokens.push(token); + non_sov_tokens.push(token.clone()); continue; } @@ -115,7 +115,7 @@ pub trait TransferTokensModule: return SplitResult::default(); } - sov_tokens.push(token.into()); + sov_tokens.push(token.clone().into()); } SplitResult { diff --git a/enshrine-esdt-safe/src/to_sovereign/create_tx.rs b/enshrine-esdt-safe/src/to_sovereign/create_tx.rs index bb02a869..f46e47bb 100644 --- a/enshrine-esdt-safe/src/to_sovereign/create_tx.rs +++ b/enshrine-esdt-safe/src/to_sovereign/create_tx.rs @@ -1,9 +1,9 @@ use crate::common; -use proxies::fee_market_proxy::FeeMarketProxy; use operation::{ aliases::{GasLimit, OptionalValueTransferDataTuple}, EventPayment, OperationData, TransferData, }; +use proxies::fee_market_proxy::FeeMarketProxy; use multiversx_sc::imports::*; @@ -71,7 +71,7 @@ pub trait CreateTxModule: } let event_payment = EventPayment::new( - payment.token_identifier, + payment.token_identifier.clone(), payment.token_nonce, current_token_data, ); @@ -89,7 +89,7 @@ pub trait CreateTxModule: // refund refundable_tokens let caller = self.blockchain().get_caller(); - self.refund_tokens(&caller, &refundable_payments); + self.refund_tokens(&caller, refundable_payments); let tx_nonce = self.get_and_save_next_tx_id(); self.deposit_event( @@ -102,7 +102,7 @@ pub trait CreateTxModule: fn check_and_extract_fee( &self, ) -> MultiValue2, ManagedVec> { - let mut payments = self.call_value().all_esdt_transfers().clone_value(); + let payments = self.call_value().all_esdt_transfers().clone_value(); require!(!payments.is_empty(), "Nothing to transfer"); require!(payments.len() <= MAX_TRANSFERS_PER_TX, "Too many tokens"); @@ -115,7 +115,7 @@ pub trait CreateTxModule: let fee_market_address = self.fee_market_address().get(); let fee_enabled = self.external_fee_enabled(fee_market_address).get(); let opt_transfer_data = if fee_enabled { - OptionalValue::Some(self.pop_first_payment(&mut payments)) + OptionalValue::Some(self.pop_first_payment(payments.clone()).0) } else { OptionalValue::None }; @@ -126,11 +126,11 @@ pub trait CreateTxModule: fn refund_tokens( &self, caller: &ManagedAddress, - refundable_payments: &ManagedVec, + refundable_payments: ManagedVec, ) { for payment in refundable_payments { if payment.amount > 0 { - self.tx().to(caller).payment(&payment).transfer(); + self.tx().to(caller).payment(payment).transfer(); } } } diff --git a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/Cargo.lock b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/Cargo.lock index 46e96fad..269d4617 100644 --- a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/Cargo.lock +++ b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/Cargo.lock @@ -116,9 +116,9 @@ dependencies = [ [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -126,9 +126,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -141,9 +141,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -152,9 +152,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -164,9 +164,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -177,18 +177,18 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67bf42a5cd6319a619e7d9915e0ae6837f693696bc55f3d1ac6b09b01cb48c4" +checksum = "efa55a68bd4eb79f38bb8d526fb0fb6e9146b0a7195a92efd030fefa4341dad7" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -220,9 +220,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -238,9 +238,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -270,9 +270,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/Cargo.toml b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/Cargo.toml index 9cd591f5..761c47c7 100644 --- a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/Cargo.toml +++ b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-full/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-view/Cargo.lock b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-view/Cargo.lock index 3aed28de..41bebc04 100644 --- a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-view/Cargo.lock +++ b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-view/Cargo.lock @@ -116,9 +116,9 @@ dependencies = [ [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -126,9 +126,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -141,9 +141,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -152,9 +152,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -164,9 +164,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -177,18 +177,18 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67bf42a5cd6319a619e7d9915e0ae6837f693696bc55f3d1ac6b09b01cb48c4" +checksum = "efa55a68bd4eb79f38bb8d526fb0fb6e9146b0a7195a92efd030fefa4341dad7" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -220,9 +220,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -238,9 +238,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -270,9 +270,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-view/Cargo.toml b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-view/Cargo.toml index a02d961e..f73cf8da 100644 --- a/enshrine-esdt-safe/wasm-enshrine-esdt-safe-view/Cargo.toml +++ b/enshrine-esdt-safe/wasm-enshrine-esdt-safe-view/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/enshrine-esdt-safe/wasm/Cargo.lock b/enshrine-esdt-safe/wasm/Cargo.lock index 7fbe49fc..c1dcb153 100644 --- a/enshrine-esdt-safe/wasm/Cargo.lock +++ b/enshrine-esdt-safe/wasm/Cargo.lock @@ -116,9 +116,9 @@ dependencies = [ [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -126,9 +126,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -141,9 +141,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -152,9 +152,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -164,9 +164,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -177,18 +177,18 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67bf42a5cd6319a619e7d9915e0ae6837f693696bc55f3d1ac6b09b01cb48c4" +checksum = "efa55a68bd4eb79f38bb8d526fb0fb6e9146b0a7195a92efd030fefa4341dad7" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -220,9 +220,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -238,9 +238,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -270,9 +270,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/enshrine-esdt-safe/wasm/Cargo.toml b/enshrine-esdt-safe/wasm/Cargo.toml index 344d97e2..f20dae21 100644 --- a/enshrine-esdt-safe/wasm/Cargo.toml +++ b/enshrine-esdt-safe/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/esdt-safe/Cargo.toml b/esdt-safe/Cargo.toml index ac484985..951ef958 100644 --- a/esdt-safe/Cargo.toml +++ b/esdt-safe/Cargo.toml @@ -36,10 +36,10 @@ path = "../fee-market" path = "../header-verifier" [dependencies.multiversx-sc] -version = "=0.54.6" +version = "=0.55.0" [dependencies.multiversx-sc-modules] -version = "=0.54.6" +version = "=0.55.0" [dev-dependencies] num-bigint = "0.4.2" @@ -47,4 +47,4 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.54.6" +version = "=0.55.0" diff --git a/esdt-safe/interactor/Cargo.toml b/esdt-safe/interactor/Cargo.toml index 376facde..b13aa45f 100644 --- a/esdt-safe/interactor/Cargo.toml +++ b/esdt-safe/interactor/Cargo.toml @@ -34,13 +34,13 @@ path = "../../common/interactor" path = "../../fee-market" [dependencies.multiversx-sc-snippets] -version = "=0.54.6" +version = "=0.55.0" [dependencies.multiversx-sc] -version = "=0.54.6" +version = "=0.55.0" [dependencies.multiversx-sc-scenario] -version = "=0.54.6" +version = "=0.55.0" [dependencies.clap] version = "4.4.7" diff --git a/esdt-safe/meta/Cargo.toml b/esdt-safe/meta/Cargo.toml index a45dce32..15cf44d0 100644 --- a/esdt-safe/meta/Cargo.toml +++ b/esdt-safe/meta/Cargo.toml @@ -11,4 +11,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "=0.54.6" +version = "=0.55.0" diff --git a/esdt-safe/src/from_sovereign/token_mapping.rs b/esdt-safe/src/from_sovereign/token_mapping.rs index 66f6ceb6..ca091bd3 100644 --- a/esdt-safe/src/from_sovereign/token_mapping.rs +++ b/esdt-safe/src/from_sovereign/token_mapping.rs @@ -40,7 +40,7 @@ pub trait TokenMappingModule: utils::UtilsModule { self.require_token_has_prefix(&sov_token_id); - let issue_cost = self.call_value().egld_value().clone_value(); + let issue_cost = self.call_value().egld().clone_value(); require!( issue_cost == DEFAULT_ISSUE_COST, "eGLD value should be 0.05" diff --git a/esdt-safe/src/from_sovereign/transfer_tokens.rs b/esdt-safe/src/from_sovereign/transfer_tokens.rs index c56c3cb7..9d3a8ea9 100644 --- a/esdt-safe/src/from_sovereign/transfer_tokens.rs +++ b/esdt-safe/src/from_sovereign/transfer_tokens.rs @@ -1,8 +1,8 @@ use multiversx_sc::api::ESDT_MULTI_TRANSFER_FUNC_NAME; -use proxies::header_verifier_proxy::HeaderverifierProxy; use operation::{ aliases::GasLimit, Operation, OperationData, OperationEsdtPayment, OperationTuple, }; +use proxies::header_verifier_proxy::HeaderverifierProxy; use crate::to_sovereign; @@ -75,7 +75,7 @@ pub trait TransferTokensModule: output_payments.push(OperationEsdtPayment::new( mvx_token_id, 0, - operation_token.token_data, + operation_token.token_data.clone(), )); continue; @@ -86,7 +86,7 @@ pub trait TransferTokensModule: output_payments.push(OperationEsdtPayment::new( mvx_token_id, nft_nonce, - operation_token.token_data, + operation_token.token_data.clone(), )); } @@ -167,8 +167,10 @@ pub trait TransferTokensModule: operation_tuple: &OperationTuple, tokens_list: &ManagedVec>, ) { - let mapped_tokens: ManagedVec> = - tokens_list.iter().map(|token| token.into()).collect(); + let mapped_tokens: ManagedVec> = tokens_list + .iter() + .map(|token| token.clone().into()) + .collect(); match &operation_tuple.operation.data.opt_transfer_data { Some(transfer_data) => { diff --git a/esdt-safe/src/to_sovereign/create_tx.rs b/esdt-safe/src/to_sovereign/create_tx.rs index 968455e3..da0ff044 100644 --- a/esdt-safe/src/to_sovereign/create_tx.rs +++ b/esdt-safe/src/to_sovereign/create_tx.rs @@ -1,10 +1,10 @@ use crate::from_sovereign::token_mapping; use multiversx_sc::storage::StorageKey; -use proxies::fee_market_proxy::FeeMarketProxy; use operation::{ aliases::{EventPaymentTuple, ExtractedFeeResult, GasLimit, OptionalValueTransferDataTuple}, OperationData, TransferData, }; +use proxies::fee_market_proxy::FeeMarketProxy; multiversx_sc::imports!(); @@ -75,7 +75,7 @@ pub trait CreateTxModule: .sync_call(); event_payments.push(MultiValue3::from(( - payment.token_identifier, + payment.token_identifier.clone(), payment.token_nonce, current_token_data, ))); @@ -85,7 +85,7 @@ pub trait CreateTxModule: if !mvx_to_sov_token_id_mapper.is_empty() { let sov_token_id = mvx_to_sov_token_id_mapper.get(); let sov_token_nonce = self.burn_mainchain_token( - payment, + payment.clone(), ¤t_token_data.token_type, &sov_token_id, ); @@ -97,7 +97,7 @@ pub trait CreateTxModule: ))); } else { event_payments.push(MultiValue3::from(( - payment.token_identifier, + payment.token_identifier.clone(), payment.token_nonce, current_token_data, ))); @@ -115,7 +115,7 @@ pub trait CreateTxModule: // refund refundable_tokens let caller = self.blockchain().get_caller(); - self.refund_tokens(&caller, &refundable_payments); + self.refund_tokens(&caller, refundable_payments); let tx_nonce = self.get_and_save_next_tx_id(); self.deposit_event( @@ -126,7 +126,7 @@ pub trait CreateTxModule: } fn check_and_extract_fee(&self) -> ExtractedFeeResult { - let mut payments = self.call_value().all_esdt_transfers().clone_value(); + let payments = self.call_value().all_esdt_transfers().clone(); require!(!payments.is_empty(), "Nothing to transfer"); require!(payments.len() <= MAX_TRANSFERS_PER_TX, "Too many tokens"); @@ -139,7 +139,7 @@ pub trait CreateTxModule: .get(); let opt_transfer_data = if fee_enabled_mapper { - OptionalValue::Some(self.pop_first_payment(&mut payments)) + OptionalValue::Some(self.pop_first_payment(payments.clone()).0) } else { OptionalValue::None }; @@ -150,11 +150,11 @@ pub trait CreateTxModule: fn refund_tokens( &self, caller: &ManagedAddress, - refundable_payments: &ManagedVec, + refundable_payments: ManagedVec, ) { for payment in refundable_payments { if payment.amount > 0 { - self.tx().to(caller).payment(&payment).transfer(); + self.tx().to(caller).payment(payment).transfer(); } } } diff --git a/esdt-safe/wasm-esdt-safe-full/Cargo.lock b/esdt-safe/wasm-esdt-safe-full/Cargo.lock index fa5e4fae..a892a1e5 100644 --- a/esdt-safe/wasm-esdt-safe-full/Cargo.lock +++ b/esdt-safe/wasm-esdt-safe-full/Cargo.lock @@ -93,9 +93,9 @@ dependencies = [ [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -103,9 +103,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -118,9 +118,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -129,9 +129,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -141,9 +141,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -154,18 +154,18 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67bf42a5cd6319a619e7d9915e0ae6837f693696bc55f3d1ac6b09b01cb48c4" +checksum = "efa55a68bd4eb79f38bb8d526fb0fb6e9146b0a7195a92efd030fefa4341dad7" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -197,9 +197,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -215,9 +215,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -247,9 +247,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/esdt-safe/wasm-esdt-safe-full/Cargo.toml b/esdt-safe/wasm-esdt-safe-full/Cargo.toml index b32427e7..243ec764 100644 --- a/esdt-safe/wasm-esdt-safe-full/Cargo.toml +++ b/esdt-safe/wasm-esdt-safe-full/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/esdt-safe/wasm-esdt-safe-view/Cargo.lock b/esdt-safe/wasm-esdt-safe-view/Cargo.lock index 083dbcaa..d4617fb5 100644 --- a/esdt-safe/wasm-esdt-safe-view/Cargo.lock +++ b/esdt-safe/wasm-esdt-safe-view/Cargo.lock @@ -93,9 +93,9 @@ dependencies = [ [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -103,9 +103,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -118,9 +118,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -129,9 +129,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -141,9 +141,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -154,18 +154,18 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67bf42a5cd6319a619e7d9915e0ae6837f693696bc55f3d1ac6b09b01cb48c4" +checksum = "efa55a68bd4eb79f38bb8d526fb0fb6e9146b0a7195a92efd030fefa4341dad7" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -197,9 +197,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -215,9 +215,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -247,9 +247,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/esdt-safe/wasm-esdt-safe-view/Cargo.toml b/esdt-safe/wasm-esdt-safe-view/Cargo.toml index 3cdc20ed..b0d01116 100644 --- a/esdt-safe/wasm-esdt-safe-view/Cargo.toml +++ b/esdt-safe/wasm-esdt-safe-view/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/esdt-safe/wasm/Cargo.lock b/esdt-safe/wasm/Cargo.lock index 3fd73e2b..0f002261 100644 --- a/esdt-safe/wasm/Cargo.lock +++ b/esdt-safe/wasm/Cargo.lock @@ -93,9 +93,9 @@ dependencies = [ [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -103,9 +103,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -118,9 +118,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -129,9 +129,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -141,9 +141,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -154,18 +154,18 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67bf42a5cd6319a619e7d9915e0ae6837f693696bc55f3d1ac6b09b01cb48c4" +checksum = "efa55a68bd4eb79f38bb8d526fb0fb6e9146b0a7195a92efd030fefa4341dad7" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -197,9 +197,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -215,9 +215,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -247,9 +247,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/esdt-safe/wasm/Cargo.toml b/esdt-safe/wasm/Cargo.toml index e797f7e3..412c2b60 100644 --- a/esdt-safe/wasm/Cargo.toml +++ b/esdt-safe/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/fee-market/Cargo.toml b/fee-market/Cargo.toml index 68eeb953..d8195720 100644 --- a/fee-market/Cargo.toml +++ b/fee-market/Cargo.toml @@ -21,10 +21,10 @@ path = "../common/proxies" path = "../common/setup-phase" [dependencies.multiversx-sc] -version = "=0.54.6" +version = "=0.55.0" [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.54.6" +version = "=0.55.0" diff --git a/fee-market/meta/Cargo.toml b/fee-market/meta/Cargo.toml index d17a1526..f70b8e30 100644 --- a/fee-market/meta/Cargo.toml +++ b/fee-market/meta/Cargo.toml @@ -8,5 +8,5 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "=0.54.6" +version = "=0.55.0" default-features = false diff --git a/fee-market/src/subtract_fee.rs b/fee-market/src/subtract_fee.rs index b46681ce..eb007268 100644 --- a/fee-market/src/subtract_fee.rs +++ b/fee-market/src/subtract_fee.rs @@ -111,10 +111,10 @@ pub trait SubtractFeeModule: self.require_caller_esdt_safe(); let caller = self.blockchain().get_caller(); - let payment = self.call_value().single_esdt(); + let payment = self.call_value().single_esdt().clone(); if !self.is_fee_enabled() || self.users_whitelist().contains(&original_caller) { - self.tx().to(&caller).payment(&payment).transfer(); + self.tx().to(&caller).payment(payment.clone()).transfer(); return FinalPayment { fee: EsdtTokenPayment::new(payment.token_identifier.clone(), 0, BigUint::zero()), diff --git a/fee-market/wasm-fee-market-view/Cargo.lock b/fee-market/wasm-fee-market-view/Cargo.lock index ae20d54b..fc064a7d 100644 --- a/fee-market/wasm-fee-market-view/Cargo.lock +++ b/fee-market/wasm-fee-market-view/Cargo.lock @@ -59,9 +59,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -69,9 +69,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -84,9 +84,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -95,9 +95,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -107,9 +107,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -154,9 +154,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -172,9 +172,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -204,9 +204,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/fee-market/wasm-fee-market-view/Cargo.toml b/fee-market/wasm-fee-market-view/Cargo.toml index 657214ed..97a3d0b2 100644 --- a/fee-market/wasm-fee-market-view/Cargo.toml +++ b/fee-market/wasm-fee-market-view/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/fee-market/wasm-fee-market/Cargo.lock b/fee-market/wasm-fee-market/Cargo.lock index 6b0ecadb..037fd0a7 100644 --- a/fee-market/wasm-fee-market/Cargo.lock +++ b/fee-market/wasm-fee-market/Cargo.lock @@ -59,9 +59,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -69,9 +69,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -84,9 +84,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -95,9 +95,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -107,9 +107,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -154,9 +154,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -172,9 +172,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -204,9 +204,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/fee-market/wasm-fee-market/Cargo.toml b/fee-market/wasm-fee-market/Cargo.toml index 066dde88..65de7022 100644 --- a/fee-market/wasm-fee-market/Cargo.toml +++ b/fee-market/wasm-fee-market/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/fee-market/wasm/Cargo.lock b/fee-market/wasm/Cargo.lock index 6b0ecadb..037fd0a7 100644 --- a/fee-market/wasm/Cargo.lock +++ b/fee-market/wasm/Cargo.lock @@ -59,9 +59,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -69,9 +69,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -84,9 +84,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -95,9 +95,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -107,9 +107,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -154,9 +154,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -172,9 +172,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -204,9 +204,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/fee-market/wasm/Cargo.toml b/fee-market/wasm/Cargo.toml index 066dde88..65de7022 100644 --- a/fee-market/wasm/Cargo.toml +++ b/fee-market/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/header-verifier/Cargo.toml b/header-verifier/Cargo.toml index 259f715f..c498cf08 100644 --- a/header-verifier/Cargo.toml +++ b/header-verifier/Cargo.toml @@ -9,7 +9,7 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.54.6" +version = "=0.55.0" [dependencies.operation] path = "../common/operation" @@ -24,4 +24,4 @@ path = "../common/setup-phase" num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.54.6" +version = "=0.55.0" diff --git a/header-verifier/meta/Cargo.toml b/header-verifier/meta/Cargo.toml index 52a96c6d..d3fff588 100644 --- a/header-verifier/meta/Cargo.toml +++ b/header-verifier/meta/Cargo.toml @@ -8,5 +8,5 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "=0.54.6" +version = "=0.55.0" default-features = false diff --git a/header-verifier/wasm-header-verifier-full/Cargo.lock b/header-verifier/wasm-header-verifier-full/Cargo.lock index 5602cef1..63d72c93 100644 --- a/header-verifier/wasm-header-verifier-full/Cargo.lock +++ b/header-verifier/wasm-header-verifier-full/Cargo.lock @@ -58,9 +58,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -68,9 +68,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -83,9 +83,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -94,9 +94,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -106,9 +106,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -119,9 +119,9 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -153,9 +153,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -171,9 +171,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -203,9 +203,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/header-verifier/wasm-header-verifier-full/Cargo.toml b/header-verifier/wasm-header-verifier-full/Cargo.toml index 51583caf..5fe677e6 100644 --- a/header-verifier/wasm-header-verifier-full/Cargo.toml +++ b/header-verifier/wasm-header-verifier-full/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/header-verifier/wasm-multisig-view/Cargo.lock b/header-verifier/wasm-multisig-view/Cargo.lock index 4b69eb8a..24f6ba1c 100644 --- a/header-verifier/wasm-multisig-view/Cargo.lock +++ b/header-verifier/wasm-multisig-view/Cargo.lock @@ -58,9 +58,9 @@ dependencies = [ [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -68,9 +68,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -83,9 +83,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -94,9 +94,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -106,9 +106,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -119,9 +119,9 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -153,9 +153,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -171,9 +171,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -203,9 +203,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/header-verifier/wasm-multisig-view/Cargo.toml b/header-verifier/wasm-multisig-view/Cargo.toml index 25e597a5..127e517b 100644 --- a/header-verifier/wasm-multisig-view/Cargo.toml +++ b/header-verifier/wasm-multisig-view/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/header-verifier/wasm/Cargo.lock b/header-verifier/wasm/Cargo.lock index 48db0192..077f8e60 100644 --- a/header-verifier/wasm/Cargo.lock +++ b/header-verifier/wasm/Cargo.lock @@ -58,9 +58,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -68,9 +68,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -83,9 +83,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -94,9 +94,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -106,9 +106,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -119,9 +119,9 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -153,9 +153,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -171,9 +171,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -203,9 +203,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/header-verifier/wasm/Cargo.toml b/header-verifier/wasm/Cargo.toml index 72066983..3a325101 100644 --- a/header-verifier/wasm/Cargo.toml +++ b/header-verifier/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/sovereign-forge/Cargo.toml b/sovereign-forge/Cargo.toml index d24f34dd..be9ea262 100644 --- a/sovereign-forge/Cargo.toml +++ b/sovereign-forge/Cargo.toml @@ -9,10 +9,10 @@ authors = ["you"] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.54.6" +version = "=0.55.0" [dependencies.multiversx-sc-modules] -version = "=0.54.6" +version = "=0.55.0" [dependencies.chain-factory] path = "../chain-factory" @@ -42,4 +42,4 @@ path = "../common/setup-phase" num-bigint = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.54.6" +version = "=0.55.0" diff --git a/sovereign-forge/interactor/Cargo.toml b/sovereign-forge/interactor/Cargo.toml index f91e1ced..0b38a487 100644 --- a/sovereign-forge/interactor/Cargo.toml +++ b/sovereign-forge/interactor/Cargo.toml @@ -19,10 +19,10 @@ toml = "0.8.6" path = ".." [dependencies.multiversx-sc-snippets] -version = "0.54.6" +version = "0.55.0" [dependencies.multiversx-sc] -version = "0.54.6" +version = "0.55.0" [dependencies.proxies] path = "../../common/proxies" diff --git a/sovereign-forge/meta/Cargo.toml b/sovereign-forge/meta/Cargo.toml index 49bec5ee..5e662731 100644 --- a/sovereign-forge/meta/Cargo.toml +++ b/sovereign-forge/meta/Cargo.toml @@ -8,5 +8,5 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.55.0" default-features = false diff --git a/sovereign-forge/src/phases.rs b/sovereign-forge/src/phases.rs index 0f292019..0d5e0c72 100644 --- a/sovereign-forge/src/phases.rs +++ b/sovereign-forge/src/phases.rs @@ -53,7 +53,7 @@ pub trait PhasesModule: ) { self.require_setup_complete(); - let call_value = self.call_value().egld_value(); + let call_value = self.call_value().egld(); self.require_correct_deploy_cost(call_value.deref()); let chain_id = self.generate_chain_id(); diff --git a/sovereign-forge/wasm-sovereign-forge-full/Cargo.lock b/sovereign-forge/wasm-sovereign-forge-full/Cargo.lock index de35174c..2d96ee95 100644 --- a/sovereign-forge/wasm-sovereign-forge-full/Cargo.lock +++ b/sovereign-forge/wasm-sovereign-forge-full/Cargo.lock @@ -107,9 +107,9 @@ dependencies = [ [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -117,9 +117,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -132,9 +132,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -143,9 +143,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -155,9 +155,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -168,18 +168,18 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67bf42a5cd6319a619e7d9915e0ae6837f693696bc55f3d1ac6b09b01cb48c4" +checksum = "efa55a68bd4eb79f38bb8d526fb0fb6e9146b0a7195a92efd030fefa4341dad7" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -211,9 +211,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -229,9 +229,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -285,9 +285,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/sovereign-forge/wasm-sovereign-forge-full/Cargo.toml b/sovereign-forge/wasm-sovereign-forge-full/Cargo.toml index ce28a637..4c751652 100644 --- a/sovereign-forge/wasm-sovereign-forge-full/Cargo.toml +++ b/sovereign-forge/wasm-sovereign-forge-full/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/sovereign-forge/wasm-soveriegn-forge-view/Cargo.lock b/sovereign-forge/wasm-soveriegn-forge-view/Cargo.lock index f1997c65..40e6a45c 100644 --- a/sovereign-forge/wasm-soveriegn-forge-view/Cargo.lock +++ b/sovereign-forge/wasm-soveriegn-forge-view/Cargo.lock @@ -107,9 +107,9 @@ dependencies = [ [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -117,9 +117,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -132,9 +132,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -143,9 +143,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -155,9 +155,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -168,18 +168,18 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67bf42a5cd6319a619e7d9915e0ae6837f693696bc55f3d1ac6b09b01cb48c4" +checksum = "efa55a68bd4eb79f38bb8d526fb0fb6e9146b0a7195a92efd030fefa4341dad7" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -211,9 +211,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -229,9 +229,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -285,9 +285,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/sovereign-forge/wasm-soveriegn-forge-view/Cargo.toml b/sovereign-forge/wasm-soveriegn-forge-view/Cargo.toml index 87c2b0e1..6054ad8b 100644 --- a/sovereign-forge/wasm-soveriegn-forge-view/Cargo.toml +++ b/sovereign-forge/wasm-soveriegn-forge-view/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/sovereign-forge/wasm/Cargo.lock b/sovereign-forge/wasm/Cargo.lock index b8c27dad..f0168e9d 100644 --- a/sovereign-forge/wasm/Cargo.lock +++ b/sovereign-forge/wasm/Cargo.lock @@ -107,9 +107,9 @@ dependencies = [ [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -117,9 +117,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -132,9 +132,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -143,9 +143,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -155,9 +155,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -168,18 +168,18 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67bf42a5cd6319a619e7d9915e0ae6837f693696bc55f3d1ac6b09b01cb48c4" +checksum = "efa55a68bd4eb79f38bb8d526fb0fb6e9146b0a7195a92efd030fefa4341dad7" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -211,9 +211,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -229,9 +229,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -285,9 +285,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/sovereign-forge/wasm/Cargo.toml b/sovereign-forge/wasm/Cargo.toml index 6dced102..69678a74 100644 --- a/sovereign-forge/wasm/Cargo.toml +++ b/sovereign-forge/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/testing-sc/Cargo.toml b/testing-sc/Cargo.toml index 04e80f6f..2ae4b23b 100644 --- a/testing-sc/Cargo.toml +++ b/testing-sc/Cargo.toml @@ -9,10 +9,10 @@ authors = ["you"] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.54.6" +version = "=0.55.0" [dev-dependencies] num-bigint = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.54.6" +version = "=0.55.0" diff --git a/testing-sc/meta/Cargo.toml b/testing-sc/meta/Cargo.toml index e7140e95..837f8d08 100644 --- a/testing-sc/meta/Cargo.toml +++ b/testing-sc/meta/Cargo.toml @@ -8,5 +8,5 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "=0.54.6" +version = "=0.55.0" default-features = false diff --git a/testing-sc/wasm-testing-sc-full/Cargo.lock b/testing-sc/wasm-testing-sc-full/Cargo.lock index 8343859e..971c9637 100644 --- a/testing-sc/wasm-testing-sc-full/Cargo.lock +++ b/testing-sc/wasm-testing-sc-full/Cargo.lock @@ -40,9 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -50,9 +50,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -65,9 +65,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -76,9 +76,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -88,9 +88,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -101,9 +101,9 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -128,18 +128,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -162,9 +162,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/testing-sc/wasm-testing-sc-full/Cargo.toml b/testing-sc/wasm-testing-sc-full/Cargo.toml index c41431ca..3e2a0e3e 100644 --- a/testing-sc/wasm-testing-sc-full/Cargo.toml +++ b/testing-sc/wasm-testing-sc-full/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/testing-sc/wasm-testing-view/Cargo.lock b/testing-sc/wasm-testing-view/Cargo.lock index b5469e79..1837b4c2 100644 --- a/testing-sc/wasm-testing-view/Cargo.lock +++ b/testing-sc/wasm-testing-view/Cargo.lock @@ -40,9 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -50,9 +50,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -65,9 +65,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -76,9 +76,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -88,9 +88,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -101,9 +101,9 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -128,18 +128,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -162,9 +162,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/testing-sc/wasm-testing-view/Cargo.toml b/testing-sc/wasm-testing-view/Cargo.toml index 862e8847..870b62cd 100644 --- a/testing-sc/wasm-testing-view/Cargo.toml +++ b/testing-sc/wasm-testing-view/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/testing-sc/wasm/Cargo.lock b/testing-sc/wasm/Cargo.lock index 603dabba..5e0eb87c 100644 --- a/testing-sc/wasm/Cargo.lock +++ b/testing-sc/wasm/Cargo.lock @@ -40,9 +40,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -50,9 +50,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -65,9 +65,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -76,9 +76,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -88,9 +88,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -101,9 +101,9 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -128,18 +128,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -162,9 +162,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/testing-sc/wasm/Cargo.toml b/testing-sc/wasm/Cargo.toml index 5d81c4e1..750570f7 100644 --- a/testing-sc/wasm/Cargo.toml +++ b/testing-sc/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/token-handler/Cargo.toml b/token-handler/Cargo.toml index 4b96734c..7695bd70 100644 --- a/token-handler/Cargo.toml +++ b/token-handler/Cargo.toml @@ -18,13 +18,13 @@ path = "../common/proxies" path = "../chain-factory" [dependencies.multiversx-sc] -version = "=0.54.6" +version = "=0.55.0" [dependencies.multiversx-sc-modules] -version = "=0.54.6" +version = "=0.55.0" [dev-dependencies] num-bigint = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.54.6" +version = "=0.55.0" diff --git a/token-handler/meta/Cargo.toml b/token-handler/meta/Cargo.toml index b248b3cd..6f4bffc4 100644 --- a/token-handler/meta/Cargo.toml +++ b/token-handler/meta/Cargo.toml @@ -8,5 +8,5 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "=0.54.6" +version = "=0.55.0" default-features = false diff --git a/token-handler/src/transfer_tokens.rs b/token-handler/src/transfer_tokens.rs index af3624cb..64fd6b30 100644 --- a/token-handler/src/transfer_tokens.rs +++ b/token-handler/src/transfer_tokens.rs @@ -28,7 +28,7 @@ pub trait TransferTokensModule: common_storage::CommonStorage { let mut output_payments = self.mint_tokens(&tokens.to_vec()); let call_value_esdt_transfer = self.call_value().all_esdt_transfers(); - output_payments.extend(&call_value_esdt_transfer.clone_value()); + output_payments.extend(call_value_esdt_transfer.clone()); self.distribute_payments(&to, &output_payments, &opt_transfer_data); } @@ -100,7 +100,7 @@ pub trait TransferTokensModule: common_storage::CommonStorage { ); } - output_payments.push(operation_token.into()); + output_payments.push(operation_token.clone().into()); } output_payments @@ -151,9 +151,9 @@ pub trait TransferTokensModule: common_storage::CommonStorage { args.push_arg(mapped_tokens.len()); for token in mapped_tokens { - args.push_arg(token.token_identifier); + args.push_arg(token.token_identifier.clone()); args.push_arg(token.token_nonce); - args.push_arg(token.amount); + args.push_arg(token.amount.clone()); } args diff --git a/token-handler/wasm-token-handler-full/Cargo.lock b/token-handler/wasm-token-handler-full/Cargo.lock index 92d9b364..66e79a10 100644 --- a/token-handler/wasm-token-handler-full/Cargo.lock +++ b/token-handler/wasm-token-handler-full/Cargo.lock @@ -62,9 +62,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -72,9 +72,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -87,9 +87,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -98,9 +98,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -110,9 +110,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -123,18 +123,18 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67bf42a5cd6319a619e7d9915e0ae6837f693696bc55f3d1ac6b09b01cb48c4" +checksum = "efa55a68bd4eb79f38bb8d526fb0fb6e9146b0a7195a92efd030fefa4341dad7" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -166,9 +166,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -216,9 +216,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/token-handler/wasm-token-handler-full/Cargo.toml b/token-handler/wasm-token-handler-full/Cargo.toml index 676e34d2..fd07cab7 100644 --- a/token-handler/wasm-token-handler-full/Cargo.toml +++ b/token-handler/wasm-token-handler-full/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/token-handler/wasm-token-handler-view/Cargo.lock b/token-handler/wasm-token-handler-view/Cargo.lock index 7b7ef58a..84d81c46 100644 --- a/token-handler/wasm-token-handler-view/Cargo.lock +++ b/token-handler/wasm-token-handler-view/Cargo.lock @@ -62,9 +62,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -72,9 +72,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -87,9 +87,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -98,9 +98,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -110,9 +110,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -123,18 +123,18 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67bf42a5cd6319a619e7d9915e0ae6837f693696bc55f3d1ac6b09b01cb48c4" +checksum = "efa55a68bd4eb79f38bb8d526fb0fb6e9146b0a7195a92efd030fefa4341dad7" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -166,9 +166,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -216,9 +216,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/token-handler/wasm-token-handler-view/Cargo.toml b/token-handler/wasm-token-handler-view/Cargo.toml index 8f62a89f..8c93c23d 100644 --- a/token-handler/wasm-token-handler-view/Cargo.toml +++ b/token-handler/wasm-token-handler-view/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] diff --git a/token-handler/wasm/Cargo.lock b/token-handler/wasm/Cargo.lock index fc343720..8f7fcb13 100644 --- a/token-handler/wasm/Cargo.lock +++ b/token-handler/wasm/Cargo.lock @@ -62,9 +62,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-chain-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c483122550dca9dd4286f970000d855e9d0184e4fe5c5527209a131ac1207638" +checksum = "deeae1474599e5f1145942db88df8397116fba3e0a4480111e77b2d0907d7329" dependencies = [ "bitflags", "multiversx-sc-codec", @@ -72,9 +72,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cd30870fc66d3ba7c8c0c0eac92a54283a87b9514d790ccc6038e51de704" +checksum = "960795ffd67b78b976735f679112d17dfda278504fae4f2d468ff62046658463" dependencies = [ "bitflags", "hex-literal", @@ -87,9 +87,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72f7f6a3e0828c5e38fe0e98298706837f8337fe06bca3ff21df22c84b6256" +checksum = "f0df6c337692e14e5b9ea2448216cc5a75d3e891ebfe327eccaaee31dfd119e3" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -98,9 +98,9 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b915f0f463fd1811de124b51d68cb2067f5a4796cde2a9570316780cf18961" +checksum = "2571c0afb65e504fe80a431f3b6a288c50dd3e7cd38d6cef18f8b47e5c8e8796" dependencies = [ "hex", "proc-macro2", @@ -110,9 +110,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e26214e1f9105a32c296bee6d70055533741fb0a6d00a24b1236c78622fa69" +checksum = "bb090fe537f483ac26e4a7f125f2ed4c18ab8a9315dfc80d0d74655604bd4132" dependencies = [ "hex", "proc-macro2", @@ -123,18 +123,18 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67bf42a5cd6319a619e7d9915e0ae6837f693696bc55f3d1ac6b09b01cb48c4" +checksum = "efa55a68bd4eb79f38bb8d526fb0fb6e9146b0a7195a92efd030fefa4341dad7" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.6" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a09c1950c96c5af7e597c247a248f5d73f8e229392cd98dbf402c96084d0d36" +checksum = "b449886977bc57b4f410a14642ca1d09b4909b53ad66185b0d6131d84e3608ab" dependencies = [ "multiversx-sc", ] @@ -166,9 +166,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -216,9 +216,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", diff --git a/token-handler/wasm/Cargo.toml b/token-handler/wasm/Cargo.toml index e6093c9a..c35f27c6 100644 --- a/token-handler/wasm/Cargo.toml +++ b/token-handler/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.54.6" +version = "=0.55.0" [workspace] members = ["."] From 4762bd67cbf47c1785f6524a1ae540816ac96bbf Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Thu, 9 Jan 2025 11:33:06 +0200 Subject: [PATCH 40/41] Fixed enshrine-logic Signed-off-by: Andrei Baltariu --- enshrine-esdt-safe/src/to_sovereign/create_tx.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/enshrine-esdt-safe/src/to_sovereign/create_tx.rs b/enshrine-esdt-safe/src/to_sovereign/create_tx.rs index f46e47bb..ef28d766 100644 --- a/enshrine-esdt-safe/src/to_sovereign/create_tx.rs +++ b/enshrine-esdt-safe/src/to_sovereign/create_tx.rs @@ -114,13 +114,13 @@ pub trait CreateTxModule: let fee_market_address = self.fee_market_address().get(); let fee_enabled = self.external_fee_enabled(fee_market_address).get(); - let opt_transfer_data = if fee_enabled { - OptionalValue::Some(self.pop_first_payment(payments.clone()).0) - } else { - OptionalValue::None - }; - MultiValue2::from((opt_transfer_data, payments)) + if !fee_enabled { + return MultiValue2::from((OptionalValue::None, payments)); + } else { + let (fee_payment, no_fee_payments) = self.pop_first_payment(payments.clone()); + return MultiValue2::from((OptionalValue::Some(fee_payment), no_fee_payments)); + } } fn refund_tokens( From 2e83a4d0796f7a981938a32ce0d7a6fd72ab89b6 Mon Sep 17 00:00:00 2001 From: Andrei Baltariu Date: Thu, 9 Jan 2025 11:37:02 +0200 Subject: [PATCH 41/41] Added commit hash for workflow Signed-off-by: Andrei Baltariu --- .github/workflows/actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index f19ab7fc..a6ed02f2 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -20,7 +20,7 @@ permissions: jobs: contracts: name: Contracts - uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v4.2.0 + uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@eb65c5cae88d1d540f1603c0cabc428fbe9e0975 with: rust-toolchain: stable coverage-args: --ignore-filename-regex='/.cargo/git' --output ./coverage.md