diff --git a/common/sc-proxies/src/multi_transfer_esdt_proxy.rs b/common/sc-proxies/src/multi_transfer_esdt_proxy.rs index 9e26331b..68871989 100644 --- a/common/sc-proxies/src/multi_transfer_esdt_proxy.rs +++ b/common/sc-proxies/src/multi_transfer_esdt_proxy.rs @@ -301,31 +301,4 @@ where .argument(&token_id) .original_result() } - - pub fn pause_endpoint( - self, - ) -> TxTypedCall { - self.wrapped_tx - .payment(NotPayable) - .raw_call("pause") - .original_result() - } - - pub fn unpause_endpoint( - self, - ) -> TxTypedCall { - self.wrapped_tx - .payment(NotPayable) - .raw_call("unpause") - .original_result() - } - - pub fn paused_status( - self, - ) -> TxTypedCall { - self.wrapped_tx - .payment(NotPayable) - .raw_call("isPaused") - .original_result() - } } diff --git a/common/sc-proxies/src/multisig_proxy.rs b/common/sc-proxies/src/multisig_proxy.rs index 61553d4d..5b111df7 100644 --- a/common/sc-proxies/src/multisig_proxy.rs +++ b/common/sc-proxies/src/multisig_proxy.rs @@ -702,93 +702,93 @@ where .original_result() } - pub fn pause_all_child_contracts( + pub fn pause_processing( self, ) -> TxTypedCall { self.wrapped_tx .payment(NotPayable) - .raw_call("pauseAllChildContracts") + .raw_call("pauseProcessing") .original_result() } - pub fn unpause_all_child_contracts( + pub fn unpause_processing( self, ) -> TxTypedCall { self.wrapped_tx .payment(NotPayable) - .raw_call("unpauseAllChildContracts") + .raw_call("unpauseProcessing") .original_result() } - pub fn pause_esdt_safe( + pub fn pause_deposits( self, ) -> TxTypedCall { self.wrapped_tx .payment(NotPayable) - .raw_call("pauseEsdtSafe") + .raw_call("pauseDeposits") .original_result() } - pub fn unpause_esdt_safe( + pub fn unpause_deposits( self, ) -> TxTypedCall { self.wrapped_tx .payment(NotPayable) - .raw_call("unpauseEsdtSafe") + .raw_call("unpauseDeposits") .original_result() } - pub fn pause_bridge_proxy( + pub fn pause_esdt_safe( self, ) -> TxTypedCall { self.wrapped_tx .payment(NotPayable) - .raw_call("pauseBridgeProxy") + .raw_call("pauseEsdtSafe") .original_result() } - pub fn unpause_bridge_proxy( + pub fn unpause_esdt_safe( self, ) -> TxTypedCall { self.wrapped_tx .payment(NotPayable) - .raw_call("unpauseBridgeProxy") + .raw_call("unpauseEsdtSafe") .original_result() } - pub fn pause_bridged_tokens_wrapper( + pub fn pause_bridge_proxy( self, ) -> TxTypedCall { self.wrapped_tx .payment(NotPayable) - .raw_call("pauseBridgedTokensWrapper") + .raw_call("pauseBridgeProxy") .original_result() } - pub fn unpause_bridged_tokens_wrapper( + pub fn unpause_bridge_proxy( self, ) -> TxTypedCall { self.wrapped_tx .payment(NotPayable) - .raw_call("unpauseBridgedTokensWrapper") + .raw_call("unpauseBridgeProxy") .original_result() } - pub fn pause_multi_transfer_esdt( + pub fn pause_bridged_tokens_wrapper( self, ) -> TxTypedCall { self.wrapped_tx .payment(NotPayable) - .raw_call("pauseMultiTransferEsdt") + .raw_call("pauseBridgedTokensWrapper") .original_result() } - pub fn unpause_multi_transfer_esdt( + pub fn unpause_bridged_tokens_wrapper( self, ) -> TxTypedCall { self.wrapped_tx .payment(NotPayable) - .raw_call("unpauseMultiTransferEsdt") + .raw_call("unpauseBridgedTokensWrapper") .original_result() } diff --git a/multi-transfer-esdt/src/lib.rs b/multi-transfer-esdt/src/lib.rs index 061168e8..37afc4e0 100644 --- a/multi-transfer-esdt/src/lib.rs +++ b/multi-transfer-esdt/src/lib.rs @@ -12,9 +12,7 @@ const CHAIN_SPECIFIC_TO_UNIVERSAL_TOKEN_MAPPING: &[u8] = b"chainSpecificToUniver #[multiversx_sc::contract] pub trait MultiTransferEsdt: - tx_batch_module::TxBatchModule - + max_bridged_amount_module::MaxBridgedAmountModule - + multiversx_sc_modules::pause::PauseModule + tx_batch_module::TxBatchModule + max_bridged_amount_module::MaxBridgedAmountModule { #[init] fn init(&self) { diff --git a/multi-transfer-esdt/wasm/src/lib.rs b/multi-transfer-esdt/wasm/src/lib.rs index e5ac4ac6..13c00129 100644 --- a/multi-transfer-esdt/wasm/src/lib.rs +++ b/multi-transfer-esdt/wasm/src/lib.rs @@ -6,9 +6,9 @@ // Init: 1 // Upgrade: 1 -// Endpoints: 22 +// Endpoints: 19 // Async Callback (empty): 1 -// Total number of exported functions: 25 +// Total number of exported functions: 22 #![no_std] @@ -39,9 +39,6 @@ multiversx_sc_wasm_adapter::endpoints! { getLastBatchId => last_batch_id setMaxBridgedAmount => set_max_bridged_amount getMaxBridgedAmount => max_bridged_amount - pause => pause_endpoint - unpause => unpause_endpoint - isPaused => paused_status ) } diff --git a/multisig/scenarios/ethereum_to_multiversx_relayer_call_data_several_tx_test.scen.json b/multisig/scenarios/ethereum_to_multiversx_relayer_call_data_several_tx_test.scen.json index ea59a03e..410d608c 100644 --- a/multisig/scenarios/ethereum_to_multiversx_relayer_call_data_several_tx_test.scen.json +++ b/multisig/scenarios/ethereum_to_multiversx_relayer_call_data_several_tx_test.scen.json @@ -352,6 +352,74 @@ "status": "0" } }, + { + "step": "scCall", + "id": "", + "tx": { + "from": "address:owner", + "to": "sc:multi-transfer", + "function": "ChangeOwnerAddress", + "arguments": [ + "0x000000000000000005006d756c74697369675f5f5f5f5f5f5f5f5f5f5f5f5f5f" + ], + "gasLimit": "5,000,000" + }, + "expect": { + "out": [], + "status": "0" + } + }, + { + "step": "scCall", + "id": "", + "tx": { + "from": "address:owner", + "to": "sc:esdt-safe", + "function": "ChangeOwnerAddress", + "arguments": [ + "0x000000000000000005006d756c74697369675f5f5f5f5f5f5f5f5f5f5f5f5f5f" + ], + "gasLimit": "5,000,000" + }, + "expect": { + "out": [], + "status": "0" + } + }, + { + "step": "scCall", + "id": "", + "tx": { + "from": "address:owner", + "to": "sc:bridge-proxy", + "function": "ChangeOwnerAddress", + "arguments": [ + "0x000000000000000005006d756c74697369675f5f5f5f5f5f5f5f5f5f5f5f5f5f" + ], + "gasLimit": "5,000,000" + }, + "expect": { + "out": [], + "status": "0" + } + }, + { + "step": "scCall", + "id": "", + "tx": { + "from": "address:owner", + "to": "sc:bridged-tokens-wrapper", + "function": "ChangeOwnerAddress", + "arguments": [ + "0x000000000000000005006d756c74697369675f5f5f5f5f5f5f5f5f5f5f5f5f5f" + ], + "gasLimit": "5,000,000" + }, + "expect": { + "out": [], + "status": "0" + } + }, { "step": "scCall", "id": "", diff --git a/multisig/scenarios/ethereum_to_multiversx_relayer_query2_test.scen.json b/multisig/scenarios/ethereum_to_multiversx_relayer_query2_test.scen.json index 5a51561a..5db2b8ba 100644 --- a/multisig/scenarios/ethereum_to_multiversx_relayer_query2_test.scen.json +++ b/multisig/scenarios/ethereum_to_multiversx_relayer_query2_test.scen.json @@ -352,6 +352,74 @@ "status": "0" } }, + { + "step": "scCall", + "id": "", + "tx": { + "from": "address:owner", + "to": "sc:multi-transfer", + "function": "ChangeOwnerAddress", + "arguments": [ + "0x000000000000000005006d756c74697369675f5f5f5f5f5f5f5f5f5f5f5f5f5f" + ], + "gasLimit": "5,000,000" + }, + "expect": { + "out": [], + "status": "0" + } + }, + { + "step": "scCall", + "id": "", + "tx": { + "from": "address:owner", + "to": "sc:esdt-safe", + "function": "ChangeOwnerAddress", + "arguments": [ + "0x000000000000000005006d756c74697369675f5f5f5f5f5f5f5f5f5f5f5f5f5f" + ], + "gasLimit": "5,000,000" + }, + "expect": { + "out": [], + "status": "0" + } + }, + { + "step": "scCall", + "id": "", + "tx": { + "from": "address:owner", + "to": "sc:bridge-proxy", + "function": "ChangeOwnerAddress", + "arguments": [ + "0x000000000000000005006d756c74697369675f5f5f5f5f5f5f5f5f5f5f5f5f5f" + ], + "gasLimit": "5,000,000" + }, + "expect": { + "out": [], + "status": "0" + } + }, + { + "step": "scCall", + "id": "", + "tx": { + "from": "address:owner", + "to": "sc:bridged-tokens-wrapper", + "function": "ChangeOwnerAddress", + "arguments": [ + "0x000000000000000005006d756c74697369675f5f5f5f5f5f5f5f5f5f5f5f5f5f" + ], + "gasLimit": "5,000,000" + }, + "expect": { + "out": [], + "status": "0" + } + }, { "step": "scCall", "id": "", diff --git a/multisig/scenarios/ethereum_to_multiversx_relayer_query_test.scen.json b/multisig/scenarios/ethereum_to_multiversx_relayer_query_test.scen.json index 76f0c892..bd6318d6 100644 --- a/multisig/scenarios/ethereum_to_multiversx_relayer_query_test.scen.json +++ b/multisig/scenarios/ethereum_to_multiversx_relayer_query_test.scen.json @@ -352,6 +352,74 @@ "status": "0" } }, + { + "step": "scCall", + "id": "", + "tx": { + "from": "address:owner", + "to": "sc:multi-transfer", + "function": "ChangeOwnerAddress", + "arguments": [ + "0x000000000000000005006d756c74697369675f5f5f5f5f5f5f5f5f5f5f5f5f5f" + ], + "gasLimit": "5,000,000" + }, + "expect": { + "out": [], + "status": "0" + } + }, + { + "step": "scCall", + "id": "", + "tx": { + "from": "address:owner", + "to": "sc:esdt-safe", + "function": "ChangeOwnerAddress", + "arguments": [ + "0x000000000000000005006d756c74697369675f5f5f5f5f5f5f5f5f5f5f5f5f5f" + ], + "gasLimit": "5,000,000" + }, + "expect": { + "out": [], + "status": "0" + } + }, + { + "step": "scCall", + "id": "", + "tx": { + "from": "address:owner", + "to": "sc:bridge-proxy", + "function": "ChangeOwnerAddress", + "arguments": [ + "0x000000000000000005006d756c74697369675f5f5f5f5f5f5f5f5f5f5f5f5f5f" + ], + "gasLimit": "5,000,000" + }, + "expect": { + "out": [], + "status": "0" + } + }, + { + "step": "scCall", + "id": "", + "tx": { + "from": "address:owner", + "to": "sc:bridged-tokens-wrapper", + "function": "ChangeOwnerAddress", + "arguments": [ + "0x000000000000000005006d756c74697369675f5f5f5f5f5f5f5f5f5f5f5f5f5f" + ], + "gasLimit": "5,000,000" + }, + "expect": { + "out": [], + "status": "0" + } + }, { "step": "scCall", "id": "", diff --git a/multisig/scenarios/ethereum_to_multiversx_tx_batch_ok_call_data_encoded.scen.json b/multisig/scenarios/ethereum_to_multiversx_tx_batch_ok_call_data_encoded.scen.json index 4d6d8f25..fb6f0eb6 100644 --- a/multisig/scenarios/ethereum_to_multiversx_tx_batch_ok_call_data_encoded.scen.json +++ b/multisig/scenarios/ethereum_to_multiversx_tx_batch_ok_call_data_encoded.scen.json @@ -352,6 +352,74 @@ "status": "0" } }, + { + "step": "scCall", + "id": "", + "tx": { + "from": "address:owner", + "to": "sc:multi-transfer", + "function": "ChangeOwnerAddress", + "arguments": [ + "0x000000000000000005006d756c74697369675f5f5f5f5f5f5f5f5f5f5f5f5f5f" + ], + "gasLimit": "5,000,000" + }, + "expect": { + "out": [], + "status": "0" + } + }, + { + "step": "scCall", + "id": "", + "tx": { + "from": "address:owner", + "to": "sc:esdt-safe", + "function": "ChangeOwnerAddress", + "arguments": [ + "0x000000000000000005006d756c74697369675f5f5f5f5f5f5f5f5f5f5f5f5f5f" + ], + "gasLimit": "5,000,000" + }, + "expect": { + "out": [], + "status": "0" + } + }, + { + "step": "scCall", + "id": "", + "tx": { + "from": "address:owner", + "to": "sc:bridge-proxy", + "function": "ChangeOwnerAddress", + "arguments": [ + "0x000000000000000005006d756c74697369675f5f5f5f5f5f5f5f5f5f5f5f5f5f" + ], + "gasLimit": "5,000,000" + }, + "expect": { + "out": [], + "status": "0" + } + }, + { + "step": "scCall", + "id": "", + "tx": { + "from": "address:owner", + "to": "sc:bridged-tokens-wrapper", + "function": "ChangeOwnerAddress", + "arguments": [ + "0x000000000000000005006d756c74697369675f5f5f5f5f5f5f5f5f5f5f5f5f5f" + ], + "gasLimit": "5,000,000" + }, + "expect": { + "out": [], + "status": "0" + } + }, { "step": "scCall", "id": "", diff --git a/multisig/src/setup.rs b/multisig/src/setup.rs index 8f60c4f8..978beb0a 100644 --- a/multisig/src/setup.rs +++ b/multisig/src/setup.rs @@ -407,23 +407,31 @@ pub trait SetupModule: // Pause/Unpause endpoints #[only_owner] - #[endpoint(pauseAllChildContracts)] - fn pause_all_child_contracts(&self) { + #[endpoint(pauseProcessing)] + fn pause_processing(&self) { self.pause_endpoint(); + } + + #[only_owner] + #[endpoint(unpauseProcessing)] + fn unpause_processing(&self) { + self.unpause_endpoint(); + } + + #[only_owner] + #[endpoint(pauseDeposits)] + fn pause_deposits(&self) { self.pause_esdt_safe(); self.pause_bridge_proxy(); self.pause_bridged_tokens_wrapper(); - self.pause_multi_transfer_esdt(); } #[only_owner] - #[endpoint(unpauseAllChildContracts)] - fn unpause_all_child_contracts(&self) { - self.unpause_endpoint(); + #[endpoint(unpauseDeposits)] + fn unpause_deposits(&self) { self.unpause_esdt_safe(); self.unpause_bridge_proxy(); self.unpause_bridged_tokens_wrapper(); - self.unpause_multi_transfer_esdt(); } #[only_owner] @@ -508,32 +516,4 @@ pub trait SetupModule: self.unpause_bridged_tokens_wrapper_event(); } - - #[only_owner] - #[endpoint(pauseMultiTransferEsdt)] - fn pause_multi_transfer_esdt(&self) { - let proxy_addr = self.multi_transfer_esdt_address().get(); - - self.tx() - .to(proxy_addr) - .typed(multi_transfer_esdt_proxy::MultiTransferEsdtProxy) - .pause_endpoint() - .sync_call(); - - self.pause_multi_transfer_esdt_event(); - } - - #[only_owner] - #[endpoint(unpauseMultiTransferEsdt)] - fn unpause_multi_transfer_esdt(&self) { - let proxy_addr = self.multi_transfer_esdt_address().get(); - - self.tx() - .to(proxy_addr) - .typed(multi_transfer_esdt_proxy::MultiTransferEsdtProxy) - .unpause_endpoint() - .sync_call(); - - self.unpause_multi_transfer_esdt_event(); - } } diff --git a/multisig/tests/multisig_blackbox_test.rs b/multisig/tests/multisig_blackbox_test.rs index 4f0a783c..786c42fb 100644 --- a/multisig/tests/multisig_blackbox_test.rs +++ b/multisig/tests/multisig_blackbox_test.rs @@ -965,17 +965,7 @@ fn multisig_pause_all_child_scs_test() { .from(OWNER_ADDRESS) .to(MULTISIG_ADDRESS) .typed(multisig_proxy::MultisigProxy) - .pause_all_child_contracts() - .run(); - - state - .world - .tx() - .from(OWNER_ADDRESS) - .to(MULTISIG_ADDRESS) - .typed(multisig_proxy::MultisigProxy) - .paused_status() - .returns(ExpectValue(true)) + .pause_deposits() .run(); state @@ -1008,16 +998,6 @@ fn multisig_pause_all_child_scs_test() { .returns(ExpectValue(true)) .run(); - state - .world - .tx() - .from(MULTISIG_ADDRESS) - .to(MULTI_TRANSFER_ADDRESS) - .typed(multi_transfer_esdt_proxy::MultiTransferEsdtProxy) - .paused_status() - .returns(ExpectValue(true)) - .run(); - // Unpause state .world @@ -1025,17 +1005,7 @@ fn multisig_pause_all_child_scs_test() { .from(OWNER_ADDRESS) .to(MULTISIG_ADDRESS) .typed(multisig_proxy::MultisigProxy) - .unpause_all_child_contracts() - .run(); - - state - .world - .tx() - .from(OWNER_ADDRESS) - .to(MULTISIG_ADDRESS) - .typed(multisig_proxy::MultisigProxy) - .paused_status() - .returns(ExpectValue(false)) + .unpause_deposits() .run(); state @@ -1071,9 +1041,37 @@ fn multisig_pause_all_child_scs_test() { state .world .tx() - .from(MULTISIG_ADDRESS) - .to(MULTI_TRANSFER_ADDRESS) - .typed(multi_transfer_esdt_proxy::MultiTransferEsdtProxy) + .from(OWNER_ADDRESS) + .to(MULTISIG_ADDRESS) + .typed(multisig_proxy::MultisigProxy) + .pause_processing() + .run(); + + state + .world + .tx() + .from(OWNER_ADDRESS) + .to(MULTISIG_ADDRESS) + .typed(multisig_proxy::MultisigProxy) + .paused_status() + .returns(ExpectValue(true)) + .run(); + + state + .world + .tx() + .from(OWNER_ADDRESS) + .to(MULTISIG_ADDRESS) + .typed(multisig_proxy::MultisigProxy) + .unpause_processing() + .run(); + + state + .world + .tx() + .from(OWNER_ADDRESS) + .to(MULTISIG_ADDRESS) + .typed(multisig_proxy::MultisigProxy) .paused_status() .returns(ExpectValue(false)) .run(); diff --git a/multisig/wasm/src/lib.rs b/multisig/wasm/src/lib.rs index b67a4b57..383b97d1 100644 --- a/multisig/wasm/src/lib.rs +++ b/multisig/wasm/src/lib.rs @@ -57,16 +57,16 @@ multiversx_sc_wasm_adapter::endpoints! { multiTransferEsdtSetMaxRefundTxBatchSize => multi_transfer_esdt_set_max_refund_tx_batch_size multiTransferEsdtSetMaxRefundTxBatchBlockDuration => multi_transfer_esdt_set_max_refund_tx_batch_block_duration multiTransferEsdtSetWrappingContractAddress => multi_transfer_esdt_set_wrapping_contract_address - pauseAllChildContracts => pause_all_child_contracts - unpauseAllChildContracts => unpause_all_child_contracts + pauseProcessing => pause_processing + unpauseProcessing => unpause_processing + pauseDeposits => pause_deposits + unpauseDeposits => unpause_deposits pauseEsdtSafe => pause_esdt_safe unpauseEsdtSafe => unpause_esdt_safe pauseBridgeProxy => pause_bridge_proxy unpauseBridgeProxy => unpause_bridge_proxy pauseBridgedTokensWrapper => pause_bridged_tokens_wrapper unpauseBridgedTokensWrapper => unpause_bridged_tokens_wrapper - pauseMultiTransferEsdt => pause_multi_transfer_esdt - unpauseMultiTransferEsdt => unpause_multi_transfer_esdt getQuorum => quorum getNumBoardMembers => num_board_members getRequiredStakeAmount => required_stake_amount