Add local session garbage collect to cic-ussd

Fix missing session passing for nonce reserve teste
Typo in session
2021-07-14 23:48:41 +02:00 · 2021-07-14 23:45:23 +02:00 · 2021-07-14 23:17:32 +02:00 · 2021-07-14 22:56:03 +02:00 · 2021-07-14 22:37:01 +02:00 · 2021-07-14 22:29:28 +02:00
23 changed files with 94 additions and 150 deletions
--- a/apps/cic-eth/cic_eth/db/migrations/default/versions/0ec0d6d1e785_add_chainqueue.py
+++ b/apps/cic-eth/cic_eth/db/migrations/default/versions/0ec0d6d1e785_add_chainqueue.py
@@ -8,8 +8,7 @@ Create Date: 2021-04-02 18:30:55.398388
 from alembic import op
 import sqlalchemy as sa

-#from chainqueue.db.migrations.sqlalchemy import (
-from chainqueue.db.migrations.default.export import (
+from chainqueue.db.migrations.sqlalchemy import (
        chainqueue_upgrade,
        chainqueue_downgrade,
        )
--- a/apps/cic-eth/cic_eth/db/migrations/default/versions/b125cbf81e32_add_chain_syncer.py
+++ b/apps/cic-eth/cic_eth/db/migrations/default/versions/b125cbf81e32_add_chain_syncer.py
@@ -8,7 +8,7 @@ Create Date: 2021-04-02 18:36:44.459603
 from alembic import op
 import sqlalchemy as sa

-from chainsyncer.db.migrations.default.export import (
+from chainsyncer.db.migrations.sqlalchemy import (
        chainsyncer_upgrade,
        chainsyncer_downgrade,
        )
--- a/apps/cic-eth/cic_eth/runnable/create.py
+++ b/apps/cic-eth/cic_eth/runnable/create.py
@@ -80,12 +80,7 @@ def main():
    t = api.create_account(register=register)

    ps.get_message()
-    try:
-        o = ps.get_message(timeout=args.timeout)
-    except TimeoutError as e:
-        sys.stderr.write('got no new address from cic-eth before timeout: {}\n'.format(e))
-        sys.exit(1) 
-    ps.unsubscribe()
+    o = ps.get_message(timeout=args.timeout)
    m = json.loads(o['data'])
    print(m['result'])

--- a/apps/cic-eth/services_requirements.txt
+++ b/apps/cic-eth/services_requirements.txt
@@ -1,5 +1,5 @@
-chainsyncer[sql]~=0.0.4a1
-chainqueue~=0.0.3a1
+chainsyncer[sql]~=0.0.3a5
+chainqueue~=0.0.2b7
 alembic==1.4.2
 confini>=0.3.6rc4,<0.5.0
 redis==3.5.3
--- a/apps/cic-eth/tools_requirements.txt
+++ b/apps/cic-eth/tools_requirements.txt
@@ -1,5 +1,5 @@
 crypto-dev-signer~=0.4.14b7
-chainqueue~=0.0.2b6
+chainqueue~=0.0.2b5
 confini>=0.3.6rc4,<0.5.0
 cic-eth-registry~=0.5.6a2
 redis==3.5.3
--- a/apps/cic-ussd/cic_ussd/runnable/daemons/cic_user_server.py
+++ b/apps/cic-ussd/cic_ussd/runnable/daemons/cic_user_server.py
@@ -28,7 +28,7 @@ elif args.v:
    logging.getLogger().setLevel(logging.INFO)

 # parse config
-config = Config(args.c, env_prefix=args.env_prefix)
+config = Config(config_dir=args.c, env_prefix=args.env_prefix)
 config.process()
 config.censor('PASSWORD', 'DATABASE')
 logg.debug('config loaded from {}:\n{}'.format(args.c, config))
--- a/apps/cic-ussd/cic_ussd/runnable/daemons/cic_user_ussd_server.py
+++ b/apps/cic-ussd/cic_ussd/runnable/daemons/cic_user_ussd_server.py
@@ -45,7 +45,7 @@ elif args.v:
    logging.getLogger().setLevel(logging.INFO)

 # parse config
-config = Config(args.c, env_prefix=args.env_prefix)
+config = Config(config_dir=args.c, env_prefix=args.env_prefix)
 config.process()
 config.censor('PASSWORD', 'DATABASE')
 logg.debug('config loaded from {}:\n{}'.format(args.c, config))
--- a/apps/cic-ussd/scripts/migrate.py
+++ b/apps/cic-ussd/scripts/migrate.py
@@ -30,7 +30,7 @@ arg_parser.add_argument('-vv', action='store_true', help='be more verbose')
 args = arg_parser.parse_args()


-config = Config(args.c, env_prefix=args.env_prefix)
+config = Config(config_dir=args.c, env_prefix=args.env_prefix)
 config.process()
 config.censor('PASSWORD', 'DATABASE')
 logg.debug(f'config:\n{config}')
--- a/apps/contract-migration/config_template/bancor.ini
+++ b/apps/contract-migration/config_template/bancor.ini
@@ -0,0 +1,2 @@
+[bancor]
+dir = /usr/local/share/cic/bancor
--- a/apps/contract-migration/config_template/chain.ini
+++ b/apps/contract-migration/config_template/chain.ini
@@ -1,2 +0,0 @@
-[chain]
-spec = evm:ethereum:1
--- a/apps/contract-migration/config_template/redis.ini
+++ b/apps/contract-migration/config_template/redis.ini
@@ -1,4 +0,0 @@
-[redis]
-host = localhost
-port = 63379
-db = 0
--- a/apps/contract-migration/config_template/rpc.ini
+++ b/apps/contract-migration/config_template/rpc.ini
@@ -1,5 +0,0 @@
-[rpc]
-http_provider = http://localhost:8545
-http_authentication = 
-http_username =
-http_password =
--- a/apps/contract-migration/config_template/token.ini
+++ b/apps/contract-migration/config_template/token.ini
@@ -1,8 +0,0 @@
-[token]
-name =
-symbol =
-decimals =
-demurrage_level =
-redistribution_period =
-sink_address =
-supply_limit = 0
--- a/apps/contract-migration/config_template/wallet.ini
+++ b/apps/contract-migration/config_template/wallet.ini
@@ -1,3 +0,0 @@
-[wallet]
-key_file = 
-passphrase = 
--- a/apps/contract-migration/docker/Dockerfile
+++ b/apps/contract-migration/docker/Dockerfile
@@ -14,18 +14,17 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com  --recv-keys 2A518C819BE37D2C20
 RUN mkdir -vp /usr/local/etc/cic

 ENV CONFINI_DIR /usr/local/etc/cic/
-#RUN mkdir -vp $CONFINI_DIR
+RUN mkdir -vp $CONFINI_DIR

-#ARG cic_config_commit=24287fb253196820f23ff8a7177b122f2cd99a11
-#ARG cic_config_url=https://gitlab.com/grassrootseconomics/cic-config.git/
-#RUN echo Install confini schema files && \
-#	git clone --depth 1 $cic_config_url cic-config && \
-#	cd cic-config && \
-#	git fetch --depth 1 origin $cic_config_commit && \
-#	git checkout $cic_config_commit && \	
-#	cp -v *.ini $CONFINI_DIR
+ARG cic_config_commit=0abe0867f18077907c7023bf0ef5e466a3984dd8
+ARG cic_config_url=https://gitlab.com/grassrootseconomics/cic-config.git/
+RUN echo Install confini schema files && \
+	git clone --depth 1 $cic_config_url cic-config && \
+	cd cic-config && \
+	git fetch --depth 1 origin $cic_config_commit && \
+	git checkout $cic_config_commit && \	
+	cp -v *.ini $CONFINI_DIR

-COPY config_template/ /usr/local/etc/cic/
 COPY requirements.txt . 

 ARG pip_index_url=https://pypi.org/simple
--- a/apps/contract-migration/requirements.txt
+++ b/apps/contract-migration/requirements.txt
@@ -1,11 +1,5 @@
-sarafu-faucet~=0.0.4a4
-cic-eth[tools]==0.12.1a2
+cic_base[full]==0.1.3a4+build.ce68c833
+sarafu-faucet~=0.0.4a1
+cic-eth[tools]==0.12.0a2
 eth-erc20~=0.0.10a3
-erc20-demurrage-token==0.0.2a4
-eth-address-index~=0.1.2a2
-eth-accounts-index~=0.0.12a2
-cic-eth-registry~=0.5.6a2
-erc20-faucet~=0.2.2a2
-erc20-transfer-authorization~=0.3.2a2
-sarafu-faucet~=0.0.4a3
-chainlib-eth~=0.0.5a4
+erc20-demurrage-token==0.0.2a3
--- a/apps/contract-migration/seed_cic_eth.sh
+++ b/apps/contract-migration/seed_cic_eth.sh
@@ -15,6 +15,10 @@ CIC_DATA_DIR=${CIC_DATA_DIR:-/tmp/cic}
 ETH_PASSPHRASE=''
 CIC_DEFAULT_TOKEN_SYMBOL=${CIC_DEFAULT_TOKEN_SYMBOL:-GFT}
 TOKEN_SYMBOL=$CIC_DEFAULT_TOKEN_SYMBOL
+if [[ $CIC_DEFAULT_TOKEN_SYMBOL != 'GFT' && $CIC_DEFAULT_TOKEN_SYMBOL != 'SRF' ]]; then
+	>&2 echo CIC_DEFAULT_TOKEN_SYMBOL must be one of [GFT,SRF], but was $CIC_DEFAULT_TOKEN_SYMBOL
+	exit 1
+fi

 # Debug flag
 DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER=0xEb3907eCad74a0013c259D5874AE7f22DcBcC95C
@@ -73,13 +77,13 @@ eth-accounts-index-writer -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER

 # Transfer gas to custodial gas provider adddress
 >&2 echo gift gas to gas gifter
->&2 eth-gas --send -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w $debug -a $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 --send -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w $debug -a $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 --send -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w $debug -a $DEV_ETH_ACCOUNT_ACCOUNT_REGISTRY_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
--- a/apps/data-seeding/README.md
+++ b/apps/data-seeding/README.md
@@ -167,7 +167,7 @@ If you have previously run the `cic_ussd` import incompletely, it could be a goo

 Then, in sequence, run in first terminal:

-`python cic_ussd/import_balance.py -v -c config -p <eth_provider> -r <cic_registry_address> --token-symbol <token_symbol> -y ../contract-migration/keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c out`
+`python cic_eth/import_balance.py -v -c config -p <eth_provider> -r <cic_registry_address> --token-symbol <token_symbol> -y ../keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c out`

 In second terminal:

--- a/apps/data-seeding/cic_meta/import_meta.js
+++ b/apps/data-seeding/cic_meta/import_meta.js
@@ -11,6 +11,7 @@ const config = new crdt.Config('./config');
 config.process();
 console.log(config);

+
 function sendit(uid, envelope) {
 	const d = envelope.toJSON();

--- a/apps/data-seeding/package-lock.json
+++ b/apps/data-seeding/package-lock.json
@@ -6,7 +6,7 @@
    "": {
      "dependencies": {
        "@cicnet/cic-client-meta": "^0.0.11",
-        "@cicnet/crdt-meta": "^0.0.12",
+        "@cicnet/crdt-meta": "^0.0.10",
        "vcard-parser": "^1.0.0"
      }
    },
@@ -34,7 +34,7 @@
        "node": ">=14.16.1"
      }
    },
-    "node_modules/@cicnet/cic-client-meta/node_modules/@cicnet/crdt-meta": {
+    "node_modules/@cicnet/crdt-meta": {
      "version": "0.0.10",
      "resolved": "https://registry.npmjs.org/@cicnet/crdt-meta/-/crdt-meta-0.0.10.tgz",
      "integrity": "sha512-f+H6BQA2tE718KuNYiNzrDJN4wY00zeuhXM6aPKJUX6nryzX9g2r0yf8iDhkz+Fts1R6M7Riz73MfFEa8fgvsw==",
@@ -48,36 +48,22 @@
        "node": ">=14.16.1"
      }
    },
-    "node_modules/@cicnet/crdt-meta": {
-      "version": "0.0.12",
-      "resolved": "https://registry.npmjs.org/@cicnet/crdt-meta/-/crdt-meta-0.0.12.tgz",
-      "integrity": "sha512-wPX86P1Lsq4RxkVUlhlouhLkMOtkqzHgpNuXicHvWuhH3ks2Nsg7yqvTw9yt+kqj+N8a5pPMrNhKvUEFW8rJjA==",
-      "dependencies": {
-        "automerge": "^0.14.2",
-        "ini": "^1.3.8",
-        "openpgp": "^4.10.8",
-        "readline-sync": "^1.4.10"
-      },
-      "engines": {
-        "node": ">=14.16.1"
-      }
-    },
    "node_modules/@ethereumjs/common": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-2.4.0.tgz",
-      "integrity": "sha512-UdkhFWzWcJCZVsj1O/H8/oqj/0RVYjLc1OhPjBrQdALAkQHpCp8xXI4WLnuGTADqTdJZww0NtgwG+TRPkXt27w==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-2.3.0.tgz",
+      "integrity": "sha512-Fmi15MdVptsC85n6NcUXIFiiXCXWEfZNgPWP+OGAQOC6ZtdzoNawtxH/cYpIgEgSuIzfOeX3VKQP/qVI1wISHg==",
      "dependencies": {
        "crc-32": "^1.2.0",
-        "ethereumjs-util": "^7.1.0"
+        "ethereumjs-util": "^7.0.10"
      }
    },
    "node_modules/@ethereumjs/tx": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-3.3.0.tgz",
