Rehabilitate transfer, approve

Signed-off-by: nolash <dev@holbrook.no>
2021-03-29 13:27:53 +00:00
parent 299385f320
commit b65ab8a0ca
222 changed files with 3272 additions and 809800 deletions
--- a/apps/contract-migration/docker/Dockerfile
+++ b/apps/contract-migration/docker/Dockerfile
@@ -57,54 +57,14 @@ WORKDIR /home/grassroots
 USER grassroots

 ARG pip_extra_index_url=https://pip.grassrootseconomics.net:8433
-ARG cic_base_version=0.1.1a23
-ARG cic_registry_version=0.5.3a24
-ARG cic_eth_version=0.10.0a41
-ARG chainlib_version=0.0.1a21
+ARG cic_base_version=0.1.2a49
+ARG cic_eth_version=0.10.1b1
+ARG sarafu_faucet_version=0.0.2a13
 ARG cic_contracts_version=0.0.2a2
 RUN pip install --user --extra-index-url $pip_extra_index_url cic-base[full_graph]==$cic_base_version \
-                                                              cic-registry==$cic_registry_version \
-                                                              cic-eth==$cic_eth_version \
-                                                              chainlib==$chainlib_version \
-															  cic-contracts==$cic_contracts_version
-
-# ARG cic_bancor_url=https://gitlab.com/grassrootseconomics/cic-bancor.git/
-# ARG cic_bancor_contracts_url=https://github.com/bancorprotocol/contracts-solidity
-# RUN echo Compile and install bancor protocol contracts && \
-# 	git clone --depth 1 $cic_bancor_url cic-bancor && \
-# 	cd cic-bancor
-
-# RUN cd cic-bancor/python && \
-# 	pip install --extra-index-url $pip_extra_index_url .
-
-# This is a temporary solution for building the Bancor contracts using the bancor protocol repository truffle setup
-# We should instead flatten the files ourselves and build them with solc in the first image layer in this file
-# ARG cic_bancor_commit=a04c7ae6882ea515938d852cc861d59a35070094
-# ARG cic_bancor_url=https://gitlab.com/grassrootseconomics/cic-bancor.git/
-# ARG cic_bancor_contracts_url=https://github.com/bancorprotocol/contracts-solidity
-# RUN echo Compile and install bancor protocol contracts && \
-# 	git clone --depth 1 $cic_bancor_url cic-bancor && \
-# 	cd cic-bancor && \
-# 	git fetch --depth 1 origin $cic_bancor_commit && \
-# 	git checkout $cic_bancor_commit && \
-# 	# Apparently the git version here doesn't have set-url as a command. *sigh*
-# 	#if [ ! -z $cic_bancor_contracts_url ]; then
-# 	#	git submodule set-url bancor $cic_bancor_contracts_url
-# 	#fi
-# 	git submodule init && \
-# 	git submodule update
-# RUN cd root && \
-# 	. $NVM_DIR/nvm.sh &&\
-# 	nvm install $BANCOR_NODE_VERSION && \
-# 	nvm use $BANCOR_NODE_VERSION && \
-# 	cd - && \
-# 	cd cic-bancor/bancor && \
-# 	npm install --python=/usr/bin/python2 && \
-# 	node_modules/truffle/build/cli.bundled.js compile && \
-# 	mkdir -vp /usr/local/share/cic/bancor/solidity/build  && \
-# 	cp -vR solidity/build/contracts /usr/local/share/cic/bancor/solidity/build/
-# RUN cd cic-bancor/python && \
-# 	pip install --extra-index-url $pip_extra_index_url .
+	cic-eth==$cic_eth_version \
+	cic-contracts==$cic_contracts_version \
+	sarafu-faucet==$sarafu_faucet_version

 FROM python:3.8.6-slim-buster as runtime-image

@@ -124,17 +84,19 @@ COPY contract-migration/testdata/pgp testdata/pgp
 COPY contract-migration/sarafu_declaration.json sarafu_declaration.json
 COPY contract-migration/keystore keystore
 COPY contract-migration/envlist .
