From 982bbcf01525c5e9808c9f1ed1474f965b3267d8 Mon Sep 17 00:00:00 2001 From: Iulian Pascalau Date: Fri, 8 Nov 2024 18:14:47 +0200 Subject: [PATCH 1/6] - mainnet v3 deploy scripts - added ledger support --- .../interaction/config/aggregator-snippets.sh | 12 +- multisig/interaction/config/configs.cfg | 6 + multisig/interaction/config/helper.cfg | 31 ++++ .../config/issue-tokens-snippets.sh | 12 +- .../interaction/config/mainnet-release-v3.sh | 25 ++++ .../interaction/config/multisig-snippets.sh | 52 +++---- .../config/multitransfer-snippets.sh | 10 +- multisig/interaction/config/proxy-snippets.sh | 12 +- .../interaction/config/relayers-snippets.sh | 4 +- multisig/interaction/config/safe-snippets.sh | 14 +- multisig/interaction/config/testing.sh | 12 +- .../interaction/config/wrapped-snippets.sh | 28 ++-- .../interaction/release-v3/config-setter.cfg | 69 +++++++++ .../interaction/release-v3/menu_functions.cfg | 141 ++++++++++++++++++ multisig/interaction/script-v3-release.sh | 106 +++++++++++++ 15 files changed, 456 insertions(+), 78 deletions(-) create mode 100644 multisig/interaction/config/mainnet-release-v3.sh create mode 100644 multisig/interaction/release-v3/config-setter.cfg create mode 100644 multisig/interaction/release-v3/menu_functions.cfg create mode 100755 multisig/interaction/script-v3-release.sh diff --git a/multisig/interaction/config/aggregator-snippets.sh b/multisig/interaction/config/aggregator-snippets.sh index 3bbc3ebe..c5c910ef 100644 --- a/multisig/interaction/config/aggregator-snippets.sh +++ b/multisig/interaction/config/aggregator-snippets.sh @@ -2,7 +2,7 @@ deployAggregator() { CHECK_VARIABLES AGGREGATOR_WASM CHAIN_SPECIFIC_TOKEN ORACLE_ADDR_0 ORACLE_ADDR_1 ORACLE_ADDR_2 STAKE=$(echo "$ORACLE_REQUIRED_STAKE*10^18" | bc) - mxpy --verbose contract deploy --bytecode=${AGGREGATOR_WASM} --recall-nonce --pem=${ALICE} \ + mxpy contract deploy --bytecode=${AGGREGATOR_WASM} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=100000000 --arguments str:EGLD ${STAKE} 1 2 3 \ ${ORACLE_ADDR_0} ${ORACLE_ADDR_1} ${ORACLE_ADDR_2} \ --send --outfile=deploy-price-agregator-testnet.interaction.json --proxy=${PROXY} --chain=${CHAIN_ID} || return @@ -66,7 +66,7 @@ submitAggregatorBatch() { setPairDecimals() { CHECK_VARIABLES AGGREGATOR - mxpy --verbose contract call ${AGGREGATOR} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${AGGREGATOR} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=15000000 --function="setPairDecimals" \ --arguments str:GWEI str:${CHAIN_SPECIFIC_TOKEN_TICKER} 0 \ --send --proxy=${PROXY} --chain=${CHAIN_ID} || return @@ -75,7 +75,7 @@ setPairDecimals() { pauseAggregator() { CHECK_VARIABLES AGGREGATOR - mxpy --verbose contract call ${AGGREGATOR} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${AGGREGATOR} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=5000000 --function="pause" \ --send --proxy=${PROXY} --chain=${CHAIN_ID} || return } @@ -83,7 +83,7 @@ pauseAggregator() { pauseAggregatorV2() { CHECK_VARIABLES AGGREGATOR_v2 - mxpy --verbose contract call ${AGGREGATOR_v2} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${AGGREGATOR_v2} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=5000000 --function="pause" \ --send --proxy=${PROXY} --chain=${CHAIN_ID} || return } @@ -91,7 +91,7 @@ pauseAggregatorV2() { unpauseAggregator() { CHECK_VARIABLES AGGREGATOR - mxpy --verbose contract call ${AGGREGATOR} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${AGGREGATOR} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=5000000 --function="unpause" \ --send --proxy=${PROXY} --chain=${CHAIN_ID} || return } @@ -99,7 +99,7 @@ unpauseAggregator() { aggregator-upgrade() { CHECK_VARIABLES AGGREGATOR AGGREGATOR_WASM - mxpy --verbose contract upgrade ${AGGREGATOR} --bytecode=${AGGREGATOR_WASM} --recall-nonce --pem=${ALICE} \ + mxpy contract upgrade ${AGGREGATOR} --bytecode=${AGGREGATOR_WASM} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=100000000 --send \ --outfile="upgrade-aggregator.json" --proxy=${PROXY} --chain=${CHAIN_ID} || return } diff --git a/multisig/interaction/config/configs.cfg b/multisig/interaction/config/configs.cfg index d82522b6..df5ba4cf 100644 --- a/multisig/interaction/config/configs.cfg +++ b/multisig/interaction/config/configs.cfg @@ -10,6 +10,12 @@ CHAIN_ID=T ALICE="./wallets/erd1zsha9cvx7gwraytgp740dcjzwy9v5xwnmas77d33uve6sk0rs0vqel4ln5.pem" ALICE_ADDRESS=erd1zsha9cvx7gwraytgp740dcjzwy9v5xwnmas77d33uve6sk0rs0vqel4ln5 +MXPY_SIGN=() +#use this for signing transactions with a pem file +#MXPY_SIGN+=(--pem=${ALICE}) +#use this to sign with ledger +MXPY_SIGN+=(--ledger) + #============WASM FILES============== AGGREGATOR_WASM="./multiversx-price-aggregator-sc.wasm" diff --git a/multisig/interaction/config/helper.cfg b/multisig/interaction/config/helper.cfg index 0d8d105e..97a8dc7e 100644 --- a/multisig/interaction/config/helper.cfg +++ b/multisig/interaction/config/helper.cfg @@ -55,6 +55,37 @@ function manual-update-config-file { source $SCRIPTPATH/config/configs.cfg } +function confirmation-multiple { + DISPLAY_STR="" + for var in "$@" + do + DISPLAY_STR="${DISPLAY_STR} & ${var}" + done + + echo -e + read -p "Do you want to go on with ${GREEN}${DISPLAY_STR}${NC} (Default No) ? (Yy/Nn)" yn + echo -e + + case $yn in + [Yy]* ) + + echo -e "${GREEN}Proceeding with ${DISPLAY_STR}!${NC}" + for var in "$@" + do + confirmation ${var} + done + + ;; + [Nn]* ) + echo -e "${GREEN}Exiting...${NC}" + ;; + + * ) + echo -e "${GREEN}I'll take that as a no then... ${NC}" + ;; + esac +} + function update-config { TARGET_KEY=$1 REPLACEMENT_VALUE=$2 diff --git a/multisig/interaction/config/issue-tokens-snippets.sh b/multisig/interaction/config/issue-tokens-snippets.sh index b800bcde..17886593 100644 --- a/multisig/interaction/config/issue-tokens-snippets.sh +++ b/multisig/interaction/config/issue-tokens-snippets.sh @@ -4,7 +4,7 @@ issueUniversalToken() { CHECK_VARIABLES ESDT_SYSTEM_SC_ADDRESS ESDT_ISSUE_COST UNIVERSAL_TOKEN_DISPLAY_NAME \ UNIVERSAL_TOKEN_TICKER NR_DECIMALS_UNIVERSAL - mxpy --verbose contract call ${ESDT_SYSTEM_SC_ADDRESS} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${ESDT_SYSTEM_SC_ADDRESS} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=60000000 --value=${ESDT_ISSUE_COST} --function="issue" \ --arguments str:${UNIVERSAL_TOKEN_DISPLAY_NAME} str:${UNIVERSAL_TOKEN_TICKER} \ 0 ${NR_DECIMALS_UNIVERSAL} str:canAddSpecialRoles str:true \ @@ -17,7 +17,7 @@ issueChainSpecificToken() { VALUE_TO_MINT=$(echo "scale=0; $UNIVERSAL_TOKENS_ALREADY_MINTED*10^$NR_DECIMALS_CHAIN_SPECIFIC/1" | bc) - mxpy --verbose contract call ${ESDT_SYSTEM_SC_ADDRESS} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${ESDT_SYSTEM_SC_ADDRESS} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=60000000 --value=${ESDT_ISSUE_COST} --function="issue" \ --arguments str:${CHAIN_SPECIFIC_TOKEN_DISPLAY_NAME} str:${CHAIN_SPECIFIC_TOKEN_TICKER} \ ${VALUE_TO_MINT} ${NR_DECIMALS_CHAIN_SPECIFIC} str:canAddSpecialRoles str:true \ @@ -29,21 +29,21 @@ transferToSC() { VALUE_TO_MINT=$(echo "scale=0; $UNIVERSAL_TOKENS_ALREADY_MINTED*10^$NR_DECIMALS_CHAIN_SPECIFIC/1" | bc) - mxpy --verbose contract call ${BRIDGED_TOKENS_WRAPPER} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${BRIDGED_TOKENS_WRAPPER} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=5000000 --function="ESDTTransfer" \ --arguments str:${CHAIN_SPECIFIC_TOKEN} ${VALUE_TO_MINT} str:depositLiquidity \ --send --proxy=${PROXY} --chain=${CHAIN_ID} } setMintRole() { - mxpy --verbose contract call ${ESDT_SYSTEM_SC_ADDRESS} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${ESDT_SYSTEM_SC_ADDRESS} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=60000000 --function="setSpecialRole" \ --arguments str:${CHAIN_SPECIFIC_TOKEN} ${ALICE_ADDRESS} str:ESDTRoleLocalMint \ --send --proxy=${PROXY} --chain=${CHAIN_ID} } unSetMintRole() { - mxpy --verbose contract call ${ESDT_SYSTEM_SC_ADDRESS} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${ESDT_SYSTEM_SC_ADDRESS} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=60000000 --function="unSetSpecialRole" \ --arguments str:${CHAIN_SPECIFIC_TOKEN} ${ALICE_ADDRESS} str:ESDTRoleLocalMint \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -53,7 +53,7 @@ mint() { CHECK_VARIABLES NR_DECIMALS_CHAIN_SPECIFIC ALICE_ADDRESS CHAIN_SPECIFIC_TOKEN read -p "Amount to mint(without decimals): " AMOUNT_TO_MINT VALUE_TO_MINT=$(echo "scale=0; $AMOUNT_TO_MINT*10^$NR_DECIMALS_CHAIN_SPECIFIC/1" | bc) - mxpy --verbose contract call ${ALICE_ADDRESS} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${ALICE_ADDRESS} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=300000 --function="ESDTLocalMint" \ --arguments str:${CHAIN_SPECIFIC_TOKEN} ${VALUE_TO_MINT} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} diff --git a/multisig/interaction/config/mainnet-release-v3.sh b/multisig/interaction/config/mainnet-release-v3.sh new file mode 100644 index 00000000..28479238 --- /dev/null +++ b/multisig/interaction/config/mainnet-release-v3.sh @@ -0,0 +1,25 @@ +deployMultisigMainnetV3() { + CHECK_VARIABLES RELAYER_ADDR_0 RELAYER_ADDR_1 RELAYER_ADDR_2 RELAYER_ADDR_3 \ + RELAYER_ADDR_4 RELAYER_ADDR_5 RELAYER_ADDR_6 RELAYER_ADDR_7 RELAYER_ADDR_8 \ + RELAYER_ADDR_9 SAFE MULTI_TRANSFER BRIDGE_PROXY RELAYER_REQUIRED_STAKE SLASH_AMOUNT QUORUM MULTISIG_WASM + + MIN_STAKE=$(echo "$RELAYER_REQUIRED_STAKE*10^18" | bc) + mxpy contract deploy --bytecode=${MULTISIG_WASM} --recall-nonce "${MXPY_SIGN[@]}" \ + --gas-limit=200000000 \ + --arguments ${SAFE} ${MULTI_TRANSFER} ${BRIDGE_PROXY} \ + ${MIN_STAKE} ${SLASH_AMOUNT} ${QUORUM} \ + ${RELAYER_ADDR_0} ${RELAYER_ADDR_1} ${RELAYER_ADDR_2} ${RELAYER_ADDR_3} \ + ${RELAYER_ADDR_4} ${RELAYER_ADDR_5} ${RELAYER_ADDR_6} ${RELAYER_ADDR_7} \ + ${RELAYER_ADDR_8} ${RELAYER_ADDR_9} \ + --send --outfile="deploy-testnet.interaction.json" --proxy=${PROXY} --chain=${CHAIN_ID} || return + + TRANSACTION=$(mxpy data parse --file="./deploy-testnet.interaction.json" --expression="data['emitted_tx']['hash']") + ADDRESS=$(mxpy data parse --file="./deploy-testnet.interaction.json" --expression="data['contractAddress']") + + mxpy data store --key=address-testnet-multisig --value=${ADDRESS} + mxpy data store --key=deployTransaction-testnet --value=${TRANSACTION} + + echo "" + echo "Multisig contract address: ${ADDRESS}" + update-config MULTISIG ${ADDRESS} +} \ No newline at end of file diff --git a/multisig/interaction/config/multisig-snippets.sh b/multisig/interaction/config/multisig-snippets.sh index f48c9942..8485a624 100644 --- a/multisig/interaction/config/multisig-snippets.sh +++ b/multisig/interaction/config/multisig-snippets.sh @@ -4,7 +4,7 @@ deployMultisig() { RELAYER_ADDR_9 SAFE MULTI_TRANSFER BRIDGE_PROXY RELAYER_REQUIRED_STAKE SLASH_AMOUNT QUORUM MULTISIG_WASM MIN_STAKE=$(echo "$RELAYER_REQUIRED_STAKE*10^18" | bc) - mxpy --verbose contract deploy --bytecode=${MULTISIG_WASM} --recall-nonce --pem=${ALICE} \ + mxpy contract deploy --bytecode=${MULTISIG_WASM} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=200000000 \ --arguments ${SAFE} ${MULTI_TRANSFER} ${BRIDGE_PROXY} \ ${MIN_STAKE} ${SLASH_AMOUNT} ${QUORUM} \ @@ -25,7 +25,7 @@ deployMultisig() { changeChildContractsOwnershipSafe() { CHECK_VARIABLES SAFE MULTISIG - mxpy --verbose contract call ${SAFE} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${SAFE} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=10000000 --function="ChangeOwnerAddress" \ --arguments ${MULTISIG} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -34,7 +34,7 @@ changeChildContractsOwnershipSafe() { changeChildContractsOwnershipProxy() { CHECK_VARIABLES BRIDGE_PROXY MULTISIG - mxpy --verbose contract call ${BRIDGE_PROXY} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${BRIDGE_PROXY} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=10000000 --function="ChangeOwnerAddress" \ --arguments ${MULTISIG} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -43,7 +43,7 @@ changeChildContractsOwnershipProxy() { changeChildContractsOwnershipMultiTransfer() { CHECK_VARIABLES MULTI_TRANSFER MULTISIG - mxpy --verbose contract call ${MULTI_TRANSFER} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTI_TRANSFER} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=10000000 --function="ChangeOwnerAddress" \ --arguments ${MULTISIG} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -52,7 +52,7 @@ changeChildContractsOwnershipMultiTransfer() { clearMapping() { CHECK_VARIABLES ERC20_TOKEN CHAIN_SPECIFIC_TOKEN MULTISIG - mxpy --verbose contract call ${MULTISIG} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=40000000 --function="clearMapping" \ --arguments ${ERC20_TOKEN} str:${CHAIN_SPECIFIC_TOKEN} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -61,7 +61,7 @@ clearMapping() { addMapping() { CHECK_VARIABLES ERC20_TOKEN CHAIN_SPECIFIC_TOKEN MULTISIG - mxpy --verbose contract call ${MULTISIG} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=40000000 --function="addMapping" \ --arguments ${ERC20_TOKEN} str:${CHAIN_SPECIFIC_TOKEN} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -74,7 +74,7 @@ addTokenToWhitelist() { MINT=$(echo "$MINT_BALANCE*10^$NR_DECIMALS_CHAIN_SPECIFIC" | bc) BURN=$(echo "$BURN_BALANCE*10^$NR_DECIMALS_CHAIN_SPECIFIC" | bc) - mxpy --verbose contract call ${MULTISIG} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=60000000 --function="esdtSafeAddTokenToWhitelist" \ --arguments str:${CHAIN_SPECIFIC_TOKEN} str:${CHAIN_SPECIFIC_TOKEN_TICKER} ${MINTBURN_WHITELIST} ${NATIVE_TOKEN} \ ${BALANCE} ${MINT} ${BURN} --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -83,7 +83,7 @@ addTokenToWhitelist() { removeTokenFromWhitelist() { CHECK_VARIABLES CHAIN_SPECIFIC_TOKEN CHAIN_SPECIFIC_TOKEN_TICKER MULTISIG - mxpy --verbose contract call ${MULTISIG} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=60000000 --function="esdtSafeRemoveTokenFromWhitelist" \ --arguments str:${CHAIN_SPECIFIC_TOKEN} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -92,7 +92,7 @@ removeTokenFromWhitelist() { esdtSafeSetMaxTxBatchSize() { CHECK_VARIABLES MAX_TX_PER_BATCH MULTISIG - mxpy --verbose contract call ${MULTISIG} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=30000000 --function="esdtSafeSetMaxTxBatchSize" \ --arguments ${MAX_TX_PER_BATCH} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -101,7 +101,7 @@ esdtSafeSetMaxTxBatchSize() { esdtSafeSetMaxTxBatchBlockDuration() { CHECK_VARIABLES MAX_TX_BLOCK_DURATION_PER_BATCH MULTISIG - mxpy --verbose contract call ${MULTISIG} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=30000000 --function="esdtSafeSetMaxTxBatchBlockDuration" \ --arguments ${MAX_TX_BLOCK_DURATION_PER_BATCH} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -110,7 +110,7 @@ esdtSafeSetMaxTxBatchBlockDuration() { clearMapping() { CHECK_VARIABLES ERC20_TOKEN CHAIN_SPECIFIC_TOKEN MULTISIG - mxpy --verbose contract call ${MULTISIG} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=40000000 --function="clearMapping" \ --arguments ${ERC20_TOKEN} str:${CHAIN_SPECIFIC_TOKEN} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -119,7 +119,7 @@ clearMapping() { changeQuorum() { CHECK_VARIABLES QUORUM MULTISIG - mxpy --verbose contract call ${MULTISIG} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=40000000 --function="changeQuorum" \ --arguments ${QUORUM} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -128,7 +128,7 @@ changeQuorum() { pause() { CHECK_VARIABLES MULTISIG - mxpy --verbose contract call ${MULTISIG} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=40000000 --function="pause" \ --send --proxy=${PROXY} --chain=${CHAIN_ID} } @@ -136,7 +136,7 @@ pause() { pauseV2() { CHECK_VARIABLES MULTISIG_v2 - mxpy --verbose contract call ${MULTISIG_v2} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG_v2} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=40000000 --function="pause" \ --send --proxy=${PROXY} --chain=${CHAIN_ID} } @@ -144,7 +144,7 @@ pauseV2() { pauseEsdtSafe() { CHECK_VARIABLES MULTISIG - mxpy --verbose contract call ${MULTISIG} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=40000000 --function="pauseEsdtSafe" \ --send --proxy=${PROXY} --chain=${CHAIN_ID} } @@ -152,7 +152,7 @@ pauseEsdtSafe() { pauseEsdtSafeV2() { CHECK_VARIABLES MULTISIG_v2 - mxpy --verbose contract call ${MULTISIG_v2} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG_v2} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=40000000 --function="pauseEsdtSafe" \ --send --proxy=${PROXY} --chain=${CHAIN_ID} } @@ -160,7 +160,7 @@ pauseEsdtSafeV2() { pauseProxy() { CHECK_VARIABLES MULTISIG - mxpy --verbose contract call ${MULTISIG} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=40000000 --function="pauseProxy" \ --send --proxy=${PROXY} --chain=${CHAIN_ID} } @@ -168,7 +168,7 @@ pauseProxy() { unpause() { CHECK_VARIABLES MULTISIG - mxpy --verbose contract call ${MULTISIG} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=40000000 --function="unpause" \ --send --proxy=${PROXY} --chain=${CHAIN_ID} } @@ -176,7 +176,7 @@ unpause() { unpauseEsdtSafe() { CHECK_VARIABLES MULTISIG - mxpy --verbose contract call ${MULTISIG} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=40000000 --function="unpauseEsdtSafe" \ --send --proxy=${PROXY} --chain=${CHAIN_ID} } @@ -184,7 +184,7 @@ unpauseEsdtSafe() { unpauseProxy() { CHECK_VARIABLES MULTISIG - mxpy --verbose contract call ${MULTISIG} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=40000000 --function="unpauseProxy" \ --send --proxy=${PROXY} --chain=${CHAIN_ID} } @@ -193,7 +193,7 @@ esdtSafeSetMaxBridgedAmountForToken() { CHECK_VARIABLES MAX_AMOUNT NR_DECIMALS_CHAIN_SPECIFIC CHAIN_SPECIFIC_TOKEN MULTISIG MAX=$(echo "scale=0; $MAX_AMOUNT*10^$NR_DECIMALS_CHAIN_SPECIFIC/1" | bc) - mxpy --verbose contract call ${MULTISIG} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=40000000 --function="esdtSafeSetMaxBridgedAmountForToken" \ --arguments str:${CHAIN_SPECIFIC_TOKEN} ${MAX} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -203,7 +203,7 @@ multiTransferEsdtSetMaxBridgedAmountForToken() { CHECK_VARIABLES MAX_AMOUNT NR_DECIMALS_CHAIN_SPECIFIC CHAIN_SPECIFIC_TOKEN MULTISIG MAX=$(echo "scale=0; $MAX_AMOUNT*10^$NR_DECIMALS_CHAIN_SPECIFIC/1" | bc) - mxpy --verbose contract call ${MULTISIG} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=40000000 --function="multiTransferEsdtSetMaxBridgedAmountForToken" \ --arguments str:${CHAIN_SPECIFIC_TOKEN} ${MAX} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -213,7 +213,7 @@ multiTransferEsdtSetMaxBridgedAmountForToken() { setMultiTransferOnEsdtSafeThroughMultisig() { CHECK_VARIABLES MULTISIG - mxpy --verbose contract call ${MULTISIG} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=60000000 --function="setMultiTransferOnEsdtSafe" \ --send --proxy=${PROXY} --chain=${CHAIN_ID} } @@ -221,7 +221,7 @@ setMultiTransferOnEsdtSafeThroughMultisig() { setEsdtSafeOnMultiTransferThroughMultisig() { CHECK_VARIABLES MULTISIG - mxpy --verbose contract call ${MULTISIG} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=60000000 --function="setEsdtSafeOnMultiTransfer" \ --send --proxy=${PROXY} --chain=${CHAIN_ID} } @@ -242,7 +242,7 @@ initSupplyMintBurn() { MINT=$(echo ${MINT%.*}) # trim decimals, if existing BURN=$(echo ${BURN%.*}) # trim decimals, if existing - mxpy --verbose contract call ${MULTISIG} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=60000000 --function="initSupplyMintBurnEsdtSafe" \ --arguments str:${CHAIN_SPECIFIC_TOKEN} ${MINT} ${BURN} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -251,7 +251,7 @@ initSupplyMintBurn() { upgradeMultisig() { CHECK_VARIABLES SAFE MULTI_TRANSFER BRIDGE_PROXY MULTISIG_WASM - mxpy --verbose contract upgrade ${MULTISIG} --bytecode=${MULTISIG_WASM} --recall-nonce --pem=${ALICE} \ + mxpy contract upgrade ${MULTISIG} --bytecode=${MULTISIG_WASM} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=100000000 --send \ --arguments ${SAFE} ${MULTI_TRANSFER} ${BRIDGE_PROXY} \ --outfile="upgrade-multisig-child-sc.json" --proxy=${PROXY} --chain=${CHAIN_ID} || return diff --git a/multisig/interaction/config/multitransfer-snippets.sh b/multisig/interaction/config/multitransfer-snippets.sh index 68958542..4dcff5b9 100644 --- a/multisig/interaction/config/multitransfer-snippets.sh +++ b/multisig/interaction/config/multitransfer-snippets.sh @@ -1,7 +1,7 @@ deployMultiTransfer() { CHECK_VARIABLES MULTI_TRANSFER_WASM - mxpy --verbose contract deploy --bytecode=${MULTI_TRANSFER_WASM} --recall-nonce --pem=${ALICE} \ + mxpy contract deploy --bytecode=${MULTI_TRANSFER_WASM} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=100000000 --metadata-payable \ --send --outfile="deploy-multitransfer-testnet.interaction.json" --proxy=${PROXY} --chain=${CHAIN_ID} || return @@ -16,7 +16,7 @@ deployMultiTransfer() { setBridgeProxyContractAddressOnMultiTransfer() { CHECK_VARIABLES MULTI_TRANSFER BRIDGE_PROXY - mxpy --verbose contract call ${MULTI_TRANSFER} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTI_TRANSFER} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=60000000 --function="setBridgeProxyContractAddress" \ --arguments ${BRIDGE_PROXY} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -25,7 +25,7 @@ setBridgeProxyContractAddressOnMultiTransfer() { setBridgedTokensWrapperOnMultiTransfer() { CHECK_VARIABLES MULTI_TRANSFER BRIDGED_TOKENS_WRAPPER - mxpy --verbose contract call ${MULTI_TRANSFER} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTI_TRANSFER} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=60000000 --function="setWrappingContractAddress" \ --arguments ${BRIDGED_TOKENS_WRAPPER} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -34,7 +34,7 @@ setBridgedTokensWrapperOnMultiTransfer() { deployMultiTransferForUpgrade() { CHECK_VARIABLES MULTI_TRANSFER_WASM - mxpy --verbose contract deploy --bytecode=${MULTI_TRANSFER_WASM} --recall-nonce --pem=${ALICE} \ + mxpy contract deploy --bytecode=${MULTI_TRANSFER_WASM} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=100000000 --metadata-payable \ --send --outfile="deploy-multitransfer-upgrade.interaction.json" --proxy=${PROXY} --chain=${CHAIN_ID} || return @@ -48,7 +48,7 @@ deployMultiTransferForUpgrade() { upgradeMultiTransferContract() { local NEW_MULTI_TRANSFER_ADDR=$(mxpy data parse --file="./deploy-multitransfer-upgrade.interaction.json" --expression="data['contractAddress']") - mxpy --verbose contract call ${MULTISIG} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=400000000 --function="upgradeChildContractFromSource" \ --arguments ${MULTI_TRANSFER} ${NEW_MULTI_TRANSFER_ADDR} 0x00 \ --send --outfile="upgrade-multitransfer-child-sc.json" --proxy=${PROXY} --chain=${CHAIN_ID} diff --git a/multisig/interaction/config/proxy-snippets.sh b/multisig/interaction/config/proxy-snippets.sh index 507815d0..2db7d8d4 100644 --- a/multisig/interaction/config/proxy-snippets.sh +++ b/multisig/interaction/config/proxy-snippets.sh @@ -1,7 +1,7 @@ deployBridgeProxy() { CHECK_VARIABLES PROXY_WASM MULTI_TRANSFER - mxpy --verbose contract deploy --bytecode=${PROXY_WASM} --recall-nonce --pem=${ALICE} \ + mxpy contract deploy --bytecode=${PROXY_WASM} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=200000000 \ --arguments ${MULTI_TRANSFER} \ --send --outfile="deploy-proxy-testnet.interaction.json" --proxy=${PROXY} --chain=${CHAIN_ID} || return @@ -20,7 +20,7 @@ deployBridgeProxy() { setBridgedTokensWrapperOnSCProxy() { CHECK_VARIABLES BRIDGE_PROXY BRIDGED_TOKENS_WRAPPER - mxpy --verbose contract call ${BRIDGE_PROXY} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${BRIDGE_PROXY} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=60000000 --function="setBridgedTokensWrapperAddress" \ --arguments ${BRIDGED_TOKENS_WRAPPER} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -29,7 +29,7 @@ setBridgedTokensWrapperOnSCProxy() { setMultiTransferOnSCProxy() { CHECK_VARIABLES BRIDGE_PROXY MULTI_TRANSFER - mxpy --verbose contract call ${BRIDGE_PROXY} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${BRIDGE_PROXY} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=60000000 --function="setMultiTransferAddress" \ --arguments ${MULTI_TRANSFER} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -38,7 +38,7 @@ setMultiTransferOnSCProxy() { setEsdtSafeOnSCProxy() { CHECK_VARIABLES BRIDGE_PROXY SAFE - mxpy --verbose contract call ${BRIDGE_PROXY} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${BRIDGE_PROXY} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=60000000 --function="setEsdtSafeAddress" \ --arguments ${SAFE} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -47,7 +47,7 @@ setEsdtSafeOnSCProxy() { deployBridgeProxyForUpgrade() { CHECK_VARIABLES PROXY_WASM MULTI_TRANSFER - mxpy --verbose contract deploy --bytecode=${PROXY_WASM} --recall-nonce --pem=${ALICE} \ + mxpy contract deploy --bytecode=${PROXY_WASM} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=200000000 \ --arguments ${MULTI_TRANSFER} \ --send --outfile="deploy-proxy-upgrade.interaction.json" --proxy=${PROXY} --chain=${CHAIN_ID} || return @@ -62,7 +62,7 @@ deployBridgeProxyForUpgrade() { upgradeBridgeProxyContract() { local NEW_BRIDGE_PROXY_ADDR=$(mxpy data parse --file="./deploy-proxy-upgrade.interaction.json" --expression="data['contractAddress']") - mxpy --verbose contract call ${MULTISIG} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=400000000 --function="upgradeChildContractFromSource" \ --arguments ${BRIDGE_PROXY} ${NEW_BRIDGE_PROXY_ADDR} 0x00 \ --send --outfile="upgrade-proxy-child-sc.json" --proxy=${PROXY} --chain=${CHAIN_ID} diff --git a/multisig/interaction/config/relayers-snippets.sh b/multisig/interaction/config/relayers-snippets.sh index 0ebc5645..5a416943 100644 --- a/multisig/interaction/config/relayers-snippets.sh +++ b/multisig/interaction/config/relayers-snippets.sh @@ -2,7 +2,7 @@ addBoardMember() { CHECK_VARIABLES MULTISIG read -p "Relayer address: " RELAYER_ADDR - mxpy --verbose contract call ${MULTISIG} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=35000000 --function="addBoardMember" --arguments ${RELAYER_ADDR} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} } @@ -11,7 +11,7 @@ removeBoardMember() { CHECK_VARIABLES MULTISIG read -p "Relayer address: " RELAYER_ADDR - mxpy --verbose contract call ${MULTISIG} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=35000000 --function="removeUser" --arguments ${RELAYER_ADDR} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} } diff --git a/multisig/interaction/config/safe-snippets.sh b/multisig/interaction/config/safe-snippets.sh index 2adf00fd..506939a5 100644 --- a/multisig/interaction/config/safe-snippets.sh +++ b/multisig/interaction/config/safe-snippets.sh @@ -1,7 +1,7 @@ deploySafe() { CHECK_VARIABLES SAFE_WASM MULTI_TRANSFER AGGREGATOR - mxpy --verbose contract deploy --bytecode=${SAFE_WASM} --recall-nonce --pem=${ALICE} \ + mxpy contract deploy --bytecode=${SAFE_WASM} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=150000000 \ --arguments ${AGGREGATOR} ${MULTI_TRANSFER} 1 \ --send --outfile="deploy-safe-testnet.interaction.json" --proxy=${PROXY} --chain=${CHAIN_ID} || return @@ -20,7 +20,7 @@ deploySafe() { setLocalRolesEsdtSafe() { CHECK_VARIABLES ESDT_SYSTEM_SC_ADDRESS CHAIN_SPECIFIC_TOKEN SAFE - mxpy --verbose contract call ${ESDT_SYSTEM_SC_ADDRESS} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${ESDT_SYSTEM_SC_ADDRESS} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=60000000 --function="setSpecialRole" \ --arguments str:${CHAIN_SPECIFIC_TOKEN} ${SAFE} str:ESDTRoleLocalBurn str:ESDTRoleLocalMint \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -29,7 +29,7 @@ setLocalRolesEsdtSafe() { unsetLocalRolesEsdtSafe() { CHECK_VARIABLES ESDT_SYSTEM_SC_ADDRESS CHAIN_SPECIFIC_TOKEN SAFE - mxpy --verbose contract call ${ESDT_SYSTEM_SC_ADDRESS} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${ESDT_SYSTEM_SC_ADDRESS} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=60000000 --function="unSetSpecialRole" \ --arguments str:${CHAIN_SPECIFIC_TOKEN} ${SAFE} str:ESDTRoleLocalBurn str:ESDTRoleLocalMint \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -38,7 +38,7 @@ unsetLocalRolesEsdtSafe() { setBridgedTokensWrapperOnEsdtSafe() { CHECK_VARIABLES SAFE BRIDGED_TOKENS_WRAPPER - mxpy --verbose contract call ${SAFE} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${SAFE} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=60000000 --function="setBridgedTokensWrapperAddress" \ --arguments ${BRIDGED_TOKENS_WRAPPER} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -47,7 +47,7 @@ setBridgedTokensWrapperOnEsdtSafe() { setSCProxyOnEsdtSafe() { CHECK_VARIABLES SAFE BRIDGE_PROXY - mxpy --verbose contract call ${SAFE} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${SAFE} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=60000000 --function="setBridgeProxyContractAddress" \ --arguments ${BRIDGE_PROXY} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -56,7 +56,7 @@ setSCProxyOnEsdtSafe() { deploySafeForUpgrade() { CHECK_VARIABLES SAFE_WASM MULTI_TRANSFER AGGREGATOR BRIDGE_PROXY - mxpy --verbose contract deploy --bytecode=${SAFE_WASM} --recall-nonce --pem=${ALICE} \ + mxpy contract deploy --bytecode=${SAFE_WASM} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=150000000 \ --arguments ${AGGREGATOR} ${MULTI_TRANSFER} 1 \ --send --outfile="deploy-safe-upgrade.interaction.json" --proxy=${PROXY} --chain=${CHAIN_ID} || return @@ -71,7 +71,7 @@ deploySafeForUpgrade() { upgradeSafeContract() { local NEW_SAFE_ADDR=$(mxpy data parse --file="./deploy-safe-upgrade.interaction.json" --expression="data['contractAddress']") - mxpy --verbose contract call ${MULTISIG} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${MULTISIG} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=400000000 --function="upgradeChildContractFromSource" \ --arguments ${SAFE} ${NEW_SAFE_ADDR} 0x00 \ ${AGGREGATOR} ${MULTI_TRANSFER} ${BRIDGE_PROXY} 1 \ diff --git a/multisig/interaction/config/testing.sh b/multisig/interaction/config/testing.sh index f1777daf..d7426120 100644 --- a/multisig/interaction/config/testing.sh +++ b/multisig/interaction/config/testing.sh @@ -1,7 +1,7 @@ deployFaucet() { CHECK_VARIABLES FAUCET_WASM ALICE - mxpy --verbose contract deploy --bytecode=${FAUCET_WASM} --recall-nonce --pem=${ALICE} \ + mxpy contract deploy --bytecode=${FAUCET_WASM} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=20000000 \ --send --outfile=deploy-faucet-testnet.interaction.json --proxy=${PROXY} --chain=${CHAIN_ID} || return @@ -19,7 +19,7 @@ deployFaucet() { setMintRoleForUniversalToken() { CHECK_VARIABLES ALICE ALICE_ADDRESS - mxpy --verbose contract call ${ESDT_SYSTEM_SC_ADDRESS} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${ESDT_SYSTEM_SC_ADDRESS} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=60000000 --function="setSpecialRole" \ --arguments str:${UNIVERSAL_TOKEN} ${ALICE_ADDRESS} str:ESDTRoleLocalMint \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -30,14 +30,14 @@ mintAndDeposit() { read -p "Amount to mint (without decimals): " AMOUNT_TO_MINT VALUE_TO_MINT=$(echo "scale=0; $AMOUNT_TO_MINT*10^$NR_DECIMALS_UNIVERSAL/1" | bc) - mxpy --verbose contract call ${ALICE_ADDRESS} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${ALICE_ADDRESS} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=300000 --function="ESDTLocalMint" \ --arguments str:${UNIVERSAL_TOKEN} ${VALUE_TO_MINT} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} sleep 6 - mxpy --verbose contract call ${FAUCET} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${FAUCET} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=5000000 --function="ESDTTransfer" \ --arguments str:${UNIVERSAL_TOKEN} ${VALUE_TO_MINT} str:deposit 100 \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -46,7 +46,7 @@ mintAndDeposit() { unSetMintRoleForUniversalToken() { CHECK_VARIABLES ALICE ALICE_ADDRESS ESDT_SYSTEM_SC_ADDRESS - mxpy --verbose contract call ${ESDT_SYSTEM_SC_ADDRESS} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${ESDT_SYSTEM_SC_ADDRESS} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=60000000 --function="unSetSpecialRole" \ --arguments str:${UNIVERSAL_TOKEN} ${ALICE_ADDRESS} str:ESDTRoleLocalMint \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -55,7 +55,7 @@ unSetMintRoleForUniversalToken() { deployTestCaller() { CHECK_VARIABLES TEST_CALLER_WASM ALICE - mxpy --verbose contract deploy --bytecode=${TEST_CALLER_WASM} --recall-nonce --pem=${ALICE} \ + mxpy contract deploy --bytecode=${TEST_CALLER_WASM} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=20000000 \ --send --outfile=deploy-test-caller.interaction.json --proxy=${PROXY} --chain=${CHAIN_ID} || return diff --git a/multisig/interaction/config/wrapped-snippets.sh b/multisig/interaction/config/wrapped-snippets.sh index f5740b4c..1bcc3e73 100644 --- a/multisig/interaction/config/wrapped-snippets.sh +++ b/multisig/interaction/config/wrapped-snippets.sh @@ -8,7 +8,7 @@ deployBridgedTokensWrapper() { CHECK_VARIABLES BRIDGED_TOKENS_WRAPPER_WASM - mxpy --verbose contract deploy --bytecode=${BRIDGED_TOKENS_WRAPPER_WASM} --recall-nonce --pem=${ALICE} \ + mxpy contract deploy --bytecode=${BRIDGED_TOKENS_WRAPPER_WASM} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=60000000 \ --send --outfile="deploy-bridged-tokens-wrapper-testnet.interaction.json" --proxy=${PROXY} --chain=${CHAIN_ID} || return @@ -26,7 +26,7 @@ deployBridgedTokensWrapper() { setLocalRolesBridgedTokensWrapper() { CHECK_VARIABLES ESDT_SYSTEM_SC_ADDRESS UNIVERSAL_TOKEN BRIDGED_TOKENS_WRAPPER - mxpy --verbose contract call ${ESDT_SYSTEM_SC_ADDRESS} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${ESDT_SYSTEM_SC_ADDRESS} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=60000000 --function="setSpecialRole" \ --arguments str:${UNIVERSAL_TOKEN} ${BRIDGED_TOKENS_WRAPPER} str:ESDTRoleLocalMint str:ESDTRoleLocalBurn\ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -35,7 +35,7 @@ setLocalRolesBridgedTokensWrapper() { unsetLocalRolesBridgedTokensWrapper() { CHECK_VARIABLES ESDT_SYSTEM_SC_ADDRESS UNIVERSAL_TOKEN BRIDGED_TOKENS_WRAPPER - mxpy --verbose contract call ${ESDT_SYSTEM_SC_ADDRESS} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${ESDT_SYSTEM_SC_ADDRESS} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=60000000 --function="unSetSpecialRole" \ --arguments str:${UNIVERSAL_TOKEN} ${BRIDGED_TOKENS_WRAPPER} str:ESDTRoleLocalMint str:ESDTRoleLocalBurn\ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -44,7 +44,7 @@ unsetLocalRolesBridgedTokensWrapper() { addWrappedToken() { CHECK_VARIABLES BRIDGED_TOKENS_WRAPPER UNIVERSAL_TOKEN NR_DECIMALS_UNIVERSAL - mxpy --verbose contract call ${BRIDGED_TOKENS_WRAPPER} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${BRIDGED_TOKENS_WRAPPER} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=6000000 --function="addWrappedToken" \ --arguments str:${UNIVERSAL_TOKEN} ${NR_DECIMALS_UNIVERSAL} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -53,7 +53,7 @@ addWrappedToken() { removeWrappedToken() { CHECK_VARIABLES BRIDGED_TOKENS_WRAPPER UNIVERSAL_TOKEN - mxpy --verbose contract call ${BRIDGED_TOKENS_WRAPPER} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${BRIDGED_TOKENS_WRAPPER} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=6000000 --function="removeWrappedToken" \ --arguments str:${UNIVERSAL_TOKEN} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -62,7 +62,7 @@ removeWrappedToken() { removeWrappedToken() { CHECK_VARIABLES BRIDGED_TOKENS_WRAPPER UNIVERSAL_TOKEN - mxpy --verbose contract call ${BRIDGED_TOKENS_WRAPPER} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${BRIDGED_TOKENS_WRAPPER} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=6000000 --function="removeWrappedToken" \ --arguments str:${UNIVERSAL_TOKEN} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -71,7 +71,7 @@ removeWrappedToken() { wrapper-whitelistToken() { CHECK_VARIABLES BRIDGED_TOKENS_WRAPPER CHAIN_SPECIFIC_TOKEN NR_DECIMALS_CHAIN_SPECIFIC UNIVERSAL_TOKEN - mxpy --verbose contract call ${BRIDGED_TOKENS_WRAPPER} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${BRIDGED_TOKENS_WRAPPER} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=6000000 --function="whitelistToken" \ --arguments str:${CHAIN_SPECIFIC_TOKEN} ${NR_DECIMALS_CHAIN_SPECIFIC} str:${UNIVERSAL_TOKEN} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -80,7 +80,7 @@ wrapper-whitelistToken() { wrapper-blacklistToken() { CHECK_VARIABLES BRIDGED_TOKENS_WRAPPER CHAIN_SPECIFIC_TOKEN UNIVERSAL_TOKEN - mxpy --verbose contract call ${BRIDGED_TOKENS_WRAPPER} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${BRIDGED_TOKENS_WRAPPER} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=6000000 --function="blacklistToken" \ --arguments str:${CHAIN_SPECIFIC_TOKEN} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -89,7 +89,7 @@ wrapper-blacklistToken() { wrapper-updateWrappedToken() { CHECK_VARIABLES BRIDGED_TOKENS_WRAPPER UNIVERSAL_TOKEN NR_DECIMALS_UNIVERSAL - mxpy --verbose contract call ${BRIDGED_TOKENS_WRAPPER} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${BRIDGED_TOKENS_WRAPPER} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=6000000 --function="updateWrappedToken" \ --arguments str:${UNIVERSAL_TOKEN} ${NR_DECIMALS_UNIVERSAL} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -98,7 +98,7 @@ wrapper-updateWrappedToken() { wrapper-updateWhitelistedToken() { CHECK_VARIABLES BRIDGED_TOKENS_WRAPPER CHAIN_SPECIFIC_TOKEN NR_DECIMALS_CHAIN_SPECIFIC - mxpy --verbose contract call ${BRIDGED_TOKENS_WRAPPER} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${BRIDGED_TOKENS_WRAPPER} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=6000000 --function="updateWhitelistedToken" \ --arguments str:${CHAIN_SPECIFIC_TOKEN} ${NR_DECIMALS_CHAIN_SPECIFIC} \ --send --proxy=${PROXY} --chain=${CHAIN_ID} @@ -108,7 +108,7 @@ wrapper-updateWhitelistedToken() { wrapper-unpause() { CHECK_VARIABLES BRIDGED_TOKENS_WRAPPER - mxpy --verbose contract call ${BRIDGED_TOKENS_WRAPPER} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${BRIDGED_TOKENS_WRAPPER} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=5000000 --function="unpause" \ --send --proxy=${PROXY} --chain=${CHAIN_ID} || return } @@ -116,7 +116,7 @@ wrapper-unpause() { wrapper-pause() { CHECK_VARIABLES BRIDGED_TOKENS_WRAPPER - mxpy --verbose contract call ${BRIDGED_TOKENS_WRAPPER} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${BRIDGED_TOKENS_WRAPPER} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=5000000 --function="pause" \ --send --proxy=${PROXY} --chain=${CHAIN_ID} || return } @@ -124,7 +124,7 @@ wrapper-pause() { wrapper-pauseV2() { CHECK_VARIABLES BRIDGED_TOKENS_WRAPPER_v2 - mxpy --verbose contract call ${BRIDGED_TOKENS_WRAPPER_v2} --recall-nonce --pem=${ALICE} \ + mxpy contract call ${BRIDGED_TOKENS_WRAPPER_v2} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=5000000 --function="pause" \ --send --proxy=${PROXY} --chain=${CHAIN_ID} || return } @@ -132,7 +132,7 @@ wrapper-pauseV2() { wrapper-upgrade() { CHECK_VARIABLES BRIDGED_TOKENS_WRAPPER BRIDGED_TOKENS_WRAPPER_WASM - mxpy --verbose contract upgrade ${BRIDGED_TOKENS_WRAPPER} --bytecode=${BRIDGED_TOKENS_WRAPPER_WASM} --recall-nonce --pem=${ALICE} \ + mxpy contract upgrade ${BRIDGED_TOKENS_WRAPPER} --bytecode=${BRIDGED_TOKENS_WRAPPER_WASM} --recall-nonce "${MXPY_SIGN[@]}" \ --gas-limit=50000000 --send \ --outfile="upgrade-bridged-tokens-wrapper.json" --proxy=${PROXY} --chain=${CHAIN_ID} || return } diff --git a/multisig/interaction/release-v3/config-setter.cfg b/multisig/interaction/release-v3/config-setter.cfg new file mode 100644 index 00000000..c7d28a7a --- /dev/null +++ b/multisig/interaction/release-v3/config-setter.cfg @@ -0,0 +1,69 @@ +function set-eth-contracts-settings() { + update-config RELAYER_ADDR_0 erd1utcjaku9mpat3mqmref29ppklvk0rfamxtwa6vszpn538e5gxc7qxn60fv + update-config RELAYER_ADDR_1 erd13cgug7jgk0rfjypgxxe78g08cuetcd59nwygdtvtxf757mp0kuxq0ptlmz + update-config RELAYER_ADDR_2 erd176k35a4x6edcp3zf3s78ht73nw0fdw3sa0rzdctfrdr97pf2sxvqhrqcgz + update-config RELAYER_ADDR_3 erd1e7rkf4zsehn3ny3wz9ryp8zfr0emu49jx2vz7szsugwftavctskquff643 + update-config RELAYER_ADDR_4 erd1h4zv5y3xaxz523p0pluc2dz88lvqt8p9w28ftzz86vnsc6yx8vxqqc8sr9 + update-config RELAYER_ADDR_5 erd1c744ej6prx3yjydmr68jyrsg7hz5hj58gmcr02j6he782yh2qqyqlpamdj + update-config RELAYER_ADDR_6 erd1cdjeyqcxxeqc8jx0r463rywrew6x26kxq6h42duuxaffm0gjvszq5y8ynv + update-config RELAYER_ADDR_7 erd175tjdcmxq47rk0qd3n8fr74n9uaxyfjv5xvel5mp9emvxqk2tdzqdhyrqk + update-config RELAYER_ADDR_8 erd17t7kr6u4kzm4r0ftjzpzher38yw9z4hzu96p3hhkz9q944xv43wq8fc6rz + update-config RELAYER_ADDR_9 erd1ack50m42nta2x0my4kadfl0ylzu60prxgzuhjhdw6jlujjgmk5yq2wvxcr + update-config QUORUM 7 + + manual-update-config-file +} + +function set-bsc-contracts-settings() { + update-config RELAYER_ADDR_0 erd18ymp4ppzxjkexvceedxt2lwllgqf9r30tf53af5jx8tufqa70rvq8f48fc + update-config RELAYER_ADDR_1 erd12l4hyrxp76fdjae42vqr7tfcs38d83qe4d5kh8gykvqkkr3a0ejqzsl568 + update-config RELAYER_ADDR_2 erd1nrf9f39slwaj6qmv6vkchqydl9ap2tw28xxllg08weqw4vul8pvqheh84x + update-config RELAYER_ADDR_3 erd1e9h0g5sjc26dpskuyxsn3hkqcw229zgcdkpjghc94nmcsht47nzqpefjwa + update-config RELAYER_ADDR_4 erd1wzr5se3xwn5d2aurl9jzjcmchuv3gljk8f4dl0uxdashmn3ygysq54renf + update-config RELAYER_ADDR_5 erd1f5zvn3snuruvs4vuzhs0mqx4q8r4gtt4ze2zmsdcu7tl6cgkvxyqtrftk6 + update-config RELAYER_ADDR_6 erd10adh0mnzv7s7g4hmr0aj4mpwp3mgr3ykq8lgwg2tkd84jukxyyzqh5tf23 + update-config RELAYER_ADDR_7 erd1lzssh9anhmxg480jmt0rdxt4v43vjnx9wpjg4psq5c68qthc4gzqs2lcqx + update-config RELAYER_ADDR_8 erd1yv639w0lkrvdh5vmyjy8n8e23zh9a55upzx2gr8h4ez0vgw09psqr40w8g + update-config RELAYER_ADDR_9 erd1sy2ymmvk2l5z6dkfl5gtzrvvwc9g9jwaaq63t3jfeenagne2fdcqqwm3jq + update-config QUORUM 7 + + manual-update-config-file +} + +function set-oracle-addresses { + update-config ORACLE_ADDR_0 erd1fpchumqmwhfencl2r4za6cxr95h632crejvz6eywptq3jf5lvvqq9s6mm7 + update-config ORACLE_ADDR_1 erd1zlzllfd5nks50w9lvfl4m7czkzsnxlxuw4zl7y563wku90hpdgqqvnaqsg + update-config ORACLE_ADDR_2 erd19qnq0g2ym0ex2sthvmp9x94cl40uaar6hxr4hjxfyv7j37yy7uqq27ludx + + manual-update-config-file +} + +function set-eth-USDC-token-settings { + update-config NR_DECIMALS_CHAIN_SPECIFIC 6 + update-config NR_DECIMALS_UNIVERSAL 6 + update-config UNIVERSAL_TOKEN USDCJLS-fe0ed1 + update-config CHAIN_SPECIFIC_TOKEN_TICKER ETHUSDCJ + update-config CHAIN_SPECIFIC_TOKEN ETHUSDCJ-2336be + update-config ERC20_TOKEN 0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48 + update-config MINTBURN_WHITELIST true + update-config NATIVE_TOKEN false + update-config FEE_AMOUNT 5 + update-config MAX_AMOUNT 1000 + + manual-update-config-file +} + +function set-bsc-USDC-token-settings { + update-config NR_DECIMALS_CHAIN_SPECIFIC 18 + update-config NR_DECIMALS_UNIVERSAL 6 + update-config UNIVERSAL_TOKEN USDCJLS-fe0ed1 + update-config CHAIN_SPECIFIC_TOKEN_TICKER BSCUSDCJ + update-config CHAIN_SPECIFIC_TOKEN BSCUSDCJ-91756a + update-config ERC20_TOKEN 0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d + update-config MINTBURN_WHITELIST true + update-config NATIVE_TOKEN false + update-config FEE_AMOUNT 5 + update-config MAX_AMOUNT 1000 + + manual-update-config-file +} \ No newline at end of file diff --git a/multisig/interaction/release-v3/menu_functions.cfg b/multisig/interaction/release-v3/menu_functions.cfg new file mode 100644 index 00000000..ab5a8a91 --- /dev/null +++ b/multisig/interaction/release-v3/menu_functions.cfg @@ -0,0 +1,141 @@ +#!/bin/bash +set -e + +source $SCRIPTPATH/config/aggregator-snippets.sh +source $SCRIPTPATH/config/issue-tokens-snippets.sh +source $SCRIPTPATH/config/multisig-snippets.sh +source $SCRIPTPATH/config/multitransfer-snippets.sh +source $SCRIPTPATH/config/proxy-snippets.sh +source $SCRIPTPATH/config/relayers-snippets.sh +source $SCRIPTPATH/config/wrapped-snippets.sh +source $SCRIPTPATH/config/safe-snippets.sh +source $SCRIPTPATH/config/testing.sh +source $SCRIPTPATH/config/mainnet-release-v3.sh +source $SCRIPTPATH/release-v3/config-setter.cfg + +CHECK_VARIABLES ALICE PROXY CHAIN_ID + +function deploy-bridge-contracts-eth-v3 { + echo -e + echo "PREREQUIREMENTS: The BRIDGED_TOKENS_WRAPPER address should be defined in configs.cfg file" + echo -e + + set-eth-contracts-settings + set-oracle-addresses + + confirmation-with-skip deployAggregator + confirmation-with-skip manual-update-config-file + + deploy-chain-only-contract +} + +function deploy-bridge-contracts-bsc-v3 { + echo -e + echo "PREREQUIREMENTS: The BRIDGED_TOKENS_WRAPPER address should be defined in configs.cfg file" + echo -e + + set-bsc-contracts-settings + + deploy-chain-only-contract +} + +function deploy-chain-only-contract { + confirmation-with-skip deployMultiTransfer + manual-update-config-file + confirmation-with-skip deploySafe + manual-update-config-file + confirmation-with-skip deployBridgeProxy + manual-update-config-file + confirmation-with-skip deployMultisigMainnetV3 + manual-update-config-file + + confirmation-with-skip setBridgeProxyContractAddressOnMultiTransfer + confirmation-with-skip setBridgedTokensWrapperOnMultiTransfer + + confirmation-with-skip setBridgedTokensWrapperOnSCProxy + confirmation-with-skip setMultiTransferOnSCProxy + confirmation-with-skip setEsdtSafeOnSCProxy + + confirmation-with-skip setBridgedTokensWrapperOnEsdtSafe + confirmation-with-skip setSCProxyOnEsdtSafe + + confirmation-with-skip changeChildContractsOwnershipSafe + confirmation-with-skip changeChildContractsOwnershipMultiTransfer + confirmation-with-skip changeChildContractsOwnershipProxy + + confirmation-with-skip setEsdtSafeOnMultiTransferThroughMultisig +} + +function unpause-contracts-eth-v3 { + confirmation-with-skip unpauseAggregator + confirmation-with-skip unpause + confirmation-with-skip unpauseEsdtSafe + confirmation-with-skip unpauseProxy +} + +function unpause-contracts-bsc-v3 { + confirmation-with-skip unpause + confirmation-with-skip unpauseEsdtSafe + confirmation-with-skip unpauseProxy +} + +function set-tokens-on-eth { + confirmation-multiple set-eth-USDC-token-settings addMapping addTokenToWhitelist setPairDecimals +} + +function set-tokens-on-bsc { + confirmation-multiple set-bsc-USDC-token-settings addMapping addTokenToWhitelist setPairDecimals +} + +function stake-oracles { + echo -e + echo "PREREQUIREMENTS: The AGGREGATOR address should be defined in configs.cfg file" + echo -e + + confirmation-with-skip manual-update-config-file + set-oracle-addresses + + confirmation stakeOracles +} + +function submit-aggregation-batches-eth { + echo -e + echo "PREREQUIREMENTS: The AGGREGATOR address should be defined in configs.cfg file" + echo -e + + confirmation-with-skip manual-update-config-file + set-oracle-addresses + + confirmation-multiple set-eth-USDC-token-settings submitAggregatorBatch +} + +function submit-aggregation-batches-bsc { + echo -e + echo "PREREQUIREMENTS: The AGGREGATOR address should be defined in configs.cfg file" + echo -e + + confirmation-with-skip manual-update-config-file + set-oracle-addresses + + confirmation-multiple set-bsc-USDC-token-settings submitAggregatorBatch +} + +function stake-relayers-eth { + set-eth-contracts-settings + + confirmation-with-skip stakeRelayers +} + +function stake-relayers-bsc { + set-bsc-contracts-settings + + confirmation-with-skip stakeRelayers +} + +function set-roles-on-esdt-safe-eth { + confirmation-multiple set-eth-USDC-token-settings setLocalRolesEsdtSafe +} + +function set-roles-on-esdt-safe-bsc { + confirmation-multiple set-bsc-USDC-token-settings setLocalRolesEsdtSafe +} \ No newline at end of file diff --git a/multisig/interaction/script-v3-release.sh b/multisig/interaction/script-v3-release.sh new file mode 100755 index 00000000..c030c292 --- /dev/null +++ b/multisig/interaction/script-v3-release.sh @@ -0,0 +1,106 @@ +#!/bin/bash +set -e + +#Make script aware of its location +SCRIPTPATH="$( cd "$(dirname -- "$0")" ; pwd -P )" + +source $SCRIPTPATH/config/configs.cfg +source $SCRIPTPATH/config/helper.cfg +source $SCRIPTPATH/config/menu_functions.cfg +source $SCRIPTPATH/release-v3/menu_functions.cfg + +case "$1" in + +### PART 1 + +'deploy-bridge-contracts-eth-v3') + confirmation deploy-bridge-contracts-eth-v3 + ;; + +'unpause-contracts-eth-v3') + confirmation unpause-contracts-eth-v3 + ;; + +'set-tokens-on-eth') + confirmation set-tokens-on-eth + ;; + +'stake-oracles') + confirmation stake-oracles + ;; + +'submit-aggregation-batches-eth') + confirmation submit-aggregation-batches-eth + ;; + +'stake-relayers-eth') + confirmation stake-relayers-eth + ;; + +'set-roles-on-esdt-safe-eth') + confirmation set-roles-on-esdt-safe-eth + ;; + +### PART 2 + +'deploy-bridge-contracts-bsc-v3') + confirmation deploy-bridge-contracts-bsc-v3 + ;; + +'unpause-contracts-bsc-v3') + confirmation unpause-contracts-bsc-v3 + ;; + +'set-tokens-on-bsc') + confirmation set-tokens-on-bsc + ;; + +'submit-aggregation-batches-bsc') + confirmation submit-aggregation-batches-bsc + ;; + +'stake-relayers-bsc') + confirmation stake-relayers-bsc + ;; + +'set-roles-on-esdt-safe-bsc') + confirmation set-roles-on-esdt-safe-bsc + ;; + +### PART 3 + +'upgrade-wrapper') + confirmation upgrade-wrapper + ;; + +*) + echo "Usage: Invalid choice: '"$1"'" + echo -e + echo "Choose from:" + echo "PART 1 - Ethereum:" + echo " 1.1 deploy-bridge-contracts-eth-v3" + echo " 1.2 unpause-contracts-eth-v3" + echo " 1.3 set-tokens-on-eth" + echo " -----------" + echo " 1.4 stake-oracles" + echo " 1.5 submit-aggregation-batches-eth" + echo " 1.6 stake-relayers-eth" + echo " -----------" + echo " 1.7 set-roles-on-esdt-safe-eth" + echo -e + echo "PART 2 - BSC:" + echo " 2.1 deploy-bridge-contracts-bsc-v3" + echo " 2.2 unpause-contracts-bsc-v3" + echo " 2.3 set-tokens-on-bsc" + echo " -----------" + echo " 2.4 submit-aggregation-batches-bsc" + echo " 2.5 stake-relayers-bsc" + echo " -----------" + echo " 2.6 set-roles-on-esdt-safe-bsc" + echo -e + echo "PART 3 - Upgrade wrapper:" + echo " 3.1 upgrade-wrapper" + echo -e + ;; + +esac \ No newline at end of file From e4fd04baa3bd744b1b4a3538db0b6498b9555a64 Mon Sep 17 00:00:00 2001 From: Iulian Pascalau Date: Sat, 9 Nov 2024 11:47:14 +0200 Subject: [PATCH 2/6] - added last step --- multisig/interaction/release-v3/menu_functions.cfg | 4 ++++ multisig/interaction/script-v3-release.sh | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/multisig/interaction/release-v3/menu_functions.cfg b/multisig/interaction/release-v3/menu_functions.cfg index ab5a8a91..eb24cf74 100644 --- a/multisig/interaction/release-v3/menu_functions.cfg +++ b/multisig/interaction/release-v3/menu_functions.cfg @@ -138,4 +138,8 @@ function set-roles-on-esdt-safe-eth { function set-roles-on-esdt-safe-bsc { confirmation-multiple set-bsc-USDC-token-settings setLocalRolesEsdtSafe +} + +function unpause-wrapper { + confirmation-with-skip wrapper-unpause } \ No newline at end of file diff --git a/multisig/interaction/script-v3-release.sh b/multisig/interaction/script-v3-release.sh index c030c292..008d2708 100755 --- a/multisig/interaction/script-v3-release.sh +++ b/multisig/interaction/script-v3-release.sh @@ -73,6 +73,10 @@ case "$1" in confirmation upgrade-wrapper ;; +'unpause-wrapper') + confirmation unpause-wrapper + ;; + *) echo "Usage: Invalid choice: '"$1"'" echo -e @@ -100,6 +104,7 @@ case "$1" in echo -e echo "PART 3 - Upgrade wrapper:" echo " 3.1 upgrade-wrapper" + echo " 3.2 unpause-wrapper" echo -e ;; From 858b66429b46e00ea77d9fdeb3cc2eab6c45651e Mon Sep 17 00:00:00 2001 From: Iulian Pascalau Date: Mon, 11 Nov 2024 11:47:42 +0200 Subject: [PATCH 3/6] - finalized scripts --- .../interaction/release-v3/config-setter.cfg | 258 ++++++++++++++++-- .../interaction/release-v3/menu_functions.cfg | 42 +++ 2 files changed, 279 insertions(+), 21 deletions(-) diff --git a/multisig/interaction/release-v3/config-setter.cfg b/multisig/interaction/release-v3/config-setter.cfg index c7d28a7a..3601cdcc 100644 --- a/multisig/interaction/release-v3/config-setter.cfg +++ b/multisig/interaction/release-v3/config-setter.cfg @@ -1,3 +1,5 @@ +#### Ethereum + function set-eth-contracts-settings() { update-config RELAYER_ADDR_0 erd1utcjaku9mpat3mqmref29ppklvk0rfamxtwa6vszpn538e5gxc7qxn60fv update-config RELAYER_ADDR_1 erd13cgug7jgk0rfjypgxxe78g08cuetcd59nwygdtvtxf757mp0kuxq0ptlmz @@ -14,6 +16,188 @@ function set-eth-contracts-settings() { manual-update-config-file } +function set-eth-USDC-token-settings { + update-config NR_DECIMALS_CHAIN_SPECIFIC 6 + update-config NR_DECIMALS_UNIVERSAL 6 + update-config UNIVERSAL_TOKEN USDC-c76f1f + update-config CHAIN_SPECIFIC_TOKEN_TICKER ETHUSDCJ + update-config CHAIN_SPECIFIC_TOKEN ETHUSDC-220753 + update-config ERC20_TOKEN 0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48 + update-config MINTBURN_WHITELIST true + update-config NATIVE_TOKEN false + update-config FEE_AMOUNT 20 + update-config MAX_AMOUNT 50000 + + manual-update-config-file +} + +function set-eth-UTK-token-settings { + update-config NR_DECIMALS_CHAIN_SPECIFIC 18 + update-config NR_DECIMALS_UNIVERSAL 18 + update-config UNIVERSAL_TOKEN UTK-2f80e9 + update-config CHAIN_SPECIFIC_TOKEN_TICKER ETHUTK + update-config CHAIN_SPECIFIC_TOKEN ETHUTK-8cdf7a + update-config ERC20_TOKEN 0xdc9ac3c20d1ed0b540df9b1fedc10039df13f99c + update-config MINTBURN_WHITELIST true + update-config NATIVE_TOKEN false + update-config FEE_AMOUNT 660 + update-config MAX_AMOUNT 676600 + + manual-update-config-file +} + +function set-eth-USDT-token-settings { + update-config NR_DECIMALS_CHAIN_SPECIFIC 6 + update-config NR_DECIMALS_UNIVERSAL 6 + update-config UNIVERSAL_TOKEN USDT-f8c08c + update-config CHAIN_SPECIFIC_TOKEN_TICKER ETHUSDT + update-config CHAIN_SPECIFIC_TOKEN ETHUSDT-9c73c6 + update-config ERC20_TOKEN 0xdac17f958d2ee523a2206206994597c13d831ec7 + update-config MINTBURN_WHITELIST true + update-config NATIVE_TOKEN false + update-config FEE_AMOUNT 20 + update-config MAX_AMOUNT 50000 + + manual-update-config-file +} + +#function set-eth-BUSD-token-settings { +# update-config NR_DECIMALS_CHAIN_SPECIFIC 18 +# update-config NR_DECIMALS_UNIVERSAL 18 +# update-config UNIVERSAL_TOKEN BUSD-40b57e +# update-config CHAIN_SPECIFIC_TOKEN_TICKER ETHBUSD +# update-config CHAIN_SPECIFIC_TOKEN ETHBUSD-450923 +# update-config ERC20_TOKEN 0x4fabb145d64652a948d72533023f6e7a623c7c53 +# update-config MINTBURN_WHITELIST true +# update-config NATIVE_TOKEN false +# update-config FEE_AMOUNT 25 +# update-config MAX_AMOUNT 50000 +# +# manual-update-config-file +#} + +function set-eth-HMT-token-settings { + update-config NR_DECIMALS_CHAIN_SPECIFIC 18 + update-config NR_DECIMALS_UNIVERSAL 18 + update-config UNIVERSAL_TOKEN HMT-fc75d2 + update-config CHAIN_SPECIFIC_TOKEN_TICKER ETHHMT + update-config CHAIN_SPECIFIC_TOKEN ETHHMT-18538a + update-config ERC20_TOKEN 0xd1ba9bac957322d6e8c07a160a3a8da11a0d2867 + update-config MINTBURN_WHITELIST true + update-config NATIVE_TOKEN false + update-config FEE_AMOUNT 870 + update-config MAX_AMOUNT 872750 + + manual-update-config-file +} + +function set-eth-CGG-token-settings { + update-config NR_DECIMALS_CHAIN_SPECIFIC 18 + update-config NR_DECIMALS_UNIVERSAL 18 + update-config UNIVERSAL_TOKEN CGG-8b4838 + update-config CHAIN_SPECIFIC_TOKEN_TICKER ETHCGG + update-config CHAIN_SPECIFIC_TOKEN ETHCGG-ee4e0c + update-config ERC20_TOKEN 0x1fe24f25b1cf609b9c4e7e12d802e3640dfa5e43 + update-config MINTBURN_WHITELIST true + update-config NATIVE_TOKEN false + update-config FEE_AMOUNT 1853 + update-config MAX_AMOUNT 635000 + + manual-update-config-file +} + +function set-eth-INFRA-token-settings { + update-config NR_DECIMALS_CHAIN_SPECIFIC 18 + update-config NR_DECIMALS_UNIVERSAL 18 + update-config UNIVERSAL_TOKEN INFRA-43985c + update-config CHAIN_SPECIFIC_TOKEN_TICKER ETHINFRA + update-config CHAIN_SPECIFIC_TOKEN ETHINFRA-60a3bf + update-config ERC20_TOKEN 0x013062189dc3dcc99e9cee714c513033b8d99e3c + update-config MINTBURN_WHITELIST true + update-config NATIVE_TOKEN false + update-config FEE_AMOUNT 150 + update-config MAX_AMOUNT 100000 + + manual-update-config-file +} + +function set-eth-WBTC-token-settings { + update-config NR_DECIMALS_CHAIN_SPECIFIC 8 + update-config NR_DECIMALS_UNIVERSAL 8 + update-config UNIVERSAL_TOKEN WBTC-5349b3 + update-config CHAIN_SPECIFIC_TOKEN_TICKER ETHWBTC + update-config CHAIN_SPECIFIC_TOKEN ETHWBTC-74e282 + update-config ERC20_TOKEN 0x2260fac5e5542a773aa44fbcfedf7c193bc2c599 + update-config MINTBURN_WHITELIST true + update-config NATIVE_TOKEN false + update-config FEE_AMOUNT 0.00032055 + update-config MAX_AMOUNT 2 + + manual-update-config-file +} + +function set-eth-WETH-token-settings { + update-config NR_DECIMALS_CHAIN_SPECIFIC 18 + update-config NR_DECIMALS_UNIVERSAL 18 + update-config UNIVERSAL_TOKEN WETH-b4ca29 + update-config CHAIN_SPECIFIC_TOKEN_TICKER ETHWETH + update-config CHAIN_SPECIFIC_TOKEN ETHWETH-e1c126 + update-config ERC20_TOKEN 0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2 + update-config MINTBURN_WHITELIST true + update-config NATIVE_TOKEN false + update-config FEE_AMOUNT 0.00711 + update-config MAX_AMOUNT 28.5 + + manual-update-config-file +} + +function set-eth-WSDAI-token-settings { + update-config NR_DECIMALS_CHAIN_SPECIFIC 18 + update-config NR_DECIMALS_UNIVERSAL 18 + update-config UNIVERSAL_TOKEN WSDAI-277fee + update-config CHAIN_SPECIFIC_TOKEN_TICKER ETHWSDAI + update-config CHAIN_SPECIFIC_TOKEN ETHWSDAI-572803 + update-config ERC20_TOKEN 0x83f20f44975d03b1b09e64809b757c47f942beea + update-config MINTBURN_WHITELIST true + update-config NATIVE_TOKEN false + update-config FEE_AMOUNT 17 + update-config MAX_AMOUNT 50000 + + manual-update-config-file +} + +function set-eth-UMB-token-settings { + update-config NR_DECIMALS_CHAIN_SPECIFIC 18 + update-config NR_DECIMALS_UNIVERSAL 18 + update-config UNIVERSAL_TOKEN UMB-e2b3d8 + update-config CHAIN_SPECIFIC_TOKEN_TICKER ETHUMB + update-config CHAIN_SPECIFIC_TOKEN ETHUMB-291202 + update-config ERC20_TOKEN 0x6fc13eace26590b80cccab1ba5d51890577d83b2 + update-config MINTBURN_WHITELIST true + update-config NATIVE_TOKEN false + update-config FEE_AMOUNT 2640 + update-config MAX_AMOUNT 2500000 + + manual-update-config-file +} + +function set-eth-WDAI-token-settings { + update-config NR_DECIMALS_CHAIN_SPECIFIC 18 + update-config NR_DECIMALS_UNIVERSAL 18 + update-config UNIVERSAL_TOKEN WDAI-9eeb54 + update-config CHAIN_SPECIFIC_TOKEN_TICKER ETHWDAI + update-config CHAIN_SPECIFIC_TOKEN ETHWDAI-bd65f9 + update-config ERC20_TOKEN 0x6b175474e89094c44da98b954eedeac495271d0f + update-config MINTBURN_WHITELIST true + update-config NATIVE_TOKEN false + update-config FEE_AMOUNT 20 + update-config MAX_AMOUNT 50000 + + manual-update-config-file +} + +### BSC + function set-bsc-contracts-settings() { update-config RELAYER_ADDR_0 erd18ymp4ppzxjkexvceedxt2lwllgqf9r30tf53af5jx8tufqa70rvq8f48fc update-config RELAYER_ADDR_1 erd12l4hyrxp76fdjae42vqr7tfcs38d83qe4d5kh8gykvqkkr3a0ejqzsl568 @@ -30,40 +214,72 @@ function set-bsc-contracts-settings() { manual-update-config-file } -function set-oracle-addresses { - update-config ORACLE_ADDR_0 erd1fpchumqmwhfencl2r4za6cxr95h632crejvz6eywptq3jf5lvvqq9s6mm7 - update-config ORACLE_ADDR_1 erd1zlzllfd5nks50w9lvfl4m7czkzsnxlxuw4zl7y563wku90hpdgqqvnaqsg - update-config ORACLE_ADDR_2 erd19qnq0g2ym0ex2sthvmp9x94cl40uaar6hxr4hjxfyv7j37yy7uqq27ludx +function set-bsc-USDC-token-settings { + update-config NR_DECIMALS_CHAIN_SPECIFIC 18 + update-config NR_DECIMALS_UNIVERSAL 6 + update-config UNIVERSAL_TOKEN USDC-c76f1f + update-config CHAIN_SPECIFIC_TOKEN_TICKER BSCUSDC + update-config CHAIN_SPECIFIC_TOKEN BSCUSDC-887875 + update-config ERC20_TOKEN 0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d + update-config MINTBURN_WHITELIST true + update-config NATIVE_TOKEN false + update-config FEE_AMOUNT 1 + update-config MAX_AMOUNT 50000 manual-update-config-file } -function set-eth-USDC-token-settings { - update-config NR_DECIMALS_CHAIN_SPECIFIC 6 +function set-bsc-USDT-token-settings { + update-config NR_DECIMALS_CHAIN_SPECIFIC 18 update-config NR_DECIMALS_UNIVERSAL 6 - update-config UNIVERSAL_TOKEN USDCJLS-fe0ed1 - update-config CHAIN_SPECIFIC_TOKEN_TICKER ETHUSDCJ - update-config CHAIN_SPECIFIC_TOKEN ETHUSDCJ-2336be - update-config ERC20_TOKEN 0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48 + update-config UNIVERSAL_TOKEN USDT-f8c08c + update-config CHAIN_SPECIFIC_TOKEN_TICKER BSCUSDT + update-config CHAIN_SPECIFIC_TOKEN BSCUSDT-059796 + update-config ERC20_TOKEN 0x55d398326f99059ff775485246999027b3197955 update-config MINTBURN_WHITELIST true update-config NATIVE_TOKEN false - update-config FEE_AMOUNT 5 - update-config MAX_AMOUNT 1000 + update-config FEE_AMOUNT 1 + update-config MAX_AMOUNT 50000 manual-update-config-file } -function set-bsc-USDC-token-settings { +# function set-bsc-BUSD-token-settings { +# update-config NR_DECIMALS_CHAIN_SPECIFIC 18 +# update-config NR_DECIMALS_UNIVERSAL 18 +# update-config UNIVERSAL_TOKEN BUSD-40b57e +# update-config CHAIN_SPECIFIC_TOKEN_TICKER BSCBUSD +# update-config CHAIN_SPECIFIC_TOKEN BSCBUSD-69b1d9 +# update-config ERC20_TOKEN 0xe9e7cea3dedca5984780bafc599bd69add087d56 +# update-config MINTBURN_WHITELIST true +# update-config NATIVE_TOKEN false +# update-config FEE_AMOUNT 5 +# update-config MAX_AMOUNT 50000 +# +# manual-update-config-file +# } + +function set-bsc-TADA-token-settings { update-config NR_DECIMALS_CHAIN_SPECIFIC 18 - update-config NR_DECIMALS_UNIVERSAL 6 - update-config UNIVERSAL_TOKEN USDCJLS-fe0ed1 - update-config CHAIN_SPECIFIC_TOKEN_TICKER BSCUSDCJ - update-config CHAIN_SPECIFIC_TOKEN BSCUSDCJ-91756a - update-config ERC20_TOKEN 0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d + update-config NR_DECIMALS_UNIVERSAL 18 + update-config UNIVERSAL_TOKEN TADA-5c032c + update-config CHAIN_SPECIFIC_TOKEN_TICKER BSCTADA + update-config CHAIN_SPECIFIC_TOKEN BSCTADA-f64757 + update-config ERC20_TOKEN 0x9b26e318bc6a2c8b45f5daea2cc14697e0e0f8b5 update-config MINTBURN_WHITELIST true update-config NATIVE_TOKEN false - update-config FEE_AMOUNT 5 - update-config MAX_AMOUNT 1000 + update-config FEE_AMOUNT 45 + update-config MAX_AMOUNT 1000000 + + manual-update-config-file +} + +### common + +function set-oracle-addresses { + update-config ORACLE_ADDR_0 erd1fpchumqmwhfencl2r4za6cxr95h632crejvz6eywptq3jf5lvvqq9s6mm7 + update-config ORACLE_ADDR_1 erd1zlzllfd5nks50w9lvfl4m7czkzsnxlxuw4zl7y563wku90hpdgqqvnaqsg + update-config ORACLE_ADDR_2 erd19qnq0g2ym0ex2sthvmp9x94cl40uaar6hxr4hjxfyv7j37yy7uqq27ludx manual-update-config-file -} \ No newline at end of file +} diff --git a/multisig/interaction/release-v3/menu_functions.cfg b/multisig/interaction/release-v3/menu_functions.cfg index eb24cf74..a838bd3c 100644 --- a/multisig/interaction/release-v3/menu_functions.cfg +++ b/multisig/interaction/release-v3/menu_functions.cfg @@ -81,10 +81,24 @@ function unpause-contracts-bsc-v3 { function set-tokens-on-eth { confirmation-multiple set-eth-USDC-token-settings addMapping addTokenToWhitelist setPairDecimals + confirmation-multiple set-eth-UTK-token-settings addMapping addTokenToWhitelist setPairDecimals + confirmation-multiple set-eth-USDT-token-settings addMapping addTokenToWhitelist setPairDecimals + #confirmation-multiple set-eth-BUSD-token-settings addMapping addTokenToWhitelist setPairDecimals + confirmation-multiple set-eth-HMT-token-settings addMapping addTokenToWhitelist setPairDecimals + confirmation-multiple set-eth-CGG-token-settings addMapping addTokenToWhitelist setPairDecimals + confirmation-multiple set-eth-INFRA-token-settings addMapping addTokenToWhitelist setPairDecimals + confirmation-multiple set-eth-WBTC-token-settings addMapping addTokenToWhitelist setPairDecimals + confirmation-multiple set-eth-WETH-token-settings addMapping addTokenToWhitelist setPairDecimals + confirmation-multiple set-eth-WSDAI-token-settings addMapping addTokenToWhitelist setPairDecimals + confirmation-multiple set-eth-WDAI-token-settings addMapping addTokenToWhitelist setPairDecimals + confirmation-multiple set-eth-UMB-token-settings addMapping addTokenToWhitelist setPairDecimals } function set-tokens-on-bsc { confirmation-multiple set-bsc-USDC-token-settings addMapping addTokenToWhitelist setPairDecimals + confirmation-multiple set-bsc-USDT-token-settings addMapping addTokenToWhitelist setPairDecimals + #confirmation-multiple set-bsc-BUSD-token-settings addMapping addTokenToWhitelist setPairDecimals + confirmation-multiple set-bsc-TADA-token-settings addMapping addTokenToWhitelist setPairDecimals } function stake-oracles { @@ -107,6 +121,17 @@ function submit-aggregation-batches-eth { set-oracle-addresses confirmation-multiple set-eth-USDC-token-settings submitAggregatorBatch + confirmation-multiple set-eth-UTK-token-settings submitAggregatorBatch + confirmation-multiple set-eth-USDT-token-settings submitAggregatorBatch + #confirmation-multiple set-eth-BUSD-token-settings submitAggregatorBatch + confirmation-multiple set-eth-HMT-token-settings submitAggregatorBatch + confirmation-multiple set-eth-CGG-token-settings submitAggregatorBatch + confirmation-multiple set-eth-INFRA-token-settings submitAggregatorBatch + confirmation-multiple set-eth-WBTC-token-settings submitAggregatorBatch + confirmation-multiple set-eth-WETH-token-settings submitAggregatorBatch + confirmation-multiple set-eth-WSDAI-token-settings submitAggregatorBatch + confirmation-multiple set-eth-WDAI-token-settings submitAggregatorBatch + confirmation-multiple set-eth-UMB-token-settings submitAggregatorBatch } function submit-aggregation-batches-bsc { @@ -118,6 +143,9 @@ function submit-aggregation-batches-bsc { set-oracle-addresses confirmation-multiple set-bsc-USDC-token-settings submitAggregatorBatch + confirmation-multiple set-bsc-USDT-token-settings submitAggregatorBatch + #confirmation-multiple set-bsc-BUSD-token-settings submitAggregatorBatch + confirmation-multiple set-bsc-TADA-token-settings submitAggregatorBatch } function stake-relayers-eth { @@ -134,10 +162,24 @@ function stake-relayers-bsc { function set-roles-on-esdt-safe-eth { confirmation-multiple set-eth-USDC-token-settings setLocalRolesEsdtSafe + confirmation-multiple set-eth-UTK-token-settings setLocalRolesEsdtSafe + confirmation-multiple set-eth-USDT-token-settings setLocalRolesEsdtSafe + #confirmation-multiple set-eth-BUSD-token-settings setLocalRolesEsdtSafe + confirmation-multiple set-eth-HMT-token-settings setLocalRolesEsdtSafe + confirmation-multiple set-eth-CGG-token-settings setLocalRolesEsdtSafe + confirmation-multiple set-eth-INFRA-token-settings setLocalRolesEsdtSafe + confirmation-multiple set-eth-WBTC-token-settings setLocalRolesEsdtSafe + confirmation-multiple set-eth-WETH-token-settings setLocalRolesEsdtSafe + confirmation-multiple set-eth-WSDAI-token-settings setLocalRolesEsdtSafe + confirmation-multiple set-eth-WDAI-token-settings setLocalRolesEsdtSafe + confirmation-multiple set-eth-UMB-token-settings setLocalRolesEsdtSafe } function set-roles-on-esdt-safe-bsc { confirmation-multiple set-bsc-USDC-token-settings setLocalRolesEsdtSafe + confirmation-multiple set-bsc-USDT-token-settings setLocalRolesEsdtSafe + #confirmation-multiple set-bsc-BUSD-token-settings setLocalRolesEsdtSafe + confirmation-multiple set-bsc-TADA-token-settings setLocalRolesEsdtSafe } function unpause-wrapper { From bdcd1329b80cb541ac40822274a984e9c104d304 Mon Sep 17 00:00:00 2001 From: Iulian Pascalau Date: Mon, 11 Nov 2024 13:50:45 +0200 Subject: [PATCH 4/6] - fixed oracle addresses --- multisig/interaction/release-v3/config-setter.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/multisig/interaction/release-v3/config-setter.cfg b/multisig/interaction/release-v3/config-setter.cfg index 3601cdcc..dce2db23 100644 --- a/multisig/interaction/release-v3/config-setter.cfg +++ b/multisig/interaction/release-v3/config-setter.cfg @@ -277,9 +277,9 @@ function set-bsc-TADA-token-settings { ### common function set-oracle-addresses { - update-config ORACLE_ADDR_0 erd1fpchumqmwhfencl2r4za6cxr95h632crejvz6eywptq3jf5lvvqq9s6mm7 - update-config ORACLE_ADDR_1 erd1zlzllfd5nks50w9lvfl4m7czkzsnxlxuw4zl7y563wku90hpdgqqvnaqsg - update-config ORACLE_ADDR_2 erd19qnq0g2ym0ex2sthvmp9x94cl40uaar6hxr4hjxfyv7j37yy7uqq27ludx + update-config ORACLE_ADDR_0 erd1eq3yemt04efrsafedena3h8qcxlypvhxq5t69nuvaaxgj25uytxq7hc5ga + update-config ORACLE_ADDR_1 erd1hkfnfsajglf4dk44fe4v67nhz3kxfp2qqejj5uazmu5hv6xye42qyywr53 + update-config ORACLE_ADDR_2 erd12806lwvndt7r37l95dmv5p35nsqv59judlds9qxacgtksv8h9pjqa5hnw9 manual-update-config-file } From 32c9086a7e5913033d12cfababa1a31e6955e287 Mon Sep 17 00:00:00 2001 From: Iulian Pascalau Date: Mon, 11 Nov 2024 14:00:38 +0200 Subject: [PATCH 5/6] - fixed USDC ticker --- multisig/interaction/release-v3/config-setter.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multisig/interaction/release-v3/config-setter.cfg b/multisig/interaction/release-v3/config-setter.cfg index dce2db23..d427afe1 100644 --- a/multisig/interaction/release-v3/config-setter.cfg +++ b/multisig/interaction/release-v3/config-setter.cfg @@ -20,7 +20,7 @@ function set-eth-USDC-token-settings { update-config NR_DECIMALS_CHAIN_SPECIFIC 6 update-config NR_DECIMALS_UNIVERSAL 6 update-config UNIVERSAL_TOKEN USDC-c76f1f - update-config CHAIN_SPECIFIC_TOKEN_TICKER ETHUSDCJ + update-config CHAIN_SPECIFIC_TOKEN_TICKER ETHUSDC update-config CHAIN_SPECIFIC_TOKEN ETHUSDC-220753 update-config ERC20_TOKEN 0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48 update-config MINTBURN_WHITELIST true From 0890bd4651159cc0e884fe184fc6f39fab12c9a3 Mon Sep 17 00:00:00 2001 From: Iulian Pascalau Date: Mon, 11 Nov 2024 14:28:21 +0200 Subject: [PATCH 6/6] - swapped order --- .../interaction/release-v3/config-setter.cfg | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/multisig/interaction/release-v3/config-setter.cfg b/multisig/interaction/release-v3/config-setter.cfg index d427afe1..f3c4c863 100644 --- a/multisig/interaction/release-v3/config-setter.cfg +++ b/multisig/interaction/release-v3/config-setter.cfg @@ -166,32 +166,32 @@ function set-eth-WSDAI-token-settings { manual-update-config-file } -function set-eth-UMB-token-settings { +function set-eth-WDAI-token-settings { update-config NR_DECIMALS_CHAIN_SPECIFIC 18 update-config NR_DECIMALS_UNIVERSAL 18 - update-config UNIVERSAL_TOKEN UMB-e2b3d8 - update-config CHAIN_SPECIFIC_TOKEN_TICKER ETHUMB - update-config CHAIN_SPECIFIC_TOKEN ETHUMB-291202 - update-config ERC20_TOKEN 0x6fc13eace26590b80cccab1ba5d51890577d83b2 + update-config UNIVERSAL_TOKEN WDAI-9eeb54 + update-config CHAIN_SPECIFIC_TOKEN_TICKER ETHWDAI + update-config CHAIN_SPECIFIC_TOKEN ETHWDAI-bd65f9 + update-config ERC20_TOKEN 0x6b175474e89094c44da98b954eedeac495271d0f update-config MINTBURN_WHITELIST true update-config NATIVE_TOKEN false - update-config FEE_AMOUNT 2640 - update-config MAX_AMOUNT 2500000 + update-config FEE_AMOUNT 20 + update-config MAX_AMOUNT 50000 manual-update-config-file } -function set-eth-WDAI-token-settings { +function set-eth-UMB-token-settings { update-config NR_DECIMALS_CHAIN_SPECIFIC 18 update-config NR_DECIMALS_UNIVERSAL 18 - update-config UNIVERSAL_TOKEN WDAI-9eeb54 - update-config CHAIN_SPECIFIC_TOKEN_TICKER ETHWDAI - update-config CHAIN_SPECIFIC_TOKEN ETHWDAI-bd65f9 - update-config ERC20_TOKEN 0x6b175474e89094c44da98b954eedeac495271d0f + update-config UNIVERSAL_TOKEN UMB-e2b3d8 + update-config CHAIN_SPECIFIC_TOKEN_TICKER ETHUMB + update-config CHAIN_SPECIFIC_TOKEN ETHUMB-291202 + update-config ERC20_TOKEN 0x6fc13eace26590b80cccab1ba5d51890577d83b2 update-config MINTBURN_WHITELIST true update-config NATIVE_TOKEN false - update-config FEE_AMOUNT 20 - update-config MAX_AMOUNT 50000 + update-config FEE_AMOUNT 2640 + update-config MAX_AMOUNT 2500000 manual-update-config-file }