From 6210fe05ef37d2a9fcf3a54d437fb0b85765f895 Mon Sep 17 00:00:00 2001 From: nolash Date: Sun, 4 Apr 2021 14:36:17 +0200 Subject: [PATCH] Update use chain_spec instead of chain_id for tx factory, unpack --- apps/cic-eth/cic_eth/version.py | 2 +- apps/cic-eth/docker/Dockerfile | 2 +- apps/cic-eth/requirements.txt | 6 +-- apps/contract-migration/docker/Dockerfile | 4 +- .../scripts/import_balance.py | 40 +++++++++---------- .../scripts/import_sovereign_users.py | 2 +- .../scripts/requirements.txt | 6 +-- apps/contract-migration/scripts/verify.py | 8 ++-- apps/contract-migration/seed_cic_eth.sh | 2 + 9 files changed, 37 insertions(+), 35 deletions(-) diff --git a/apps/cic-eth/cic_eth/version.py b/apps/cic-eth/cic_eth/version.py index 704b4594..b81b08b0 100644 --- a/apps/cic-eth/cic_eth/version.py +++ b/apps/cic-eth/cic_eth/version.py @@ -10,7 +10,7 @@ version = ( 0, 11, 0, - 'alpha.2', + 'alpha.3', ) version_object = semver.VersionInfo( diff --git a/apps/cic-eth/docker/Dockerfile b/apps/cic-eth/docker/Dockerfile index 86bde4c5..b5c4b35c 100644 --- a/apps/cic-eth/docker/Dockerfile +++ b/apps/cic-eth/docker/Dockerfile @@ -29,7 +29,7 @@ RUN /usr/local/bin/python -m pip install --upgrade pip # python merge_requirements.py | tee merged_requirements.txt #RUN cd cic-base && \ # pip install $pip_extra_index_url_flag -r ./merged_requirements.txt -RUN pip install $pip_extra_index_url_flag cic-base[full_graph]==0.1.2a44 +RUN pip install $pip_extra_index_url_flag cic-base[full_graph]==0.1.2a57 COPY cic-eth/scripts/ scripts/ COPY cic-eth/setup.cfg cic-eth/setup.py ./ diff --git a/apps/cic-eth/requirements.txt b/apps/cic-eth/requirements.txt index 6820ab0b..727ee618 100644 --- a/apps/cic-eth/requirements.txt +++ b/apps/cic-eth/requirements.txt @@ -1,8 +1,8 @@ -cic-base~=0.1.2a56 +cic-base~=0.1.2a57 celery==4.4.7 crypto-dev-signer~=0.4.14a17 confini~=0.3.6rc3 -cic-eth-registry~=0.5.4a10 +cic-eth-registry~=0.5.4a11 #cic-bancor~=0.0.6 redis==3.5.3 alembic==1.4.2 @@ -15,7 +15,7 @@ uWSGI==2.0.19.1 semver==2.13.0 websocket-client==0.57.0 moolb~=0.1.1b2 -eth-address-index~=0.1.1a6 +eth-address-index~=0.1.1a7 chainlib~=0.0.2a1 hexathon~=0.0.1a7 chainsyncer~=0.0.1a21 diff --git a/apps/contract-migration/docker/Dockerfile b/apps/contract-migration/docker/Dockerfile index 93f302ec..d72b387f 100644 --- a/apps/contract-migration/docker/Dockerfile +++ b/apps/contract-migration/docker/Dockerfile @@ -57,8 +57,8 @@ WORKDIR /home/grassroots USER grassroots ARG pip_extra_index_url=https://pip.grassrootseconomics.net:8433 -ARG cic_base_version=0.1.2a56 -ARG cic_eth_version=0.11.1a2 +ARG cic_base_version=0.1.2a57 +ARG cic_eth_version=0.11.0a3 ARG sarafu_faucet_version=0.0.2a16 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 \ diff --git a/apps/contract-migration/scripts/import_balance.py b/apps/contract-migration/scripts/import_balance.py index 244b8202..061e5348 100644 --- a/apps/contract-migration/scripts/import_balance.py +++ b/apps/contract-migration/scripts/import_balance.py @@ -174,25 +174,25 @@ class Handler: # logg.error('key record not found in imports: {}'.format(e).ljust(200)) -class BlockGetter: - - def __init__(self, conn, gas_oracle, nonce_oracle, chain_id): - self.conn = conn - self.tx_factory = ERC20(signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle, chain_id=chain_id) - - - def get(self, n): - o = block_by_number(n) - r = self.conn.do(o) - b = None - try: - b = Block(r) - except TypeError as e: - if r == None: - logg.debug('block not found {}'.format(n)) - else: - logg.error('block retrieve error {}'.format(e)) - return b +#class BlockGetter: +# +# def __init__(self, conn, gas_oracle, nonce_oracle, chain_spec): +# self.conn = conn +# self.tx_factory = ERC20(signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle, chain_id=chain_id) +# +# +# def get(self, n): +# o = block_by_number(n) +# r = self.conn.do(o) +# b = None +# try: +# b = Block(r) +# except TypeError as e: +# if r == None: +# logg.debug('block not found {}'.format(n)) +# else: +# logg.error('block retrieve error {}'.format(e)) +# return b def progress_callback(block_number, tx_index, s): @@ -208,7 +208,7 @@ def main(): 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()) + txf = TxFactory(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=None) tx = txf.template(signer_address, config.get('CIC_REGISTRY_ADDRESS')) registry_addressof_method = keccak256_string_to_hex('addressOf(bytes32)')[:8] diff --git a/apps/contract-migration/scripts/import_sovereign_users.py b/apps/contract-migration/scripts/import_sovereign_users.py index 30e3f5db..bf7eff60 100644 --- a/apps/contract-migration/scripts/import_sovereign_users.py +++ b/apps/contract-migration/scripts/import_sovereign_users.py @@ -103,7 +103,7 @@ def register_eth(i, u): address = add_0x(to_checksum_address(address_hex)) gas_oracle = RPCGasOracle(rpc, code_callback=AccountRegistry.gas) - c = AccountRegistry(signer=signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle, chain_id=chain_spec.chain_id()) + c = AccountRegistry(chain_spec, signer=signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle) (tx_hash_hex, o) = c.add(account_registry_address, signer_address, address) logg.debug('o {}'.format(o)) rpc.do(o) diff --git a/apps/contract-migration/scripts/requirements.txt b/apps/contract-migration/scripts/requirements.txt index 6599852f..c7611236 100644 --- a/apps/contract-migration/scripts/requirements.txt +++ b/apps/contract-migration/scripts/requirements.txt @@ -1,5 +1,5 @@ -cic-base[full_graph]==0.1.2a56 +cic-base[full_graph]==0.1.2a57 sarafu-faucet==0.0.2a16 -cic-eth==0.11.0a2 -cic-types==0.1.0a8 +cic-eth==0.11.0a3 +cic-types==0.1.0a10 crypto-dev-signer==0.4.14a17 diff --git a/apps/contract-migration/scripts/verify.py b/apps/contract-migration/scripts/verify.py index 08b791a7..d18435b9 100644 --- a/apps/contract-migration/scripts/verify.py +++ b/apps/contract-migration/scripts/verify.py @@ -203,12 +203,12 @@ class Verifier: self.index_address = index_address self.token_address = token_address self.faucet_address = faucet_address - 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.erc20_tx_factory = ERC20(chain_spec, gas_oracle=gas_oracle) + self.tx_factory = TxFactory(chain_spec, gas_oracle=gas_oracle) self.api = cic_eth_api self.data_dir = data_dir self.exit_on_error = exit_on_error - self.faucet_tx_factory = SingleShotFaucet(chain_id=chain_spec.chain_id(), gas_oracle=gas_oracle) + self.faucet_tx_factory = SingleShotFaucet(chain_spec, gas_oracle=gas_oracle) verifymethods = [] for k in dir(self): @@ -326,7 +326,7 @@ def main(): 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()) + txf = TxFactory(chain_spec, signer=None, gas_oracle=gas_oracle, nonce_oracle=None) tx = txf.template(ZERO_ADDRESS, config.get('CIC_REGISTRY_ADDRESS')) # TODO: replace with cic-eth-registry diff --git a/apps/contract-migration/seed_cic_eth.sh b/apps/contract-migration/seed_cic_eth.sh index b937cf2f..5d6da696 100755 --- a/apps/contract-migration/seed_cic_eth.sh +++ b/apps/contract-migration/seed_cic_eth.sh @@ -30,6 +30,8 @@ truncate $env_out_file -s 0 set -e set -a +#pip install --extra-index-url $DEV_PIP_EXTRA_INDEX_URL eth-address-index==0.1.1a7 + # 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_ACCOUNT_INDEX_ADDRESS=`eth-contract-registry-list -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -r $CIC_REGISTRY_ADDRESS -f brief AccountRegistry`