Merge remote-tracking branch 'origin/master'

apps/cic-cache/requirements.txt

@@ -1,3 +1,4 @@
+cic-base==0.1.3a3+build.4aa03607
 alembic==1.4.2
 confini~=0.3.6rc3
 uwsgi==2.0.19.1

apps/cic-cache/test_requirements.txt

@@ -6,4 +6,5 @@ sqlparse==0.4.1
 pytest-celery==0.0.0a1
 eth_tester==0.5.0b3
 py-evm==0.3.0a20
+cic_base[full]==0.1.3a3+build.4aa03607
 sarafu-faucet~=0.0.4a1

apps/cic-eth/cic_eth/version.py

@@ -10,7 +10,7 @@ version = (
         0,
         11,
         1,
-        'alpha.3',
+        'alpha.2',
         )
 
 version_object = semver.VersionInfo(

apps/cic-eth/requirements.txt

@@ -1,3 +1,4 @@
+cic-base==0.1.3a3+build.4aa03607
 celery==4.4.7
 crypto-dev-signer~=0.4.14b6
 confini~=0.3.6rc3

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

@@ -1 +1 @@
-from cic_eth.pytest.fixtures_celery import *
+from tests.fixtures_celery import *

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

@@ -13,7 +13,6 @@ from chainlib.eth.tx import (
 
 # local imports
 from cic_eth.queue.tx import register_tx
-from cic_eth.error import YouAreBrokeError
 
 logg = logging.getLogger()
 
@@ -168,101 +167,3 @@ def test_erc20_approve_task(
     r = t.get_leaf()
 
     logg.debug('result {}'.format(r))
-
-
-def test_erc20_transfer_from_task(
-        default_chain_spec,
-        foo_token,
-        agent_roles,
-        custodial_roles,
-        eth_signer,
-        eth_rpc,
-        init_database,
-        celery_session_worker,
-        token_roles,
-        ):
-
-    token_object = {
-        'address': foo_token,
-            }
-    transfer_value = 100 * (10 ** 6)
-
-    nonce_oracle = RPCNonceOracle(token_roles['FOO_TOKEN_OWNER'], conn=eth_rpc)
-    c = ERC20(default_chain_spec, signer=eth_signer, nonce_oracle=nonce_oracle) 
-    (tx_hash, o) = c.approve(foo_token, token_roles['FOO_TOKEN_OWNER'], agent_roles['ALICE'], transfer_value)
-    r = eth_rpc.do(o)
-    o = receipt(tx_hash)
-    r = eth_rpc.do(o)
-    assert r['status'] == 1
-
-    s_nonce = celery.signature(
-        'cic_eth.eth.nonce.reserve_nonce',
-        [
-            [token_object],
-            default_chain_spec.asdict(),
-            custodial_roles['FOO_TOKEN_GIFTER'],
-            ],
-        queue=None,
-            )
-    s_transfer = celery.signature(
-            'cic_eth.eth.erc20.transfer_from',
-            [
-                custodial_roles['FOO_TOKEN_GIFTER'],
-                agent_roles['BOB'],
-                transfer_value,
-                default_chain_spec.asdict(),
-                agent_roles['ALICE'],
-                ],
-            queue=None,
-            )
-    s_nonce.link(s_transfer)
-    t = s_nonce.apply_async()
-    r = t.get_leaf()
-
-    logg.debug('result {}'.format(r))
-
-
-def test_erc20_allowance_check_task(
-        default_chain_spec,
-        foo_token,
-        agent_roles,
-        custodial_roles,
-        eth_signer,
-        eth_rpc,
-        init_database,
-        celery_session_worker,
-        token_roles,
-        ):
-
-    token_object = {
-        'address': foo_token,
-        'symbol': 'FOO',
-            }
-    transfer_value = 100 * (10 ** 6)
-
-    s_check = celery.signature(
-        'cic_eth.eth.erc20.check_allowance',
-        [
-            [token_object],
-            custodial_roles['FOO_TOKEN_GIFTER'],
-            transfer_value,
-            default_chain_spec.asdict(),
-            agent_roles['ALICE']
-            ],
-        queue=None,
-            )
-    t = s_check.apply_async()
-    with pytest.raises(YouAreBrokeError):
-        t.get() 
-
-    nonce_oracle = RPCNonceOracle(token_roles['FOO_TOKEN_OWNER'], conn=eth_rpc)
-    c = ERC20(default_chain_spec, signer=eth_signer, nonce_oracle=nonce_oracle) 
-    (tx_hash, o) = c.approve(foo_token, token_roles['FOO_TOKEN_OWNER'], agent_roles['ALICE'], transfer_value)
-    r = eth_rpc.do(o)
-    o = receipt(tx_hash)
-    r = eth_rpc.do(o)
-    assert r['status'] == 1
-
-    t = s_check.apply_async()
-    t.get() 
-    assert t.successful()

apps/cic-notify/cic_notify/version.py

@@ -9,7 +9,7 @@ import semver
 
 logg = logging.getLogger()
 
-version = (0, 4, 0, 'alpha.7')
+version = (0, 4, 0, 'alpha.6')
 
 version_object = semver.VersionInfo(
         major=version[0],

apps/cic-notify/requirements.txt

@@ -1,5 +1 @@
-celery==4.4.7
-confini~=0.3.6rc3
-semver==2.13.0
-SQLAlchemy==1.3.20
-alembic==1.4.2
+cic_base[full_graph]==0.1.3a3+build.4aa03607

apps/cic-ussd/requirements.txt

@@ -1,3 +1,4 @@
-cic-eth~=0.11.1a3
-cic-notify~=0.4.0a7
+cic_base[full_graph]==0.1.3a3+build.4aa03607
+cic-eth~=0.11.1a2
+cic-notify~=0.4.0a6
 cic-types~=0.1.0a11

apps/contract-migration/requirements.txt

@@ -1,3 +1,4 @@
-sarafu-faucet==0.0.3a3
-sarafu-token==0.0.1a8
-cic-eth==0.11.0b16 
+	cic-base[full_graph]==0.1.2b15
+	sarafu-faucet==0.0.3a3
+	sarafu-token==0.0.1a8
+	cic-eth==0.11.0b16 

apps/data-seeding/requirements.txt

@@ -1,4 +1,4 @@
-cic_base[full_graph]==0.1.3a3+build.984b5cff
+cic_base[full_graph]==0.1.3a3+build.4aa03607
 sarafu-faucet==0.0.4a1
 cic-eth==0.11.1a1
 cic-types==0.1.0a13

apps/data-seeding/verify.py

@@ -254,10 +254,6 @@ class Verifier:
             if len(k) > 7 and k[:7] == 'verify_':
                 logg.debug('verifier has verify method {}'.format(k))
                 verifymethods.append(k[7:])
-        o = self.faucet_tx_factory.token_amount(self.faucet_address, sender_address=ZERO_ADDRESS)
-        r = self.conn.do(o)
-        self.faucet_amount = self.faucet_tx_factory.parse_token_amount(r)
-        logg.info('faucet amount set to {} at verify initialization time'.format(self.faucet_amount))
 
         self.state = VerifierState(verifymethods, active_tests=active_tests)
 
@@ -288,7 +284,6 @@ class Verifier:
         except ValueError:
             actual_balance = int(r)
         balance = int(balance / 1000000) * 1000000
-        balance += self.faucet_amount
         logg.debug('balance for {}: {}'.format(address, balance))
         if balance != actual_balance:
             raise VerifierError((actual_balance, balance), 'balance')

apps/util/requirements/base_requirement.txt

@@ -1 +1 @@
-cic-base==0.1.3a3+build.984b5cff
+cic-base==0.1.3a3+build.4aa03607

apps/util/requirements/check_local.sh

@@ -1,33 +0,0 @@
-#!/bin/bash
-
-MODULE_ROOT='../..'
-repos=($MODULE_ROOT/cic-cache $MODULE_ROOT/cic-eth $MODULE_ROOT/cic-ussd $MODULE_ROOT/cic-notify)
-
-sumd=$(realpath ./local_package_sums)
-mkdir -vp $sumd
-
-for r in ${repos[@]}; do
-	b=$(basename $r)
-	pushd $r
-	rm -v dist/*
-	python setup.py sdist
-	f=`ls dist/`
-	cp -v dist/$f $sumd/$b.tar.gz
-	pushd $sumd
-	if [ -f $b.sha256sum ]; then
-		echo "sha256sum -c $b.sha256sum"
-		sha256sum $b.tar.gz
-		cat $b.sha256sum
-		sha256sum -c $b.sha256sum
-		if [ $? -gt 0 ]; then
-			>&2 echo "sum mismatch for $f"
-			sha256sum $b.whl > $b.sha256sum
-		else
-			>&2 echo "sum match (no change) for $f"
-		fi
-	else
-		sha256sum $b.tar.gz > $b.sha256sum
-	fi
-	popd
-	popd
-done

apps/util/requirements/compile.sh

@@ -1,58 +0,0 @@
-#!/bin/bash
-
-set +x
-which pyreq-merge &> /dev/null
-if [ $? -gt 0 ]; then
-	>&2 echo pyreq-merge missing, please install requirements
-	exit 1
-fi
-
-PIP_INDEX_URL=${PIP_INDEX_URL:-http://localhost/python}
-in=$(mktemp)
-out=$(mktemp)
->&2 echo using tmp $t
-cat ../../requirements.txt > $out
-
-repos=(../../cic-cache ../../cic-eth ../../cic-ussd ../../data-seeding ../../cic-notify ../../contract-migration)
-
-
-for r in ${repos[@]}; do
-	f="$r/requirements.txt"
-	>&2 echo updating $f
-	pyreq-merge $f $out -vv > $in
-	if [ $? -gt 0 ]; then
-		>&2 echo requirement prepare failed for $f
-		exit 1
-	fi
-	cp $in $out
-
-	f="$r/test_requirements.txt"
-	if [ -f $f ]; then
-		>&2 echo updating $f
-		pyreq-merge $f $out -vv > $in
-		if [ $? -gt 0 ]; then
-			>&2 echo requirement prepare failed for $f
-			exit 1
-		fi
-		cp $in $out
-	fi
-done
-cp -v $out compiled_requirements.txt
-
-outd=$(mktemp -d)
-for r in ${repos[@]}; do
-	f=$(realpath $r/requirements.txt)
-	b=$(basename $f)
-	b_in=$b.in
-	d=$(basename $r)
-	echo output to $outd/$d/$b_in
-	mkdir -vp $outd/$d
-	echo "-r $f" > $outd/$d/$b_in
-	pyreq-update -v $f compiled_requirements.txt >> $outd/$d/$b_in
-	pip-compile --pre -v --extra-index-url $PIP_INDEX_URL $outd/$d/$b_in -o $outd/$d/$b
-	if [ $? -gt 0 ]; then
-		>&2 echo requirement compile failed for $f
-		exit 1
-	fi
-done
-set -x

apps/util/requirements/requirements.txt

@@ -1,2 +1 @@
-requirements-magic~=0.0.3a1
-pip-tools==6.2.0
+requirements-magic~=0.0.2

apps/util/requirements/update_base.sh

@@ -14,11 +14,8 @@ repos=(../../cic-cache ../../cic-eth ../../cic-ussd ../../data-seeding ../../cic
 for r in ${repos[@]}; do
 	f="$r/requirements.txt"
 	>&2 echo updating $f
-	pyreq-update $f base_requirement.txt -vv > $t 
-	cp $t $f
-
 	f="$r/test_requirements.txt"
 	>&2 echo updating $f
-	pyreq-update $f base_requirement.txt -vv > $t 
+	pyreq-update $f base_requirement.txt > $t
 	cp $t $f
 done