Skip to content

Commit

Permalink
esdt-safe: tests: ix roles
Browse files Browse the repository at this point in the history
  • Loading branch information
@CostinCarabas
CostinCarabas committed Jan 5, 2024
1 parent d6d2ff2 commit fb20be9
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 20 deletions.
2 changes: 1 addition & 1 deletion esdt-safe/scenarios/add_refund_batch.scen.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"str:BRIDGE-123456": {
"balance": "3,001,300",
"roles": [
"ESDTRoleLocalBurn"
"ESDTRoleLocalBurn","ESDTRoleLocalMint"
]
}
},
Expand Down
6 changes: 4 additions & 2 deletions esdt-safe/scenarios/create_another_tx_too_late_for_batch.scen.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@
"str:BRIDGE-123456": {
"balance": "4,501,400",
"roles": [
"ESDTRoleLocalBurn"
"ESDTRoleLocalBurn",
"ESDTRoleLocalMint"
]
}
},
Expand Down Expand Up @@ -215,7 +216,8 @@
"str:BRIDGE-123456": {
"balance": "6,001,500",
"roles": [
"ESDTRoleLocalBurn"
"ESDTRoleLocalBurn",
"ESDTRoleLocalMint"
]
}
},
Expand Down
2 changes: 1 addition & 1 deletion esdt-safe/scenarios/distribute_fees.scen.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"str:BRIDGE-123456": {
"balance": "400",
"roles": [
"ESDTRoleLocalBurn"
"ESDTRoleLocalBurn","ESDTRoleLocalMint"
]
}
},
Expand Down
3 changes: 2 additions & 1 deletion esdt-safe/scenarios/execute_batch_both_rejected.scen.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@
"str:BRIDGE-123456": {
"balance": "3,000,000",
"roles": [
"ESDTRoleLocalBurn"
"ESDTRoleLocalBurn",
"ESDTRoleLocalMint"
]
}
},
Expand Down
10 changes: 5 additions & 5 deletions esdt-safe/scenarios/execute_batch_both_success.scen.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"function": "setTransactionBatchStatus",
"arguments": [
"1",
"3", "3"
"3",
"3"
],
"gasLimit": "50,000,000",
"gasPrice": "0"
Expand Down Expand Up @@ -95,17 +96,16 @@
"str:BRIDGE-123456": {
"balance": "3,001,300",
"roles": [
"ESDTRoleLocalBurn"
"ESDTRoleLocalBurn",
"ESDTRoleLocalMint"
]
}
},
"storage": {
"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"
Expand All @@ -114,4 +114,4 @@
}
}
]
}
}
10 changes: 5 additions & 5 deletions esdt-safe/scenarios/execute_batch_one_success_one_rejected.scen.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"function": "setTransactionBatchStatus",
"arguments": [
"1",
"3", "4"
"3",
"4"
],
"gasLimit": "50,000,000",
"gasPrice": "0"
Expand Down Expand Up @@ -96,17 +97,16 @@
"str:BRIDGE-123456": {
"balance": "3,000,400",
"roles": [
"ESDTRoleLocalBurn"
"ESDTRoleLocalBurn",
"ESDTRoleLocalMint"
]
}
},
"storage": {
"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"
Expand All @@ -115,4 +115,4 @@
}
}
]
}
}
3 changes: 2 additions & 1 deletion esdt-safe/scenarios/execute_transaction_rejected.scen.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@
"str:BRIDGE-123456": {
"balance": "1,500,000",
"roles": [
"ESDTRoleLocalBurn"
"ESDTRoleLocalBurn",
"ESDTRoleLocalMint"
]
}
},
Expand Down
3 changes: 2 additions & 1 deletion esdt-safe/scenarios/execute_transaction_success.scen.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@
"str:BRIDGE-123456": {
"balance": "1,500,400",
"roles": [
"ESDTRoleLocalBurn"
"ESDTRoleLocalBurn",
"ESDTRoleLocalMint"
]
}
},
Expand Down
2 changes: 1 addition & 1 deletion multisig/interaction/config/upgrade-snippets.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion multisig/src/setup.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion multisig/wasm/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit fb20be9

Please sign in to comment.