Add custom meta tags
This commit is contained in:
parent
60fdb06034
commit
cfab16f4a9
@ -62,6 +62,18 @@ class Api:
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def default_token(self):
|
||||||
|
s_token = celery.signature(
|
||||||
|
'cic_eth.admin.token.default_token',
|
||||||
|
[],
|
||||||
|
queue=self.queue,
|
||||||
|
)
|
||||||
|
if self.callback_param != None:
|
||||||
|
s_token.link(self.callback_success)
|
||||||
|
|
||||||
|
return s_token.apply_async()
|
||||||
|
|
||||||
|
|
||||||
def convert_transfer(self, from_address, to_address, target_return, minimum_return, from_token_symbol, to_token_symbol):
|
def convert_transfer(self, from_address, to_address, target_return, minimum_return, from_token_symbol, to_token_symbol):
|
||||||
"""Executes a chain of celery tasks that performs conversion between two ERC20 tokens, and transfers to a specified receipient after convert has completed.
|
"""Executes a chain of celery tasks that performs conversion between two ERC20 tokens, and transfers to a specified receipient after convert has completed.
|
||||||
|
|
||||||
|
@ -30,6 +30,7 @@ from cic_eth.eth import (
|
|||||||
from cic_eth.admin import (
|
from cic_eth.admin import (
|
||||||
debug,
|
debug,
|
||||||
ctrl,
|
ctrl,
|
||||||
|
token,
|
||||||
)
|
)
|
||||||
from cic_eth.queue import (
|
from cic_eth.queue import (
|
||||||
query,
|
query,
|
||||||
@ -54,6 +55,7 @@ from cic_eth.registry import (
|
|||||||
connect_declarator,
|
connect_declarator,
|
||||||
connect_token_registry,
|
connect_token_registry,
|
||||||
)
|
)
|
||||||
|
from cic_eth.task import BaseTask
|
||||||
|
|
||||||
|
|
||||||
logging.basicConfig(level=logging.WARNING)
|
logging.basicConfig(level=logging.WARNING)
|
||||||
@ -66,6 +68,7 @@ argparser.add_argument('-p', '--provider', dest='p', type=str, help='rpc provide
|
|||||||
argparser.add_argument('-c', type=str, default=config_dir, help='config file')
|
argparser.add_argument('-c', type=str, default=config_dir, help='config file')
|
||||||
argparser.add_argument('-q', type=str, default='cic-eth', help='queue name for worker tasks')
|
argparser.add_argument('-q', type=str, default='cic-eth', help='queue name for worker tasks')
|
||||||
argparser.add_argument('-r', type=str, help='CIC registry address')
|
argparser.add_argument('-r', type=str, help='CIC registry address')
|
||||||
|
argparser.add_argument('--default-token-symbol', dest='default_token_symbol', type=str, help='Symbol of default token to use')
|
||||||
argparser.add_argument('--abi-dir', dest='abi_dir', type=str, help='Directory containing bytecode and abi')
|
argparser.add_argument('--abi-dir', dest='abi_dir', type=str, help='Directory containing bytecode and abi')
|
||||||
argparser.add_argument('--trace-queue-status', default=None, dest='trace_queue_status', action='store_true', help='set to perist all queue entry status changes to storage')
|
argparser.add_argument('--trace-queue-status', default=None, dest='trace_queue_status', action='store_true', help='set to perist all queue entry status changes to storage')
|
||||||
argparser.add_argument('-i', '--chain-spec', dest='i', type=str, help='chain spec')
|
argparser.add_argument('-i', '--chain-spec', dest='i', type=str, help='chain spec')
|
||||||
@ -85,6 +88,7 @@ config.process()
|
|||||||
args_override = {
|
args_override = {
|
||||||
'CIC_CHAIN_SPEC': getattr(args, 'i'),
|
'CIC_CHAIN_SPEC': getattr(args, 'i'),
|
||||||
'CIC_REGISTRY_ADDRESS': getattr(args, 'r'),
|
'CIC_REGISTRY_ADDRESS': getattr(args, 'r'),
|
||||||
|
'CIC_DEFAULT_TOKEN_SYMBOL': getattr(args, 'default_token_symbol'),
|
||||||
'ETH_PROVIDER': getattr(args, 'p'),
|
'ETH_PROVIDER': getattr(args, 'p'),
|
||||||
'TASKS_TRACE_QUEUE_STATUS': getattr(args, 'trace_queue_status'),
|
'TASKS_TRACE_QUEUE_STATUS': getattr(args, 'trace_queue_status'),
|
||||||
}
|
}
|
||||||
@ -173,7 +177,7 @@ def main():
|
|||||||
rpc = RPCConnection.connect(chain_spec, 'default')
|
rpc = RPCConnection.connect(chain_spec, 'default')
|
||||||
|
|
||||||
try:
|
try:
|
||||||
connect_registry(rpc, chain_spec, config.get('CIC_REGISTRY_ADDRESS'))
|
registry = connect_registry(rpc, chain_spec, config.get('CIC_REGISTRY_ADDRESS'))
|
||||||
except UnknownContractError as e:
|
except UnknownContractError as e:
|
||||||
logg.exception('Registry contract connection failed for {}: {}'.format(config.get('CIC_REGISTRY_ADDRESS'), e))
|
logg.exception('Registry contract connection failed for {}: {}'.format(config.get('CIC_REGISTRY_ADDRESS'), e))
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
@ -189,6 +193,10 @@ def main():
|
|||||||
connect_declarator(rpc, chain_spec, trusted_addresses)
|
connect_declarator(rpc, chain_spec, trusted_addresses)
|
||||||
connect_token_registry(rpc, chain_spec)
|
connect_token_registry(rpc, chain_spec)
|
||||||
|
|
||||||
|
BaseTask.default_token_symbol = config.get('CIC_DEFAULT_TOKEN_SYMBOL')
|
||||||
|
BaseTask.default_token_address = registry.by_name(BaseTask.default_token_symbol)
|
||||||
|
logg.info('default token set to {} {}'.format(BaseTask.default_token_symbol, BaseTask.default_token_address))
|
||||||
|
|
||||||
liveness.linux.set()
|
liveness.linux.set()
|
||||||
current_app.worker_main(argv)
|
current_app.worker_main(argv)
|
||||||
liveness.linux.reset()
|
liveness.linux.reset()
|
||||||
|
@ -29,6 +29,8 @@ class BaseTask(celery.Task):
|
|||||||
call_address = ZERO_ADDRESS
|
call_address = ZERO_ADDRESS
|
||||||
create_nonce_oracle = RPCNonceOracle
|
create_nonce_oracle = RPCNonceOracle
|
||||||
create_gas_oracle = RPCGasOracle
|
create_gas_oracle = RPCGasOracle
|
||||||
|
default_token_address = None
|
||||||
|
default_token_symbol = None
|
||||||
|
|
||||||
def create_session(self):
|
def create_session(self):
|
||||||
return BaseTask.session_func()
|
return BaseTask.session_func()
|
||||||
|
@ -3,5 +3,6 @@ registry_address =
|
|||||||
chain_spec = evm:bloxberg:8996
|
chain_spec = evm:bloxberg:8996
|
||||||
tx_retry_delay =
|
tx_retry_delay =
|
||||||
trust_address =
|
trust_address =
|
||||||
|
default_token_symbol = GFT
|
||||||
health_modules = cic_eth.check.db,cic_eth.check.signer,cic_eth.check.gas
|
health_modules = cic_eth.check.db,cic_eth.check.signer,cic_eth.check.gas
|
||||||
run_dir = /run
|
run_dir = /run
|
||||||
|
@ -3,5 +3,6 @@ registry_address =
|
|||||||
chain_spec = evm:bloxberg:8996
|
chain_spec = evm:bloxberg:8996
|
||||||
trust_address = 0xEb3907eCad74a0013c259D5874AE7f22DcBcC95C
|
trust_address = 0xEb3907eCad74a0013c259D5874AE7f22DcBcC95C
|
||||||
tx_retry_delay = 20
|
tx_retry_delay = 20
|
||||||
|
default_token_symbol = GFT
|
||||||
health_modules = cic_eth.check.db,cic_eth.check.signer,cic_eth.check.gas
|
health_modules = cic_eth.check.db,cic_eth.check.signer,cic_eth.check.gas
|
||||||
run_dir = /run
|
run_dir = /run
|
||||||
|
@ -53,6 +53,7 @@ console_scripts =
|
|||||||
cic-eth-create = cic_eth.runnable.create:main
|
cic-eth-create = cic_eth.runnable.create:main
|
||||||
cic-eth-inspect = cic_eth.runnable.view:main
|
cic-eth-inspect = cic_eth.runnable.view:main
|
||||||
cic-eth-ctl = cic_eth.runnable.ctrl:main
|
cic-eth-ctl = cic_eth.runnable.ctrl:main
|
||||||
|
cic-eth-info = cic_eth.runnable.info:main
|
||||||
# TODO: Merge this with ctl when subcmds sorted to submodules
|
# TODO: Merge this with ctl when subcmds sorted to submodules
|
||||||
cic-eth-tag = cic_eth.runnable.tag:main
|
cic-eth-tag = cic_eth.runnable.tag:main
|
||||||
cic-eth-resend = cic_eth.runnable.resend:main
|
cic-eth-resend = cic_eth.runnable.resend:main
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
set -a
|
set -a
|
||||||
|
|
||||||
CIC_CHAIN_SPEC=${CIC_CHAIN_SPEC:-evm:bloxberg:8995}
|
CIC_CHAIN_SPEC=${CIC_CHAIN_SPEC:-evm:bloxberg:8995}
|
||||||
DEV_TOKEN_TYPE=${DEV_TOKEN_TYPE:-GFT}
|
CIC_DEFAULT_TOKEN_SYMBOL=${CIC_DEFAULT_TOKEN_SYMBOL:-GFT}
|
||||||
DEV_ETH_ACCOUNT_RESERVE_MINTER=${DEV_ETH_ACCOUNT_RESERVE_MINTER:-$DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER}
|
DEV_ETH_ACCOUNT_RESERVE_MINTER=${DEV_ETH_ACCOUNT_RESERVE_MINTER:-$DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER}
|
||||||
DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER=${DEV_ETH_ACCOUNT_RESERVE_MINTER:-$DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER}
|
DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER=${DEV_ETH_ACCOUNT_RESERVE_MINTER:-$DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER}
|
||||||
DEV_RESERVE_AMOUNT=${DEV_ETH_RESERVE_AMOUNT:-""10000000000000000000000000000000000}
|
DEV_RESERVE_AMOUNT=${DEV_ETH_RESERVE_AMOUNT:-""10000000000000000000000000000000000}
|
||||||
@ -19,8 +19,8 @@ if [ ! -z $DEV_ETH_GAS_PRICE ]; then
|
|||||||
>&2 echo using static gas price $DEV_ETH_GAS_PRICE
|
>&2 echo using static gas price $DEV_ETH_GAS_PRICE
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $DEV_TOKEN_TYPE != 'GFT' && $DEV_TOKEN_TYPE != 'SRF' ]]; then
|
if [[ $CIC_DEFAULT_TOKEN_SYMBOL != 'GFT' && $CIC_DEFAULT_TOKEN_SYMBOL != 'SRF' ]]; then
|
||||||
>&2 echo DEV_TOKEN_TYPE must be one of [GFT,SRF], but was $DEV_TOKEN_TYPE
|
>&2 echo CIC_DEFAULT_TOKEN_SYMBOL must be one of [GFT,SRF], but was $CIC_DEFAULT_TOKEN_SYMBOL
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -60,7 +60,7 @@ if [[ -n "${ETH_PROVIDER}" ]]; then
|
|||||||
./wait-for-it.sh "${ETH_PROVIDER_HOST}:${ETH_PROVIDER_PORT}"
|
./wait-for-it.sh "${ETH_PROVIDER_HOST}:${ETH_PROVIDER_PORT}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $DEV_TOKEN_TYPE == 'GFT' ]; then
|
if [ $CIC_DEFAULT_TOKEN_SYMBOL == 'GFT' ]; then
|
||||||
>&2 echo "deploying 'giftable token'"
|
>&2 echo "deploying 'giftable token'"
|
||||||
DEV_RESERVE_ADDRESS=`giftable-token-deploy $gas_price_arg -p $ETH_PROVIDER -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -vv -w --name "Giftable Token" --symbol "GFT" --decimals 6 -vv`
|
DEV_RESERVE_ADDRESS=`giftable-token-deploy $gas_price_arg -p $ETH_PROVIDER -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -vv -w --name "Giftable Token" --symbol "GFT" --decimals 6 -vv`
|
||||||
else
|
else
|
||||||
|
@ -32,6 +32,7 @@ default_config_dir = '/usr/local/etc/cic'
|
|||||||
argparser = argparse.ArgumentParser()
|
argparser = argparse.ArgumentParser()
|
||||||
argparser.add_argument('-c', type=str, default=default_config_dir, help='config file')
|
argparser.add_argument('-c', type=str, default=default_config_dir, help='config file')
|
||||||
argparser.add_argument('-i', '--chain-spec', dest='i', type=str, help='Chain specification string')
|
argparser.add_argument('-i', '--chain-spec', dest='i', type=str, help='Chain specification string')
|
||||||
|
argparser.add_argument('--old-chain-spec', type=str, dest='old_chain_spec', default='evm:oldchain:1', help='chain spec')
|
||||||
argparser.add_argument('--redis-host', dest='redis_host', type=str, help='redis host to use for task submission')
|
argparser.add_argument('--redis-host', dest='redis_host', type=str, help='redis host to use for task submission')
|
||||||
argparser.add_argument('--redis-port', dest='redis_port', type=int, help='redis host to use for task submission')
|
argparser.add_argument('--redis-port', dest='redis_port', type=int, help='redis host to use for task submission')
|
||||||
argparser.add_argument('--redis-db', dest='redis_db', type=int, help='redis db to use for task submission and callback')
|
argparser.add_argument('--redis-db', dest='redis_db', type=int, help='redis db to use for task submission and callback')
|
||||||
@ -76,6 +77,11 @@ os.makedirs(user_new_dir)
|
|||||||
meta_dir = os.path.join(args.user_dir, 'meta')
|
meta_dir = os.path.join(args.user_dir, 'meta')
|
||||||
os.makedirs(meta_dir)
|
os.makedirs(meta_dir)
|
||||||
|
|
||||||
|
custom_dir = os.path.join(args.user_dir, 'custom')
|
||||||
|
os.makedirs(custom_dir)
|
||||||
|
os.makedirs(os.path.join(custom_dir, 'new'))
|
||||||
|
os.makedirs(os.path.join(custom_dir, 'meta'))
|
||||||
|
|
||||||
phone_dir = os.path.join(args.user_dir, 'phone')
|
phone_dir = os.path.join(args.user_dir, 'phone')
|
||||||
os.makedirs(os.path.join(phone_dir, 'meta'))
|
os.makedirs(os.path.join(phone_dir, 'meta'))
|
||||||
|
|
||||||
@ -85,6 +91,11 @@ os.stat(user_old_dir)
|
|||||||
txs_dir = os.path.join(args.user_dir, 'txs')
|
txs_dir = os.path.join(args.user_dir, 'txs')
|
||||||
os.makedirs(txs_dir)
|
os.makedirs(txs_dir)
|
||||||
|
|
||||||
|
user_dir = args.user_dir
|
||||||
|
|
||||||
|
old_chain_spec = ChainSpec.from_chain_str(args.old_chain_spec)
|
||||||
|
old_chain_str = str(old_chain_spec)
|
||||||
|
|
||||||
chain_spec = ChainSpec.from_chain_str(config.get('CIC_CHAIN_SPEC'))
|
chain_spec = ChainSpec.from_chain_str(config.get('CIC_CHAIN_SPEC'))
|
||||||
chain_str = str(chain_spec)
|
chain_str = str(chain_spec)
|
||||||
|
|
||||||
@ -133,7 +144,17 @@ def register_eth(i, u):
|
|||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|
||||||
#fi = open(os.path.join(user_out_dir, 'addresses.csv'), 'a')
|
user_tags = {}
|
||||||
|
f = open(os.path.join(user_dir, 'tags.csv'), 'r')
|
||||||
|
while True:
|
||||||
|
r = f.readline().rstrip()
|
||||||
|
if len(r) == 0:
|
||||||
|
break
|
||||||
|
(old_address, tags_csv) = r.split(':')
|
||||||
|
old_address = strip_0x(old_address)
|
||||||
|
user_tags[old_address] = tags_csv.split(',')
|
||||||
|
logg.debug('read tags {} for old address {}'.format(user_tags[old_address], old_address))
|
||||||
|
|
||||||
|
|
||||||
i = 0
|
i = 0
|
||||||
j = 0
|
j = 0
|
||||||
@ -198,6 +219,29 @@ if __name__ == '__main__':
|
|||||||
os.symlink(os.path.realpath(filepath), meta_phone_filepath)
|
os.symlink(os.path.realpath(filepath), meta_phone_filepath)
|
||||||
|
|
||||||
|
|
||||||
|
# custom data
|
||||||
|
custom_key = generate_metadata_pointer(phone.encode('utf-8'), ':cic.custom')
|
||||||
|
custom_filepath = os.path.join(custom_dir, 'meta', custom_key)
|
||||||
|
|
||||||
|
filepath = os.path.join(
|
||||||
|
custom_dir,
|
||||||
|
'new',
|
||||||
|
custom_key[:2].upper(),
|
||||||
|
custom_key[2:4].upper(),
|
||||||
|
custom_key.upper() + '.json',
|
||||||
|
)
|
||||||
|
os.makedirs(os.path.dirname(filepath), exist_ok=True)
|
||||||
|
|
||||||
|
sub_old_chain_str = '{}:{}'.format(old_chain_spec.common_name(), old_chain_spec.network_id())
|
||||||
|
f = open(filepath, 'w')
|
||||||
|
k = u.identities['evm'][sub_old_chain_str][0]
|
||||||
|
tag_data = {'tags': user_tags[strip_0x(k)]}
|
||||||
|
f.write(json.dumps(tag_data))
|
||||||
|
f.close()
|
||||||
|
|
||||||
|
os.symlink(os.path.realpath(filepath), custom_filepath)
|
||||||
|
|
||||||
|
|
||||||
i += 1
|
i += 1
|
||||||
sys.stdout.write('imported {} {}'.format(i, u).ljust(200) + "\r")
|
sys.stdout.write('imported {} {}'.format(i, u).ljust(200) + "\r")
|
||||||
|
|
||||||
|
139
apps/contract-migration/scripts/cic_meta/import_meta_custom.js
Normal file
139
apps/contract-migration/scripts/cic_meta/import_meta_custom.js
Normal file
@ -0,0 +1,139 @@
|
|||||||
|
const fs = require('fs');
|
||||||
|
const path = require('path');
|
||||||
|
const http = require('http');
|
||||||
|
|
||||||
|
const cic = require('cic-client-meta');
|
||||||
|
const vcfp = require('vcard-parser');
|
||||||
|
|
||||||
|
//const conf = JSON.parse(fs.readFileSync('./cic.conf'));
|
||||||
|
|
||||||
|
const config = new cic.Config('./config');
|
||||||
|
config.process();
|
||||||
|
console.log(config);
|
||||||
|
|
||||||
|
|
||||||
|
function sendit(uid, envelope) {
|
||||||
|
const d = envelope.toJSON();
|
||||||
|
|
||||||
|
const contentLength = (new TextEncoder().encode(d)).length;
|
||||||
|
const opts = {
|
||||||
|
method: 'PUT',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
'Content-Length': contentLength,
|
||||||
|
'X-CIC-AUTOMERGE': 'client',
|
||||||
|
|
||||||
|
},
|
||||||
|
};
|
||||||
|
let url = config.get('META_URL');
|
||||||
|
url = url.replace(new RegExp('^(.+://[^/]+)/*$'), '$1/');
|
||||||
|
console.log('posting to url: ' + url + uid);
|
||||||
|
const req = http.request(url + uid, opts, (res) => {
|
||||||
|
res.on('data', process.stdout.write);
|
||||||
|
res.on('end', () => {
|
||||||
|
console.log('result', res.statusCode, res.headers);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
if (!req.write(d)) {
|
||||||
|
console.error('foo', d);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
req.end();
|
||||||
|
}
|
||||||
|
|
||||||
|
function doOne(keystore, filePath, identifier) {
|
||||||
|
const signer = new cic.PGPSigner(keystore);
|
||||||
|
|
||||||
|
const o = JSON.parse(fs.readFileSync(filePath).toString());
|
||||||
|
//const b = Buffer.from(j['vcard'], 'base64');
|
||||||
|
//const s = b.toString();
|
||||||
|
//const o = vcfp.parse(s);
|
||||||
|
//const phone = o.tel[0].value;
|
||||||
|
|
||||||
|
//cic.Phone.toKey(phone).then((uid) => {
|
||||||
|
//const o = fs.readFileSync(filePath, 'utf-8');
|
||||||
|
|
||||||
|
const s = new cic.Syncable(identifier, o);
|
||||||
|
s.setSigner(signer);
|
||||||
|
s.onwrap = (env) => {
|
||||||
|
sendit(identifier, env);
|
||||||
|
};
|
||||||
|
s.sign();
|
||||||
|
//});
|
||||||
|
}
|
||||||
|
|
||||||
|
const privateKeyPath = path.join(config.get('PGP_EXPORTS_DIR'), config.get('PGP_PRIVATE_KEY_FILE'));
|
||||||
|
const publicKeyPath = path.join(config.get('PGP_EXPORTS_DIR'), config.get('PGP_PRIVATE_KEY_FILE'));
|
||||||
|
pk = fs.readFileSync(privateKeyPath);
|
||||||
|
pubk = fs.readFileSync(publicKeyPath);
|
||||||
|
|
||||||
|
new cic.PGPKeyStore(
|
||||||
|
config.get('PGP_PASSPHRASE'),
|
||||||
|
pk,
|
||||||
|
pubk,
|
||||||
|
undefined,
|
||||||
|
undefined,
|
||||||
|
importMetaCustom,
|
||||||
|
);
|
||||||
|
|
||||||
|
const batchSize = 16;
|
||||||
|
const batchDelay = 1000;
|
||||||
|
const total = parseInt(process.argv[3]);
|
||||||
|
const dataDir = process.argv[2];
|
||||||
|
const workDir = path.join(dataDir, 'custom/meta');
|
||||||
|
const userDir = path.join(dataDir, 'custom/new');
|
||||||
|
let count = 0;
|
||||||
|
let batchCount = 0;
|
||||||
|
|
||||||
|
|
||||||
|
function importMetaCustom(keystore) {
|
||||||
|
let err;
|
||||||
|
let files;
|
||||||
|
|
||||||
|
try {
|
||||||
|
err, files = fs.readdirSync(workDir);
|
||||||
|
} catch {
|
||||||
|
console.error('source directory not yet ready', workDir);
|
||||||
|
setTimeout(importMetaPhone, batchDelay, keystore);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let limit = batchSize;
|
||||||
|
if (files.length < limit) {
|
||||||
|
limit = files.length;
|
||||||
|
}
|
||||||
|
for (let i = 0; i < limit; i++) {
|
||||||
|
const file = files[i];
|
||||||
|
if (file.length < 3) {
|
||||||
|
console.debug('skipping file', file);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
//const identifier = file.substr(0,file.length-5);
|
||||||
|
const identifier = file;
|
||||||
|
const filePath = path.join(workDir, file);
|
||||||
|
console.log(filePath);
|
||||||
|
|
||||||
|
//const address = fs.readFileSync(filePath).toString().substring(2).toUpperCase();
|
||||||
|
const custom = JSON.parse(fs.readFileSync(filePath).toString());
|
||||||
|
const customFilePath = path.join(
|
||||||
|
userDir,
|
||||||
|
identifier.substring(0, 2),
|
||||||
|
identifier.substring(2, 4),
|
||||||
|
identifier + '.json',
|
||||||
|
);
|
||||||
|
|
||||||
|
doOne(keystore, filePath, identifier);
|
||||||
|
fs.unlinkSync(filePath);
|
||||||
|
count++;
|
||||||
|
batchCount++;
|
||||||
|
if (batchCount == batchSize) {
|
||||||
|
console.debug('reached batch size, breathing');
|
||||||
|
batchCount=0;
|
||||||
|
setTimeout(importMeta, batchDelay, keystore);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (count == total) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
setTimeout(importMetaCustom, 100, keystore);
|
||||||
|
}
|
@ -37,6 +37,7 @@ config_dir = os.environ.get('CONFINI_DIR', os.path.join(script_dir, 'config'))
|
|||||||
|
|
||||||
argparser = argparse.ArgumentParser()
|
argparser = argparse.ArgumentParser()
|
||||||
argparser.add_argument('-c', type=str, default=config_dir, help='Config dir')
|
argparser.add_argument('-c', type=str, default=config_dir, help='Config dir')
|
||||||
|
argparser.add_argument('--tag', type=str, action='append', help='Tags to add to record')
|
||||||
argparser.add_argument('--gift-threshold', type=int, help='If set, users will be funded with additional random balance (in token integer units)')
|
argparser.add_argument('--gift-threshold', type=int, help='If set, users will be funded with additional random balance (in token integer units)')
|
||||||
argparser.add_argument('-v', action='store_true', help='Be verbose')
|
argparser.add_argument('-v', action='store_true', help='Be verbose')
|
||||||
argparser.add_argument('-vv', action='store_true', help='Be more verbose')
|
argparser.add_argument('-vv', action='store_true', help='Be more verbose')
|
||||||
@ -81,6 +82,10 @@ phone_idx = []
|
|||||||
user_dir = args.dir
|
user_dir = args.dir
|
||||||
user_count = args.user_count
|
user_count = args.user_count
|
||||||
|
|
||||||
|
tags = args.tag
|
||||||
|
if tags == None or len(tags) == 0:
|
||||||
|
tags = ['individual']
|
||||||
|
|
||||||
random.seed()
|
random.seed()
|
||||||
|
|
||||||
def genPhoneIndex(phone):
|
def genPhoneIndex(phone):
|
||||||
@ -189,6 +194,7 @@ if __name__ == '__main__':
|
|||||||
os.makedirs(base_dir, exist_ok=True)
|
os.makedirs(base_dir, exist_ok=True)
|
||||||
|
|
||||||
fa = open(os.path.join(user_dir, 'balances.csv'), 'w')
|
fa = open(os.path.join(user_dir, 'balances.csv'), 'w')
|
||||||
|
ft = open(os.path.join(user_dir, 'tags.csv'), 'w')
|
||||||
|
|
||||||
i = 0
|
i = 0
|
||||||
while i < user_count:
|
while i < user_count:
|
||||||
@ -215,10 +221,12 @@ if __name__ == '__main__':
|
|||||||
f.write(eth)
|
f.write(eth)
|
||||||
f.close()
|
f.close()
|
||||||
|
|
||||||
|
ft.write('{}:{}\n'.format(eth, ','.join(tags)))
|
||||||
amount = genAmount()
|
amount = genAmount()
|
||||||
fa.write('{},{}\n'.format(eth,amount))
|
fa.write('{},{}\n'.format(eth,amount))
|
||||||
logg.debug('pidx {}, uid {}, eth {}, amount {}, phone {}'.format(pidx, uid, eth, amount, phone))
|
logg.debug('pidx {}, uid {}, eth {}, amount {}, phone {}'.format(pidx, uid, eth, amount, phone))
|
||||||
|
|
||||||
i += 1
|
i += 1
|
||||||
|
|
||||||
|
ft.close()
|
||||||
fa.close()
|
fa.close()
|
||||||
|
@ -38,6 +38,7 @@ argparser = argparse.ArgumentParser()
|
|||||||
argparser.add_argument('-p', '--provider', dest='p', default='http://localhost:8545', type=str, help='Web3 provider url (http only)')
|
argparser.add_argument('-p', '--provider', dest='p', default='http://localhost:8545', type=str, help='Web3 provider url (http only)')
|
||||||
argparser.add_argument('-y', '--key-file', dest='y', type=str, help='Ethereum keystore file to use for signing')
|
argparser.add_argument('-y', '--key-file', dest='y', type=str, help='Ethereum keystore file to use for signing')
|
||||||
argparser.add_argument('-c', type=str, default=default_config_dir, help='config file')
|
argparser.add_argument('-c', type=str, default=default_config_dir, help='config file')
|
||||||
|
argparser.add_argument('--old-chain-spec', type=str, dest='old_chain_spec', default='evm:oldchain:1', help='chain spec')
|
||||||
argparser.add_argument('-i', '--chain-spec', dest='i', type=str, help='Chain specification string')
|
argparser.add_argument('-i', '--chain-spec', dest='i', type=str, help='Chain specification string')
|
||||||
argparser.add_argument('-r', '--registry', dest='r', type=str, help='Contract registry address')
|
argparser.add_argument('-r', '--registry', dest='r', type=str, help='Contract registry address')
|
||||||
argparser.add_argument('--batch-size', dest='batch_size', default=50, type=int, help='burst size of sending transactions to node')
|
argparser.add_argument('--batch-size', dest='batch_size', default=50, type=int, help='burst size of sending transactions to node')
|
||||||
@ -68,6 +69,11 @@ os.makedirs(user_new_dir)
|
|||||||
meta_dir = os.path.join(args.user_dir, 'meta')
|
meta_dir = os.path.join(args.user_dir, 'meta')
|
||||||
os.makedirs(meta_dir)
|
os.makedirs(meta_dir)
|
||||||
|
|
||||||
|
custom_dir = os.path.join(args.user_dir, 'custom')
|
||||||
|
os.makedirs(custom_dir)
|
||||||
|
os.makedirs(os.path.join(custom_dir, 'new'))
|
||||||
|
os.makedirs(os.path.join(custom_dir, 'meta'))
|
||||||
|
|
||||||
phone_dir = os.path.join(args.user_dir, 'phone')
|
phone_dir = os.path.join(args.user_dir, 'phone')
|
||||||
os.makedirs(os.path.join(phone_dir, 'meta'))
|
os.makedirs(os.path.join(phone_dir, 'meta'))
|
||||||
|
|
||||||
@ -77,9 +83,14 @@ os.stat(user_old_dir)
|
|||||||
txs_dir = os.path.join(args.user_dir, 'txs')
|
txs_dir = os.path.join(args.user_dir, 'txs')
|
||||||
os.makedirs(txs_dir)
|
os.makedirs(txs_dir)
|
||||||
|
|
||||||
|
user_dir = args.user_dir
|
||||||
|
|
||||||
chain_spec = ChainSpec.from_chain_str(config.get('CIC_CHAIN_SPEC'))
|
chain_spec = ChainSpec.from_chain_str(config.get('CIC_CHAIN_SPEC'))
|
||||||
chain_str = str(chain_spec)
|
chain_str = str(chain_spec)
|
||||||
|
|
||||||
|
old_chain_spec = ChainSpec.from_chain_str(args.old_chain_spec)
|
||||||
|
old_chain_str = str(old_chain_spec)
|
||||||
|
|
||||||
batch_size = args.batch_size
|
batch_size = args.batch_size
|
||||||
batch_delay = args.batch_delay
|
batch_delay = args.batch_delay
|
||||||
|
|
||||||
@ -127,12 +138,18 @@ def register_eth(i, u):
|
|||||||
return address
|
return address
|
||||||
|
|
||||||
|
|
||||||
def register_ussd(u):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|
||||||
|
user_tags = {}
|
||||||
|
f = open(os.path.join(user_dir, 'tags.csv'), 'r')
|
||||||
|
while True:
|
||||||
|
r = f.readline().rstrip()
|
||||||
|
if len(r) == 0:
|
||||||
|
break
|
||||||
|
(old_address, tags_csv) = r.split(':')
|
||||||
|
old_address = strip_0x(old_address)
|
||||||
|
user_tags[old_address] = tags_csv.split(',')
|
||||||
|
logg.debug('read tags {} for old address {}'.format(user_tags[old_address], old_address))
|
||||||
|
|
||||||
i = 0
|
i = 0
|
||||||
j = 0
|
j = 0
|
||||||
@ -150,6 +167,7 @@ if __name__ == '__main__':
|
|||||||
continue
|
continue
|
||||||
f.close()
|
f.close()
|
||||||
u = Person.deserialize(o)
|
u = Person.deserialize(o)
|
||||||
|
logg.debug('u {}'.format(o))
|
||||||
|
|
||||||
new_address = register_eth(i, u)
|
new_address = register_eth(i, u)
|
||||||
if u.identities.get('evm') == None:
|
if u.identities.get('evm') == None:
|
||||||
@ -157,8 +175,6 @@ if __name__ == '__main__':
|
|||||||
sub_chain_str = '{}:{}'.format(chain_spec.common_name(), chain_spec.network_id())
|
sub_chain_str = '{}:{}'.format(chain_spec.common_name(), chain_spec.network_id())
|
||||||
u.identities['evm'][sub_chain_str] = [new_address]
|
u.identities['evm'][sub_chain_str] = [new_address]
|
||||||
|
|
||||||
register_ussd(u)
|
|
||||||
|
|
||||||
new_address_clean = strip_0x(new_address)
|
new_address_clean = strip_0x(new_address)
|
||||||
filepath = os.path.join(
|
filepath = os.path.join(
|
||||||
user_new_dir,
|
user_new_dir,
|
||||||
@ -198,6 +214,29 @@ if __name__ == '__main__':
|
|||||||
|
|
||||||
os.symlink(os.path.realpath(filepath), meta_phone_filepath)
|
os.symlink(os.path.realpath(filepath), meta_phone_filepath)
|
||||||
|
|
||||||
|
|
||||||
|
# custom data
|
||||||
|
custom_key = generate_metadata_pointer(phone.encode('utf-8'), ':cic.custom')
|
||||||
|
custom_filepath = os.path.join(custom_dir, 'meta', custom_key)
|
||||||
|
|
||||||
|
filepath = os.path.join(
|
||||||
|
custom_dir,
|
||||||
|
'new',
|
||||||
|
custom_key[:2].upper(),
|
||||||
|
custom_key[2:4].upper(),
|
||||||
|
custom_key.upper() + '.json',
|
||||||
|
)
|
||||||
|
os.makedirs(os.path.dirname(filepath), exist_ok=True)
|
||||||
|
|
||||||
|
sub_old_chain_str = '{}:{}'.format(old_chain_spec.common_name(), old_chain_spec.network_id())
|
||||||
|
f = open(filepath, 'w')
|
||||||
|
k = u.identities['evm'][sub_old_chain_str][0]
|
||||||
|
tag_data = {'tags': user_tags[strip_0x(k)]}
|
||||||
|
f.write(json.dumps(tag_data))
|
||||||
|
f.close()
|
||||||
|
|
||||||
|
os.symlink(os.path.realpath(filepath), custom_filepath)
|
||||||
|
|
||||||
i += 1
|
i += 1
|
||||||
sys.stdout.write('imported {} {}'.format(i, u).ljust(200) + "\r")
|
sys.stdout.write('imported {} {}'.format(i, u).ljust(200) + "\r")
|
||||||
|
|
||||||
|
2101
apps/contract-migration/scripts/package-lock.json
generated
2101
apps/contract-migration/scripts/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -39,11 +39,11 @@ set -a
|
|||||||
# get required addresses from registries
|
# get required addresses from registries
|
||||||
DEV_TOKEN_INDEX_ADDRESS=`eth-contract-registry-list -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -r $CIC_REGISTRY_ADDRESS -f brief TokenRegistry`
|
DEV_TOKEN_INDEX_ADDRESS=`eth-contract-registry-list -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -r $CIC_REGISTRY_ADDRESS -f brief TokenRegistry`
|
||||||
DEV_ACCOUNT_INDEX_ADDRESS=`eth-contract-registry-list -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -r $CIC_REGISTRY_ADDRESS -f brief AccountRegistry`
|
DEV_ACCOUNT_INDEX_ADDRESS=`eth-contract-registry-list -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -r $CIC_REGISTRY_ADDRESS -f brief AccountRegistry`
|
||||||
DEV_RESERVE_ADDRESS=`eth-token-index-list -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -a $DEV_TOKEN_INDEX_ADDRESS -f brief $DEV_TOKEN_TYPE`
|
DEV_RESERVE_ADDRESS=`eth-token-index-list -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -a $DEV_TOKEN_INDEX_ADDRESS -f brief $CIC_DEFAULT_TOKEN_SYMBOL`
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
Token registry: $DEV_TOKEN_INDEX_ADDRESS
|
Token registry: $DEV_TOKEN_INDEX_ADDRESS
|
||||||
Account reigstry: $DEV_ACCOUNT_INDEX_ADDRESS
|
Account reigstry: $DEV_ACCOUNT_INDEX_ADDRESS
|
||||||
Reserve address: $DEV_RESERVE_ADDRESS ($DEV_TOKEN_TYPE)
|
Reserve address: $DEV_RESERVE_ADDRESS ($CIC_DEFAULT_TOKEN_SYMBOL)
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
>&2 echo "create account for gas gifter"
|
>&2 echo "create account for gas gifter"
|
||||||
|
@ -104,7 +104,7 @@ services:
|
|||||||
DEV_PIP_EXTRA_INDEX_URL: ${DEV_PIP_EXTRA_INDEX_URL:-https://pip.grassrootseconomics.net:8433}
|
DEV_PIP_EXTRA_INDEX_URL: ${DEV_PIP_EXTRA_INDEX_URL:-https://pip.grassrootseconomics.net:8433}
|
||||||
RUN_MASK: ${RUN_MASK:-0} # bit flags; 1: contract migrations 2: seed data
|
RUN_MASK: ${RUN_MASK:-0} # bit flags; 1: contract migrations 2: seed data
|
||||||
DEV_FAUCET_AMOUNT: ${DEV_FAUCET_AMOUNT:-0}
|
DEV_FAUCET_AMOUNT: ${DEV_FAUCET_AMOUNT:-0}
|
||||||
DEV_TOKEN_TYPE: ${DEV_TOKEN_TYPE:-GFT}
|
CIC_DEFAULT_TOKEN_SYMBOL: ${CIC_DEFAULT_TOKEN_SYMBOL:-GFT}
|
||||||
DEV_SARAFU_DEMURRAGE_LEVEL: ${DEV_SARAFU_DEMURRAGE_LEVEL:-196454828847045000000000000000000}
|
DEV_SARAFU_DEMURRAGE_LEVEL: ${DEV_SARAFU_DEMURRAGE_LEVEL:-196454828847045000000000000000000}
|
||||||
DEV_ETH_GAS_PRICE: ${DEV_ETH_GAS_PRICE:-1}
|
DEV_ETH_GAS_PRICE: ${DEV_ETH_GAS_PRICE:-1}
|
||||||
command: ["./run_job.sh"]
|
command: ["./run_job.sh"]
|
||||||
@ -249,6 +249,7 @@ services:
|
|||||||
SIGNER_SECRET: ${SIGNER_SECRET:-deadbeef}
|
SIGNER_SECRET: ${SIGNER_SECRET:-deadbeef}
|
||||||
ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER: ${DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER:-0xACB0BC74E1686D62dE7DC6414C999EA60C09F0eA}
|
ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER: ${DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER:-0xACB0BC74E1686D62dE7DC6414C999EA60C09F0eA}
|
||||||
TASKS_TRACE_QUEUE_STATUS: ${TASKS_TRACE_QUEUE_STATUS:-1}
|
TASKS_TRACE_QUEUE_STATUS: ${TASKS_TRACE_QUEUE_STATUS:-1}
|
||||||
|
CIC_DEFAULT_TOKEN_SYMBOL: ${CIC_DEFAULT_TOKEN_SYMBOL:-GFT}
|
||||||
depends_on:
|
depends_on:
|
||||||
- eth
|
- eth
|
||||||
- postgres
|
- postgres
|
||||||
|
Loading…
Reference in New Issue
Block a user