-      "integrity": "sha512-yTwEj2lVzSMgE6Hjw9Oa1DZks/nKTWM8Wn4ykDNapBPua2f4nXO3qKnni86O6lgDj5fVNRqbDsD0yy7/XNGDEA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-3.2.0.tgz",
+      "integrity": "sha512-D3X/XtZ3ldUg34hr99Jvj7NxW3NxVKdUKrwQnEWlAp4CmCQpvYoyn7NF4lk34rHEt7ScS+Agu01pcDHoOcd19A==",
      "dependencies": {
-        "@ethereumjs/common": "^2.4.0",
-        "ethereumjs-util": "^7.1.0"
+        "@ethereumjs/common": "^2.3.0",
+        "ethereumjs-util": "^7.0.10"
      }
    },
    "node_modules/@types/bn.js": {
@@ -89,9 +75,9 @@
      }
    },
    "node_modules/@types/node": {
-      "version": "16.3.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.3.2.tgz",
-      "integrity": "sha512-jJs9ErFLP403I+hMLGnqDRWT0RYKSvArxuBVh2veudHV7ifEC1WAmjJADacZ7mRbA2nWgHtn8xyECMAot0SkAw=="
+      "version": "15.12.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.12.0.tgz",
+      "integrity": "sha512-+aHJvoCsVhO2ZCuT4o5JtcPrCPyDE3+1nvbDprYes+pPkEsbjH7AGUCNtjMOXS0fqH14t+B7yLzaqSz92FPWyw=="
    },
    "node_modules/@types/pbkdf2": {
      "version": "3.1.0",
@@ -102,9 +88,9 @@
      }
    },
    "node_modules/@types/secp256k1": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@types/secp256k1/-/secp256k1-4.0.3.tgz",
