WIP refactor custodial initialization

apps/contract-migration/2_deploy_contract_instance.sh

@@ -28,7 +28,8 @@ CIC_REGISTRY_ADDRESS=`okota-contract-registry-deploy $fee_price_arg -i $CHAIN_SP
 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
 
 >&2 echo -e "\033[;96mAdd address declarator record to contract registry\033[;39m"
-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
+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`
+add_pending_tx_hash $r
 
 
 # Deploy transfer authorization contact
@@ -36,7 +37,9 @@ eth-contract-registry-set $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -e $CIC_RE
 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`
 
 >&2 echo -e "\033[;96mAdd transfer authorization record to contract registry\033[;39m"
-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
+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`
+add_pending_tx_hash $r
+
 
 
 # Deploy token index contract
@@ -44,7 +47,8 @@ eth-contract-registry-set $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -e $CIC_RE
 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`
 
 >&2 echo -e "\033[;96mAdd token symbol index record to contract registry\033[;39m"
-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 
+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`
+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

apps/contract-migration/3_deploy_token.sh

@@ -15,15 +15,14 @@ if [ ! -z $DEV_ETH_GAS_PRICE ]; then
 	fee_price_arg="--fee-price $DEV_ETH_GAS_PRICE"
 fi
 
+have_default_token=1
+token_feedback_display_string='token'
+
 must_address "$DEV_ADDRESS_DECLARATOR" "address declarator"
 must_address "$CIC_REGISTRY_ADDRESS" "registry"
 must_eth_rpc
 
 
-have_default_token=1
-token_feedback_display_string='token'
-
-
 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"
@@ -69,7 +68,7 @@ function deploy_minter_faucet() {
 	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`
 
-	>&2 echo -e "\033[;96mSet token faucet amount\033[;39m"
+	>&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`
 	add_pending_tx_hash $r
 

apps/contract-migration/config/config.ini

@@ -1,23 +1,12 @@
 [dev]
 eth_account_contract_deployer =
-#eth_account_reserve_minter =
-#eth_account_accounts_index_writer =
 token_mint_amount = 10000000000000000000000000000000000
-default_token_symbol = GFT
 faucet_amount = 0
-gas_amount = 100000000000000000000000
+#gas_amount = 100000000000000000000000
-token_amount = 100000000000000000000000
 eth_gas_price =
 data_dir =
-#pip_extra_index_url = 
 address_declarator = 
 declarator_description = 0x546869732069732074686520434943206e6574776f726b000000000000000000
 
-[rpc]
-provider = http://localhost:8545
-
-[chain]
-spec = 
-
 [cic]
 registry_address =

apps/contract-migration/envlist

@@ -1,62 +0,0 @@
-SYNCER_LOOP_INTERVAL
-SSL_ENABLE_CLIENT
-SSL_CERT_FILE
-SSL_KEY_FILE
-SSL_PASSWORD
-SSL_CA_FILE
-BANCOR_DIR
-REDIS_HOST
-REDIS_PORT
-REDIS_DB
-PGP_EXPORTS_DIR
-PGP_PRIVATEKEY_FILE
-PGP_PASSPHRASE
-DATABASE_USER
-DATABASE_PASSWORD
-DATABASE_NAME
-DATABASE_HOST
-DATABASE_PORT
-DATABASE_ENGINE
-DATABASE_DRIVER
-DATABASE_DEBUG
-TASKS_AFRICASTALKING
-TASKS_SMS_DB
-TASKS_LOG
-TASKS_TRACE_QUEUE_STATUS
-TASKS_TRANSFER_CALLBACKS
-DEV_MNEMONIC
-DEV_ETH_RESERVE_ADDRESS
-DEV_ETH_ACCOUNTS_INDEX_ADDRESS
-DEV_ETH_RESERVE_AMOUNT
-DEV_ETH_ACCOUNT_BANCOR_DEPLOYER
-DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER
-DEV_ETH_ACCOUNT_GAS_PROVIDER
-DEV_ETH_ACCOUNT_RESERVE_OWNER
-DEV_ETH_ACCOUNT_RESERVE_MINTER
-DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_OWNER
-DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER
-DEV_ETH_ACCOUNT_SARAFU_OWNER
-DEV_ETH_ACCOUNT_SARAFU_GIFTER
-DEV_ETH_ACCOUNT_APPROVAL_ESCROW_OWNER
-DEV_ETH_ACCOUNT_SINGLE_SHOT_FAUCET_OWNER
-DEV_ETH_SARAFU_TOKEN_NAME
-DEV_ETH_SARAFU_TOKEN_SYMBOL
-DEV_ETH_SARAFU_TOKEN_DECIMALS
-DEV_ETH_SARAFU_TOKEN_ADDRESS
-DEV_PGP_PUBLICKEYS_ACTIVE_FILE
-DEV_PGP_PUBLICKEYS_TRUSTED_FILE
-DEV_PGP_PUBLICKEYS_ENCRYPT_FILE
-CIC_REGISTRY_ADDRESS
-CIC_APPROVAL_ESCROW_ADDRESS
-CIC_TOKEN_INDEX_ADDRESS
-CIC_ACCOUNTS_INDEX_ADDRESS
-CIC_DECLARATOR_ADDRESS
-CIC_CHAIN_SPEC
-ETH_PROVIDER
-ETH_ABI_DIR
-SIGNER_SOCKET_PATH
-SIGNER_SECRET
-SIGNER_PROVIDER
-CELERY_BROKER_URL
-CELERY_RESULT_URL
-META_PROVIDER

apps/contract-migration/run_job.sh

@@ -7,7 +7,7 @@ DEV_DEBUG_FLAG=""
 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
 
@@ -17,8 +17,8 @@ unset CONFINI_DIR
 set +a
 
 LAST_BIT_POS=4
-files=(deploy_contract_root deploy_contract_instance deploy_token)
+files=(deploy_contract_root deploy_contract_instance deploy_token init_custodial)
-description=("global contracts" "instance specific contracts" "token deployment")
+description=("global contracts" "instance specific contracts" "token deployment" "initialize custodial engine")
 
 >&2 echo -e "\033[;96mRUNNING configurations\033[;39m"
 source ./config.sh