This commit is contained in:
Blair Vanderlugt 2021-09-22 15:15:54 +03:00
parent 34d4c9389c
commit e7e697c7db
7 changed files with 10 additions and 16 deletions

1
.gitignore vendored
View File

@ -15,3 +15,4 @@ build/
.idea .idea
**/.vim **/.vim
**/*secret.yaml **/*secret.yaml
**/*.bash_history

View File

@ -1,6 +0,0 @@
ls /tmp/cic/config/
cat /tmp/cic/config/env_reset
exit
cat /tmp/cic/config/
cat /tmp/cic/config/env_reset
exit

View File

@ -120,6 +120,9 @@ export CIC_DEFAULT_TOKEN_SYMBOL=$CIC_DEFAULT_TOKEN_SYMBOL
export TOKEN_NAME=$TOKEN_NAME export TOKEN_NAME=$TOKEN_NAME
EOF EOF
confini-dump -vv --schema-module chainlib.eth.data.config --schema-module cic_eth.data.config --schema-dir ./config --prefix export > ${DEV_DATA_DIR}/env_reset
confini-dump --schema-module chainlib.eth.data.config --schema-module cic_eth.data.config --schema-dir ./config
set +a set +a
set +e set +e

View File

@ -22,11 +22,6 @@ fi
if [[ $((RUN_MASK & 2)) -eq 2 ]] if [[ $((RUN_MASK & 2)) -eq 2 ]]
then then
>&2 echo -e "\033[;96mRUNNING\033[;39m RUN_MASK 2 - custodial service initialization" >&2 echo -e "\033[;96mRUNNING\033[;39m RUN_MASK 2 - custodial service initialization"
if [ -f $DEV_DATA_DIR/env_reset ]; then
echo "found previous env_reset file"
cat $DEV_DATA_DIR/env_reset
source $DEV_DATA_DIR/env_reset;
fi
./seed_cic_eth.sh ./seed_cic_eth.sh
if [ $? -ne "0" ]; then if [ $? -ne "0" ]; then
>&2 echo -e "\033[;31mFAILED\033[;39m RUN_MASK 2 - custodial service initialization" >&2 echo -e "\033[;31mFAILED\033[;39m RUN_MASK 2 - custodial service initialization"

View File

@ -82,7 +82,7 @@ cic-eth-ctl -i $CHAIN_SPEC unlock INIT
cic-eth-ctl -i $CHAIN_SPEC unlock SEND cic-eth-ctl -i $CHAIN_SPEC unlock SEND
cic-eth-ctl -i $CHAIN_SPEC unlock QUEUE cic-eth-ctl -i $CHAIN_SPEC unlock QUEUE
#confini-dump --schema-module chainlib.eth.data.config --schema-module cic_eth.data.config --schema-dir ./config confini-dump --schema-module chainlib.eth.data.config --schema-module cic_eth.data.config --schema-dir ./config
set +a set +a
set +e set +e

View File

@ -94,7 +94,8 @@ services:
RUN_MASK: ${RUN_MASK:-0} # bit flags; 1: contract migrations 2: seed data RUN_MASK: ${RUN_MASK:-0} # bit flags; 1: contract migrations 2: seed data
DEV_FAUCET_AMOUNT: ${DEV_FAUCET_AMOUNT:-0} DEV_FAUCET_AMOUNT: ${DEV_FAUCET_AMOUNT:-0}
DEV_ETH_GAS_PRICE: $DEV_ETH_GAS_PRICE DEV_ETH_GAS_PRICE: $DEV_ETH_GAS_PRICE
WALLET_KEY_FILE: ./keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c #DEV_GAS_AMOUNT: "100000000000000000000000" # removed from env_reset
#WALLET_KEY_FILE: ./keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c #removed from env_reset
TOKEN_NAME: ${TOKEN_NAME:-Giftable Token} TOKEN_NAME: ${TOKEN_NAME:-Giftable Token}
TOKEN_SYMBOL: ${TOKEN_SYMBOL:-GFT} TOKEN_SYMBOL: ${TOKEN_SYMBOL:-GFT}
TOKEN_TYPE: ${TOKEN_TYPE:-giftable_erc20_token} TOKEN_TYPE: ${TOKEN_TYPE:-giftable_erc20_token}
@ -109,8 +110,8 @@ services:
TOKEN_SINK_ADDRESS: $TOKEN_SINK_ADDRESS TOKEN_SINK_ADDRESS: $TOKEN_SINK_ADDRESS
SIGNER_PROVIDER: ${SIGNER_SOCKET_PATH:-http://cic-eth-signer:8000} SIGNER_PROVIDER: ${SIGNER_SOCKET_PATH:-http://cic-eth-signer:8000}
restart: on-failure restart: on-failure
command: ["./run_job.sh"] #command: ["./run_job.sh"]
#command: ["./reset.sh"] command: bash -c "while true; do sleep 1; done" # Infinite loop to keep container live doing nothing
depends_on: depends_on:
- eth - eth
- postgres - postgres

View File

@ -1 +1 @@
docker run -v --rm cic-internal-integration_contract-config:/tmp/cic/config busybox cat /tmp/cic/config/env_reset docker run --rm -v cic-internal-integration_contract-config:/tmp/cic/config busybox cat /tmp/cic/config/env_reset