Remove misplaced sweep code, bump version

This commit is contained in:
nolash 2021-11-15 14:30:56 +01:00
parent ccacffe962
commit 2cdccd821f
Signed by untrusted user who does not match committer: lash
GPG Key ID: 21D2E7BB88C2A746
4 changed files with 16 additions and 4 deletions

View File

@ -48,6 +48,8 @@ class SQLKeystore(EthKeystore):
self.db_session.execute(s) self.db_session.execute(s)
self.db_session.commit() self.db_session.commit()
self.symmetric_key = kwargs.get('symmetric_key') self.symmetric_key = kwargs.get('symmetric_key')
self.__rs = None
self.__rs_crsr = 0
def __del__(self): def __del__(self):
@ -72,6 +74,15 @@ class SQLKeystore(EthKeystore):
return a 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): def import_key(self, pk, password=None):
address_hex = private_key_to_address(pk) address_hex = private_key_to_address(pk)
address_hex_clean = strip_0x(address_hex).lower() address_hex_clean = strip_0x(address_hex).lower()

View File

@ -2,8 +2,8 @@ cryptography==3.2.1
pysha3==1.0.2 pysha3==1.0.2
rlp==2.0.1 rlp==2.0.1
json-rpc==1.13.0 json-rpc==1.13.0
confini>=0.3.6rc3,<0.5.0 confini~=0.5.1
coincurve==15.0.0 coincurve==15.0.0
hexathon~=0.0.1a7 hexathon~=0.1.0
pycryptodome==3.10.1 pycryptodome==3.10.1
funga>=0.5.1a1,<0.6.0 funga==0.5.1

View File

@ -5,6 +5,7 @@ classifiers =
Development Status :: 3 - Alpha Development Status :: 3 - Alpha
Intended Audience :: Developers Intended Audience :: Developers
Topic :: Software Development :: Libraries Topic :: Software Development :: Libraries
Environment :: Console
License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+) License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
license = GPLv3 license = GPLv3
license_files = license_files =

View File

@ -33,7 +33,7 @@ f.close()
setup( setup(
name="funga-eth", name="funga-eth",
version="0.5.1a2", version="0.5.1",
description="Ethereum implementation of the funga keystore and signer", description="Ethereum implementation of the funga keystore and signer",
author="Louis Holbrook", author="Louis Holbrook",
author_email="dev@holbrook.no", author_email="dev@holbrook.no",