From a803b59cbffc90b5e377a41605dd4b0ae4d5c07d Mon Sep 17 00:00:00 2001 From: nolash Date: Fri, 16 Jul 2021 14:34:54 +0200 Subject: [PATCH] Rehailitate contract migration config/requirements --- apps/cic-eth/cic_eth/runnable/create.py | 7 +- apps/cic-eth/tools_requirements.txt | 2 +- .../config_template/bancor.ini | 2 - .../config_template/redis.ini | 4 + apps/contract-migration/docker/Dockerfile | 19 +-- apps/contract-migration/requirements.txt | 14 +- apps/contract-migration/seed_cic_eth.sh | 6 +- apps/data-seeding/cic_meta/import_meta.js | 1 - apps/data-seeding/package-lock.json | 145 +++++++++++------- apps/data-seeding/package.json | 2 +- apps/data-seeding/verify.py | 2 +- 11 files changed, 122 insertions(+), 82 deletions(-) delete mode 100644 apps/contract-migration/config_template/bancor.ini create mode 100644 apps/contract-migration/config_template/redis.ini diff --git a/apps/cic-eth/cic_eth/runnable/create.py b/apps/cic-eth/cic_eth/runnable/create.py index 66ba619f..973ac2f5 100644 --- a/apps/cic-eth/cic_eth/runnable/create.py +++ b/apps/cic-eth/cic_eth/runnable/create.py @@ -80,7 +80,12 @@ def main(): t = api.create_account(register=register) ps.get_message() - o = ps.get_message(timeout=args.timeout) + 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() m = json.loads(o['data']) print(m['result']) diff --git a/apps/cic-eth/tools_requirements.txt b/apps/cic-eth/tools_requirements.txt index 0920b4b2..7e9d74c1 100644 --- 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.2b5 +chainqueue~=0.0.2b6 confini>=0.3.6rc4,<0.5.0 cic-eth-registry~=0.5.6a2 redis==3.5.3 diff --git a/apps/contract-migration/config_template/bancor.ini b/apps/contract-migration/config_template/bancor.ini deleted file mode 100644 index 443924f5..00000000 --- a/apps/contract-migration/config_template/bancor.ini +++ /dev/null @@ -1,2 +0,0 @@ -[bancor] -dir = /usr/local/share/cic/bancor diff --git a/apps/contract-migration/config_template/redis.ini b/apps/contract-migration/config_template/redis.ini new file mode 100644 index 00000000..ea321378 --- /dev/null +++ b/apps/contract-migration/config_template/redis.ini @@ -0,0 +1,4 @@ +[redis] +host = localhost +port = 63379 +db = 0 diff --git a/apps/contract-migration/docker/Dockerfile b/apps/contract-migration/docker/Dockerfile index 2c588fd2..e90e6995 100644 --- a/apps/contract-migration/docker/Dockerfile +++ b/apps/contract-migration/docker/Dockerfile @@ -14,17 +14,18 @@ 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=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 +#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 +COPY config_template/ /usr/local/etc/cic/ COPY requirements.txt . ARG pip_index_url=https://pypi.org/simple diff --git a/apps/contract-migration/requirements.txt b/apps/contract-migration/requirements.txt index 1fd19d3a..223e7c46 100644 --- a/apps/contract-migration/requirements.txt +++ b/apps/contract-migration/requirements.txt @@ -1,5 +1,11 @@ -cic_base[full]==0.1.3a4+build.ce68c833 -sarafu-faucet~=0.0.4a1 -cic-eth[tools]==0.12.0a2 +sarafu-faucet~=0.0.4a4 +cic-eth[tools]==0.12.1a2 eth-erc20~=0.0.10a3 -erc20-demurrage-token==0.0.2a3 +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 diff --git a/apps/contract-migration/seed_cic_eth.sh b/apps/contract-migration/seed_cic_eth.sh index d9a3f8e2..5865dd6a 100755 --- a/apps/contract-migration/seed_cic_eth.sh +++ b/apps/contract-migration/seed_cic_eth.sh @@ -77,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 $DEV_ETH_ACCOUNT_GAS_GIFTER $gas_amount +>&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 echo gift gas to sarafu token owner ->&2 eth-gas --send -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w $debug $DEV_ETH_ACCOUNT_SARAFU_GIFTER $gas_amount +>&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 echo gift gas to account index owner ->&2 eth-gas --send -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w $debug $DEV_ETH_ACCOUNT_ACCOUNT_REGISTRY_WRITER $gas_amount +>&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 # Send token to token creator diff --git a/apps/data-seeding/cic_meta/import_meta.js b/apps/data-seeding/cic_meta/import_meta.js index c9e5fe7d..469c2f52 100644 --- a/apps/data-seeding/cic_meta/import_meta.js +++ b/apps/data-seeding/cic_meta/import_meta.js @@ -11,7 +11,6 @@ const config = new crdt.Config('./config'); config.process(); console.log(config); - function sendit(uid, envelope) { const d = envelope.toJSON(); diff --git a/apps/data-seeding/package-lock.json b/apps/data-seeding/package-lock.json index e2da1566..e9d81174 100644 --- 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.10", + "@cicnet/crdt-meta": "^0.0.12", "vcard-parser": "^1.0.0" } }, @@ -34,7 +34,7 @@ "node": ">=14.16.1" } }, - "node_modules/@cicnet/crdt-meta": { + "node_modules/@cicnet/cic-client-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,22 +48,36 @@ "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.3.0", - "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-2.3.0.tgz", - "integrity": "sha512-Fmi15MdVptsC85n6NcUXIFiiXCXWEfZNgPWP+OGAQOC6ZtdzoNawtxH/cYpIgEgSuIzfOeX3VKQP/qVI1wISHg==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-2.4.0.tgz", + "integrity": "sha512-UdkhFWzWcJCZVsj1O/H8/oqj/0RVYjLc1OhPjBrQdALAkQHpCp8xXI4WLnuGTADqTdJZww0NtgwG+TRPkXt27w==", "dependencies": { "crc-32": "^1.2.0", - "ethereumjs-util": "^7.0.10" + "ethereumjs-util": "^7.1.0" } }, "node_modules/@ethereumjs/tx": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-3.2.0.tgz", - "integrity": "sha512-D3X/XtZ3ldUg34hr99Jvj7NxW3NxVKdUKrwQnEWlAp4CmCQpvYoyn7NF4lk34rHEt7ScS+Agu01pcDHoOcd19A==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-3.3.0.tgz", + "integrity": "sha512-yTwEj2lVzSMgE6Hjw9Oa1DZks/nKTWM8Wn4ykDNapBPua2f4nXO3qKnni86O6lgDj5fVNRqbDsD0yy7/XNGDEA==", "dependencies": { - "@ethereumjs/common": "^2.3.0", - "ethereumjs-util": "^7.0.10" + "@ethereumjs/common": "^2.4.0", + "ethereumjs-util": "^7.1.0" } }, "node_modules/@types/bn.js": { @@ -75,9 +89,9 @@ } }, "node_modules/@types/node": { - "version": "15.12.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-15.12.0.tgz", - "integrity": "sha512-+aHJvoCsVhO2ZCuT4o5JtcPrCPyDE3+1nvbDprYes+pPkEsbjH7AGUCNtjMOXS0fqH14t+B7yLzaqSz92FPWyw==" + "version": "16.3.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.3.2.tgz", + "integrity": "sha512-jJs9ErFLP403I+hMLGnqDRWT0RYKSvArxuBVh2veudHV7ifEC1WAmjJADacZ7mRbA2nWgHtn8xyECMAot0SkAw==" }, "node_modules/@types/pbkdf2": { "version": "3.1.0", @@ -88,9 +102,9 @@ } }, "node_modules/@types/secp256k1": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@types/secp256k1/-/secp256k1-4.0.2.tgz", - "integrity": "sha512-QMg+9v0bbNJ2peLuHRWxzmy0HRJIG6gFZNhaRSp7S3ggSbCCxiqQB2/ybvhXyhHOCequpNkrx7OavNhrWOsW0A==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/@types/secp256k1/-/secp256k1-4.0.3.tgz", + "integrity": "sha512-Da66lEIFeIz9ltsdMZcpQvmrmmoqrfju8pm1BH8WbYjZSwUgCwXLb9C+9XYogwBITnbsSaMdVPb2ekf7TV+03w==", "dependencies": { "@types/node": "*" } @@ -273,9 +287,9 @@ } }, "node_modules/blakejs": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.1.0.tgz", - "integrity": "sha1-ad+S75U6qIylGjLfarHFShVfx6U=" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.1.1.tgz", + "integrity": "sha512-bLG6PHOCZJKNshTjGRBvET0vTciwQE6zFKOKKXPDJfwFBd4Ac0yBfPZqcGvGJap50l7ktvlpFqc2jGVaUgbJgg==" }, "node_modules/block-stream": { "version": "0.0.9", @@ -639,9 +653,9 @@ } }, "node_modules/ethereumjs-util": { - "version": "7.0.10", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-7.0.10.tgz", - "integrity": "sha512-c/xThw6A+EAnej5Xk5kOzFzyoSnw0WX0tSlZ6pAsfGVvQj3TItaDg9b1+Fz1RJXA+y2YksKwQnuzgt1eY6LKzw==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-7.1.0.tgz", + "integrity": "sha512-kR+vhu++mUDARrsMMhsjjzPduRVAeundLGXucGRHF3B4oEltOUspfgCVco4kckucj3FMlLaZHUl9n7/kdmr6Tw==", "dependencies": { "@types/bn.js": "^5.1.0", "bn.js": "^5.1.2", @@ -1148,9 +1162,9 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/needle": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz", - "integrity": "sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/needle/-/needle-2.8.0.tgz", + "integrity": "sha512-ZTq6WYkN/3782H1393me3utVYdq2XyqNUFBsprEE3VMAT0+hP/cItpnITpqsY6ep2yeFE4Tqtqwc74VqUlUYtw==", "dependencies": { "debug": "^3.2.6", "iconv-lite": "^0.4.4", @@ -2125,9 +2139,9 @@ } }, "node_modules/yargs-parser": { - "version": "20.2.7", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz", - "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==", + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", "engines": { "node": ">=10" } @@ -2189,12 +2203,25 @@ "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.10", - "resolved": "https://registry.npmjs.org/@cicnet/crdt-meta/-/crdt-meta-0.0.10.tgz", - "integrity": "sha512-f+H6BQA2tE718KuNYiNzrDJN4wY00zeuhXM6aPKJUX6nryzX9g2r0yf8iDhkz+Fts1R6M7Riz73MfFEa8fgvsw==", + "version": "0.0.12", + "resolved": "https://registry.npmjs.org/@cicnet/crdt-meta/-/crdt-meta-0.0.12.tgz", + "integrity": "sha512-wPX86P1Lsq4RxkVUlhlouhLkMOtkqzHgpNuXicHvWuhH3ks2Nsg7yqvTw9yt+kqj+N8a5pPMrNhKvUEFW8rJjA==", "requires": { "automerge": "^0.14.2", "ini": "^1.3.8", @@ -2203,21 +2230,21 @@ } }, "@ethereumjs/common": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-2.3.0.tgz", - "integrity": "sha512-Fmi15MdVptsC85n6NcUXIFiiXCXWEfZNgPWP+OGAQOC6ZtdzoNawtxH/cYpIgEgSuIzfOeX3VKQP/qVI1wISHg==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-2.4.0.tgz", + "integrity": "sha512-UdkhFWzWcJCZVsj1O/H8/oqj/0RVYjLc1OhPjBrQdALAkQHpCp8xXI4WLnuGTADqTdJZww0NtgwG+TRPkXt27w==", "requires": { "crc-32": "^1.2.0", - "ethereumjs-util": "^7.0.10" + "ethereumjs-util": "^7.1.0" } }, "@ethereumjs/tx": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-3.2.0.tgz", - "integrity": "sha512-D3X/XtZ3ldUg34hr99Jvj7NxW3NxVKdUKrwQnEWlAp4CmCQpvYoyn7NF4lk34rHEt7ScS+Agu01pcDHoOcd19A==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-3.3.0.tgz", + "integrity": "sha512-yTwEj2lVzSMgE6Hjw9Oa1DZks/nKTWM8Wn4ykDNapBPua2f4nXO3qKnni86O6lgDj5fVNRqbDsD0yy7/XNGDEA==", "requires": { - "@ethereumjs/common": "^2.3.0", - "ethereumjs-util": "^7.0.10" + "@ethereumjs/common": "^2.4.0", + "ethereumjs-util": "^7.1.0" } }, "@types/bn.js": { @@ -2229,9 +2256,9 @@ } }, "@types/node": { - "version": "15.12.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-15.12.0.tgz", - "integrity": "sha512-+aHJvoCsVhO2ZCuT4o5JtcPrCPyDE3+1nvbDprYes+pPkEsbjH7AGUCNtjMOXS0fqH14t+B7yLzaqSz92FPWyw==" + "version": "16.3.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.3.2.tgz", + "integrity": "sha512-jJs9ErFLP403I+hMLGnqDRWT0RYKSvArxuBVh2veudHV7ifEC1WAmjJADacZ7mRbA2nWgHtn8xyECMAot0SkAw==" }, "@types/pbkdf2": { "version": "3.1.0", @@ -2242,9 +2269,9 @@ } }, "@types/secp256k1": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@types/secp256k1/-/secp256k1-4.0.2.tgz", - "integrity": "sha512-QMg+9v0bbNJ2peLuHRWxzmy0HRJIG6gFZNhaRSp7S3ggSbCCxiqQB2/ybvhXyhHOCequpNkrx7OavNhrWOsW0A==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/@types/secp256k1/-/secp256k1-4.0.3.tgz", + "integrity": "sha512-Da66lEIFeIz9ltsdMZcpQvmrmmoqrfju8pm1BH8WbYjZSwUgCwXLb9C+9XYogwBITnbsSaMdVPb2ekf7TV+03w==", "requires": { "@types/node": "*" } @@ -2412,9 +2439,9 @@ } }, "blakejs": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.1.0.tgz", - "integrity": "sha1-ad+S75U6qIylGjLfarHFShVfx6U=" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.1.1.tgz", + "integrity": "sha512-bLG6PHOCZJKNshTjGRBvET0vTciwQE6zFKOKKXPDJfwFBd4Ac0yBfPZqcGvGJap50l7ktvlpFqc2jGVaUgbJgg==" }, "block-stream": { "version": "0.0.9", @@ -2728,9 +2755,9 @@ } }, "ethereumjs-util": { - "version": "7.0.10", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-7.0.10.tgz", - "integrity": "sha512-c/xThw6A+EAnej5Xk5kOzFzyoSnw0WX0tSlZ6pAsfGVvQj3TItaDg9b1+Fz1RJXA+y2YksKwQnuzgt1eY6LKzw==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-7.1.0.tgz", + "integrity": "sha512-kR+vhu++mUDARrsMMhsjjzPduRVAeundLGXucGRHF3B4oEltOUspfgCVco4kckucj3FMlLaZHUl9n7/kdmr6Tw==", "requires": { "@types/bn.js": "^5.1.0", "bn.js": "^5.1.2", @@ -3157,9 +3184,9 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "needle": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz", - "integrity": "sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/needle/-/needle-2.8.0.tgz", + "integrity": "sha512-ZTq6WYkN/3782H1393me3utVYdq2XyqNUFBsprEE3VMAT0+hP/cItpnITpqsY6ep2yeFE4Tqtqwc74VqUlUYtw==", "requires": { "debug": "^3.2.6", "iconv-lite": "^0.4.4", @@ -3944,9 +3971,9 @@ } }, "yargs-parser": { - "version": "20.2.7", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz", - "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==" + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==" } } } diff --git a/apps/data-seeding/package.json b/apps/data-seeding/package.json index 3cdb6613..d08fb235 100644 --- 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.10", + "@cicnet/crdt-meta": "^0.0.12", "vcard-parser": "^1.0.0" } } diff --git a/apps/data-seeding/verify.py b/apps/data-seeding/verify.py index 911f0750..1c227740 100644 --- 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.debug('balance for {}: {}'.format(address, balance)) + logg.info('balance for {}: {}'.format(address, balance)) if balance != actual_balance: raise VerifierError((actual_balance, balance), 'balance')