-      "integrity": "sha512-Da66lEIFeIz9ltsdMZcpQvmrmmoqrfju8pm1BH8WbYjZSwUgCwXLb9C+9XYogwBITnbsSaMdVPb2ekf7TV+03w==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/secp256k1/-/secp256k1-4.0.2.tgz",
+      "integrity": "sha512-QMg+9v0bbNJ2peLuHRWxzmy0HRJIG6gFZNhaRSp7S3ggSbCCxiqQB2/ybvhXyhHOCequpNkrx7OavNhrWOsW0A==",
      "dependencies": {
        "@types/node": "*"
      }
@@ -287,9 +273,9 @@
      }
    },
    "node_modules/blakejs": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.1.1.tgz",
-      "integrity": "sha512-bLG6PHOCZJKNshTjGRBvET0vTciwQE6zFKOKKXPDJfwFBd4Ac0yBfPZqcGvGJap50l7ktvlpFqc2jGVaUgbJgg=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.1.0.tgz",
+      "integrity": "sha1-ad+S75U6qIylGjLfarHFShVfx6U="
    },
    "node_modules/block-stream": {
      "version": "0.0.9",
@@ -653,9 +639,9 @@
      }
    },
    "node_modules/ethereumjs-util": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-7.1.0.tgz",
-      "integrity": "sha512-kR+vhu++mUDARrsMMhsjjzPduRVAeundLGXucGRHF3B4oEltOUspfgCVco4kckucj3FMlLaZHUl9n7/kdmr6Tw==",
+      "version": "7.0.10",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-7.0.10.tgz",
+      "integrity": "sha512-c/xThw6A+EAnej5Xk5kOzFzyoSnw0WX0tSlZ6pAsfGVvQj3TItaDg9b1+Fz1RJXA+y2YksKwQnuzgt1eY6LKzw==",
      "dependencies": {
        "@types/bn.js": "^5.1.0",
        "bn.js": "^5.1.2",
@@ -1162,9 +1148,9 @@
      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
    },
    "node_modules/needle": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-2.8.0.tgz",
