Fixes for underlying eth-account release (#1478)

delvtech · May 20, 2024 · 6f7dd81 · 6f7dd81
1 parent 854e939
commit 6f7dd81
Show file tree

Hide file tree

Showing 17 changed files with 20 additions and 19 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -28,6 +28,7 @@ dependencies = [
     "dill",
     "docker",
     "eth-typing==4.1.0",
+    "eth-account",
     "fixedpointmath",
     "flask",
     "flask-expects-json",

diff --git a/src/agent0/core/base/make_key.py b/src/agent0/core/base/make_key.py
@@ -24,5 +24,5 @@ def make_private_key(extra_entropy: str = "SOME STRING") -> str:
     """
     extra_key_bytes = text_if_str(to_bytes, extra_entropy)
     key_bytes = keccak(os.urandom(32) + extra_key_bytes)
-    key = Account()._parsePrivateKey(key_bytes)  # pylint: disable=protected-access
+    key = Account()._parse_private_key(key_bytes)  # pylint: disable=protected-access
     return str(key)
diff --git a/src/agent0/ethpy/base/transactions.py b/src/agent0/ethpy/base/transactions.py
@@ -484,7 +484,7 @@ async def _async_send_transaction_and_wait_for_receipt(
         a TypedDict; success can be checked via tx_receipt["status"]
     """
     signed_txn = signer.sign_transaction(unsent_txn)
-    tx_hash = web3.eth.send_raw_transaction(signed_txn.rawTransaction)
+    tx_hash = web3.eth.send_raw_transaction(signed_txn.raw_transaction)
     tx_receipt = await async_wait_for_transaction_receipt(web3, tx_hash, timeout=timeout)
 
     # Error checking when transaction doesn't throw an error, but instead
@@ -691,7 +691,7 @@ def send_transaction_and_wait_for_receipt(
         a TypedDict; success can be checked via tx_receipt["status"]
     """
     signed_txn = signer.sign_transaction(unsent_txn)
-    tx_hash = web3.eth.send_raw_transaction(signed_txn.rawTransaction)
+    tx_hash = web3.eth.send_raw_transaction(signed_txn.raw_transaction)
     tx_receipt = wait_for_transaction_receipt(web3, tx_hash, timeout=timeout)
 
     # Error checking when transaction doesn't throw an error, but instead
@@ -927,7 +927,7 @@ async def async_eth_transfer(
     unsent_txn["maxFeePerGas"] = Wei(max_fee_per_gas)
     unsent_txn["maxPriorityFeePerGas"] = Wei(max_priority_fee)
     signed_txn = signer.sign_transaction(unsent_txn)
-    tx_hash = web3.eth.send_raw_transaction(signed_txn.rawTransaction)
+    tx_hash = web3.eth.send_raw_transaction(signed_txn.raw_transaction)
     return await async_wait_for_transaction_receipt(web3, tx_hash)
 
 
@@ -991,7 +991,7 @@ def eth_transfer(
     unsent_txn["maxPriorityFeePerGas"] = Wei(max_priority_fee)
     signed_txn = signer.sign_transaction(unsent_txn)
 
-    tx_hash = web3.eth.send_raw_transaction(signed_txn.rawTransaction)
+    tx_hash = web3.eth.send_raw_transaction(signed_txn.raw_transaction)
     return web3.eth.wait_for_transaction_receipt(tx_hash)
 
 

diff --git a/src/agent0/ethpy/hyperdrive/interface/read_write_interface_test.py b/src/agent0/ethpy/hyperdrive/interface/read_write_interface_test.py
@@ -31,7 +31,7 @@ def test_set_variable_rate(self, hyperdrive_read_write_interface_fixture: Hyperd
         # TODO: Setup a fixture to create a funded local account
         extra_key_bytes = text_if_str(to_bytes, "extra_entropy")
         key_bytes = keccak(os.urandom(32) + extra_key_bytes)
-        private_key = Account()._parsePrivateKey(key_bytes)  # pylint: disable=protected-access
+        private_key = Account()._parse_private_key(key_bytes)  # pylint: disable=protected-access
         sender: LocalAccount = Account().from_key(private_key)
         set_anvil_account_balance(hyperdrive_read_write_interface_fixture.web3, sender.address, 10**19)
         hyperdrive_read_write_interface_fixture.set_variable_rate(sender, new_rate)

diff --git a/src/agent0/hypertypes/types/ERC20ForwarderFactoryContract.py b/src/agent0/hypertypes/types/ERC20ForwarderFactoryContract.py
@@ -419,7 +419,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/src/agent0/hypertypes/types/ERC20MintableContract.py b/src/agent0/hypertypes/types/ERC20MintableContract.py
@@ -2554,7 +2554,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/src/agent0/hypertypes/types/ERC4626HyperdriveCoreDeployerContract.py b/src/agent0/hypertypes/types/ERC4626HyperdriveCoreDeployerContract.py
@@ -236,7 +236,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/src/agent0/hypertypes/types/ERC4626HyperdriveDeployerCoordinatorContract.py b/src/agent0/hypertypes/types/ERC4626HyperdriveDeployerCoordinatorContract.py
@@ -2404,7 +2404,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/src/agent0/hypertypes/types/ERC4626Target0DeployerContract.py b/src/agent0/hypertypes/types/ERC4626Target0DeployerContract.py
@@ -222,7 +222,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/src/agent0/hypertypes/types/ERC4626Target1DeployerContract.py b/src/agent0/hypertypes/types/ERC4626Target1DeployerContract.py
@@ -222,7 +222,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/src/agent0/hypertypes/types/ERC4626Target2DeployerContract.py b/src/agent0/hypertypes/types/ERC4626Target2DeployerContract.py
@@ -222,7 +222,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/src/agent0/hypertypes/types/ERC4626Target3DeployerContract.py b/src/agent0/hypertypes/types/ERC4626Target3DeployerContract.py
@@ -222,7 +222,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/src/agent0/hypertypes/types/HyperdriveFactoryContract.py b/src/agent0/hypertypes/types/HyperdriveFactoryContract.py
@@ -7042,7 +7042,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/src/agent0/hypertypes/types/HyperdriveRegistryContract.py b/src/agent0/hypertypes/types/HyperdriveRegistryContract.py
@@ -700,7 +700,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/src/agent0/hypertypes/types/IHyperdriveContract.py b/src/agent0/hypertypes/types/IHyperdriveContract.py
@@ -6790,7 +6790,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/src/agent0/hypertypes/types/LPMathContract.py b/src/agent0/hypertypes/types/LPMathContract.py
@@ -762,7 +762,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/src/agent0/hypertypes/types/MockERC4626Contract.py b/src/agent0/hypertypes/types/MockERC4626Contract.py
@@ -3542,7 +3542,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