Skip to content

Commit ace3080

Browse files
committed
Move slip39.invoice.communications to slip39.communications
o Avoids any requirement for extras [invoice], filesystem I/O w/ solcx
1 parent 9d740e9 commit ace3080

File tree

4 files changed

+20
-9
lines changed

4 files changed

+20
-9
lines changed

requirements-invoice.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
eth-account >=0.7.0,<0.8
2+
py-solc-x >=1.1.1,<1.2
3+
pycryptodome >=3.16, <4
4+
requests >=2.20, <3
5+
tabulate >=0.9, <1
6+
crypto-licensing >=3.0.3
7+
dkimpy[ed25519] >=1.0.5,<2
8+
9+
# These versions are very brittle; must be upgraded in lock-step (see web3.py/setup.py)
10+
web3[tester] ==6.0.0b8
11+
eth-tester[py-evm] ==v0.7.0-beta.1
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
from email.mime import multipart, text
3333
from tabulate import tabulate
3434

35-
from ..util import is_listlike, commas, uniq, log_cfg, log_level
35+
from .util import is_listlike, commas, uniq, log_cfg, log_level
3636

3737

3838
__author__ = "Perry Kundert"
@@ -608,12 +608,12 @@ def autoresponder( address, from_addr, to_addrs, server, port, reinject ):
608608
$ make
609609
$ make altinstall
610610
611-
Install python-slip39
611+
Install python-slip39 (no extras required for just slip39.communications)
612612
613-
# python3.10 -m pip install https://github.com/pjkundert/python-slip39/archive/feature-invoice.zip#egg=slip39[gui,wallet]
613+
# python3.10 -m pip install https://github.com/pjkundert/python-slip39/archive/feature-invoice.zip#egg=slip39
614614
615615
Configure Postfix system roughly as per: https://github.com/innovara/autoreply,
616-
to run our slip39.invoice.communications autoresponder
616+
to run our slip39.communications autoresponder
617617
618618
- Create 'autoreply' user, and /opt/autoreply (not presently used)
619619
- Only necessary if your filter uses filesystem; otherwise, use 'nobody'
@@ -623,7 +623,7 @@ def autoresponder( address, from_addr, to_addrs, server, port, reinject ):
623623
# autoresponder pipe
624624
autoreply unix - n n - - pipe
625625
flags= user=autoreply null_sender=
626-
argv=/usr/local/bin/python3.10 -m slip39.invoice.communication autoresponder [email protected] ${sender} ${recipient}
626+
argv=/usr/local/bin/python3.10 -m slip39.communications autoresponder [email protected] ${sender} ${recipient}
627627
628628
- Create /etc/postfix/autoreply w/ lines like (and postmap /etc/postfix/autoreply):
629629
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
from aiosmtpd.controller import Controller
1313

1414
from .communications import dkim_message, send_message, matchaddr, AutoResponder
15-
from ..defaults import SMTP_TO, SMTP_FROM
15+
from .defaults import SMTP_TO, SMTP_FROM
1616

1717
log = logging.getLogger( __package__ )
1818

1919
# If we find a DKIM key, lets use it. Otherwise, we'll just use the pre-defined pre-signed email.Message
20-
dkim_keys = list( Path( __file__ ).resolve().parent.parent.parent.glob( 'licensing.dominionrnd.com.*.key' ))
20+
dkim_keys = list( Path( __file__ ).resolve().parent.parent.glob( 'licensing.dominionrnd.com.*.key' ))
2121
dkim_key = None
2222
dkim_msg = None
2323
if dkim_keys:
@@ -214,7 +214,7 @@ async def handle_DATA(self, server, session, envelope):
214214
here = Path( __file__ ).resolve().parent
215215
for execute in [
216216
[
217-
"python3", "-m", "slip39.invoice.communications",
217+
"python3", "-m", "slip39.communications",
218218
]
219219

220220
]:

slip39/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
__version_info__ = ( 10, 2, 0 )
1+
__version_info__ = ( 10, 2, 1 )
22
__version__ = '.'.join( map( str, __version_info__ ))

0 commit comments

Comments
 (0)