-      "integrity": "sha512-ZTq6WYkN/3782H1393me3utVYdq2XyqNUFBsprEE3VMAT0+hP/cItpnITpqsY6ep2yeFE4Tqtqwc74VqUlUYtw==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz",
+      "integrity": "sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==",
      "dependencies": {
        "debug": "^3.2.6",
        "iconv-lite": "^0.4.4",
@@ -2139,9 +2125,9 @@
      }
    },
    "node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "version": "20.2.7",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
+      "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
      "engines": {
        "node": ">=10"
      }
@@ -2203,25 +2189,12 @@
        "pg": "^8.4.2",
        "sqlite3": "^5.0.0",
        "yargs": "^16.1.0"
-      },
-      "dependencies": {
-        "@cicnet/crdt-meta": {
-          "version": "0.0.10",
-          "resolved": "https://registry.npmjs.org/@cicnet/crdt-meta/-/crdt-meta-0.0.10.tgz",
-          "integrity": "sha512-f+H6BQA2tE718KuNYiNzrDJN4wY00zeuhXM6aPKJUX6nryzX9g2r0yf8iDhkz+Fts1R6M7Riz73MfFEa8fgvsw==",
-          "requires": {
-            "automerge": "^0.14.2",
-            "ini": "^1.3.8",
-            "openpgp": "^4.10.8",
-            "readline-sync": "^1.4.10"
-          }
-        }
      }
    },
    "@cicnet/crdt-meta": {
-      "version": "0.0.12",
-      "resolved": "https://registry.npmjs.org/@cicnet/crdt-meta/-/crdt-meta-0.0.12.tgz",
-      "integrity": "sha512-wPX86P1Lsq4RxkVUlhlouhLkMOtkqzHgpNuXicHvWuhH3ks2Nsg7yqvTw9yt+kqj+N8a5pPMrNhKvUEFW8rJjA==",
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/@cicnet/crdt-meta/-/crdt-meta-0.0.10.tgz",
+      "integrity": "sha512-f+H6BQA2tE718KuNYiNzrDJN4wY00zeuhXM6aPKJUX6nryzX9g2r0yf8iDhkz+Fts1R6M7Riz73MfFEa8fgvsw==",
      "requires": {
        "automerge": "^0.14.2",
        "ini": "^1.3.8",
@@ -2230,21 +2203,21 @@
      }
    },
    "@ethereumjs/common": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-2.4.0.tgz",
