Update to web3 6.8.0

Author: pjkundert

requirements-invoice.txt

@@ -9,8 +9,14 @@ requests		>=2.20,	<3
 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
+# 6.0.0b9
+#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"
 
+# 6.6.1
+web3[tester]		==6.8.0
+eth-tester[py-evm]	==v0.9.1-b.1
 # Until ethpm upgrade to avoid dependency
-ipfshttpclient				; python_version >= "3.11"
+#ipfshttpclient		= 0.8.0a2

requirements.txt

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

slip39/invoice/multipayout_test.py

@@ -13,7 +13,7 @@
 from crypto_licensing	import licensing, ed25519
 
 from web3		import Web3, logs as web3_logs
-from web3.contract	import normalize_address_no_ens
+from web3._utils.normalizers import normalize_address_no_ens
 from web3.middleware	import construct_sign_and_send_raw_middleware
 from eth_account	import Account
 
@@ -306,7 +306,7 @@ def test_create(address, nonce, expected_address):
 #
 # Here are the Goerli testnet results from the first successful test:
 #
-# The funds came from the 0x667A... source account, and were:
+# The funds came from the 0x667A... (the "zoo zoo ... wrong") source account, and were:
 #
 #       .01 ETH
 #    820.00 WEENUS
@@ -956,7 +956,7 @@ def test_multipayout_api( testnet, provider, chain_id, src, src_prvkey, destinat
     print( f"{machine} == {machine.bytes.hex()}" )
 
     # Get unique Agent ID Keypair (plaintext; no username/password required)
-    (keyname,keypair),		= licensing.load_keys(
+    (keyname,keypair),		= licensing.load_keypairs(
         extra=[os.path.dirname( __file__ )], filename=__file__ )
     print( f"{licensing.into_b64( keypair.vk )}: {keyname}" )