From fc4c211849cd7b94955e774d4bc960fee244ce9f Mon Sep 17 00:00:00 2001 From: nolash Date: Sun, 20 Sep 2020 10:00:59 +0200 Subject: [PATCH] Rename forbidden keyword import --- CHANGELOG | 2 ++ crypto_dev_signer/keystore/interface.py | 3 +++ crypto_dev_signer/keystore/postgres.py | 5 ++++- setup.py | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b0e2880..4bba6a0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +* 0.2.0 + - Add import method to keystore interface * 0.1.1 - Create key table only if not exist * 0.1.0 diff --git a/crypto_dev_signer/keystore/interface.py b/crypto_dev_signer/keystore/interface.py index b17c8fc..2525388 100644 --- a/crypto_dev_signer/keystore/interface.py +++ b/crypto_dev_signer/keystore/interface.py @@ -6,3 +6,6 @@ class Keystore: def new(self, password=None): raise NotImplementedError + def import_key(self, pk, password=None): + raise NotImplementedError + diff --git a/crypto_dev_signer/keystore/postgres.py b/crypto_dev_signer/keystore/postgres.py index 9adc16b..803695a 100644 --- a/crypto_dev_signer/keystore/postgres.py +++ b/crypto_dev_signer/keystore/postgres.py @@ -55,12 +55,15 @@ class ReferenceKeystore(Keystore): def new(self, password=None): b = os.urandom(32) pk = keyapi.PrivateKey(b) + self.import(pk, password) + + def import_key(self, pk, password=None): pubk = keyapi.private_key_to_public_key(pk) address_hex = pubk.to_checksum_address() address_hex_clean = strip_hex_prefix(address_hex) - logg.debug('address {}'.format(address_hex_clean)) + logg.debug('inserting address {}'.format(address_hex_clean)) c = self._encrypt(pk.to_bytes(), password) s = sql.SQL('INSERT INTO ethereum (wallet_address_hex, key_ciphertext) VALUES (%s, %s)') self.cur.execute(s, [ address_hex_clean, c.decode('utf-8') ]) diff --git a/setup.py b/setup.py index 5e6ded3..1bd5195 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup setup( name="crypto-dev-signer", - version="0.1.1", + version="0.2.0" description="A signer and keystore daemon and library for cryptocurrency software development", author="Louis Holbrook", author_email="dev@holbrook.no",