chore: resolve merge conflicts

Author: antazoey

README.md

@@ -107,8 +107,7 @@ docker run \
 apeworx/ape compile
 ```
 
-**Docker Uninstall Process:** You will need to remove files generated by
-docker
+**Docker Uninstall Process:** You will need to remove files generated by docker
 
 ```bash
 sudo rm -rf **\~/.solcx**

src/ape/api/providers.py

@@ -616,10 +616,11 @@ def update_settings(self, new_settings: dict):
         self.provider_settings.update(new_settings)
         self.connect()
 
-    def estimate_gas_cost(self, txn: TransactionAPI) -> int:
+    def estimate_gas_cost(self, txn: TransactionAPI, **kwargs) -> int:
         txn_dict = txn.dict()
         try:
-            return self._web3.eth.estimate_gas(txn_dict)  # type: ignore
+            block_id = kwargs.pop("block_identifier", None)
+            return self.web3.eth.estimate_gas(txn_dict, block_identifier=block_id)  # type: ignore
         except ValueError as err:
             tx_error = self.get_virtual_machine_error(err)
 
@@ -657,27 +658,33 @@ def get_block(self, block_id: BlockID) -> BlockAPI:
         block_data = dict(self.web3.eth.get_block(block_id))
         return self.network.ecosystem.decode_block(block_data)
 
-    def get_nonce(self, address: str) -> int:
-        return self.web3.eth.get_transaction_count(address)  # type: ignore
+    def get_nonce(self, address: str, **kwargs) -> int:
+        block_id = kwargs.pop("block_identifier", None)
+        return self.web3.eth.get_transaction_count(address, block_identifier=block_id)
 
     def get_balance(self, address: str) -> int:
-        return self.web3.eth.get_balance(address)  # type: ignore
+        return self.web3.eth.get_balance(address)
 
     def get_code(self, address: str) -> bytes:
-        return self.web3.eth.get_code(address)  # type: ignore
+        return self.web3.eth.get_code(address)
 
-    def get_storage_at(self, address: str, slot: int) -> bytes:
+    def get_storage_at(self, address: str, slot: int, **kwargs) -> bytes:
+        block_id = kwargs.pop("block_identifier", None)
         try:
-            return self.web3.eth.get_storage_at(address, slot)  # type: ignore
+            return self.web3.eth.get_storage_at(
+                address, slot, block_identifier=block_id
+            )  # type: ignore
         except ValueError as err:
             if "RPC Endpoint has not been implemented" in str(err):
                 raise APINotImplementedError(str(err)) from err
 
             raise  # Raise original error
 
-    def send_call(self, txn: TransactionAPI) -> bytes:
+    def send_call(self, txn: TransactionAPI, **kwargs) -> bytes:
         try:
-            return self.web3.eth.call(txn.dict())
+            block_id = kwargs.pop("block_identifier", None)
+            state = kwargs.pop("state_override", None)
+            return self.web3.eth.call(txn.dict(), block_identifier=block_id, state_override=state)
         except ValueError as err:
             raise self.get_virtual_machine_error(err) from err
 

src/ape/contracts/base.py

@@ -79,8 +79,7 @@ def serialize_transaction(self, *args, **kwargs) -> TransactionAPI:
     def __call__(self, *args, **kwargs) -> Any:
         txn = self.serialize_transaction(*args, **kwargs)
         txn.chain_id = self.provider.network.chain_id
-
-        raw_output = self.provider.send_call(txn)
+        raw_output = self.provider.send_call(txn, **kwargs)
         output = self.provider.network.ecosystem.decode_returndata(
             self.abi,
             raw_output,

src/ape_ethereum/transactions.py

@@ -51,15 +51,12 @@ class AccessList(BaseModel):
 
 class BaseTransaction(TransactionAPI):
     def serialize_transaction(self) -> bytes:
-
         if not self.signature:
             raise SignatureError("The transaction is not signed.")
 
         txn_data = self.dict(exclude={"sender"})
-
         unsigned_txn = serializable_unsigned_transaction_from_dict(txn_data)
         signature = (self.signature.v, to_int(self.signature.r), to_int(self.signature.s))
-
         signed_txn = encode_transaction(unsigned_txn, signature)
 
         if self.sender and EthAccount.recover_transaction(signed_txn) != self.sender:

src/ape_test/providers.py

@@ -33,10 +33,10 @@ def disconnect(self):
     def update_settings(self, new_settings: dict):
         pass
 
-    def estimate_gas_cost(self, txn: TransactionAPI) -> int:
+    def estimate_gas_cost(self, txn: TransactionAPI, **kwargs) -> int:
         try:
-            result = self.web3.eth.estimate_gas(txn.dict())  # type: ignore
-            return result
+            block_id = kwargs.pop("block_identifier", None)
+            return self.web3.eth.estimate_gas(txn.dict(), block_identifier=block_id)  # type: ignore
         except ValidationError as err:
             message = gas_estimation_error_message(err)
             raise TransactionError(base_err=err, message=message) from err
@@ -65,13 +65,15 @@ def priority_fee(self) -> int:
         """Returns 0 because test chains do not care about priority fees."""
         return 0
 
-    def send_call(self, txn: TransactionAPI) -> bytes:
+    def send_call(self, txn: TransactionAPI, **kwargs) -> bytes:
         data = txn.dict(exclude_none=True)
         if "gas" not in data or data["gas"] == 0:
             data["gas"] = int(1e12)
 
         try:
-            return self.web3.eth.call(data)
+            block_id = kwargs.pop("block_identifier", None)
+            state = kwargs.pop("state_override", None)
+            return self.web3.eth.call(data, block_identifier=block_id, state_override=state)
         except ValidationError as err:
             raise VirtualMachineError(base_err=err) from err
         except TransactionFailed as err:

tests/functional/test_contract_instance.py

@@ -29,6 +29,17 @@ def test_init_specify_contract_type(
     assert contract.myNumber() == 2
 
 
+def test_call_using_block_identifier(
+    vyper_contract_instance, owner, chain, networks_connected_to_tester
+):
+    contract = vyper_contract_instance
+    contract.setNumber(1, sender=owner)
+    height = chain.blocks.height
+    contract.setNumber(33, sender=owner)
+    actual = contract.myNumber(block_identifier=height)
+    assert actual == 1
+
+
 def test_repr(contract_instance):
     assert re.match(
         rf"<TestContract((Sol)|(Vy)) {contract_instance.address}>", repr(contract_instance)