-      "integrity": "sha512-UdkhFWzWcJCZVsj1O/H8/oqj/0RVYjLc1OhPjBrQdALAkQHpCp8xXI4WLnuGTADqTdJZww0NtgwG+TRPkXt27w==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-2.3.0.tgz",
+      "integrity": "sha512-Fmi15MdVptsC85n6NcUXIFiiXCXWEfZNgPWP+OGAQOC6ZtdzoNawtxH/cYpIgEgSuIzfOeX3VKQP/qVI1wISHg==",
      "requires": {
        "crc-32": "^1.2.0",
-        "ethereumjs-util": "^7.1.0"
+        "ethereumjs-util": "^7.0.10"
      }
    },
    "@ethereumjs/tx": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-3.3.0.tgz",
-      "integrity": "sha512-yTwEj2lVzSMgE6Hjw9Oa1DZks/nKTWM8Wn4ykDNapBPua2f4nXO3qKnni86O6lgDj5fVNRqbDsD0yy7/XNGDEA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-3.2.0.tgz",
+      "integrity": "sha512-D3X/XtZ3ldUg34hr99Jvj7NxW3NxVKdUKrwQnEWlAp4CmCQpvYoyn7NF4lk34rHEt7ScS+Agu01pcDHoOcd19A==",
      "requires": {
-        "@ethereumjs/common": "^2.4.0",
-        "ethereumjs-util": "^7.1.0"
+        "@ethereumjs/common": "^2.3.0",
+        "ethereumjs-util": "^7.0.10"
      }
    },
    "@types/bn.js": {
@@ -2256,9 +2229,9 @@
      }
    },
    "@types/node": {
-      "version": "16.3.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.3.2.tgz",
-      "integrity": "sha512-jJs9ErFLP403I+hMLGnqDRWT0RYKSvArxuBVh2veudHV7ifEC1WAmjJADacZ7mRbA2nWgHtn8xyECMAot0SkAw=="
+      "version": "15.12.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.12.0.tgz",
+      "integrity": "sha512-+aHJvoCsVhO2ZCuT4o5JtcPrCPyDE3+1nvbDprYes+pPkEsbjH7AGUCNtjMOXS0fqH14t+B7yLzaqSz92FPWyw=="
    },
    "@types/pbkdf2": {
      "version": "3.1.0",
@@ -2269,9 +2242,9 @@
      }
    },
    "@types/secp256k1": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@types/secp256k1/-/secp256k1-4.0.3.tgz",
