diff --git a/esdt-safe/src/esdt_safe_proxy.rs b/esdt-safe/src/esdt_safe_proxy.rs index 87d50f05..48a12bd9 100644 --- a/esdt-safe/src/esdt_safe_proxy.rs +++ b/esdt-safe/src/esdt_safe_proxy.rs @@ -45,22 +45,14 @@ where { pub fn init< Arg0: ProxyArg, - Arg1: ProxyArg, - Arg2: ProxyArg>, - Arg3: ProxyArg>>, >( self, is_sovereign_chain: Arg0, - min_valid_signers: Arg1, - initiator_address: Arg2, - signers: Arg3, - ) -> TxProxyDeploy { + ) -> TxTypedDeploy { self.wrapped_tx + .payment(NotPayable) .raw_deploy() .argument(&is_sovereign_chain) - .argument(&min_valid_signers) - .argument(&initiator_address) - .argument(&signers) .original_result() } } @@ -76,8 +68,9 @@ where { pub fn upgrade( self, - ) -> TxProxyUpgrade { + ) -> TxTypedUpgrade { self.wrapped_tx + .payment(NotPayable) .raw_upgrade() .original_result() } @@ -97,8 +90,9 @@ where >( self, fee_market_address: Arg0, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("setFeeMarketAddress") .argument(&fee_market_address) .original_result() @@ -109,9 +103,10 @@ where >( self, header_verifier_address: Arg0, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx - .raw_call("setMultisigAddress") + .payment(NotPayable) + .raw_call("setHeaderVerifierAddress") .argument(&header_verifier_address) .original_result() } @@ -121,8 +116,9 @@ where >( self, bridge_address: Arg0, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("setSovereignBridgeAddress") .argument(&bridge_address) .original_result() @@ -135,8 +131,9 @@ where self, new_value: Arg0, opt_sig: Arg1, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("setMaxUserTxGasLimit") .argument(&new_value) .argument(&opt_sig) @@ -150,8 +147,9 @@ where self, opt_signature: Arg0, tokens: Arg1, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("setBurnAndMint") .argument(&opt_signature) .argument(&tokens) @@ -165,8 +163,9 @@ where self, opt_signature: Arg0, tokens: Arg1, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("removeBurnAndMint") .argument(&opt_signature) .argument(&tokens) @@ -180,8 +179,9 @@ where self, opt_signature: Arg0, names: Arg1, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("addBannedEndpointNames") .argument(&opt_signature) .argument(&names) @@ -195,8 +195,9 @@ where self, opt_signature: Arg0, names: Arg1, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("removeBannedEndpointNames") .argument(&opt_signature) .argument(&names) @@ -208,7 +209,7 @@ where >( self, to: Arg0, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx .raw_call("depositBack") .argument(&to) @@ -223,7 +224,7 @@ where self, to: Arg0, opt_transfer_data: Arg1, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx .raw_call("deposit") .argument(&to) @@ -239,8 +240,9 @@ where >( self, token_id: Arg0, - ) -> TxProxyCall>> { + ) -> TxTypedCall>> { self.wrapped_tx + .payment(NotPayable) .raw_call("claimRefund") .argument(&token_id) .original_result() @@ -259,8 +261,9 @@ where batch_id: Arg0, signature: Arg1, tx_statuses: Arg2, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("setTransactionBatchStatus") .argument(&batch_id) .argument(&signature) @@ -273,8 +276,9 @@ where >( self, new_value: Arg0, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("setMinValidSigners") .argument(&new_value) .original_result() @@ -285,8 +289,9 @@ where >( self, signers: Arg0, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("addSigners") .argument(&signers) .original_result() @@ -297,8 +302,9 @@ where >( self, signers: Arg0, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("removeSigners") .argument(&signers) .original_result() @@ -317,7 +323,7 @@ where token_display_name: Arg2, token_ticker: Arg3, num_decimals: Arg4, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx .raw_call("registerToken") .argument(&sov_token_id) @@ -333,8 +339,9 @@ where >( self, sov_token_id: Arg0, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("clearRegisteredSovereignToken") .argument(&sov_token_id) .original_result() @@ -345,8 +352,9 @@ where >( self, mvx_token_id: Arg0, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("clearRegisteredMultiversxToken") .argument(&mvx_token_id) .original_result() @@ -359,8 +367,9 @@ where self, hash_of_hashes: Arg0, operation: Arg1, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("executeBridgeOps") .argument(&hash_of_hashes) .argument(&operation) @@ -372,8 +381,9 @@ where >( self, new_max_tx_batch_size: Arg0, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("setMaxTxBatchSize") .argument(&new_max_tx_batch_size) .original_result() @@ -384,8 +394,9 @@ where >( self, new_max_tx_batch_block_duration: Arg0, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("setMaxTxBatchBlockDuration") .argument(&new_max_tx_batch_block_duration) .original_result() @@ -393,16 +404,18 @@ where pub fn get_current_tx_batch( self, - ) -> TxProxyCall, ManagedAddress, ManagedVec>, ManagedVec>, Option>>>>>> { + ) -> TxTypedCall, ManagedAddress, ManagedVec>, ManagedVec>, Option>>>>>> { self.wrapped_tx + .payment(NotPayable) .raw_call("getCurrentTxBatch") .original_result() } pub fn get_first_batch_any_status( self, - ) -> TxProxyCall, ManagedAddress, ManagedVec>, ManagedVec>, Option>>>>>> { + ) -> TxTypedCall, ManagedAddress, ManagedVec>, ManagedVec>, Option>>>>>> { self.wrapped_tx + .payment(NotPayable) .raw_call("getFirstBatchAnyStatus") .original_result() } @@ -412,8 +425,9 @@ where >( self, batch_id: Arg0, - ) -> TxProxyCall, ManagedAddress, ManagedVec>, ManagedVec>, Option>>>>>> { + ) -> TxTypedCall, ManagedAddress, ManagedVec>, ManagedVec>, Option>>>>>> { self.wrapped_tx + .payment(NotPayable) .raw_call("getBatch") .argument(&batch_id) .original_result() @@ -424,8 +438,9 @@ where >( self, batch_id: Arg0, - ) -> TxProxyCall> { + ) -> TxTypedCall> { self.wrapped_tx + .payment(NotPayable) .raw_call("getBatchStatus") .argument(&batch_id) .original_result() @@ -433,16 +448,18 @@ where pub fn first_batch_id( self, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("getFirstBatchId") .original_result() } pub fn last_batch_id( self, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("getLastBatchId") .original_result() } @@ -454,8 +471,9 @@ where self, token_id: Arg0, max_amount: Arg1, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("setMaxBridgedAmount") .argument(&token_id) .argument(&max_amount) @@ -467,8 +485,9 @@ where >( self, token_id: Arg0, - ) -> TxProxyCall> { + ) -> TxTypedCall> { self.wrapped_tx + .payment(NotPayable) .raw_call("getMaxBridgedAmount") .argument(&token_id) .original_result() @@ -476,8 +495,9 @@ where pub fn end_setup_phase( self, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("endSetupPhase") .original_result() } @@ -490,8 +510,9 @@ where self, opt_signature: Arg0, tokens: Arg1, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("addTokensToWhitelist") .argument(&opt_signature) .argument(&tokens) @@ -505,8 +526,9 @@ where self, opt_signature: Arg0, tokens: Arg1, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("removeTokensFromWhitelist") .argument(&opt_signature) .argument(&tokens) @@ -521,8 +543,9 @@ where self, opt_signature: Arg0, tokens: Arg1, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("addTokensToBlacklist") .argument(&opt_signature) .argument(&tokens) @@ -536,8 +559,9 @@ where self, opt_signature: Arg0, tokens: Arg1, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("removeTokensFromBlacklist") .argument(&opt_signature) .argument(&tokens) @@ -546,40 +570,45 @@ where pub fn token_whitelist( self, - ) -> TxProxyCall>> { + ) -> TxTypedCall>> { self.wrapped_tx + .payment(NotPayable) .raw_call("getTokenWhitelist") .original_result() } pub fn token_blacklist( self, - ) -> TxProxyCall>> { + ) -> TxTypedCall>> { self.wrapped_tx + .payment(NotPayable) .raw_call("getTokenBlacklist") .original_result() } pub fn pause_endpoint( self, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("pause") .original_result() } pub fn unpause_endpoint( self, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("unpause") .original_result() } pub fn paused_status( self, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("isPaused") .original_result() } diff --git a/esdt-safe/src/lib.rs b/esdt-safe/src/lib.rs index 3be80ccd..161f06d6 100644 --- a/esdt-safe/src/lib.rs +++ b/esdt-safe/src/lib.rs @@ -44,7 +44,7 @@ pub trait EsdtSafe: } #[only_owner] - #[endpoint(setMultisigAddress)] + #[endpoint(setHeaderVerifierAddress)] fn set_header_verifier_address(&self, header_verifier_address: ManagedAddress) { self.require_sc_address(&header_verifier_address); diff --git a/esdt-safe/wasm-esdt-safe-full/src/lib.rs b/esdt-safe/wasm-esdt-safe-full/src/lib.rs index 6edaf050..a3f02bbd 100644 --- a/esdt-safe/wasm-esdt-safe-full/src/lib.rs +++ b/esdt-safe/wasm-esdt-safe-full/src/lib.rs @@ -22,7 +22,7 @@ multiversx_sc_wasm_adapter::endpoints! { init => init upgrade => upgrade setFeeMarketAddress => set_fee_market_address - setMultisigAddress => set_header_verifier_address + setHeaderVerifierAddress => set_header_verifier_address setSovereignBridgeAddress => set_sovereign_bridge_address setMaxUserTxGasLimit => set_max_user_tx_gas_limit setBurnAndMint => set_burn_and_mint diff --git a/esdt-safe/wasm/src/lib.rs b/esdt-safe/wasm/src/lib.rs index 6edaf050..a3f02bbd 100644 --- a/esdt-safe/wasm/src/lib.rs +++ b/esdt-safe/wasm/src/lib.rs @@ -22,7 +22,7 @@ multiversx_sc_wasm_adapter::endpoints! { init => init upgrade => upgrade setFeeMarketAddress => set_fee_market_address - setMultisigAddress => set_header_verifier_address + setHeaderVerifierAddress => set_header_verifier_address setSovereignBridgeAddress => set_sovereign_bridge_address setMaxUserTxGasLimit => set_max_user_tx_gas_limit setBurnAndMint => set_burn_and_mint diff --git a/fee-market/src/fee_market_proxy.rs b/fee-market/src/fee_market_proxy.rs index 35e30bd0..4f4528f4 100644 --- a/fee-market/src/fee_market_proxy.rs +++ b/fee-market/src/fee_market_proxy.rs @@ -54,8 +54,9 @@ where price_aggregator_address: Arg1, usdc_token_id: Arg2, wegld_token_id: Arg3, - ) -> TxProxyDeploy { + ) -> TxTypedDeploy { self.wrapped_tx + .payment(NotPayable) .raw_deploy() .argument(&esdt_safe_address) .argument(&price_aggregator_address) @@ -76,8 +77,9 @@ where { pub fn upgrade( self, - ) -> TxProxyUpgrade { + ) -> TxTypedUpgrade { self.wrapped_tx + .payment(NotPayable) .raw_upgrade() .original_result() } @@ -94,16 +96,18 @@ where { pub fn enable_fee( self, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("enableFee") .original_result() } pub fn disable_fee( self, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("disableFee") .original_result() } @@ -115,8 +119,9 @@ where self, base_token: Arg0, fee_type: Arg1, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("addFee") .argument(&base_token) .argument(&fee_type) @@ -128,8 +133,9 @@ where >( self, base_token: Arg0, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("removeFee") .argument(&base_token) .original_result() @@ -140,8 +146,9 @@ where >( self, token_id: Arg0, - ) -> TxProxyCall> { + ) -> TxTypedCall> { self.wrapped_tx + .payment(NotPayable) .raw_call("getTokenFee") .argument(&token_id) .original_result() @@ -152,8 +159,9 @@ where >( self, users: Arg0, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("addUsersToWhitelist") .argument(&users) .original_result() @@ -164,8 +172,9 @@ where >( self, users: Arg0, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("removeUsersFromWhitelist") .argument(&users) .original_result() @@ -177,8 +186,9 @@ where >( self, address_percentage_pairs: Arg0, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("distributeFees") .argument(&address_percentage_pairs) .original_result() @@ -193,7 +203,7 @@ where original_caller: Arg0, total_transfers: Arg1, opt_gas_limit: Arg2, - ) -> TxProxyCall> { + ) -> TxTypedCall> { self.wrapped_tx .raw_call("subtractFee") .argument(&original_caller) @@ -204,8 +214,9 @@ where pub fn users_whitelist( self, - ) -> TxProxyCall>> { + ) -> TxTypedCall>> { self.wrapped_tx + .payment(NotPayable) .raw_call("getUsersWhitelist") .original_result() } @@ -215,8 +226,9 @@ where >( self, new_value: Arg0, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("setMinValidSigners") .argument(&new_value) .original_result() @@ -227,8 +239,9 @@ where >( self, signers: Arg0, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("addSigners") .argument(&signers) .original_result() @@ -239,8 +252,9 @@ where >( self, signers: Arg0, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("removeSigners") .argument(&signers) .original_result() diff --git a/header-verifier/src/header_verifier_proxy.rs b/header-verifier/src/header_verifier_proxy.rs index 7a99b0e2..4f57c709 100644 --- a/header-verifier/src/header_verifier_proxy.rs +++ b/header-verifier/src/header_verifier_proxy.rs @@ -48,8 +48,9 @@ where >( self, bls_pub_keys: Arg0, - ) -> TxProxyDeploy { + ) -> TxTypedDeploy { self.wrapped_tx + .payment(NotPayable) .raw_deploy() .argument(&bls_pub_keys) .original_result() @@ -67,8 +68,9 @@ where { pub fn upgrade( self, - ) -> TxProxyUpgrade { + ) -> TxTypedUpgrade { self.wrapped_tx + .payment(NotPayable) .raw_upgrade() .original_result() } @@ -92,8 +94,9 @@ where signature: Arg0, bridge_operations_hash: Arg1, operations_hashes: Arg2, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("registerBridgeOps") .argument(&signature) .argument(&bridge_operations_hash) @@ -106,8 +109,9 @@ where >( self, esdt_safe_address: Arg0, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("setEsdtSafeAddress") .argument(&esdt_safe_address) .original_result() @@ -120,8 +124,9 @@ where self, hash_of_hashes: Arg0, operation_hash: Arg1, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("removeExecutedHash") .argument(&hash_of_hashes) .argument(&operation_hash) @@ -133,8 +138,9 @@ where >( self, new_value: Arg0, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("setMinValidSigners") .argument(&new_value) .original_result() @@ -145,8 +151,9 @@ where >( self, signers: Arg0, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("addSigners") .argument(&signers) .original_result() @@ -157,8 +164,9 @@ where >( self, signers: Arg0, - ) -> TxProxyCall { + ) -> TxTypedCall { self.wrapped_tx + .payment(NotPayable) .raw_call("removeSigners") .argument(&signers) .original_result()