Chainlib upgrade to handle none receipts, rpc node debug output in bootstrap
This commit is contained in:
parent
a6de7e9fe0
commit
a548ba6fce
@ -683,3 +683,4 @@ class Api(ApiBase):
|
||||
|
||||
t = self.callback_success.apply_async([r])
|
||||
return t
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
celery==4.4.7
|
||||
chainlib-eth>=0.0.10a4,<0.1.0
|
||||
chainlib-eth>=0.0.10a15,<0.1.0
|
||||
semver==2.13.0
|
||||
crypto-dev-signer>=0.4.15rc2,<0.5.0
|
||||
|
@ -8,15 +8,16 @@ set -a
|
||||
|
||||
set -e
|
||||
|
||||
if [ ! -z $DEV_ETH_GAS_PRICE ]; then
|
||||
gas_price_arg="--gas-price $DEV_ETH_GAS_PRICE"
|
||||
fee_price_arg="--fee-price $DEV_ETH_GAS_PRICE"
|
||||
if [ ! -z $DEV_FEE_PRICE ]; then
|
||||
gas_price_arg="--gas-price $DEV_FEE_PRICE"
|
||||
fee_price_arg="--fee-price $DEV_FEE_PRICE"
|
||||
fi
|
||||
|
||||
must_eth_rpc
|
||||
|
||||
# Deploy address declarator registry
|
||||
advance_nonce
|
||||
debug_rpc
|
||||
>&2 echo -e "\033[;96mDeploy address declarator contract\033[;39m"
|
||||
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`
|
||||
|
||||
|
@ -13,50 +13,57 @@ set -e
|
||||
must_address "$DEV_ADDRESS_DECLARATOR" "address declarator"
|
||||
must_eth_rpc
|
||||
|
||||
if [ ! -z $DEV_ETH_GAS_PRICE ]; then
|
||||
gas_price_arg="--gas-price $DEV_ETH_GAS_PRICE"
|
||||
fee_price_arg="--fee-price $DEV_ETH_GAS_PRICE"
|
||||
if [ ! -z $DEV_FEE_PRICE ]; then
|
||||
gas_price_arg="--gas-price $DEV_FEE_PRICE"
|
||||
fee_price_arg="--fee-price $DEV_FEE_PRICE"
|
||||
fi
|
||||
|
||||
|
||||
# Deploy contract registry contract
|
||||
advance_nonce
|
||||
debug_rpc
|
||||
>&2 echo -e "\033[;96mDeploy contract registry contract\033[;39m"
|
||||
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"
|
||||
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`
|
||||
debug_rpc
|
||||
r=`eth-contract-registry-set $DEV_WAIT_FLAG $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"
|
||||
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`
|
||||
debug_rpc
|
||||
r=`eth-contract-registry-set $DEV_WAIT_FLAG $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
|
||||
debug_rpc
|
||||
>&2 echo -e "\033[;96mDeploy transfer authorization contract\033[;39m"
|
||||
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"
|
||||
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`
|
||||
debug_rpc
|
||||
r=`eth-contract-registry-set $DEV_WAIT_FLAG $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
|
||||
debug_rpc
|
||||
>&2 echo -e "\033[;96mDeploy token symbol index contract\033[;39m"
|
||||
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"
|
||||
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`
|
||||
debug_rpc
|
||||
r=`eth-contract-registry-set $DEV_WAIT_FLAG $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
|
||||
|
||||
check_wait 2
|
||||
|
@ -10,9 +10,9 @@ WAIT_FOR_TIMEOUT=${WAIT_FOR_TIMEOUT:-60}
|
||||
|
||||
set -e
|
||||
|
||||
if [ ! -z $DEV_ETH_GAS_PRICE ]; then
|
||||
gas_price_arg="--gas-price $DEV_ETH_GAS_PRICE"
|
||||
fee_price_arg="--fee-price $DEV_ETH_GAS_PRICE"
|
||||
if [ ! -z $DEV_FEE_PRICE ]; then
|
||||
gas_price_arg="--gas-price $DEV_FEE_PRICE"
|
||||
fee_price_arg="--fee-price $DEV_FEE_PRICE"
|
||||
fi
|
||||
|
||||
have_default_token=1
|
||||
@ -25,16 +25,17 @@ must_eth_rpc
|
||||
|
||||
function _deploy_token_defaults {
|
||||
if [ -z "$TOKEN_SYMBOL" ]; then
|
||||
>&2 echo -e "\033[;33mtoken symbol not set, setting defaults for type $TOKEN_TYPE\033[;39m"
|
||||
>&2 echo -e "\033[;33mToken symbol not set, setting defaults for type $TOKEN_TYPE\033[;39m"
|
||||
TOKEN_SYMBOL=$1
|
||||
TOKEN_NAME=$2
|
||||
elif [ -z "$TOKEN_NAME" ]; then
|
||||
>&2 echo -e "\033[;33mtoken name not set, setting same as symbol for type $TOKEN_TYPE\033[;39m"
|
||||
>&2 echo -e "\033[;33mToken name not set, setting same as symbol for type $TOKEN_TYPE\033[;39m"
|
||||
TOKEN_NAME=$TOKEN_SYMBOL
|
||||
fi
|
||||
TOKEN_DECIMALS=${TOKEN_DECIMALS:-6}
|
||||
|
||||
default_token_registered=`eth-contract-registry-list -u -i $CHAIN_SPEC -p $RPC_PROVIDER -e $CIC_REGISTRY_ADDRESS $DEV_DEBUG_FLAG --raw DefaultToken`
|
||||
debug_rpc
|
||||
default_token_registered=`eth-contract-registry-list -u -i $CHAIN_SPEC -p $RPC_PROVIDER -e $CIC_REGISTRY_ADDRESS $DEV_DEBUG_FLAG --raw DefaultToken --fee-limit 8000000`
|
||||
if [ $default_token_registered == '0000000000000000000000000000000000000000' ]; then
|
||||
>&2 echo -e "\033[;33mFound no existing default token in token registry"
|
||||
have_default_token=''
|
||||
@ -51,6 +52,7 @@ function _deploy_token_defaults {
|
||||
function deploy_token_giftable_erc20_token() {
|
||||
_deploy_token_defaults "GFT" "Giftable Token"
|
||||
advance_nonce
|
||||
debug_rpc
|
||||
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`
|
||||
}
|
||||
|
||||
@ -58,6 +60,7 @@ function deploy_token_giftable_erc20_token() {
|
||||
function deploy_token_erc20_demurrage_token() {
|
||||
_deploy_token_defaults "DET" "Demurrage Token"
|
||||
advance_nonce
|
||||
debug_rpc
|
||||
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`
|
||||
}
|
||||
|
||||
@ -65,12 +68,14 @@ function deploy_accounts_index() {
|
||||
# Deploy accounts index contact
|
||||
>&2 echo -e "\033[;96mDeploy accounts index contract for token $TOKEN_SYMBOL\033[;39m"
|
||||
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`
|
||||
debug_rpc
|
||||
DEV_ACCOUNTS_INDEX_ADDRESS=`okota-accounts-index-deploy --nonce $nonce $fee_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
|
||||
debug_rpc
|
||||
>&2 echo -e "\033[;96mAdd acccounts index record for default token to contract registry\033[;39m"
|
||||
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`
|
||||
r=`eth-contract-registry-set --nonce $nonce $DEV_WAIT_FLAG $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
|
||||
}
|
||||
@ -80,27 +85,31 @@ function deploy_minter_faucet() {
|
||||
|
||||
# Token faucet contract
|
||||
advance_nonce
|
||||
debug_rpc
|
||||
>&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`
|
||||
accounts_index_address=`eth-contract-registry-list -u -i $CHAIN_SPEC -p $RPC_PROVIDER -e $CIC_REGISTRY_ADDRESS $DEV_DEBUG_FLAG --raw AccountRegistry --fee-limit 8000000`
|
||||
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
|
||||
debug_rpc
|
||||
>&2 echo -e "\033[;96mSet token faucet amount to $FAUCET_AMOUNT\033[;39m"
|
||||
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`
|
||||
r=`sarafu-faucet-set --nonce $nonce $fee_price_arg $DEV_WAIT_FLAG -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
|
||||
debug_rpc
|
||||
>&2 echo -e "\033[;96mRegister faucet in registry\033[;39m"
|
||||
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`
|
||||
r=`eth-contract-registry-set --nonce $nonce $DEV_WAIT_FLAG -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
|
||||
debug_rpc
|
||||
>&2 echo -e "\033[;96mSet faucet as token minter\033[;39m"
|
||||
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`
|
||||
r=`giftable-token-minter $DEV_WAIT_FLAG --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
|
||||
}
|
||||
|
||||
@ -110,12 +119,14 @@ deploy_token_${TOKEN_TYPE}
|
||||
|
||||
if [ -z "$have_default_token" ]; then
|
||||
advance_nonce
|
||||
debug_rpc
|
||||
>&2 echo -e "\033[;96mAdd default token to contract registry\033[;39m"
|
||||
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`
|
||||
r=`eth-contract-registry-set $DEV_WAIT_FLAG --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
|
||||
debug_rpc
|
||||
>&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 --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`
|
||||
@ -124,8 +135,9 @@ add_pending_tx_hash $r
|
||||
|
||||
TOKEN_MINT_AMOUNT=${TOKEN_MINT_AMOUNT:-${DEV_TOKEN_MINT_AMOUNT}}
|
||||
advance_nonce
|
||||
debug_rpc
|
||||
>&2 echo -e "\033[;96mMinting $TOKEN_MINT_AMOUNT tokens\033[;39m"
|
||||
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"`
|
||||
r=`giftable-token-gift $DEV_WAIT_FLAG --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
|
||||
|
||||
|
||||
|
@ -10,9 +10,9 @@ WAIT_FOR_TIMEOUT=${WAIT_FOR_TIMEOUT:-60}
|
||||
|
||||
set -e
|
||||
|
||||
if [ ! -z $DEV_ETH_GAS_PRICE ]; then
|
||||
gas_price_arg="--gas-price $DEV_ETH_GAS_PRICE"
|
||||
fee_price_arg="--fee-price $DEV_ETH_GAS_PRICE"
|
||||
if [ ! -z $DEV_FEE_PRICE ]; then
|
||||
gas_price_arg="--gas-price $DEV_FEE_PRICE"
|
||||
fee_price_arg="--fee-price $DEV_FEE_PRICE"
|
||||
fi
|
||||
|
||||
must_address "$CIC_REGISTRY_ADDRESS" "registry"
|
||||
|
@ -10,9 +10,9 @@ WAIT_FOR_TIMEOUT=${WAIT_FOR_TIMEOUT:-60}
|
||||
|
||||
set -e
|
||||
|
||||
if [ ! -z $DEV_ETH_GAS_PRICE ]; then
|
||||
gas_price_arg="--gas-price $DEV_ETH_GAS_PRICE"
|
||||
fee_price_arg="--fee-price $DEV_ETH_GAS_PRICE"
|
||||
if [ ! -z $DEV_FEE_PRICE ]; then
|
||||
gas_price_arg="--gas-price $DEV_FEE_PRICE"
|
||||
fee_price_arg="--fee-price $DEV_FEE_PRICE"
|
||||
fi
|
||||
|
||||
must_address "$CIC_REGISTRY_ADDRESS" "registry"
|
||||
|
@ -2,7 +2,8 @@
|
||||
eth_account_contract_deployer =
|
||||
token_mint_amount = 10000000000000000000000000000000000
|
||||
gas_amount = 100000000000000000000000
|
||||
eth_gas_price =
|
||||
fee_limit_call =
|
||||
fee_price =
|
||||
data_dir =
|
||||
address_declarator =
|
||||
declarator_description = 0x546869732069732074686520434943206e6574776f726b000000000000000000
|
||||
|
@ -12,13 +12,10 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 2A518C819BE37D2C20
|
||||
|
||||
RUN mkdir -vp /usr/local/etc/cic
|
||||
|
||||
ENV CONFINI_DIR /usr/local/etc/cic/
|
||||
|
||||
|
||||
COPY config_template/ /usr/local/etc/cic/
|
||||
COPY requirements.txt .
|
||||
|
||||
RUN apt-get install libffi-dev
|
||||
#RUN apt-get install libffi-dev
|
||||
|
||||
ARG pip_index_url=https://pypi.org/simple
|
||||
ARG EXTRA_PIP_INDEX_URL="https://pip.grassrootseconomics.net:8433"
|
||||
@ -35,7 +32,11 @@ COPY override_requirements.txt .
|
||||
RUN pip install --index-url $PIP_INDEX_URL \
|
||||
--pre \
|
||||
--extra-index-url $EXTRA_PIP_INDEX_URL $EXTRA_PIP_ARGS \
|
||||
--force-reinstall \
|
||||
--no-cache \
|
||||
-r override_requirements.txt
|
||||
|
||||
RUN pip freeze
|
||||
|
||||
COPY . .
|
||||
RUN chmod +x *.sh
|
||||
|
@ -1 +1 @@
|
||||
chainlib-eth==0.0.10a10
|
||||
chainlib-eth==0.0.10a15
|
||||
|
@ -1,6 +1,5 @@
|
||||
cic-eth[tools]==0.12.4a13
|
||||
chainlib-eth>=0.0.10a8,<0.1.0
|
||||
chainlib>=0.0.10a5,<0.1.0
|
||||
chainlib-eth>=0.0.10a15,<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
|
||||
@ -9,6 +8,5 @@ erc20-transfer-authorization>=0.3.5a2,<0.4.0
|
||||
erc20-faucet>=0.3.2a2,<0.4.0
|
||||
sarafu-faucet>=0.0.7a2,<0.1.0
|
||||
confini>=0.4.2rc3,<1.0.0
|
||||
crypto-dev-signer>=0.4.15rc2,<=0.4.15
|
||||
eth-token-index>=0.2.4a1,<=0.3.0
|
||||
okota>=0.2.4a15,<0.3.0
|
||||
|
@ -11,6 +11,11 @@ elif [ "$DEV_DEBUG_LEVEL" -gt 1 ]; then
|
||||
DEV_DEBUG_FLAG="-vv"
|
||||
fi
|
||||
|
||||
DEV_WAIT_FLAG=""
|
||||
if [ ! -z "$DEV_TX_WAIT" ]; then
|
||||
DEV_WAIT_FLAG="-w"
|
||||
fi
|
||||
|
||||
# disable override of config schema directory
|
||||
unset CONFINI_DIR
|
||||
|
||||
|
@ -51,9 +51,20 @@ function advance_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
|
||||
function debug_rpc() {
|
||||
if [ "$DEV_DEBUG_LEVEL" -gt 2 ]; then
|
||||
>&2 echo -e "\033[;35mRPC Node state\033[;39m"
|
||||
>&2 eth-info --local -p $RPC_PROVIDER
|
||||
fi
|
||||
}
|
||||
|
||||
function check_wait() {
|
||||
#if [ "$1" -eq "$RUN_MASK_HIGHEST" ]; then
|
||||
>&2 echo -e "\033[;96mCatch up with paralell transactions\033[;39m"
|
||||
if [ "$DEV_DEBUG_LEVEL" -gt "0" ]; then
|
||||
>&2 cat ${DEV_DATA_DIR}/hashes
|
||||
fi
|
||||
eth-wait $DEV_DEBUG_FLAG -p $RPC_PROVIDER ${DEV_DATA_DIR}/hashes
|
||||
clear_pending_tx_hashes
|
||||
#fi
|
||||
}
|
||||
|
@ -46,13 +46,18 @@ services:
|
||||
context: apps/contract-migration
|
||||
dockerfile: docker/Dockerfile
|
||||
args:
|
||||
DOCKER_REGISTRY: $DEV_DOCKER_REGISTRY
|
||||
DOCKER_REGISTRY: ${DEV_DOCKER_REGISTRY:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}
|
||||
PIP_INDEX_URL: ${PIP_INDEX_URL:-https://pypi.org/simple}
|
||||
EXTRA_PIP_INDEX_URL: ${EXTRA_PIP_INDEX_URL:-https://pip.grassrootseconomics.net:8433}
|
||||
EXTRA_PIP_ARGS: $EXTRA_PIP_ARGS
|
||||
environment:
|
||||
DEV_DATA_DIR: ${DEV_DATA_DIR:-/tmp/cic/config}
|
||||
DEV_CONFIG_RESET: $DEV_CONFIG_RESET
|
||||
DEV_FEE_PRICE: $DEV_FEE_PRICE
|
||||
DEV_FEE_LIMIT_CALL: ${DEV_FEE_LIMIT_CALL:-8000000}
|
||||
DEV_DEBUG_LEVEL: ${DEV_DEBUG_LEVEL:-0}
|
||||
DEV_TX_WAIT: $DEV_TX_WAIT
|
||||
DEV_GAS_AMOUNT: $DEV_GAS_AMOUNT
|
||||
RPC_PROVIDER: ${RPC_PROVIDER:-http://evm:8545}
|
||||
CHAIN_SPEC: ${CHAIN_SPEC:-evm:byzantium:8996:bloxberg}
|
||||
REDIS_HOST: ${REDIS_HOST:-redis}
|
||||
@ -72,6 +77,7 @@ services:
|
||||
REDIS_HOST_CALLBACK: ${REDIS_HOST_CALLBACK:-redis}
|
||||
REDIS_PORT_CALLBACK: ${REDIS_PORT_CALLBACK:-6379}
|
||||
FAUCET_AMOUNT: ${FAUCET_AMOUNT:-0}
|
||||
WALLET_KEY_FILE: ${WALLET_KEY_FILE:-/root/keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c}
|
||||
command: ["./run_job.sh"]
|
||||
depends_on:
|
||||
- evm
|
||||
@ -666,4 +672,4 @@ services:
|
||||
set +a
|
||||
./import_ussd.sh
|
||||
volumes:
|
||||
- contract-config:/tmp/cic/config/:ro
|
||||
- contract-config:/tmp/cic/config/:ro
|
||||
|
Loading…
Reference in New Issue
Block a user