-      "integrity": "sha512-Da66lEIFeIz9ltsdMZcpQvmrmmoqrfju8pm1BH8WbYjZSwUgCwXLb9C+9XYogwBITnbsSaMdVPb2ekf7TV+03w==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/secp256k1/-/secp256k1-4.0.2.tgz",
+      "integrity": "sha512-QMg+9v0bbNJ2peLuHRWxzmy0HRJIG6gFZNhaRSp7S3ggSbCCxiqQB2/ybvhXyhHOCequpNkrx7OavNhrWOsW0A==",
      "requires": {
        "@types/node": "*"
      }
@@ -2439,9 +2412,9 @@
      }
    },
    "blakejs": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.1.1.tgz",
-      "integrity": "sha512-bLG6PHOCZJKNshTjGRBvET0vTciwQE6zFKOKKXPDJfwFBd4Ac0yBfPZqcGvGJap50l7ktvlpFqc2jGVaUgbJgg=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.1.0.tgz",
+      "integrity": "sha1-ad+S75U6qIylGjLfarHFShVfx6U="
    },
    "block-stream": {
      "version": "0.0.9",
@@ -2755,9 +2728,9 @@
      }
    },
    "ethereumjs-util": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-7.1.0.tgz",
-      "integrity": "sha512-kR+vhu++mUDARrsMMhsjjzPduRVAeundLGXucGRHF3B4oEltOUspfgCVco4kckucj3FMlLaZHUl9n7/kdmr6Tw==",
+      "version": "7.0.10",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-7.0.10.tgz",
+      "integrity": "sha512-c/xThw6A+EAnej5Xk5kOzFzyoSnw0WX0tSlZ6pAsfGVvQj3TItaDg9b1+Fz1RJXA+y2YksKwQnuzgt1eY6LKzw==",
      "requires": {
        "@types/bn.js": "^5.1.0",
        "bn.js": "^5.1.2",
@@ -3184,9 +3157,9 @@
      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
    },
    "needle": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-2.8.0.tgz",
