eth-address-index

commit a06bdee719d6bcdb6fe2be5add5294055ca42424
parent 2343e384b895b9866ced948240323cb39d8c21ae
Author: nolash <dev@holbrook.no>
Date:   Sun,  2 May 2021 17:59:37 +0200

Update url

Diffstat:
M
python/eth_address_declarator/runnable/add.py
 | 
2
+-
M
python/eth_address_declarator/runnable/deploy.py
 | 
4
++--
M
python/eth_token_index/runnable/add.py
 | 
2
+-
M
python/eth_token_index/runnable/deploy.py
 | 
2
+-
M
python/eth_token_index/runnable/list.py
 | 
2
+-
M
python/requirements.txt
 | 
3
++-
M
python/setup.cfg
 | 
4
++--

7 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/python/eth_address_declarator/runnable/add.py b/python/eth_address_declarator/runnable/add.py
@@ -28,7 +28,7 @@ from chainlib.eth.connection import EthHTTPConnection
 from chainlib.eth.tx import receipt
 
 # local imports
-from eth_address_declarator import AddressDeclarator
+from eth_address_declarator.declarator import AddressDeclarator
 
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
diff --git a/python/eth_address_declarator/runnable/deploy.py b/python/eth_address_declarator/runnable/deploy.py
@@ -29,7 +29,7 @@ from chainlib.eth.connection import EthHTTPConnection
 from chainlib.eth.tx import receipt
 
 # local imports
-from eth_address_declarator import AddressDeclarator
+from eth_address_declarator.declarator import AddressDeclarator
 
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
@@ -57,8 +57,8 @@ if args.vv:
 elif args.v:
     logg.setLevel(logging.INFO)
 
-block_last = args.w
 block_all = args.ww
+block_last = args.w or block_all
 
 passphrase_env = 'ETH_PASSPHRASE'
 if args.env_prefix != None:
diff --git a/python/eth_token_index/runnable/add.py b/python/eth_token_index/runnable/add.py
@@ -27,7 +27,7 @@ from chainlib.eth.gas import (
         )
 from chainlib.eth.connection import EthHTTPConnection
 from chainlib.eth.tx import receipt
-from chainlib.eth.erc20 import ERC20
+from eth_erc20 import ERC20
 
 # local imports
 from eth_token_index import TokenUniqueSymbolIndex
diff --git a/python/eth_token_index/runnable/deploy.py b/python/eth_token_index/runnable/deploy.py
@@ -55,8 +55,8 @@ if args.vv:
 elif args.v:
     logg.setLevel(logging.INFO)
 
-block_last = args.w
 block_all = args.ww
+block_last = args.w or block_all
 
 passphrase_env = 'ETH_PASSPHRASE'
 if args.env_prefix != None:
diff --git a/python/eth_token_index/runnable/list.py b/python/eth_token_index/runnable/list.py
@@ -18,7 +18,7 @@ from crypto_dev_signer.eth.signer import ReferenceSigner as EIP155Signer
 from crypto_dev_signer.keystore.dict import DictKeystore
 from chainlib.chain import ChainSpec
 from chainlib.eth.connection import EthHTTPConnection
-from chainlib.eth.erc20 import ERC20
+from eth_erc20 import ERC20
 
 # local imports
 from eth_token_index import TokenUniqueSymbolIndex
diff --git a/python/requirements.txt b/python/requirements.txt
@@ -1,3 +1,4 @@
 confini~=0.3.6rc3
 crypto-dev-signer~=0.4.14b3
-chainlib~=0.0.2b1
+chainlib~=0.0.3a1
+eth_erc20~=0.0.9a1
diff --git a/python/setup.cfg b/python/setup.cfg
@@ -1,10 +1,10 @@
 [metadata]
 name = eth-address-index
-version = 0.1.1a10
+version = 0.1.1a11
 description = Signed metadata declarations for ethereum addresses
 author = Louis Holbrook
 author_email = dev@holbrook.no
-url = https://gitlab.com/nolash/eth-address-declarator
+url = https://gitlab.com/cicnet/eth-address-index
 keywords =
 	ethereum
 classifiers =