Update for underlying eth-account package update (#109)

delvtech · May 20, 2024 · 46e0682 · 46e0682
1 parent 90884f2
commit 46e0682
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 19 deletions.
diff --git a/example/types/ExampleContract.py b/example/types/ExampleContract.py
@@ -1029,7 +1029,7 @@ def deploy(cls, w3: Web3, account: LocalAccount | ChecksumAddress, constructorAr
         signed_tx = account.sign_transaction(deployment_tx)
 
         # Send the signed transaction and wait for receipt
-        tx_hash = w3.eth.send_raw_transaction(signed_tx.rawTransaction)
+        tx_hash = w3.eth.send_raw_transaction(signed_tx.raw_transaction)
         tx_receipt = w3.eth.wait_for_transaction_receipt(tx_hash)
 
         deployed_contract = deployer(address=tx_receipt.contractAddress)  # type: ignore

diff --git a/pypechain/templates/contract.py/contract.py.jinja2 b/pypechain/templates/contract.py/contract.py.jinja2
@@ -98,7 +98,7 @@ class {{contract_name}}Contract(Contract):
         signed_tx = account.sign_transaction(deployment_tx)
 
         # Send the signed transaction and wait for receipt
-        tx_hash = w3.eth.send_raw_transaction(signed_tx.rawTransaction)
+        tx_hash = w3.eth.send_raw_transaction(signed_tx.raw_transaction)
         tx_receipt = w3.eth.wait_for_transaction_receipt(tx_hash)
 
         deployed_contract = deployer(address=tx_receipt.contractAddress) # type: ignore

diff --git a/pypechain/test/deployment/test_deployment.py b/pypechain/test/deployment/test_deployment.py
@@ -61,7 +61,7 @@ def test_deployment_with_constructor_and_local_signer(self, w3: Web3, local_acco
         signed_tx = local_account.sign_transaction(deployment_tx)
 
         # Send the signed transaction and wait for receipt
-        tx_hash = w3.eth.send_raw_transaction(signed_tx.rawTransaction)
+        tx_hash = w3.eth.send_raw_transaction(signed_tx.raw_transaction)
         receipt = w3.eth.wait_for_transaction_receipt(tx_hash)
 
         # Assert deployment success based on receipt
@@ -104,7 +104,7 @@ def test_deployment_with_constructor_and_local_signer(self, w3: Web3, local_acco
         signed_tx = local_account.sign_transaction(deployment_tx)
 
         # Send the signed transaction and wait for receipt
-        tx_hash = w3.eth.send_raw_transaction(signed_tx.rawTransaction)
+        tx_hash = w3.eth.send_raw_transaction(signed_tx.raw_transaction)
         receipt = w3.eth.wait_for_transaction_receipt(tx_hash)
 
         # Assert deployment success based on receipt
@@ -147,7 +147,7 @@ def test_deployment_with_constructor_and_local_signer(self, w3: Web3, local_acco
         signed_tx = local_account.sign_transaction(deployment_tx)
 
         # Send the signed transaction and wait for receipt
-        tx_hash = w3.eth.send_raw_transaction(signed_tx.rawTransaction)
+        tx_hash = w3.eth.send_raw_transaction(signed_tx.raw_transaction)
         receipt = w3.eth.wait_for_transaction_receipt(tx_hash)
 
         # Assert deployment success based on receipt
@@ -196,7 +196,7 @@ def test_deployment_with_constructor_and_local_signer(self, w3: Web3, local_acco
         signed_tx = local_account.sign_transaction(deployment_tx)
 
         # Send the signed transaction and wait for receipt
-        tx_hash = w3.eth.send_raw_transaction(signed_tx.rawTransaction)
+        tx_hash = w3.eth.send_raw_transaction(signed_tx.raw_transaction)
         receipt = w3.eth.wait_for_transaction_receipt(tx_hash)
 
         # Assert deployment success based on receipt

diff --git a/pypechain/test/deployment/types/ConstructorNoArgsContract.py b/pypechain/test/deployment/types/ConstructorNoArgsContract.py
@@ -224,7 +224,7 @@ def deploy(cls, w3: Web3, account: LocalAccount | ChecksumAddress) -> Self:
         signed_tx = account.sign_transaction(deployment_tx)
 
         # Send the signed transaction and wait for receipt
-        tx_hash = w3.eth.send_raw_transaction(signed_tx.rawTransaction)
+        tx_hash = w3.eth.send_raw_transaction(signed_tx.raw_transaction)
         tx_receipt = w3.eth.wait_for_transaction_receipt(tx_hash)
 
         deployed_contract = deployer(address=tx_receipt.contractAddress)  # type: ignore

diff --git a/pypechain/test/deployment/types/ConstructorWithArgsContract.py b/pypechain/test/deployment/types/ConstructorWithArgsContract.py
@@ -233,7 +233,7 @@ def deploy(cls, w3: Web3, account: LocalAccount | ChecksumAddress, constructorAr
         signed_tx = account.sign_transaction(deployment_tx)
 
         # Send the signed transaction and wait for receipt
-        tx_hash = w3.eth.send_raw_transaction(signed_tx.rawTransaction)
+        tx_hash = w3.eth.send_raw_transaction(signed_tx.raw_transaction)
         tx_receipt = w3.eth.wait_for_transaction_receipt(tx_hash)
 
         deployed_contract = deployer(address=tx_receipt.contractAddress)  # type: ignore

diff --git a/pypechain/test/deployment/types/ConstructorWithStructArgsContract.py b/pypechain/test/deployment/types/ConstructorWithStructArgsContract.py
@@ -299,7 +299,7 @@ def deploy(cls, w3: Web3, account: LocalAccount | ChecksumAddress, constructorAr
         signed_tx = account.sign_transaction(deployment_tx)
 
         # Send the signed transaction and wait for receipt
-        tx_hash = w3.eth.send_raw_transaction(signed_tx.rawTransaction)
+        tx_hash = w3.eth.send_raw_transaction(signed_tx.raw_transaction)
         tx_receipt = w3.eth.wait_for_transaction_receipt(tx_hash)
 
         deployed_contract = deployer(address=tx_receipt.contractAddress)  # type: ignore

diff --git a/pypechain/test/deployment/types/NoConstructorContract.py b/pypechain/test/deployment/types/NoConstructorContract.py
@@ -223,7 +223,7 @@ def deploy(cls, w3: Web3, account: LocalAccount | ChecksumAddress) -> Self:
         signed_tx = account.sign_transaction(deployment_tx)
 
         # Send the signed transaction and wait for receipt
-        tx_hash = w3.eth.send_raw_transaction(signed_tx.rawTransaction)
+        tx_hash = w3.eth.send_raw_transaction(signed_tx.raw_transaction)
         tx_receipt = w3.eth.wait_for_transaction_receipt(tx_hash)
 
         deployed_contract = deployer(address=tx_receipt.contractAddress)  # type: ignore

diff --git a/pypechain/test/errors/types/ErrorsContract.py b/pypechain/test/errors/types/ErrorsContract.py
@@ -453,7 +453,7 @@ def deploy(cls, w3: Web3, account: LocalAccount | ChecksumAddress) -> Self:
         signed_tx = account.sign_transaction(deployment_tx)
 
         # Send the signed transaction and wait for receipt
-        tx_hash = w3.eth.send_raw_transaction(signed_tx.rawTransaction)
+        tx_hash = w3.eth.send_raw_transaction(signed_tx.raw_transaction)
         tx_receipt = w3.eth.wait_for_transaction_receipt(tx_hash)
 
         deployed_contract = deployer(address=tx_receipt.contractAddress)  # type: ignore

diff --git a/pypechain/test/events/types/EventsContract.py b/pypechain/test/events/types/EventsContract.py
@@ -468,7 +468,7 @@ def deploy(cls, w3: Web3, account: LocalAccount | ChecksumAddress) -> Self:
         signed_tx = account.sign_transaction(deployment_tx)
 
         # Send the signed transaction and wait for receipt
-        tx_hash = w3.eth.send_raw_transaction(signed_tx.rawTransaction)
+        tx_hash = w3.eth.send_raw_transaction(signed_tx.raw_transaction)
         tx_receipt = w3.eth.wait_for_transaction_receipt(tx_hash)
 
         deployed_contract = deployer(address=tx_receipt.contractAddress)  # type: ignore

diff --git a/pypechain/test/overloading/types/OverloadedMethodsContract.py b/pypechain/test/overloading/types/OverloadedMethodsContract.py
@@ -323,7 +323,7 @@ def deploy(cls, w3: Web3, account: LocalAccount | ChecksumAddress) -> Self:
         signed_tx = account.sign_transaction(deployment_tx)
 
         # Send the signed transaction and wait for receipt
-        tx_hash = w3.eth.send_raw_transaction(signed_tx.rawTransaction)
+        tx_hash = w3.eth.send_raw_transaction(signed_tx.raw_transaction)
         tx_receipt = w3.eth.wait_for_transaction_receipt(tx_hash)
 
         deployed_contract = deployer(address=tx_receipt.contractAddress)  # type: ignore

diff --git a/pypechain/test/return_types/types/ReturnTypesContract.py b/pypechain/test/return_types/types/ReturnTypesContract.py
@@ -813,7 +813,7 @@ def deploy(cls, w3: Web3, account: LocalAccount | ChecksumAddress) -> Self:
         signed_tx = account.sign_transaction(deployment_tx)
 
         # Send the signed transaction and wait for receipt
-        tx_hash = w3.eth.send_raw_transaction(signed_tx.rawTransaction)
+        tx_hash = w3.eth.send_raw_transaction(signed_tx.raw_transaction)
         tx_receipt = w3.eth.wait_for_transaction_receipt(tx_hash)
 
         deployed_contract = deployer(address=tx_receipt.contractAddress)  # type: ignore

diff --git a/pypechain/test/structs/types/StructsAContract.py b/pypechain/test/structs/types/StructsAContract.py
@@ -315,7 +315,7 @@ def deploy(cls, w3: Web3, account: LocalAccount | ChecksumAddress) -> Self:
         signed_tx = account.sign_transaction(deployment_tx)
 
         # Send the signed transaction and wait for receipt
-        tx_hash = w3.eth.send_raw_transaction(signed_tx.rawTransaction)
+        tx_hash = w3.eth.send_raw_transaction(signed_tx.raw_transaction)
         tx_receipt = w3.eth.wait_for_transaction_receipt(tx_hash)
 
         deployed_contract = deployer(address=tx_receipt.contractAddress)  # type: ignore

diff --git a/pypechain/test/structs/types/StructsBContract.py b/pypechain/test/structs/types/StructsBContract.py
@@ -241,7 +241,7 @@ def deploy(cls, w3: Web3, account: LocalAccount | ChecksumAddress) -> Self:
         signed_tx = account.sign_transaction(deployment_tx)
 
         # Send the signed transaction and wait for receipt
-        tx_hash = w3.eth.send_raw_transaction(signed_tx.rawTransaction)
+        tx_hash = w3.eth.send_raw_transaction(signed_tx.raw_transaction)
         tx_receipt = w3.eth.wait_for_transaction_receipt(tx_hash)
 
         deployed_contract = deployer(address=tx_receipt.contractAddress)  # type: ignore

diff --git a/pypechain/test/structs/types/StructsCContract.py b/pypechain/test/structs/types/StructsCContract.py
@@ -271,7 +271,7 @@ def deploy(cls, w3: Web3, account: LocalAccount | ChecksumAddress) -> Self:
         signed_tx = account.sign_transaction(deployment_tx)
 
         # Send the signed transaction and wait for receipt
-        tx_hash = w3.eth.send_raw_transaction(signed_tx.rawTransaction)
+        tx_hash = w3.eth.send_raw_transaction(signed_tx.raw_transaction)
         tx_receipt = w3.eth.wait_for_transaction_receipt(tx_hash)
 
         deployed_contract = deployer(address=tx_receipt.contractAddress)  # type: ignore

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [project]
 
 name = "pypechain"
-version = "0.0.29"
+version = "0.0.30"
 authors = [
     { name = "Matthew Brown", email = "matt@delv.tech" },
     { name = "Dylan Paiton", email = "dylan@delv.tech" },
@@ -16,7 +16,7 @@ classifiers = [
     "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",
 ]
-dependencies = ["autoflake", "black", "isort", "jinja2", "web3"]
+dependencies = ["autoflake", "black", "eth-account", "isort", "jinja2", "web3"]
 
 [project.scripts]
 pypechain = "pypechain.main:main"