-      "integrity": "sha512-ZTq6WYkN/3782H1393me3utVYdq2XyqNUFBsprEE3VMAT0+hP/cItpnITpqsY6ep2yeFE4Tqtqwc74VqUlUYtw==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz",
+      "integrity": "sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==",
      "requires": {
        "debug": "^3.2.6",
        "iconv-lite": "^0.4.4",
@@ -3971,9 +3944,9 @@
      }
    },
    "yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="
+      "version": "20.2.7",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
+      "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw=="
    }
  }
 }
--- a/apps/data-seeding/package.json
+++ b/apps/data-seeding/package.json
@@ -1,7 +1,7 @@
 {
  "dependencies": {
    "@cicnet/cic-client-meta": "^0.0.11",
-    "@cicnet/crdt-meta": "^0.0.12",
+    "@cicnet/crdt-meta": "^0.0.10",
    "vcard-parser": "^1.0.0"
  }
 }
--- a/apps/data-seeding/requirements.txt
+++ b/apps/data-seeding/requirements.txt
@@ -10,4 +10,3 @@ eth-contract-registry~=0.5.6a1
 eth-accounts-index~=0.0.12a1
 eth-erc20~=0.0.10a3
 erc20-faucet~=0.2.2a1
-psycopg2==2.8.6
--- a/apps/data-seeding/verify.py
+++ b/apps/data-seeding/verify.py
@@ -290,7 +290,7 @@ class Verifier:
            actual_balance = int(r)
        balance = int(balance / 1000000) * 1000000
        balance += self.faucet_amount
-        logg.info('balance for {}: {}'.format(address, balance))
+        logg.debug('balance for {}: {}'.format(address, balance))
        if balance != actual_balance:
            raise VerifierError((actual_balance, balance), 'balance')
Author	SHA1	Message	Date
nolash	eb50f2b485	Add local session garbage collect to cic-ussd	2021-07-14 23:48:41 +02:00
nolash	bb92b417e2	Fix missing session passing for nonce reserve teste	2021-07-14 23:45:23 +02:00
nolash	6f3069b90c	Typo in session	2021-07-14 23:17:32 +02:00
nolash	e9886dbb3e	Execute address translate test as celery task	2021-07-14 22:56:03 +02:00
nolash	855fc271a5	Merge branch 'master' into lash/dispatcher-leak	2021-07-14 22:37:01 +02:00
nolash	8290e10315	Upgrade cic-cache deps	2021-07-14 22:29:28 +02:00
nolash	dbaf3370db	plug sessionbase leak	2021-07-14 22:04:05 +02:00
nolash	b63595ed5c	Merge remote-tracking branch 'origin/master' into lash/dispatcher-leak	2021-07-14 17:08:42 +02:00
nolash	0131a29417	Remove session leak better	2021-07-14 14:43:51 +02:00
nolash	8b2652e551	Remove session leak	2021-07-14 14:40:47 +02:00
nolash	af6951f1f7	Merge remote-tracking branch 'origin/master' into lash/dispatcher-leak	2021-07-12 18:59:37 +02:00
nolash	b8e98fade7	trigger ci	2021-07-12 12:34:44 +02:00
nolash	f8dc188107	Merge remote-tracking branch 'origin/master' into lash/dispatcher-leak	2021-07-12 12:29:46 +02:00
nolash	255bf72c12	Move conn constructor to loop method	2021-07-11 15:10:57 +02:00