Work toward correct operation of <generator>.send( ... )

Author: pjkundert

GNUmakefile

@@ -77,7 +77,7 @@ test:
 	$(PY3TEST)
 
 analyze:
-	flake8 -j 1 --max-line-length=250 \
+	flake8 --color never -j 1 --max-line-length=250 \
 	  --ignore=W503,E201,E202,E203,E127,E221,E223,E226,E231,E241,E242,E251,E265,E272,E274 \
 	  slip39
 
@@ -127,6 +127,63 @@ slip39/layout/COVER.txt:
 # Any build dependencies that are dynamically generated, and may need updating from time to time
 deps:			$(TXT) slip39/gui/SLIP-39.txt slip39/layout/COVER.txt
 
+
+# 
+# Agent Keypairs, Product Licences
+#
+
+GLOBAL_OPTIONS	= -vv
+
+CREDENTIALS	= $(abspath $(HOME)/.crypto-licensing )
+
+export CRYPTO_LIC_PASSWORD
+export CRYPTO_LIC_USERNAME
+
+.PHONY: slip-39 perry-kundert
+products:			slip-39				\
+				perry-kundert			 \
+
+slip-39:
+
+perry-kundert:			[email protected]
+perry-kundert:			CRYPTO_LIC_PASSWORD=password
+perry-kundert:			slip39/invoice/payments_test/perry-kundert.crypto-license
+perry-kundert:			GRANTS="{\"crypto-licensing-server\": {\
+    \"override\": { \
+        \"rate\": \"0.1%\", \
+        \"crypto\": { \
+            \"ETH\": \"0xe4909b66FD66DA7d86114695A1256418580C8767\", \
+            \"BTC\": \"bc1qygm3dlynmjxuflghr0hmq6r7wmff2jd5gtgz0q\" \
+        }\
+    }\
+}}"
+
+
+
+# Create .crypto-keypair from seed; note: if the make rule fails, intermediate files are deleted.
+# We expect any password to be transmitted in CRYPTO_LIC_PASSWORD env. var.
+%.crypto-keypair: %.crypto-seed
+	$(PY3) -m crypto_licensing $(GLOBAL_OPTIONS)		\
+	    --extra   $(dir $(basename $@ ))			\
+	    --name $(notdir $(basename $@ ))			\
+            --reverse-save					\
+	    registered						\
+	    --username $(USERNAME)				\
+	    --seed $$( cat $< )
+
+# Create .crypto-license, signed by .crypto-keypair
+%.crypto-license : %.crypto-keypair
+	$(PY3) -m crypto_licensing $(GLOBAL_OPTIONS)		\
+	    --extra   $(dir $(basename $@ ))			\
+	    --name $(notdir $(basename $@ ))			\
+            --reverse-save					\
+	    license						\
+	    --username $(USERNAME) --no-registering		\
+	    --client $(CLIENT) --client-pubkey $(CLIENT_PUBKEY)	\
+	    --grant $(GRANTS)					\
+	    --author $(AUTHOR) --domain $(DOMAIN) --product $(PRODUCT) $(LICENSE_OPTIONS)
+
+
 # 
 # VirtualEnv build, install and activate
 #

requirements-invoice.txt

@@ -10,3 +10,6 @@ dkimpy[ed25519]		>=1.0.5,<2
 # These versions are very brittle; must be upgraded in lock-step (see web3.py/setup.py)
 web3[tester]		==6.0.0b9
 eth-tester[py-evm]	==v0.8.0-b.3
+
+# Until ethpm upgrade to avoid dependency
+ipfshttpclient				; python_version >= "3.11"

requirements.txt

@@ -1,7 +1,7 @@
 base58			>=2.0.1,<3
 chacha20poly1305	>=0.0.3
 click			>=8.1.3,<9
-crypto-licensing	>=3.0.4,<4
+crypto-licensing	>=3.2.0,<4
 cx_Freeze		>=6.12		; sys_platform == "win32"
 fpdf2			>=2.5.7,<3
 hdwallet		>=2.2.1,<3

slip39/invoice/artifact_test.py

@@ -568,7 +568,7 @@ def items( n, most=None, seen=None ):
 paths			= f"../-{desired - 1}"
 
 invoices_to_write		= [
-    [
+    (
         # - No obvious route between line-item currencies, and invoice currency:
         #
         # Only XRP LineItems, want USDC in 'currencies' payable (as well as 'BTC', 'ETH' and
@@ -577,25 +577,31 @@ def items( n, most=None, seen=None ):
         # ('BTC',<something>).
         Invoice(
             items( random.randint( 1, 100 ), most=1, seen=set( ('XRP', ) )),
-            accounts	= [
-                account( SEED_ZOOS, crypto='Ethereum' ),
-                account( SEED_ZOOS, crypto='Bitcoin' ),
-                account( SEED_ZOOS, crypto='Ripple' ),
-            ],
+            accounts	= a,
             currencies	= ['USDC'],
             conversions	= dict( conversions )  # | {('BTC','ETH'): None}, # now automatic
         )
-    ],
-    [
+        for a in [
+            [
+                account( SEED_ZOOS, crypto='Ethereum' ),
+                account( SEED_ZOOS, crypto='Bitcoin' ),
+                account( SEED_ZOOS, crypto='Ripple' ),
+            ]
+        ]
+    ),
+    (
         # - Only ETH.  No conversions required.
         Invoice(
             items( random.randint( 1, 100 ), most=1, seen=set( ('ETH', ) )),
-            accounts	= [
-                account( SEED_ZOOS, crypto='Ethereum' ),
-            ],
+            accounts	= a,
             currencies	= ['ETH'],
         )
-    ],
+        for a in [
+            [
+                account( SEED_ZOOS, crypto='Ethereum' ),
+            ]
+        ]
+    ),
     (
         # - Random combinations of LineItem / Invoice currencies
         #

slip39/invoice/multipayout_test.py

@@ -963,7 +963,11 @@ def test_multipayout_api( testnet, provider, chain_id, src, src_prvkey, destinat
     # OK, we can now sign the 128-bit UUIDv4 bytes w/ the agent keypair.sk (signing key).  The first
     # 64 bytes of the signed document is the signature.
     machine_signed		= ed25519.crypto_sign( machine.bytes, keypair.sk )
-    print( f"{licensing.into_b64( keypair.vk )}: machine UUID signed:    {machine_signed.hex()}" )
+    print( f"{licensing.into_b64( keypair.vk )}: machine UUID sign:       {machine_signed.hex()}" )
+    machine_sig			= machine_signed[:64]
+    print( f"{licensing.into_b64( keypair.vk )}: machine UUID signature:  {licensing.into_b64( machine_sig )}" )
+    assert ed25519.crypto_sign_open( machine_sig + machine.bytes, keypair.vk ) == machine.bytes, \
+        f"Failed to verify machine ID {machine.bytes.hex()} w/ signature {licensing.into_b64( machine_sig )}"
 
     # A 512-bit Ed25519 signature encodes 2 points on an elliptical curve, but won't fit into our
     # 256-bit <data>, so hash it (along with the document).  The result is a "fingerprint" of the