Update deps (allow bar token fixture), broaden confini version acceptance

apps/cic-cache/requirements.txt

@@ -1,13 +1,13 @@
-cic-base==0.1.3a3+build.984b5cff
+cic-base~=0.2.0a2
 alembic==1.4.2
-confini~=0.3.6rc3
+confini>=0.3.6rc3,<0.5.0
 uwsgi==2.0.19.1
 moolb~=0.1.0
-cic-eth-registry~=0.5.6a1
+cic-eth-registry~=0.5.6a2
 SQLAlchemy==1.3.20
 semver==2.13.0
 psycopg2==2.8.6
 celery==4.4.7
 redis==3.5.3
-chainsyncer[sql]~=0.0.3a3
+chainsyncer[sql]~=0.0.3a4
-erc20-faucet~=0.2.2a1
+erc20-faucet~=0.2.2a2

apps/cic-eth/cic_eth/version.py

@@ -9,8 +9,8 @@ import semver
 version = (
         0,
         12,
-        0,
+        1,
-        'alpha.2',
+        'alpha.1',
         )
 
 version_object = semver.VersionInfo(

apps/cic-eth/requirements.txt

@@ -1,3 +1,3 @@
 celery==4.4.7
-chainlib~=0.0.5a1
+chainlib~=0.0.5a2
 semver==2.13.0

apps/cic-eth/services_requirements.txt

@@ -1,16 +1,16 @@
-chainsyncer[sql]~=0.0.3a3
+crypto-dev-signer~=0.4.14a7
-chainqueue~=0.0.2b5
+chainsyncer[sql]~=0.0.3a4
+chainqueue~=0.0.2b6
 alembic==1.4.2
-confini~=0.3.6rc4
+confini>=0.3.6rc4,<0.5.0
 redis==3.5.3
 hexathon~=0.0.1a7
 pycryptodome==3.10.1
 liveness~=0.0.1a7
-eth-address-index~=0.1.2a1
+eth-address-index~=0.1.2a2
-eth-accounts-index~=0.0.12a1
+eth-accounts-index~=0.0.12a2
-cic-eth-registry~=0.5.6a1
+cic-eth-registry~=0.5.6a2
-erc20-faucet~=0.2.2a1
+erc20-faucet~=0.2.2a2
-erc20-transfer-authorization~=0.3.2a1
+erc20-transfer-authorization~=0.3.2a2
-sarafu-faucet~=0.0.4a1
+sarafu-faucet~=0.0.4a3
 moolb~=0.1.1b2
-erc20-transfer-authorization~=0.3.2a1

apps/cic-eth/test_requirements.txt

@@ -6,4 +6,4 @@ pytest-redis==2.0.0
 redis==3.5.3
 eth-tester==0.5.0b3
 py-evm==0.3.0a20
-eth-erc20~=0.0.10a2
+eth-erc20~=0.0.10a3

apps/cic-eth/tests/task/test_task_list.py

@@ -28,10 +28,11 @@ def test_ext_tx_collate(
         custodial_roles,
         agent_roles,
         foo_token,
+        bar_token,
         register_tokens,
         cic_registry,
         register_lookups,
-        celery_worker,
+        celery_session_worker,
         ):
 
     rpc = RPCConnection.connect(default_chain_spec, 'default')
@@ -39,8 +40,9 @@ def test_ext_tx_collate(
     gas_oracle = RPCGasOracle(eth_rpc)
 
     c = ERC20(default_chain_spec, signer=eth_signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle)
-    transfer_value = 1000
+    transfer_value_foo = 1000
-    (tx_hash_hex, tx_signed_raw_hex) = c.transfer(foo_token, custodial_roles['FOO_TOKEN_GIFTER'], agent_roles['ALICE'], transfer_value, tx_format=TxFormat.RLP_SIGNED)
+    transfer_value_bar = 1024
+    (tx_hash_hex, tx_signed_raw_hex) = c.transfer(foo_token, custodial_roles['FOO_TOKEN_GIFTER'], agent_roles['ALICE'], transfer_value_foo, tx_format=TxFormat.RLP_SIGNED)
     tx = unpack(bytes.fromhex(strip_0x(tx_signed_raw_hex)), default_chain_spec)
 
     otx = Otx(
@@ -56,9 +58,9 @@ def test_ext_tx_collate(
         tx['from'],
         tx['to'],
         foo_token,
-        foo_token,
+        bar_token,
-        transfer_value,
+        transfer_value_foo,
-        transfer_value,
+        transfer_value_bar,
         666,
         13,
         session=init_database,
@@ -85,5 +87,5 @@ def test_ext_tx_collate(
     tx = r[0]
     assert tx['source_token_symbol'] == 'FOO'
     assert tx['source_token_decimals'] == 6
-    assert tx['destination_token_symbol'] == 'FOO'
+    assert tx['destination_token_symbol'] == 'BAR'
-    assert tx['destination_token_decimals'] == 6
+    assert tx['destination_token_decimals'] == 9

apps/cic-eth/tools_requirements.txt

@@ -1,7 +1,7 @@
-crypto-dev-signer~=0.4.14b6
+crypto-dev-signer~=0.4.14b7
 chainqueue~=0.0.2b5
-confini~=0.3.6rc4
+confini>=0.3.6rc4,<0.5.0
-cic-eth-registry~=0.5.6a1
+cic-eth-registry~=0.5.6a2
 redis==3.5.3
 hexathon~=0.0.1a7
 pycryptodome==3.10.1

apps/data-seeding/requirements.txt

@@ -1,4 +1,4 @@
-sarafu-faucet==0.0.4a1
+sarafu-faucet==0.0.4a3
-cic-eth[tools]==0.12.0a1
+cic-eth[tools]==0.12.1a1
 cic-types==0.1.0a13
-crypto-dev-signer==0.4.14b6
+crypto-dev-signer==0.4.14b7