From 2cdccd821f51e6b1b4d06012f8c90879b90dd6c7 Mon Sep 17 00:00:00 2001 From: nolash Date: Mon, 15 Nov 2021 14:30:56 +0100 Subject: [PATCH] Remove misplaced sweep code, bump version --- funga/eth/keystore/sql.py | 11 +++++++++++ requirements.txt | 6 +++--- setup.cfg | 1 + setup.py | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/funga/eth/keystore/sql.py b/funga/eth/keystore/sql.py index 8fc4f56..e343264 100644 --- a/funga/eth/keystore/sql.py +++ b/funga/eth/keystore/sql.py @@ -48,6 +48,8 @@ class SQLKeystore(EthKeystore): self.db_session.execute(s) self.db_session.commit() self.symmetric_key = kwargs.get('symmetric_key') + self.__rs = None + self.__rs_crsr = 0 def __del__(self): @@ -72,6 +74,15 @@ class SQLKeystore(EthKeystore): return a + def list(self): + s = text('SELECT wallet_address_hex FROM ethereum') + self.__rs = self.db_session.execute(s) + addresses = [] + for r in self.__rs: + addresses.append(r) + return addresses + + def import_key(self, pk, password=None): address_hex = private_key_to_address(pk) address_hex_clean = strip_0x(address_hex).lower() diff --git a/requirements.txt b/requirements.txt index 0b70081..c082677 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,8 +2,8 @@ cryptography==3.2.1 pysha3==1.0.2 rlp==2.0.1 json-rpc==1.13.0 -confini>=0.3.6rc3,<0.5.0 +confini~=0.5.1 coincurve==15.0.0 -hexathon~=0.0.1a7 +hexathon~=0.1.0 pycryptodome==3.10.1 -funga>=0.5.1a1,<0.6.0 +funga==0.5.1 diff --git a/setup.cfg b/setup.cfg index b802f72..37339c3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,6 +5,7 @@ classifiers = Development Status :: 3 - Alpha Intended Audience :: Developers Topic :: Software Development :: Libraries + Environment :: Console License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+) license = GPLv3 license_files = diff --git a/setup.py b/setup.py index 4c61438..0315a0d 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ f.close() setup( name="funga-eth", - version="0.5.1a2", + version="0.5.1", description="Ethereum implementation of the funga keystore and signer", author="Louis Holbrook", author_email="dev@holbrook.no",