Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for underlying eth-account package update #109

Merged
merged 2 commits into from
May 20, 2024
Merged

Update for underlying eth-account package update #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d6eb4e
Fixing rawTransaction call
slundqui May 20, 2024
c08a578
version bump
slundqui May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion example/types/ExampleContract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pypechain/templates/contract.py/contract.py.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions pypechain/test/deployment/test_deployment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pypechain/test/deployment/types/ConstructorNoArgsContract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pypechain/test/deployment/types/ConstructorWithArgsContract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pypechain/test/deployment/types/ConstructorWithStructArgsContract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pypechain/test/deployment/types/NoConstructorContract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pypechain/test/errors/types/ErrorsContract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pypechain/test/events/types/EventsContract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pypechain/test/overloading/types/OverloadedMethodsContract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pypechain/test/return_types/types/ReturnTypesContract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pypechain/test/structs/types/StructsAContract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pypechain/test/structs/types/StructsBContract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pypechain/test/structs/types/StructsCContract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" },
Expand All @@ -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"
Expand Down
Loading