Merge remote-tracking branch 'origin/master' into lash/admin-api-account-check

Add admin api method to check existence of signature ins tore
Add abis back
2021-02-12 17:35:02 +01:00 · 2021-02-12 17:34:43 +01:00 · 2021-02-11 18:10:58 +01:00 · 2021-02-11 17:20:31 +01:00 · 2021-02-11 15:49:56 +01:00 · 2021-02-11 14:23:23 +01:00
4 changed files with 16 additions and 4 deletions
--- a/apps/cic-eth/cic_eth/api/api_admin.py
+++ b/apps/cic-eth/cic_eth/api/api_admin.py
@ -98,6 +98,19 @@ class AdminApi:
        session.close()


+    def have_account(self, address_hex, chain_str):
+        s_have = celery.signature(
+            'cic_eth.eth.account.have',
+            [
+                address_hex,
+                chain_str,
+                ],
+            queue=self.queue,
+            )
+        t = s_have.apply_async()
+        return t.get()
+
+
    def resend(self, tx_hash_hex, chain_str, in_place=True, unlock=False):
        logg.debug('resend {}'.format(tx_hash_hex))
        s_get_tx_cache = celery.signature(
--- a/apps/cic-eth/cic_eth/version.py
+++ b/apps/cic-eth/cic_eth/version.py
@ -10,7 +10,7 @@ version = (
        0,
        10,
        0,
-        'alpha.25',
+        'alpha.26',
        )

 version_object = semver.VersionInfo(
--- a/apps/contract-migration/reset.sh
+++ b/apps/contract-migration/reset.sh
@ -29,7 +29,7 @@ if [[ -n "${ETH_PROVIDER}" ]]; then
 	echo "waiting for ${ETH_PROVIDER}..."
  	./wait-for-it.sh "${ETH_PROVIDER_HOST}:${ETH_PROVIDER_PORT}"

-	DEV_ETH_RESERVE_ADDRESS=`giftable-token-deploy -p $ETH_PROVIDER -y $keystore_file -i $CIC_CHAIN_SPEC --account $DEV_ETH_ACCOUNT_RESERVE_MINTER --minter $DEV_ETH_ACCOUNT_RESERVE_MINTER -v -w --name "Sarafu" --symbol "SRF" $DEV_ETH_RESERVE_AMOUNT`
+	DEV_ETH_RESERVE_ADDRESS=`giftable-token-deploy -p $ETH_PROVIDER -y $keystore_file -i $CIC_CHAIN_SPEC --account $DEV_ETH_ACCOUNT_RESERVE_MINTER --minter $DEV_ETH_ACCOUNT_RESERVE_MINTER -v -w --name "Sarafu" --symbol "SRF" --decimals 6 $DEV_ETH_RESERVE_AMOUNT`

 	#BANCOR_REGISTRY_ADDRESS=`cic-bancor-deploy --bancor-dir /usr/local/share/cic/bancor -z $DEV_ETH_RESERVE_ADDRESS -p $ETH_PROVIDER -o $DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER`

--- a/apps/contract-migration/seed_cic_eth.sh
+++ b/apps/contract-migration/seed_cic_eth.sh
@ -14,7 +14,6 @@ DEV_DATABASE_NAME_CIC_ETH=${DEV_DATABASE_NAME_CIC_ETH:-"cic-eth"}
 CIC_DATA_DIR=${CIC_DATA_DIR:-/tmp/cic} 

 # Debug flag
-#debug='-v'
 DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER=0xEb3907eCad74a0013c259D5874AE7f22DcBcC95C
 keystore_file=./keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c
 debug='-vv'
@ -53,7 +52,7 @@ DEV_ETH_ACCOUNT_FAUCET_OWNER=`cic-eth-create $debug --redis-host-callback=$REDIS
 echo DEV_ETH_ACCOUNT_GAS_GIFTER=$DEV_ETH_ACCOUNT_FAUCET_OWNER >> $env_out_file
 cic-eth-tag FAUCET_GIFTER $DEV_ETH_ACCOUNT_FAUCET_OWNER

->&2 echo "create account for accounts index owner"
+>&2 echo "create account for accounts index writer"
 DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER=`cic-eth-create $debug --redis-host-callback=$REDIS_HOST --redis-port-callback=$REDIS_PORT --no-register`
 echo DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER=$DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER >> $env_out_file
 cic-eth-tag ACCOUNTS_INDEX_WRITER $DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER
Author	SHA1	Message	Date
nolash	a4885f56aa	Merge remote-tracking branch 'origin/master' into lash/admin-api-account-check	2021-02-12 17:35:02 +01:00
nolash	ec46fae39a	Add admin api method to check existence of signature ins tore	2021-02-12 17:34:43 +01:00
nolash	d3bdc850e5	Add abis back	2021-02-11 18:10:58 +01:00
nolash	33c00ed93b	Set cic-eth seed script to run sequentially after contract migration	2021-02-11 17:20:31 +01:00
nolash	6d6285a897	Once AGAIN fix ports in docker compose	2021-02-11 15:49:56 +01:00
nolash	5216a18fbb	Merge remote-tracking branch 'origin/master' into lash/correct-db-names	2021-02-11 14:23:23 +01:00
nolash	2ec785488e	Correct db names in compose, cic-eth query var scope	2021-02-11 14:23:17 +01:00