diff --git a/esdt-safe/scenarios/add_refund_batch.scen.json b/esdt-safe/scenarios/add_refund_batch.scen.json index c88b0013..4e749d92 100644 --- a/esdt-safe/scenarios/add_refund_batch.scen.json +++ b/esdt-safe/scenarios/add_refund_batch.scen.json @@ -59,7 +59,7 @@ "str:BRIDGE-123456": { "balance": "3,001,300", "roles": [ - "ESDTRoleLocalBurn" + "ESDTRoleLocalBurn","ESDTRoleLocalMint" ] } }, diff --git a/esdt-safe/scenarios/create_another_tx_too_late_for_batch.scen.json b/esdt-safe/scenarios/create_another_tx_too_late_for_batch.scen.json index e00dbcbb..811c9c0a 100644 --- a/esdt-safe/scenarios/create_another_tx_too_late_for_batch.scen.json +++ b/esdt-safe/scenarios/create_another_tx_too_late_for_batch.scen.json @@ -84,7 +84,8 @@ "str:BRIDGE-123456": { "balance": "4,501,400", "roles": [ - "ESDTRoleLocalBurn" + "ESDTRoleLocalBurn", + "ESDTRoleLocalMint" ] } }, @@ -215,7 +216,8 @@ "str:BRIDGE-123456": { "balance": "6,001,500", "roles": [ - "ESDTRoleLocalBurn" + "ESDTRoleLocalBurn", + "ESDTRoleLocalMint" ] } }, diff --git a/esdt-safe/scenarios/distribute_fees.scen.json b/esdt-safe/scenarios/distribute_fees.scen.json index fee008ef..ff0fed43 100644 --- a/esdt-safe/scenarios/distribute_fees.scen.json +++ b/esdt-safe/scenarios/distribute_fees.scen.json @@ -45,7 +45,7 @@ "str:BRIDGE-123456": { "balance": "400", "roles": [ - "ESDTRoleLocalBurn" + "ESDTRoleLocalBurn","ESDTRoleLocalMint" ] } }, diff --git a/esdt-safe/scenarios/execute_batch_both_rejected.scen.json b/esdt-safe/scenarios/execute_batch_both_rejected.scen.json index 55d42cc2..ab8b3056 100644 --- a/esdt-safe/scenarios/execute_batch_both_rejected.scen.json +++ b/esdt-safe/scenarios/execute_batch_both_rejected.scen.json @@ -97,7 +97,8 @@ "str:BRIDGE-123456": { "balance": "3,000,000", "roles": [ - "ESDTRoleLocalBurn" + "ESDTRoleLocalBurn", + "ESDTRoleLocalMint" ] } }, diff --git a/esdt-safe/scenarios/execute_batch_both_success.scen.json b/esdt-safe/scenarios/execute_batch_both_success.scen.json index ec05db60..f4bcfdef 100644 --- a/esdt-safe/scenarios/execute_batch_both_success.scen.json +++ b/esdt-safe/scenarios/execute_batch_both_success.scen.json @@ -15,7 +15,8 @@ "function": "setTransactionBatchStatus", "arguments": [ "1", - "3", "3" + "3", + "3" ], "gasLimit": "50,000,000", "gasPrice": "0" @@ -95,7 +96,8 @@ "str:BRIDGE-123456": { "balance": "3,001,300", "roles": [ - "ESDTRoleLocalBurn" + "ESDTRoleLocalBurn", + "ESDTRoleLocalMint" ] } }, @@ -103,9 +105,7 @@ "str:pendingBatches|u64:1": "", "str:firstBatchId": "2", "str:lastBatchId": "2", - "str:accumulatedTransactionFees|nested:str:BRIDGE-123456": "3,000,000", - "+": "" }, "code": "file:../output/esdt-safe.wasm" @@ -114,4 +114,4 @@ } } ] -} +} \ No newline at end of file diff --git a/esdt-safe/scenarios/execute_batch_one_success_one_rejected.scen.json b/esdt-safe/scenarios/execute_batch_one_success_one_rejected.scen.json index d94de8e8..2244cbe0 100644 --- a/esdt-safe/scenarios/execute_batch_one_success_one_rejected.scen.json +++ b/esdt-safe/scenarios/execute_batch_one_success_one_rejected.scen.json @@ -15,7 +15,8 @@ "function": "setTransactionBatchStatus", "arguments": [ "1", - "3", "4" + "3", + "4" ], "gasLimit": "50,000,000", "gasPrice": "0" @@ -96,7 +97,8 @@ "str:BRIDGE-123456": { "balance": "3,000,400", "roles": [ - "ESDTRoleLocalBurn" + "ESDTRoleLocalBurn", + "ESDTRoleLocalMint" ] } }, @@ -104,9 +106,7 @@ "str:pendingBatches|u64:1": "", "str:firstBatchId": "2", "str:lastBatchId": "2", - "str:accumulatedTransactionFees|nested:str:BRIDGE-123456": "3,000,000", - "+": "" }, "code": "file:../output/esdt-safe.wasm" @@ -115,4 +115,4 @@ } } ] -} +} \ No newline at end of file diff --git a/esdt-safe/scenarios/execute_transaction_rejected.scen.json b/esdt-safe/scenarios/execute_transaction_rejected.scen.json index 52a289ac..1d61d733 100644 --- a/esdt-safe/scenarios/execute_transaction_rejected.scen.json +++ b/esdt-safe/scenarios/execute_transaction_rejected.scen.json @@ -67,7 +67,8 @@ "str:BRIDGE-123456": { "balance": "1,500,000", "roles": [ - "ESDTRoleLocalBurn" + "ESDTRoleLocalBurn", + "ESDTRoleLocalMint" ] } }, diff --git a/esdt-safe/scenarios/execute_transaction_success.scen.json b/esdt-safe/scenarios/execute_transaction_success.scen.json index 7616dff9..1731749b 100644 --- a/esdt-safe/scenarios/execute_transaction_success.scen.json +++ b/esdt-safe/scenarios/execute_transaction_success.scen.json @@ -66,7 +66,8 @@ "str:BRIDGE-123456": { "balance": "1,500,400", "roles": [ - "ESDTRoleLocalBurn" + "ESDTRoleLocalBurn", + "ESDTRoleLocalMint" ] } }, diff --git a/multisig/interaction/config/upgrade-snippets.sh b/multisig/interaction/config/upgrade-snippets.sh index f2a6090d..a612104a 100644 --- a/multisig/interaction/config/upgrade-snippets.sh +++ b/multisig/interaction/config/upgrade-snippets.sh @@ -2,7 +2,7 @@ deploySafeForUpgrade() { getAggregatorAddressHex - local ESDT_SAFE_ETH_TX_GAS_LIMIT=20000 # gives us 200$ for elrond->eth + local ESDT_SAFE_ETH_TX_GAS_LIMIT=20000 # gives us 200$ for multiversx->eth mxpy --verbose contract deploy --project=${PROJECT_SAFE} --recall-nonce --pem=${ALICE} \ --gas-limit=150000000 \ diff --git a/multisig/src/setup.rs b/multisig/src/setup.rs index 2dd9b0bf..85abd174 100644 --- a/multisig/src/setup.rs +++ b/multisig/src/setup.rs @@ -171,7 +171,7 @@ pub trait SetupModule: /// where price_per_gas_unit is queried from the aggregator (fee estimator SC) #[only_owner] #[endpoint(changeElrondToEthGasLimit)] - fn change_elrond_to_eth_gas_limit(&self, new_gas_limit: BigUint) { + fn change_multiversx_to_eth_gas_limit(&self, new_gas_limit: BigUint) { let _: IgnoreValue = self .get_esdt_safe_proxy_instance() .set_eth_tx_gas_limit(new_gas_limit) diff --git a/multisig/wasm/src/lib.rs b/multisig/wasm/src/lib.rs index 6e2ab6ea..f5203310 100644 --- a/multisig/wasm/src/lib.rs +++ b/multisig/wasm/src/lib.rs @@ -39,7 +39,7 @@ multiversx_sc_wasm_adapter::endpoints! { pauseEsdtSafe => pause_esdt_safe unpauseEsdtSafe => unpause_esdt_safe changeFeeEstimatorContractAddress => change_fee_estimator_contract_address - changeElrondToEthGasLimit => change_elrond_to_eth_gas_limit + changeElrondToEthGasLimit => change_multiversx_to_eth_gas_limit changeDefaultPricePerGasUnit => change_default_price_per_gas_unit changeTokenTicker => change_token_ticker esdtSafeAddTokenToWhitelist => esdt_safe_add_token_to_whitelist