-COPY contract-migration/*.sh ./

 # RUN chown grassroots:grassroots .local/
-RUN chown grassroots:grassroots -R .
-RUN chmod gu+x *.sh

 RUN mkdir -p /tmp/cic/config
 RUN chown grassroots:grassroots /tmp/cic/config
 # A shared output dir for environment configs
 RUN chmod a+rwx /tmp/cic/config 

+COPY contract-migration/*.sh ./
+RUN chown grassroots:grassroots -R .
+RUN chmod gu+x *.sh
+
+
 USER grassroots

 ENTRYPOINT [ ]
--- a/apps/contract-migration/reset.sh
+++ b/apps/contract-migration/reset.sh
@@ -5,7 +5,7 @@ set -a
 DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER=0xEb3907eCad74a0013c259D5874AE7f22DcBcC95C
 DEV_ETH_ACCOUNT_RESERVE_MINTER=${DEV_ETH_ACCOUNT_RESERVE_MINTER:-$DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER}
 DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER=${DEV_ETH_ACCOUNT_RESERVE_MINTER:-$DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER}
-DEV_ETH_RESERVE_AMOUNT=${DEV_ETH_RESERVE_AMOUNT:-""10000000000000000000000000000000000}
+DEV_RESERVE_AMOUNT=${DEV_ETH_RESERVE_AMOUNT:-""10000000000000000000000000000000000}
 keystore_file=$(realpath ./keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c)

 echo "environment:"
@@ -35,22 +35,43 @@ if [[ -n "${ETH_PROVIDER}" ]]; then
 	echo "waiting for ${ETH_PROVIDER}..."
  	./wait-for-it.sh "${ETH_PROVIDER_HOST}:${ETH_PROVIDER_PORT}"

-	DEV_ETH_RESERVE_ADDRESS=`giftable-token-deploy -p $ETH_PROVIDER -y $keystore_file -i $CIC_CHAIN_SPEC --account $DEV_ETH_ACCOUNT_RESERVE_MINTER --minter $DEV_ETH_ACCOUNT_RESERVE_MINTER --minter $DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER -v -w --name "Sarafu" --symbol "SRF" --decimals 6 $DEV_ETH_RESERVE_AMOUNT`
+	DEV_RESERVE_ADDRESS=`giftable-token-deploy -p $ETH_PROVIDER -y $keystore_file -i $CIC_CHAIN_SPEC -v -w --name "Sarafu" --symbol "SRF" --decimals 6`
+	giftable-token-gift -p $ETH_PROVIDER -y $keystore_file -i $CIC_CHAIN_SPEC -v -w -a $DEV_RESERVE_ADDRESS $DEV_RESERVE_AMOUNT

 	#BANCOR_REGISTRY_ADDRESS=`cic-bancor-deploy --bancor-dir /usr/local/share/cic/bancor -z $DEV_ETH_RESERVE_ADDRESS -p $ETH_PROVIDER -o $DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER`

-	CIC_ACCOUNTS_INDEX_ADDRESS=`eth-accounts-index-deploy -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -y $keystore_file --writer $DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER -vv -w`
+	DEV_ACCOUNT_INDEX_ADDRESS=`eth-accounts-index-deploy -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -y $keystore_file -vv -w`

-	CIC_REGISTRY_ADDRESS=`cic-registry-deploy -i $CIC_CHAIN_SPEC -y $keystore_file -k CICRegistry -k BancorRegistry -k AccountRegistry -k TokenRegistry -k AddressDeclarator -k Faucet -k TransferAuthorization -p $ETH_PROVIDER -vv -w`
-	cic-registry-set -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -k CICRegistry  -p $ETH_PROVIDER $CIC_REGISTRY_ADDRESS -vv
+	CIC_REGISTRY_ADDRESS=`eth-contract-registry-deploy -i $CIC_CHAIN_SPEC -y $keystore_file --identifier BancorRegistry --identifier AccountRegistry --identifier TokenRegistry --identifier AddressDeclarator --identifier Faucet --identifier TransferAuthorization -p $ETH_PROVIDER -vv -w`
+	eth-contract-registry-set -w -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC  -p $ETH_PROVIDER -vv ContractRegistry $CIC_REGISTRY_ADDRESS
 	#cic-registry-set -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -k BancorRegistry -p $ETH_PROVIDER $BANCOR_REGISTRY_ADDRESS -vv
-	cic-registry-set -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -k AccountRegistry -p $ETH_PROVIDER $CIC_ACCOUNTS_INDEX_ADDRESS  -vv
+	eth-contract-registry-set -w -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv AccountRegistry $DEV_ACCOUNT_INDEX_ADDRESS

 	# Deploy address declarator registry
 	>&2 echo "deploy address declarator contract"
 	declarator_description=0x546869732069732074686520434943206e6574776f726b000000000000000000
-	CIC_DECLARATOR_ADDRESS=`eth-address-declarator-deploy -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -v $declarator_description`
-	cic-registry-set -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -k AddressDeclarator -p $ETH_PROVIDER $CIC_DECLARATOR_ADDRESS  -vv
+	DEV_DECLARATOR_ADDRESS=`eth-address-declarator-deploy -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -v $declarator_description`
+	eth-contract-registry-set -w -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv AddressDeclarator $DEV_DECLARATOR_ADDRESS
+
+	# Deploy transfer authorization contact
+	>&2 echo "deploy address declarator contract"
+	DEV_TRANSFER_AUTHORIZATION_ADDRESS=`erc20-transfer-auth-deploy -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -v`
+	eth-contract-registry-set -w -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC  -p $ETH_PROVIDER -vv TransferAuthorization $DEV_TRANSFER_AUTHORIZATION_ADDRESS
+
+	# Deploy token index contract
+	>&2 echo "deploy token index contract"
+	DEV_TOKEN_INDEX_ADDRESS=`eth-token-index-deploy -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -v`
+	eth-contract-registry-set -w -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv TokenRegistry $DEV_TOKEN_INDEX_ADDRESS 
+	>&2 echo "add reserve token to token index"
+	eth-token-index-add -w -y $keystore_file  -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv -a $DEV_TOKEN_INDEX_ADDRESS $DEV_RESERVE_ADDRESS
+
+	# Sarafu faucet contract
+	>&2 echo "deploy token faucet contract"
+	DEV_FAUCET_ADDRESS=`sarafu-faucet-deploy -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -v --account-index-address $DEV_ACCOUNT_INDEX_ADDRESS $DEV_RESERVE_ADDRESS`
+	eth-contract-registry-set -w -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv Faucet $DEV_FAUCET_ADDRESS
+	>&2 echo "set faucet as token minter"
+	giftable-token-minter -w -y $keystore_file -a $DEV_RESERVE_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv $DEV_FAUCET_ADDRESS
+

 else
 	echo "\$ETH_PROVIDER not set!"
@@ -61,10 +82,6 @@ mkdir -p $CIC_DATA_DIR

 # this is consumed in downstream services to set environment variables
 cat << EOF > $CIC_DATA_DIR/.env
-export DEV_ETH_RESERVE_ADDRESS=$DEV_ETH_RESERVE_ADDRESS
-export DEV_ETH_RESERVE_AMOUNT=$DEV_ETH_RESERVE_AMOUNT
-export DEV_ETH_ACCOUNTS_INDEX_ADDRESS=$CIC_ACCOUNTS_INDEX_ADDRESS
-export BANCOR_REGISTRY_ADDRESS=$BANCOR_REGISTRY_ADDRESS
 export CIC_REGISTRY_ADDRESS=$CIC_REGISTRY_ADDRESS
 export CIC_TRUST_ADDRESS=$DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER
 export CIC_DECLARATOR_ADDRESS=$CIC_DECLARATOR_ADDRESS
--- a/apps/contract-migration/run_job.sh
+++ b/apps/contract-migration/run_job.sh
@@ -1,11 +1,14 @@
 #! /bin/bash

-if [[ $RUN_LEVEL -gt 0 ]]
+if [[ $((RUN_MASK & 1)) -eq 1 ]]
 then
-  ./reset.sh
+	./reset.sh
+	if [ $? -ne "0" ]; then
+	  exit 1;
+	fi
 fi

-if [[ $RUN_LEVEL -gt 1 ]]
+if [[ $((RUN_MASK & 2)) -eq 2 ]]
 then
-  ./seed_cic_eth.sh
-fi
+	./seed_cic_eth.sh
+fi
--- a/apps/contract-migration/scripts/create_import_users.py
+++ b/apps/contract-migration/scripts/create_import_users.py
@@ -16,9 +16,8 @@ import random
 # external imports
 import vobject
 import celery
-import web3
 from faker import Faker
-import cic_registry
+import cic_eth_registry
 import confini
 from cic_eth.api import Api
 from cic_types.models.person import (
@@ -26,7 +25,7 @@ from cic_types.models.person import (
        generate_vcard_from_contact_data,
        get_contact_data_from_vcard,
        )
-from chainlib.eth.address import to_checksum
+from chainlib.eth.address import to_checksum_address

 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
@@ -142,7 +141,7 @@ def genDob():

 def gen():
    old_blockchain_address = '0x' + os.urandom(20).hex()
-    old_blockchain_checksum_address = to_checksum(old_blockchain_address)
+    old_blockchain_checksum_address = to_checksum_address(old_blockchain_address)
    gender = random.choice(['female', 'male', 'other'])
    phone = genPhone()
    city = fake.city_name()
--- a/apps/contract-migration/scripts/import_balance.py
+++ b/apps/contract-migration/scripts/import_balance.py
@@ -19,23 +19,23 @@ from hexathon import (
        )
 from chainsyncer.backend import MemBackend
 from chainsyncer.driver import HeadSyncer
-from chainlib.eth.connection import HTTPConnection
+from chainlib.eth.connection import EthHTTPConnection
 from chainlib.eth.block import (
        block_latest,
        block_by_number,
        Block,
        )
 from chainlib.eth.hash import keccak256_string_to_hex
-from chainlib.eth.address import to_checksum
-from chainlib.eth.erc20 import ERC20TxFactory
-from chainlib.eth.gas import DefaultGasOracle
-from chainlib.eth.nonce import DefaultNonceOracle
+from chainlib.eth.address import to_checksum_address
+from chainlib.eth.erc20 import ERC20
+from chainlib.eth.gas import OverrideGasOracle
+from chainlib.eth.nonce import RPCNonceOracle
 from chainlib.eth.tx import TxFactory
 from chainlib.eth.rpc import jsonrpc_template
 from chainlib.eth.error import EthException
 from chainlib.chain import ChainSpec
 from crypto_dev_signer.eth.signer import ReferenceSigner as EIP155Signer
-from crypto_dev_signer.keystore import DictKeystore
+from crypto_dev_signer.keystore.dict import DictKeystore
 from cic_types.models.person import Person


@@ -117,7 +117,7 @@ class Handler:
        self.user_dir = user_dir
        self.balances = balances
        self.chain_spec = chain_spec
-        self.tx_factory = ERC20TxFactory(signer, gas_oracle, nonce_oracle, chain_spec.network_id())
+        self.tx_factory = ERC20(signer, gas_oracle, nonce_oracle, chain_spec.network_id())


    def name(self):
@@ -131,7 +131,7 @@ class Handler:

        if tx.payload[:8] == self.account_index_add_signature:
            recipient = eth_abi.decode_single('address', bytes.fromhex(tx.payload[-64:]))
-            #original_address = to_checksum(self.addresses[to_checksum(recipient)])
+            #original_address = to_checksum_address(self.addresses[to_checksum_address(recipient)])
            user_file = 'new/{}/{}/{}.json'.format(
                    recipient[2:4].upper(),
                    recipient[4:6].upper(),
@@ -159,7 +159,7 @@ class Handler:
            balance_full = balance * multiplier
            logg.info('registered {} originally {} ({}) tx hash {} balance {}'.format(recipient, original_address, u, tx.hash, balance_full))

-            (tx_hash_hex, o) = self.tx_factory.erc20_transfer(self.token_address, signer_address, recipient, balance_full)
+            (tx_hash_hex, o) = self.tx_factory.transfer(self.token_address, signer_address, recipient, balance_full)
            logg.info('submitting erc20 transfer tx {} for recipient {}'.format(tx_hash_hex, recipient))
            r = conn.do(o)
 #        except TypeError as e:
@@ -178,7 +178,7 @@ class BlockGetter:

    def __init__(self, conn, gas_oracle, nonce_oracle, chain_id):
        self.conn = conn
-        self.tx_factory = ERC20TxFactory(signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle, chain_id=chain_id)
+        self.tx_factory = ERC20(signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle, chain_id=chain_id)


    def get(self, n):
@@ -203,9 +203,9 @@ def progress_callback(block_number, tx_index, s):
 def main():
    global chain_str, block_offset, user_dir
    
-    conn = HTTPConnection(config.get('ETH_PROVIDER'))
-    gas_oracle = DefaultGasOracle(conn)
-    nonce_oracle = DefaultNonceOracle(signer_address, conn)
+    conn = EthHTTPConnection(config.get('ETH_PROVIDER'))
+    gas_oracle = OverrideGasOracle(conn=conn, limit=8000000)
+    nonce_oracle = RPCNonceOracle(signer_address, conn)

    # Get Token registry address
    txf = TxFactory(signer=signer, gas_oracle=gas_oracle, nonce_oracle=None, chain_id=chain_spec.network_id())
@@ -221,7 +221,7 @@ def main():
    o['params'].append(txf.normalize(tx))
    o['params'].append('latest')
    r = conn.do(o)
-    token_index_address = to_checksum(eth_abi.decode_single('address', bytes.fromhex(strip_0x(r))))
+    token_index_address = to_checksum_address(eth_abi.decode_single('address', bytes.fromhex(strip_0x(r))))
    logg.info('found token index address {}'.format(token_index_address))


@@ -239,7 +239,7 @@ def main():
    o['params'].append('latest')
    r = conn.do(o)
    try:
-        sarafu_token_address = to_checksum(eth_abi.decode_single('address', bytes.fromhex(strip_0x(r))))
+        sarafu_token_address = to_checksum_address(eth_abi.decode_single('address', bytes.fromhex(strip_0x(r))))
    except ValueError as e:
        logg.critical('lookup failed for token {}: {}'.format(token_symbol, e))
        sys.exit(1)
@@ -279,7 +279,7 @@ def main():
            break
        r = l.split(',')
        try:
-            address = to_checksum(r[0])
+            address = to_checksum_address(r[0])
            sys.stdout.write('loading balance {} {} {}'.format(i, address, r[1]).ljust(200) + "\r")
        except ValueError:
            break
--- a/apps/contract-migration/scripts/requirements.txt
+++ b/apps/contract-migration/scripts/requirements.txt
@@ -1,3 +1,3 @@
-cic-base[full_graph]==0.1.1a23
-cic-eth==0.10.0a41
+cic-base[full_graph]==0.1.2a40
+cic-eth==0.10.1b1
 cic-types==0.1.0a8
--- a/apps/contract-migration/scripts/verify.py
+++ b/apps/contract-migration/scripts/verify.py
@@ -22,7 +22,7 @@ from hexathon import (
 from chainsyncer.backend import MemBackend
 from chainsyncer.driver import HeadSyncer
 from chainlib.chain import ChainSpec
-from chainlib.eth.connection import HTTPConnection
+from chainlib.eth.connection import EthHTTPConnection
 from chainlib.eth.constant import ZERO_ADDRESS
 from chainlib.eth.block import (
        block_latest,
@@ -30,15 +30,12 @@ from chainlib.eth.block import (
        Block,
        )
 from chainlib.eth.hash import keccak256_string_to_hex
-from chainlib.eth.address import to_checksum
-from chainlib.eth.erc20 import ERC20TxFactory
-from chainlib.eth.gas import DefaultGasOracle
-from chainlib.eth.nonce import DefaultNonceOracle
+from chainlib.eth.address import to_checksum_address
+from chainlib.eth.erc20 import ERC20
+from chainlib.eth.gas import OverrideGasOracle
 from chainlib.eth.tx import TxFactory
 from chainlib.eth.rpc import jsonrpc_template
 from chainlib.eth.error import EthException
-from crypto_dev_signer.eth.signer import ReferenceSigner as EIP155Signer
-from crypto_dev_signer.keystore import DictKeystore
 from cic_eth.api.api_admin import AdminApi
 from cic_types.models.person import (
        Person,
@@ -136,7 +133,7 @@ class Verifier:
        self.chain_spec = chain_spec
        self.index_address = index_address
        self.token_address = token_address
-        self.erc20_tx_factory = ERC20TxFactory(chain_id=chain_spec.chain_id(), gas_oracle=gas_oracle)
+        self.erc20_tx_factory = ERC20(chain_id=chain_spec.chain_id(), gas_oracle=gas_oracle)
        self.tx_factory = TxFactory(chain_id=chain_spec.chain_id(), gas_oracle=gas_oracle)
        self.api = cic_eth_api
        self.data_dir = data_dir
@@ -168,7 +165,7 @@ class Verifier:


    def verify_balance(self, address, balance):
-        o = self.erc20_tx_factory.erc20_balance(self.token_address, address)
+        o = self.erc20_tx_factory.balance(self.token_address, address)
        r = self.conn.do(o)
        actual_balance = int(strip_0x(r), 16)
        balance = int(balance / 1000000) * 1000000
@@ -178,7 +175,8 @@ class Verifier:


    def verify_local_key(self, address, balance=None):
-        r = self.api.have_account(address, str(self.chain_spec))
+        t = self.api.have_account(address, self.chain_spec)
+        r = t.get()
        logg.debug('verify local key result {}'.format(r))
        if r != address:
            raise VerifierError((address, r), 'local key')
@@ -252,8 +250,8 @@ class MockClient:
 def main():
    global chain_str, block_offset, user_dir
    
-    conn = HTTPConnection(config.get('ETH_PROVIDER'))
-    gas_oracle = DefaultGasOracle(conn)
+    conn = EthHTTPConnection(config.get('ETH_PROVIDER'))
+    gas_oracle = OverrideGasOracle(conn=conn, limit=8000000)

    # Get Token registry address
    txf = TxFactory(signer=None, gas_oracle=gas_oracle, nonce_oracle=None, chain_id=chain_spec.chain_id())
@@ -270,7 +268,7 @@ def main():
    o['params'].append('latest')
    r = conn.do(o)
    print('r {}'.format(r))
-    token_index_address = to_checksum(eth_abi.decode_single('address', bytes.fromhex(strip_0x(r))))
+    token_index_address = to_checksum_address(eth_abi.decode_single('address', bytes.fromhex(strip_0x(r))))
    logg.info('found token index address {}'.format(token_index_address))

    data = add_0x(registry_addressof_method)
@@ -282,7 +280,7 @@ def main():
    o['params'].append(txf.normalize(tx))
    o['params'].append('latest')
    r = conn.do(o)
-    account_index_address = to_checksum(eth_abi.decode_single('address', bytes.fromhex(strip_0x(r))))
+    account_index_address = to_checksum_address(eth_abi.decode_single('address', bytes.fromhex(strip_0x(r))))
    logg.info('found account index address {}'.format(account_index_address))


@@ -300,7 +298,7 @@ def main():
    o['params'].append('latest')
    r = conn.do(o)
    print('r {}'.format(r))
-    sarafu_token_address = to_checksum(eth_abi.decode_single('address', bytes.fromhex(strip_0x(r))))
+    sarafu_token_address = to_checksum_address(eth_abi.decode_single('address', bytes.fromhex(strip_0x(r))))
    logg.info('found token address {}'.format(sarafu_token_address))

    balances = {}
@@ -312,7 +310,7 @@ def main():
            break
        r = l.split(',')
        try:
-            address = to_checksum(r[0])
+            address = to_checksum_address(r[0])
            #sys.stdout.write('loading balance {} {}'.format(i, address).ljust(200) + "\r")
            logg.debug('loading balance {} {}'.format(i, address).ljust(200))
        except ValueError:
--- a/apps/contract-migration/seed_cic_eth.sh
+++ b/apps/contract-migration/seed_cic_eth.sh
@@ -1,17 +1,18 @@
 #!/bin/bash

 # defaults
-initlevel=`cat ${CIC_DATA_DIR}/.init`
-echo $inilevel
-if [ $initlevel -lt 2 ]; then
-	>&2 echo "initlevel too low $initlevel"
-	exit 1 
-fi
+#initlevel=`cat ${CIC_DATA_DIR}/.init`
+#echo $inilevel
+#if [ $initlevel -lt 2 ]; then
+#	>&2 echo "initlevel too low $initlevel"
+#	exit 1 
+#fi
 source ${CIC_DATA_DIR}/.env
 source ${CIC_DATA_DIR}/.env_all
 DEV_PIP_EXTRA_INDEX_URL=${DEV_PIP_EXTRA_INDEX_URL:-https://pip.grassrootseconomics.net:8433}
 DEV_DATABASE_NAME_CIC_ETH=${DEV_DATABASE_NAME_CIC_ETH:-"cic-eth"}
 CIC_DATA_DIR=${CIC_DATA_DIR:-/tmp/cic} 
+ETH_PASSPHRASE=''

 # Debug flag
 DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER=0xEb3907eCad74a0013c259D5874AE7f22DcBcC95C
@@ -26,26 +27,34 @@ env_out_file=${CIC_DATA_DIR}/.env_seed
 init_level_file=${CIC_DATA_DIR}/.init
 truncate $env_out_file -s 0

-pip install --extra-index-url https://pip.grassrootseconomics.net:8433 chainlib==0.0.1a22
-
 set -e
 set -a

+# get required addresses from registries
+DEV_TOKEN_INDEX_ADDRESS=`eth-contract-registry-list -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -r $CIC_REGISTRY_ADDRESS -f brief TokenRegistry`
+DEV_ACCOUNTS_INDEX_ADDRESS=`eth-contract-registry-list -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -r $CIC_REGISTRY_ADDRESS -f brief AccountRegistry`
+DEV_RESERVE_ADDRESS=`eth-token-index-list -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -a $DEV_TOKEN_INDEX_ADDRESS -f brief SRF`
+cat <<EOF
+Token registry: $DEV_TOKEN_INDEX_ADDRESS
+Account reigstry: $DEV_ACCOUNTS_INDEX_ADDRESS
+Reserve address: $DEV_RESERVE_ADDRESS
+EOF
+
 >&2 echo "create account for gas gifter"
 old_gas_provider=$DEV_ETH_ACCOUNT_GAS_PROVIDER
 DEV_ETH_ACCOUNT_GAS_GIFTER=`cic-eth-create $debug --redis-host-callback=$REDIS_HOST --redis-port-callback=$REDIS_PORT --no-register`
 echo DEV_ETH_ACCOUNT_GAS_GIFTER=$DEV_ETH_ACCOUNT_GAS_GIFTER >> $env_out_file
-cic-eth-tag GAS_GIFTER $DEV_ETH_ACCOUNT_GAS_GIFTER
+cic-eth-tag -i $CIC_CHAIN_SPEC GAS_GIFTER $DEV_ETH_ACCOUNT_GAS_GIFTER

 >&2 echo "create account for sarafu gifter"
 DEV_ETH_ACCOUNT_SARAFU_GIFTER=`cic-eth-create $debug --redis-host-callback=$REDIS_HOST --redis-port-callback=$REDIS_PORT --no-register`
 echo DEV_ETH_ACCOUNT_SARAFU_GIFTER=$DEV_ETH_ACCOUNT_SARAFU_GIFTER >> $env_out_file
-cic-eth-tag SARAFU_GIFTER $DEV_ETH_ACCOUNT_SARAFU_GIFTER
+cic-eth-tag -i $CIC_CHAIN_SPEC SARAFU_GIFTER $DEV_ETH_ACCOUNT_SARAFU_GIFTER

 >&2 echo "create account for approval escrow owner"
 DEV_ETH_ACCOUNT_TRANSFER_AUTHORIZATION_OWNER=`cic-eth-create $debug --redis-host-callback=$REDIS_HOST --redis-port-callback=$REDIS_PORT --no-register`
 echo DEV_ETH_ACCOUNT_TRANSFER_AUTHORIZATION_OWNER=$DEV_ETH_ACCOUNT_TRANSFER_AUTHORIZATION_OWNER >> $env_out_file
-cic-eth-tag TRANSFER_AUTHORIZATION_OWNER $DEV_ETH_ACCOUNT_TRANSFER_AUTHORIZATION_OWNER 
+cic-eth-tag -i $CIC_CHAIN_SPEC TRANSFER_AUTHORIZATION_OWNER $DEV_ETH_ACCOUNT_TRANSFER_AUTHORIZATION_OWNER 

 #>&2 echo "create account for faucet owner"
 #DEV_ETH_ACCOUNT_FAUCET_OWNER=`cic-eth-create $debug --redis-host-callback=$REDIS_HOST --redis-port-callback=$REDIS_PORT --no-register`
@@ -53,29 +62,30 @@ cic-eth-tag TRANSFER_AUTHORIZATION_OWNER $DEV_ETH_ACCOUNT_TRANSFER_AUTHORIZATION
 #cic-eth-tag FAUCET_GIFTER $DEV_ETH_ACCOUNT_FAUCET_OWNER

 >&2 echo "create account for accounts index writer"
-DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER=`cic-eth-create $debug --redis-host-callback=$REDIS_HOST --redis-port-callback=$REDIS_PORT --no-register`
-echo DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER=$DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER >> $env_out_file
-cic-eth-tag ACCOUNTS_INDEX_WRITER $DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER
-
+DEV_ETH_ACCOUNT_ACCOUNT_REGISTRY_WRITER=`cic-eth-create $debug --redis-host-callback=$REDIS_HOST --redis-port-callback=$REDIS_PORT --no-register`
+echo DEV_ETH_ACCOUNT_ACCOUNT_REGISTRY_WRITER=$DEV_ETH_ACCOUNT_ACCOUNT_REGISTRY_WRITER >> $env_out_file
+cic-eth-tag -i $CIC_CHAIN_SPEC ACCOUNT_REGISTRY_WRITER $DEV_ETH_ACCOUNT_ACCOUNT_REGISTRY_WRITER
+>&2 echo "add acccounts index writer account as writer on contract"
+eth-accounts-index-writer -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -a $DEV_ACCOUNTS_INDEX_ADDRESS -ww $debug $DEV_ETH_ACCOUNT_ACCOUNT_REGISTRY_WRITER

 # Transfer gas to custodial gas provider adddress
 >&2 echo gift gas to gas gifter
->&2 eth-gas -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w $debug $DEV_ETH_ACCOUNT_GAS_GIFTER $gas_amount
+>&2 eth-gas --send -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w $debug $DEV_ETH_ACCOUNT_GAS_GIFTER $gas_amount

 >&2 echo gift gas to sarafu token owner
->&2 eth-gas -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w $debug $DEV_ETH_ACCOUNT_SARAFU_GIFTER $gas_amount
+>&2 eth-gas --send -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w $debug $DEV_ETH_ACCOUNT_SARAFU_GIFTER $gas_amount

 >&2 echo gift gas to account index owner
->&2 eth-gas -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w $debug $DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER $gas_amount
+>&2 eth-gas --send -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w $debug $DEV_ETH_ACCOUNT_ACCOUNT_REGISTRY_WRITER $gas_amount
+

 # Send token to token creator
 >&2 echo "gift tokens to sarafu owner"
->&2 giftable-token-gift -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -a $DEV_ETH_RESERVE_ADDRESS --recipient $DEV_ETH_ACCOUNT_SARAFU_GIFTER -w $debug $token_amount
+>&2 giftable-token-gift -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -a $DEV_RESERVE_ADDRESS --recipient $DEV_ETH_ACCOUNT_SARAFU_GIFTER -w $debug $token_amount

 # Send token to token gifter
 >&2 echo "gift tokens to keystore address"
->&2 giftable-token-gift -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -a $DEV_ETH_RESERVE_ADDRESS --recipient $DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER -w $debug $token_amount
-
+>&2 giftable-token-gift -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -a $DEV_RESERVE_ADDRESS --recipient $DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER -w $debug $token_amount

 >&2 echo "set sarafu token to reserve token (temporarily while bancor contracts are not connected)"
 echo DEV_ETH_SARAFU_TOKEN_ADDRESS=$DEV_ETH_RESERVE_ADDRESS >> $env_out_file
@@ -83,68 +93,9 @@ export DEV_ETH_SARAFU_TOKEN_ADDRESS=$DEV_ETH_RESERVE_ADDRESS

 # Transfer tokens to gifter address
 >&2 echo "transfer sarafu tokens to token gifter address"
->&2 eth-transfer -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER --token-address $DEV_ETH_SARAFU_TOKEN_ADDRESS --abi-dir $abi_dir -w $debug $DEV_ETH_ACCOUNT_SARAFU_GIFTER ${token_amount:0:-1}
+>&2 eth-transfer -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER --token-address $DEV_RESERVE_ADDRESS -w $debug $DEV_ETH_ACCOUNT_SARAFU_GIFTER ${token_amount:0:-1}

-
->&2 echo "deploy transfer authorization contract"
-CIC_TRANSFER_AUTHORIZATION_ADDRESS=`erc20-transfer-auth-deploy -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER --approver $DEV_ETH_ACCOUNT_TRANSFER_AUTHORIZATION_OWNER -w $debug`
-echo CIC_TRANSFER_AUTHORIZATION_ADDRESS=$CIC_TRANSFER_AUTHORIZATION_ADDRESS  >> $env_out_file
-export CIC_TRANSFER_AUTHORIZATION_ADDRESS=$CIC_TRANSFER_AUTHORIZATION_ADDRESS 
-
-# Register transfer approval contract
->&2 echo "add transfer authorization request contract to registry"
->&2 cic-registry-set -y $keystore_file -r $CIC_REGISTRY_ADDRESS -k TransferAuthorization -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w $debug $CIC_TRANSFER_AUTHORIZATION_ADDRESS
-
-
-# Deploy one-time token faucet for newly created token
->&2 echo "deploy faucet"
-DEV_ETH_SARAFU_FAUCET_ADDRESS=`sarafu-faucet-deploy -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER --token-address $DEV_ETH_SARAFU_TOKEN_ADDRESS --editor $DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER --set-amount $faucet_amount --accounts-index-address $DEV_ETH_ACCOUNTS_INDEX_ADDRESS -w $debug`
-echo DEV_ETH_SARAFU_FAUCET_ADDRESS=$DEV_ETH_SARAFU_FAUCET_ADDRESS  >> $env_out_file
-export DEV_ETH_SARAFU_FAUCET_ADDRESS=$DEV_ETH_SARAFU_FAUCET_ADDRESS 
-
-# Transfer tokens to faucet contract
->&2 echo "transfer tokens to faucet contract"
->&2 eth-transfer  -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER --token-address $DEV_ETH_SARAFU_TOKEN_ADDRESS --abi-dir $abi_dir -w $debug $DEV_ETH_SARAFU_FAUCET_ADDRESS ${token_amount:0:-1}
-
-# Register faucet entry
->&2 echo "register faucet contract in registry"
->&2 cic-registry-set -y $keystore_file -r $CIC_REGISTRY_ADDRESS -k Faucet -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w $debug $DEV_ETH_SARAFU_FAUCET_ADDRESS
-
->&2 echo "add faucet contract as token minter"
->&2 giftable-token-add -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w $debug --token-address $DEV_ETH_SARAFU_TOKEN_ADDRESS $DEV_ETH_SARAFU_FAUCET_ADDRESS
-
->&2 echo "deploy token symbol index contract"
-CIC_TOKEN_INDEX_ADDRESS=`eth-token-index-deploy -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w $debug`
-echo CIC_TOKEN_INDEX_ADDRESS=$CIC_TOKEN_INDEX_ADDRESS >> $env_out_file
-export CIC_TOKEN_INDEX_ADDRESS=$CIC_TOKEN_INDEX_ADDRESS
->&2 eth-token-index-add -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -r $CIC_TOKEN_INDEX_ADDRESS -w $debug $DEV_ETH_SARAFU_TOKEN_ADDRESS
-
-# Register token registry
->&2 echo "register token index in registry"
->&2 cic-registry-set -y $keystore_file -r $CIC_REGISTRY_ADDRESS -k TokenRegistry -i $CIC_CHAIN_SPEC -w -p $ETH_PROVIDER $CIC_TOKEN_INDEX_ADDRESS
-
->&2 echo "add declarations for sarafu token"
-token_description_one=`sha256sum sarafu_declaration.json | awk '{ print $1; }'`
-token_description_two=0x54686973206973207468652053617261667520746f6b656e0000000000000000
-echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> foo $CIC_DECLARATOR_ADDRESSh"
->&2 eth-address-declarator-add -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -r $CIC_DECLARATOR_ADDRESS -w $debug $DEV_ETH_SARAFU_TOKEN_ADDRESS $token_description_one
->&2 eth-address-declarator-add -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -r $CIC_DECLARATOR_ADDRESS -w $debug $DEV_ETH_SARAFU_TOKEN_ADDRESS $token_description_two
-
-
-# Register address declarator
->&2 echo "add address declarator to registry"
->&2 cic-registry-set -y $keystore_file -r $CIC_REGISTRY_ADDRESS -k AddressDeclarator -i $CIC_CHAIN_SPEC -w -p $ETH_PROVIDER $CIC_DECLARATOR_ADDRESS 
-
-# We're done with the registry at this point, seal it off
->&2 echo "seal registry contract"
->&2 cic-registry-seal -y $keystore_file -i $CIC_CHAIN_SPEC -r $CIC_REGISTRY_ADDRESS -w -p $ETH_PROVIDER
-
-
-# Add accounts index writer with key from keystore
->&2 echo "add keystore account $keystore_file to accounts index writers"
->&2 eth-accounts-index-add -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -r $CIC_ACCOUNTS_INDEX_ADDRESS --writer $DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER -w $debug
-
-echo -n 0 > $init_level_file
+#echo -n 0 > $init_level_file

 set +a
 set +e