Implement asynchronous deploys in bootstrap
This commit is contained in:
nolash
parent
9d349f1579
commit
3285d8dfe5
GPG Key ID:
21D2E7BB88C2A746
|
|
@ -16,8 +16,11 @@ fi
|
|||
must_eth_rpc
|
||||
|
||||
# Deploy address declarator registry
|
||||
advance_nonce
|
||||
>&2 echo -e "\033[;96mDeploy address declarator contract\033[;39m"
|
||||
DEV_ADDRESS_DECLARATOR=`eth-address-declarator-deploy -s -u -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER -w $DEV_DEBUG_FLAG $DEV_DECLARATOR_DESCRIPTION`
|
||||
DEV_ADDRESS_DECLARATOR=`eth-address-declarator-deploy --nonce $nonce -s -u -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER -w $DEV_DEBUG_FLAG $DEV_DECLARATOR_DESCRIPTION`
|
||||
|
||||
check_wait 1
|
||||
|
||||
echo -e "\033[;96mWriting env_reset file\033[;39m"
|
||||
confini-dump --schema-dir ./config > ${DEV_DATA_DIR}/env_reset
|
||||
|
|
|
|||
|
|
@ -20,41 +20,46 @@ fi
|
|||
|
||||
|
||||
# Deploy contract registry contract
|
||||
advance_nonce
|
||||
>&2 echo -e "\033[;96mDeploy contract registry contract\033[;39m"
|
||||
CIC_REGISTRY_ADDRESS=`okota-contract-registry-deploy $fee_price_arg -i $CHAIN_SPEC -y $WALLET_KEY_FILE --identifier AccountRegistry --identifier TokenRegistry --identifier AddressDeclarator --identifier Faucet --identifier TransferAuthorization --identifier ContractRegistry --identifier DefaultToken --address-declarator $DEV_ADDRESS_DECLARATOR -p $RPC_PROVIDER $DEV_DEBUG_FLAG -s -u -w`
|
||||
CIC_REGISTRY_ADDRESS=`okota-contract-registry-deploy --nonce $nonce $fee_price_arg -i $CHAIN_SPEC -y $WALLET_KEY_FILE --identifier AccountRegistry --identifier TokenRegistry --identifier AddressDeclarator --identifier Faucet --identifier TransferAuthorization --identifier ContractRegistry --identifier DefaultToken --address-declarator $DEV_ADDRESS_DECLARATOR -p $RPC_PROVIDER $DEV_DEBUG_FLAG -s -u -w`
|
||||
|
||||
|
||||
>&2 echo -e "\033[;96mAdd contract registry record to itself\033[;39m"
|
||||
r=`eth-contract-registry-set $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG --identifier ContractRegistry $CIC_REGISTRY_ADDRESS`
|
||||
advance_nonce
|
||||
r=`eth-contract-registry-set $fee_price_arg --nonce $nonce -s -u -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG --identifier ContractRegistry $CIC_REGISTRY_ADDRESS`
|
||||
add_pending_tx_hash $r
|
||||
|
||||
|
||||
>&2 echo -e "\033[;96mAdd address declarator record to contract registry\033[;39m"
|
||||
r=`eth-contract-registry-set $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG --identifier AddressDeclarator $DEV_ADDRESS_DECLARATOR`
|
||||
advance_nonce
|
||||
r=`eth-contract-registry-set $fee_price_arg --nonce $nonce -s -u -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG --identifier AddressDeclarator $DEV_ADDRESS_DECLARATOR`
|
||||
add_pending_tx_hash $r
|
||||
|
||||
|
||||
# Deploy transfer authorization contact
|
||||
advance_nonce
|
||||
>&2 echo -e "\033[;96mDeploy transfer authorization contract\033[;39m"
|
||||
DEV_TRANSFER_AUTHORIZATION_ADDRESS=`erc20-transfer-auth-deploy $gas_price_arg -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER -w $DEV_DEBUG_FLAG`
|
||||
DEV_TRANSFER_AUTHORIZATION_ADDRESS=`erc20-transfer-auth-deploy --nonce $nonce -w $gas_price_arg -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG`
|
||||
|
||||
|
||||
>&2 echo -e "\033[;96mAdd transfer authorization record to contract registry\033[;39m"
|
||||
r=`eth-contract-registry-set $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG --identifier TransferAuthorization $DEV_TRANSFER_AUTHORIZATION_ADDRESS`
|
||||
advance_nonce
|
||||
r=`eth-contract-registry-set $fee_price_arg --nonce $nonce -s -u -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG --identifier TransferAuthorization $DEV_TRANSFER_AUTHORIZATION_ADDRESS`
|
||||
add_pending_tx_hash $r
|
||||
|
||||
|
||||
# Deploy token index contract
|
||||
advance_nonce
|
||||
>&2 echo -e "\033[;96mDeploy token symbol index contract\033[;39m"
|
||||
DEV_TOKEN_INDEX_ADDRESS=`okota-token-index-deploy -s -u $fee_price_arg -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER -w $DEV_DEBUG_FLAG --address-declarator $DEV_ADDRESS_DECLARATOR`
|
||||
DEV_TOKEN_INDEX_ADDRESS=`okota-token-index-deploy --nonce $nonce -s -w -u $fee_price_arg -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG --address-declarator $DEV_ADDRESS_DECLARATOR`
|
||||
|
||||
>&2 echo -e "\033[;96mAdd token symbol index record to contract registry\033[;39m"
|
||||
r=`eth-contract-registry-set $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG --identifier TokenRegistry $DEV_TOKEN_INDEX_ADDRESS`
|
||||
advance_nonce
|
||||
r=`eth-contract-registry-set $fee_price_arg --nonce $nonce -s -u -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG --identifier TokenRegistry $DEV_TOKEN_INDEX_ADDRESS`
|
||||
add_pending_tx_hash $r
|
||||
|
||||
#>&2 echo "add reserve token to token index"
|
||||
#eth-token-index-add $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG -e $DEV_TOKEN_INDEX_ADDRESS $DEV_RESERVE_ADDRESS
|
||||
|
||||
check_wait 2
|
||||
|
||||
echo -e "\033[;96mWriting env_reset file\033[;39m"
|
||||
confini-dump --schema-dir ./config > ${DEV_DATA_DIR}/env_reset
|
||||
|
|
|
|||
|
|
@ -50,23 +50,27 @@ function _deploy_token_defaults {
|
|||
|
||||
function deploy_token_giftable_erc20_token() {
|
||||
_deploy_token_defaults "GFT" "Giftable Token"
|
||||
TOKEN_ADDRESS=`giftable-token-deploy $fee_price_arg -p $RPC_PROVIDER -y $WALLET_KEY_FILE -i $CHAIN_SPEC -s -ww --name "$TOKEN_NAME" --symbol $TOKEN_SYMBOL --decimals $TOKEN_DECIMALS $DEV_DEBUG_FLAG`
|
||||
advance_nonce
|
||||
TOKEN_ADDRESS=`giftable-token-deploy --nonce $nonce $fee_price_arg -p $RPC_PROVIDER -y $WALLET_KEY_FILE -i $CHAIN_SPEC -s -ww --name "$TOKEN_NAME" --symbol $TOKEN_SYMBOL --decimals $TOKEN_DECIMALS $DEV_DEBUG_FLAG`
|
||||
}
|
||||
|
||||
|
||||
function deploy_token_erc20_demurrage_token() {
|
||||
_deploy_token_defaults "DET" "Demurrage Token"
|
||||
TOKEN_ADDRESS=`erc20-demurrage-token-deploy $fee_price_arg -p $RPC_PROVIDER -y $WALLET_KEY_FILE -i $CHAIN_SPEC --name "$TOKEN_NAME" --symbol $TOKEN_SYMBOL $DEV_DEBUG_FLAG -ww -s`
|
||||
advance_nonce
|
||||
TOKEN_ADDRESS=`erc20-demurrage-token-deploy --nonce $nonce $fee_price_arg -p $RPC_PROVIDER -y $WALLET_KEY_FILE -i $CHAIN_SPEC --name "$TOKEN_NAME" --symbol $TOKEN_SYMBOL $DEV_DEBUG_FLAG -ww -s`
|
||||
}
|
||||
|
||||
function deploy_accounts_index() {
|
||||
# Deploy accounts index contact
|
||||
>&2 echo -e "\033[;96mDeploy accounts index contract for token $TOKEN_SYMBOL\033[;39m"
|
||||
DEV_ACCOUNTS_INDEX_ADDRESS=`okota-accounts-index-deploy $gas_price_arg -u -s -w -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG --address-declarator $DEV_ADDRESS_DECLARATOR --token-address $1`
|
||||
advance_nonce
|
||||
DEV_ACCOUNTS_INDEX_ADDRESS=`okota-accounts-index-deploy --nonce $nonce $gas_price_arg -u -s -w -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG --address-declarator $DEV_ADDRESS_DECLARATOR --token-address $1`
|
||||
|
||||
if [ -z "$have_default_token" ]; then
|
||||
advance_nonce
|
||||
>&2 echo -e "\033[;96mAdd acccounts index record for default token to contract registry\033[;39m"
|
||||
r=`eth-contract-registry-set $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG --identifier AccountRegistry $DEV_ACCOUNTS_INDEX_ADDRESS`
|
||||
r=`eth-contract-registry-set --nonce $nonce $fee_price_arg -s -u -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG --identifier AccountRegistry $DEV_ACCOUNTS_INDEX_ADDRESS`
|
||||
add_pending_tx_hash $r
|
||||
fi
|
||||
}
|
||||
|
|
@ -75,22 +79,28 @@ function deploy_minter_faucet() {
|
|||
FAUCET_AMOUNT=${FAUCET_AMOUNT:-0}
|
||||
|
||||
# Token faucet contract
|
||||
advance_nonce
|
||||
>&2 echo -e "\033[;96mDeploy token faucet contract for token $TOKEN_SYMBOL\033[;39m"
|
||||
accounts_index_address=`eth-contract-registry-list -u -i $CHAIN_SPEC -p $RPC_PROVIDER -e $CIC_REGISTRY_ADDRESS $DEV_DEBUG_FLAG --raw AccountRegistry`
|
||||
faucet_address=`sarafu-faucet-deploy $fee_price_arg -s -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER -w $DEV_DEBUG_FLAG --account-index-address $accounts_index_address $1`
|
||||
faucet_address=`sarafu-faucet-deploy --nonce $nonce $fee_price_arg -s -w -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG --account-index-address $accounts_index_address $1`
|
||||
|
||||
# sarafu-faucet-deploy consumes TWO nonces
|
||||
advance_nonce
|
||||
advance_nonce
|
||||
>&2 echo -e "\033[;96mSet token faucet amount to $FAUCET_AMOUNT\033[;39m"
|
||||
r=`sarafu-faucet-set $fee_price_arg -s -w -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER -e $faucet_address $DEV_DEBUG_FLAG -s --fee-limit 100000 $FAUCET_AMOUNT`
|
||||
r=`sarafu-faucet-set --nonce $nonce $fee_price_arg -s -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER -e $faucet_address $DEV_DEBUG_FLAG --fee-limit 100000 $FAUCET_AMOUNT`
|
||||
add_pending_tx_hash $r
|
||||
|
||||
if [ -z $have_default_token ]; then
|
||||
advance_nonce
|
||||
>&2 echo -e "\033[;96mRegister faucet in registry\033[;39m"
|
||||
r=`eth-contract-registry-set -s -u $fee_price_arg -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG --identifier Faucet $faucet_address`
|
||||
r=`eth-contract-registry-set --nonce $nonce -s -u $fee_price_arg -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG --identifier Faucet $faucet_address`
|
||||
add_pending_tx_hash $r
|
||||
fi
|
||||
|
||||
advance_nonce
|
||||
>&2 echo -e "\033[;96mSet faucet as token minter\033[;39m"
|
||||
r=`giftable-token-minter -s -u $fee_price_arg -w -y $WALLET_KEY_FILE -e $TOKEN_ADDRESS -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG $faucet_address`
|
||||
r=`giftable-token-minter --nonce $nonce -s -u $fee_price_arg -y $WALLET_KEY_FILE -e $TOKEN_ADDRESS -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG $faucet_address`
|
||||
add_pending_tx_hash $r
|
||||
}
|
||||
|
||||
|
|
@ -99,21 +109,23 @@ TOKEN_TYPE=${TOKEN_TYPE:-giftable_erc20_token}
|
|||
deploy_token_${TOKEN_TYPE}
|
||||
|
||||
if [ -z "$have_default_token" ]; then
|
||||
advance_nonce
|
||||
>&2 echo -e "\033[;96mAdd default token to contract registry\033[;39m"
|
||||
r=`eth-contract-registry-set $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG --identifier DefaultToken $TOKEN_ADDRESS`
|
||||
r=`eth-contract-registry-set --nonce $nonce $fee_price_arg -s -u -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG --identifier DefaultToken $TOKEN_ADDRESS`
|
||||
add_pending_tx_hash $r
|
||||
fi
|
||||
|
||||
|
||||
advance_nonce
|
||||
>&2 echo -e "\033[;96mAdd token symbol $TOKEN_SYMBOL to token address $TOKEN_ADDRESS mapping to token index\033[;39m"
|
||||
token_index_address=`eth-contract-registry-list -u -i $CHAIN_SPEC -p $RPC_PROVIDER -e $CIC_REGISTRY_ADDRESS $DEV_DEBUG_FLAG --raw TokenRegistry`
|
||||
r=`eth-token-index-add $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG -e $token_index_address $TOKEN_ADDRESS`
|
||||
r=`eth-token-index-add --nonce $nonce $fee_price_arg -s -u -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER $DEV_DEBUG_FLAG -e $token_index_address $TOKEN_ADDRESS`
|
||||
add_pending_tx_hash $r
|
||||
|
||||
|
||||
TOKEN_MINT_AMOUNT=${TOKEN_MINT_AMOUNT:-${DEV_TOKEN_MINT_AMOUNT}}
|
||||
advance_nonce
|
||||
>&2 echo -e "\033[;96mMinting $TOKEN_MINT_AMOUNT tokens\033[;39m"
|
||||
r=`giftable-token-gift $fee_price_arg -p $RPC_PROVIDER -y $WALLET_KEY_FILE -i $CHAIN_SPEC -u $DEV_DEBUG_FLAG -s -w -e $TOKEN_ADDRESS "$DEV_TOKEN_MINT_AMOUNT"`
|
||||
r=`giftable-token-gift --nonce $nonce $fee_price_arg -p $RPC_PROVIDER -y $WALLET_KEY_FILE -i $CHAIN_SPEC -u $DEV_DEBUG_FLAG -s -e $TOKEN_ADDRESS "$DEV_TOKEN_MINT_AMOUNT"`
|
||||
add_pending_tx_hash $r
|
||||
|
||||
|
||||
|
|
@ -128,6 +140,7 @@ else
|
|||
deploy_minter_${TOKEN_MINTER_MODE} $TOKEN_ADDRESS
|
||||
fi
|
||||
|
||||
check_wait 3
|
||||
|
||||
>&2 echo -e "\033[;96mWriting env_reset file\033[;39m"
|
||||
confini-dump --schema-dir ./config > ${DEV_DATA_DIR}/env_reset
|
||||
|
|
|
|||
|
|
@ -42,12 +42,13 @@ add_pending_tx_hash $r
|
|||
|
||||
|
||||
# Transfer gas to custodial gas provider adddress
|
||||
advance_nonce
|
||||
>&2 echo -e "\033[;96mGift gas to gas gifter $gas_gifter\033[;39m"
|
||||
echo "eth-gas -s -u -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER -w $DEV_DEBUG_FLAG -a $gas_gifter $DEV_GAS_AMOUNT"
|
||||
r=`eth-gas -s -u -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER -w $DEV_DEBUG_FLAG -a $gas_gifter $DEV_GAS_AMOUNT`
|
||||
add_pending_tx_hash $r
|
||||
|
||||
>&2 echo -e "\033[;96mgift gas to accounts index owner $accounts_index_writer\033[;39m"
|
||||
advance_nonce
|
||||
# for now we are using the same key for both
|
||||
DEV_ETH_ACCOUNT_ACCOUNT_REGISTRY_WRITER=$DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER
|
||||
r=`eth-gas -s -u -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER -w $DEV_DEBUG_FLAG -a $accounts_index_writer $DEV_GAS_AMOUNT`
|
||||
|
|
@ -59,6 +60,7 @@ cic-eth-ctl -vv -i $CHAIN_SPEC unlock INIT
|
|||
cic-eth-ctl -vv -i $CHAIN_SPEC unlock SEND
|
||||
cic-eth-ctl -vv -i $CHAIN_SPEC unlock QUEUE
|
||||
|
||||
check_wait 4
|
||||
|
||||
>&2 echo -e "\033[;96mWriting env_reset file\033[;39m"
|
||||
confini-dump --schema-dir ./config > ${DEV_DATA_DIR}/env_reset
|
||||
|
|
|
|||
|
|
@ -8,6 +8,15 @@ else
|
|||
mkdir -p $DEV_DATA_DIR
|
||||
fi
|
||||
|
||||
# Handle wallet
|
||||
export WALLET_KEY_FILE=${WALLET_KEY_FILE:-`realpath ./keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c`}
|
||||
if [ ! -f $WALLET_KEY_FILE ]; then
|
||||
>&2 echo "wallet path '$WALLET_KEY_FILE' does not point to a file"
|
||||
exit 1
|
||||
fi
|
||||
export DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER=`eth-keyfile -z -d $WALLET_KEY_FILE`
|
||||
noncefile=${DEV_DATA_DIR}/nonce_${DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER}
|
||||
|
||||
# By default configuration values generated from previous runs will be used in subsequent invocations
|
||||
# Setting the config reset
|
||||
if [ -z $DEV_CONFIG_RESET ]; then
|
||||
|
|
@ -17,18 +26,15 @@ if [ -z $DEV_CONFIG_RESET ]; then
|
|||
fi
|
||||
else
|
||||
>&2 echo -e "\033[;33mGenerating scratch configuration\033[;39m"
|
||||
bash_debug_flag=""
|
||||
if [ "$DEV_DEBUG_LEVEL" -gt 1 ]; then
|
||||
bash_debug_flag="-v"
|
||||
fi
|
||||
rm $bash_debug_flag -f ${DEV_DATA_DIR}/env_reset
|
||||
rm $bash_debug_flag -f $noncefile
|
||||
confini-dump --schema-dir ./config --prefix export > ${DEV_DATA_DIR}/env_reset
|
||||
fi
|
||||
|
||||
# Handle wallet
|
||||
export WALLET_KEY_FILE=${WALLET_KEY_FILE:-`realpath ./keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c`}
|
||||
if [ ! -f $WALLET_KEY_FILE ]; then
|
||||
>&2 echo "wallet path '$WALLET_KEY_FILE' does not point to a file"
|
||||
exit 1
|
||||
fi
|
||||
#export DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER=`eth-checksum $(cat $WALLET_KEY_FILE | jq -r .address)`
|
||||
export DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER=`eth-keyfile -z -d $WALLET_KEY_FILE`
|
||||
|
||||
# Wallet dependent variable defaults
|
||||
export DEV_ETH_ACCOUNT_RESERVE_MINTER=${DEV_ETH_ACCOUNT_RESERVE_MINTER:-$DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER}
|
||||
export DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER=${DEV_ETH_ACCOUNT_RESERVE_MINTER:-$DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER}
|
||||
|
|
@ -36,6 +42,14 @@ export CIC_TRUST_ADDRESS=${CIC_TRUST_ADDRESS:-$DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER
|
|||
export CIC_DEFAULT_TOKEN_SYMBOL=$TOKEN_SYMBOL
|
||||
export TOKEN_SINK_ADDRESS=${TOKEN_SINK_ADDRESS:-$DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER}
|
||||
|
||||
if [ ! -f $noncefile ]; then
|
||||
nonce=`eth-count -p $RPC_PROVIDER $DEV_DEBUG_FLAG $DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER`
|
||||
>&2 echo -e "\033[;96mUsing contract deployer address $DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER with nonce $nonce\033[;39m"
|
||||
echo -n $nonce > $noncefile
|
||||
else
|
||||
nonce=`cat $noncefile`
|
||||
>&2 echo -e "\033[;96mResuming usage with contract deployer address $DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER with nonce $nonce\033[;39m"
|
||||
fi
|
||||
|
||||
# Migration variable processing
|
||||
confini-dump --schema-dir ./config > ${DEV_DATA_DIR}/env_reset
|
||||
|
|
|
|||
|
|
@ -25,12 +25,17 @@ ARG EXTRA_PIP_INDEX_URL="https://pip.grassrootseconomics.net:8433"
|
|||
ARG EXTRA_PIP_ARGS=""
|
||||
ARG PIP_INDEX_URL="https://pypi.org/simple"
|
||||
ARG pip_trusted_host=pypi.org
|
||||
RUN pip install --index-url $PIP_INDEX_URL \
|
||||
RUN pip install --index-url $PIP_INDEX_URL \
|
||||
--pre \
|
||||
--force-reinstall \
|
||||
--no-cache \
|
||||
--extra-index-url $EXTRA_PIP_INDEX_URL $EXTRA_PIP_ARGS \
|
||||
-r requirements.txt
|
||||
|
||||
COPY override_requirements.txt .
|
||||
|
||||
RUN pip install --index-url $PIP_INDEX_URL \
|
||||
--pre \
|
||||
--extra-index-url $EXTRA_PIP_INDEX_URL $EXTRA_PIP_ARGS \
|
||||
-r override_requirements.txt
|
||||
|
||||
COPY . .
|
||||
RUN chmod +x *.sh
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
chainlib-eth==0.0.10a10
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
cic-eth[tools]==0.12.4a13
|
||||
chainlib-eth>=0.0.10a5,<0.1.0
|
||||
chainlib==0.0.10a3,<0.1.0
|
||||
chainlib-eth>=0.0.10a8,<0.1.0
|
||||
chainlib>=0.0.10a5,<0.1.0
|
||||
eth-erc20>=0.1.2a3,<0.2.0
|
||||
erc20-demurrage-token>=0.0.5a2,<0.1.0
|
||||
eth-address-index>=0.2.4a1,<0.3.0
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@
|
|||
|
||||
set -a
|
||||
DEV_DEBUG_FLAG=""
|
||||
DEV_DEBUG_LEVEL=${DEV_DEBUG_LEVEL=0}
|
||||
if [ $DEV_DEBUG_LEVEL -eq 1 ]; then
|
||||
DEV_DEBUG_LEVEL=${DEV_DEBUG_LEVEL:-0}
|
||||
if [ "$DEV_DEBUG_LEVEL" -eq 1 ]; then
|
||||
DEV_DEBUG_FLAG="-v"
|
||||
elif [ $DEV_DEBUG_LEVEL -gt 1 ]; then
|
||||
elif [ "$DEV_DEBUG_LEVEL" -gt 1 ]; then
|
||||
DEV_DEBUG_FLAG="-vv"
|
||||
fi
|
||||
|
||||
|
|
@ -34,6 +34,14 @@ confini-dump --schema-dir ./config
|
|||
|
||||
clear_pending_tx_hashes
|
||||
|
||||
RUN_MASK_HIGHEST=0
|
||||
for ((i=$LAST_BIT_POS; i>0; i--)); do
|
||||
b=$((2**$((i-1))))
|
||||
if [ $((b & $RUN_MASK)) -gt 0 ]; then
|
||||
RUN_MASK_HIGHEST=$i
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
bit=1
|
||||
for ((i=0; i<$LAST_BIT_POS; i++)); do
|
||||
|
|
|
|||
|
|
@ -32,11 +32,28 @@ function must_eth_rpc() {
|
|||
|
||||
|
||||
function clear_pending_tx_hashes() {
|
||||
truncate -s 0 $DEV_DATA_DIR/hashes
|
||||
>&2 echo -e "\033[;96mClearing pending hashes\033[;39m"
|
||||
truncate -s 0 ${DEV_DATA_DIR}/hashes
|
||||
}
|
||||
|
||||
|
||||
function add_pending_tx_hash() {
|
||||
must_hash_256 $1
|
||||
echo $1 >> $DEV_DATA_DIR/hashes
|
||||
echo $1 >> ${DEV_DATA_DIR}/hashes
|
||||
}
|
||||
|
||||
function advance_nonce() {
|
||||
nonce=`cat $noncefile`
|
||||
next_nonce=$((nonce+1))
|
||||
echo -n $next_nonce > $noncefile
|
||||
if [ "$DEV_DEBUG_LEVEL" -gt 1 ]; then
|
||||
>&2 echo retrieved nonce $nonce
|
||||
fi
|
||||
}
|
||||
|
||||
function check_wait() {
|
||||
if [ "$1" -eq $RUN_MASK_HIGHEST ]; then
|
||||
eth-wait $DEV_DEBUG_FLAG -p $RPC_PROVIDER ${DEV_DATA_DIR}/hashes
|
||||
clear_pending_tx_hashes
|
||||
fi
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue