Compare commits

..

No commits in common. "2bfc1ce3b2db4fa4e5b9e31727eea557c29cdf7f" and "a043f332424dbceff34ab2683d0fb4325e60392c" have entirely different histories.

2 changed files with 6 additions and 11 deletions

View File

@ -321,8 +321,8 @@ def noop_handler(cmd):
def generate_private_key():
"""Generate a new private key."""
web3 = Web3()
account = web3.eth.account.create()
return account.address,w3.to_hex(account.key)
account = web3.eth.account.create()
return account.address
def store_key_in_keystore(private_key, key_name, store_name):
keystore = {
@ -342,13 +342,8 @@ def store_key_in_keystore(private_key, key_name, store_name):
def key_create_handler(cmd):
store_name = cmd.t
key_name = str(cmd.f).split(":")[1]
if cmd.k is None:
address,private_key = generate_private_key()
else:
if private_key.startswith("0x"):
private_key = private_key[2:]
address = w3.eth.account.from_key(privatekey)
private_key = cmd.k
address = generate_private_key()
store_key_in_keystore(private_key, key_name, store_name)
return address
@ -488,7 +483,7 @@ if __name__ == '__main__':
o = Router()
o.register(CmdId.KEY_CREATE,key_create_handler)
o.register(CmdId.VOUCHER_CREATE,voucher_create_handler)
o.register(CmdId.VOUCHER_MINT, voucher_create_handler)
o.register(CmdId.VOUCHER_MINT, voucher_mint_handler)
o.register(CmdId.VOUCHER_TRANSFER,voucher_transfer_handler)
if len(sys.argv) > 1:

View File

@ -1,4 +1,4 @@
KEY_CREATE - lockkey custodialstore
VOUCHER_CREATE - stm stopcoin 6
VOUCHER_TRANSFER - 0x0d3D8A97f970fbdf7486274b02A8308d8aCcE6a1 5000000 0xEa436D1d29a46880b0E956c22187314A8777B463 0xEef7Ad2cCCB317E6898F43eA2B5b1BD1E9C13b1
VOUCHER_TRANSFER - 0x0d3D8A97f970fbdf7486274b02A8308d8aCcE6a1 5000000 0x74096A72495FE95710C675E78bd4A10f2BfE08BC 0xEef7Ad2cCCB317E6898F43eA2B5b1BD1E9C13b1A
VOUCHER_MINT - 0x2e8ce655BEfBee9b29A34fcecb3193462e4d0999 5000000 0x74096a72495fe95710c675e78bd4a10f2bfe08bc