eth-prototype 1.3.2__tar.gz → 1.3.4__tar.gz

{eth_prototype-1.3.2 → eth_prototype-1.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eth-prototype
-Version: 1.3.2
+Version: 1.3.4
 Summary: Prototype Ethereum Smart Contracts in Python
 Home-page: https://github.com/gnarvaja/eth-prototype
 Author: Guillermo M. Narvaja
@@ -33,6 +33,7 @@ Requires-Dist: pytest; extra == "testing"
 Requires-Dist: pytest-cov; extra == "testing"
 Requires-Dist: pytest-mock; extra == "testing"
 Requires-Dist: pytest-recording; extra == "testing"
+Requires-Dist: responses; extra == "testing"
 Requires-Dist: setuptools; extra == "testing"
 Requires-Dist: web3[tester]==7.*; extra == "testing"
 Dynamic: license-file

{eth_prototype-1.3.2 → eth_prototype-1.3.4}/setup.cfg

@@ -48,6 +48,7 @@ testing =
 	pytest-cov
 	pytest-mock
 	pytest-recording
+	responses
 	setuptools
 	web3[tester]==7.*
 

{eth_prototype-1.3.2 → eth_prototype-1.3.4}/src/eth_prototype.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eth-prototype
-Version: 1.3.2
+Version: 1.3.4
 Summary: Prototype Ethereum Smart Contracts in Python
 Home-page: https://github.com/gnarvaja/eth-prototype
 Author: Guillermo M. Narvaja
@@ -33,6 +33,7 @@ Requires-Dist: pytest; extra == "testing"
 Requires-Dist: pytest-cov; extra == "testing"
 Requires-Dist: pytest-mock; extra == "testing"
 Requires-Dist: pytest-recording; extra == "testing"
+Requires-Dist: responses; extra == "testing"
 Requires-Dist: setuptools; extra == "testing"
 Requires-Dist: web3[tester]==7.*; extra == "testing"
 Dynamic: license-file

{eth_prototype-1.3.2 → eth_prototype-1.3.4}/src/eth_prototype.egg-info/requires.txt

@@ -20,6 +20,7 @@ pytest
 pytest-cov
 pytest-mock
 pytest-recording
+responses
 setuptools
 web3[tester]==7.*
 

{eth_prototype-1.3.2 → eth_prototype-1.3.4}/src/ethproto/aa_bundler.py

@@ -29,6 +29,7 @@ AA_BUNDLER_GAS_LIMIT_FACTOR = env.float("AA_BUNDLER_GAS_LIMIT_FACTOR", 1)
 AA_BUNDLER_PRIORITY_GAS_PRICE_FACTOR = env.float("AA_BUNDLER_PRIORITY_GAS_PRICE_FACTOR", 1)
 AA_BUNDLER_BASE_GAS_PRICE_FACTOR = env.float("AA_BUNDLER_BASE_GAS_PRICE_FACTOR", 1)
 AA_BUNDLER_VERIFICATION_GAS_FACTOR = env.float("AA_BUNDLER_VERIFICATION_GAS_FACTOR", 1)
+AA_BUNDLER_MAX_FEE_PER_GAS = env.int("AA_BUNDLER_MAX_FEE_PER_GAS", 200000000000)  # 200 gwei
 
 AA_BUNDLER_STATE_OVERRIDES = env.json("AA_BUNDLER_STATE_OVERRIDES", default={})
 
@@ -329,6 +330,7 @@ class Bundler:
         gas_limit_factor: float = AA_BUNDLER_GAS_LIMIT_FACTOR,
         priority_gas_price_factor: float = AA_BUNDLER_PRIORITY_GAS_PRICE_FACTOR,
         base_gas_price_factor: float = AA_BUNDLER_BASE_GAS_PRICE_FACTOR,
+        max_fee_per_gas: int = AA_BUNDLER_MAX_FEE_PER_GAS,
         executor_pk: HexBytes = AA_BUNDLER_EXECUTOR_PK,
         overrides: StateOverride = AA_BUNDLER_STATE_OVERRIDES,
     ):
@@ -343,6 +345,7 @@ class Bundler:
         self.priority_gas_price_factor = priority_gas_price_factor
         self.base_gas_price_factor = base_gas_price_factor
         self.executor_pk = executor_pk
+        self.max_fee_per_gas = max_fee_per_gas
 
         # stateOverrideSet mapping to use when calling eth_estimateUserOperationGas
         # https://docs.alchemy.com/reference/eth-estimateuseroperationgas
@@ -353,7 +356,7 @@ class Bundler:
             f"Bundler(type={self.bundler_type}, entrypoint={self.entrypoint}, nonce_mode={self.nonce_mode}, "
             f"fixed_nonce_key={self.fixed_nonce_key}, verification_gas_factor={self.verification_gas_factor}, "
             f"gas_limit_factor={self.gas_limit_factor}, priority_gas_price_factor={self.priority_gas_price_factor}, "
-            f"base_gas_price_factor={self.base_gas_price_factor})"
+            f"base_gas_price_factor={self.base_gas_price_factor}, max_fee_per_gas={self.max_fee_per_gas})"
         )
 
     def get_nonce_and_key(self, tx: Tx, fetch=False):
@@ -406,10 +409,17 @@ class Bundler:
         if "error" in resp:
             raise BundlerRevertError(resp["error"]["message"], response=resp)
         max_priority_fee_per_gas = int(int(resp["result"], 16) * self.priority_gas_price_factor)
-        max_fee_per_gas = max_priority_fee_per_gas + self.get_base_fee()
+        max_fee_per_gas = min(max_priority_fee_per_gas + self.get_base_fee(), self.max_fee_per_gas)
 
         return GasPrice(max_priority_fee_per_gas=max_priority_fee_per_gas, max_fee_per_gas=max_fee_per_gas)
 
+    def generic_gas_price(self):
+        base_fee = self.get_base_fee()
+        priority_fee = self.w3.eth.max_priority_fee
+        max_priority_fee_per_gas = int(priority_fee * self.priority_gas_price_factor)
+        max_fee_per_gas = min(max_priority_fee_per_gas + base_fee, self.max_fee_per_gas)
+        return GasPrice(max_priority_fee_per_gas=max_priority_fee_per_gas, max_fee_per_gas=max_fee_per_gas)
+
     def build_user_operation(self, tx: Tx, retry_nonce=None) -> UserOperation:
         nonce_key, nonce = self.get_nonce_and_key(tx, fetch=retry_nonce is not None)
         # Consume the nonce, even if the userop may fail later
@@ -422,16 +432,15 @@ class Bundler:
 
         if self.bundler_type == "alchemy":
             gas_price = self.alchemy_gas_price()
-            user_operation = user_operation.add_gas_price(gas_price)
 
         elif self.bundler_type == "generic":
-            # At the moment generic just prices the gas at 0
-            pass
+            gas_price = self.generic_gas_price()
 
         else:
             warn(f"Unknown bundler_type: {self.bundler_type}")
+            gas_price = GasPrice(0, 0)
 
-        return user_operation
+        return user_operation.add_gas_price(gas_price)
 
     def send_transaction(self, tx: Tx, retry_nonce=None):
         user_operation = self.build_user_operation(tx, retry_nonce).sign(

{eth_prototype-1.3.2 → eth_prototype-1.3.4}/src/ethproto/wrappers.py

@@ -17,7 +17,7 @@ DEFAULT_PROVIDER = env.str("DEFAULT_PROVIDER", None)
 
 ETHERSCAN_TOKEN = env.str("ETHERSCAN_TOKEN", None)
 ETHERSCAN_DOMAIN = env.str("ETHERSCAN_DOMAIN", "api.etherscan.io")
-ETHERSCAN_URL = env.str("ETHERSCAN_URL", "https://{domain}/api?apikey={token}&")
+ETHERSCAN_URL = env.str("ETHERSCAN_URL", "https://{domain}/v2/api?apikey={token}&chainid={chainid}&")
 AMOUNT_DECIMALS = env.int("AMOUNT_DECIMALS", 18)
 AMOUNT_CLASSNAME = env.str("AMOUNT_CLASSNAME", None)
 
@@ -266,7 +266,9 @@ class BaseProvider(ABC):
     def get_etherscan_url(self):
         if ETHERSCAN_TOKEN is None:
             return None
-        return ETHERSCAN_URL.format(token=ETHERSCAN_TOKEN, domain=ETHERSCAN_DOMAIN)
+        return ETHERSCAN_URL.format(
+            token=ETHERSCAN_TOKEN, domain=ETHERSCAN_DOMAIN, chainid=self.w3.eth.chain_id
+        )
 
     def get_first_block(self, eth_wrapper):
         etherscan_url = self.get_etherscan_url()
@@ -275,7 +277,7 @@ class BaseProvider(ABC):
         address = self.get_contract_address(eth_wrapper)
         url = (
             etherscan_url
-            + f"&module=account&action=txlist&address={address}&startblock=0&"
+            + f"module=account&action=txlist&address={address}&startblock=0&"
             + "endblock=99999999&page=1&offset=10&sort=asc"
         )
         resp = requests.get(url)

{eth_prototype-1.3.2 → eth_prototype-1.3.4}/tests/test_w3.py

@@ -1,6 +1,9 @@
+import importlib
 import os
+import sys
 
 import pytest
+import responses
 from web3 import Web3
 
 from ethproto import w3wrappers, wrappers
@@ -11,6 +14,28 @@ pytestmark = [
 ]
 
 
+@pytest.fixture
+def provider_with_etherscan_env(mocker):
+    mocker.patch.dict(
+        os.environ,
+        {"ETHERSCAN_TOKEN": "abc123", "ETHERSCAN_DOMAIN": "api.etherscan.io"},
+    )
+    sys.modules.pop("ethproto.wrappers", None)
+    sys.modules.pop("ethproto.w3wrappers", None)
+    wrappers = importlib.import_module("ethproto.wrappers")
+    w3wrappers = importlib.import_module("ethproto.w3wrappers")
+
+    w3wrappers.register_w3_provider("w3_test", Web3(Web3.EthereumTesterProvider()))
+    provider = wrappers.get_provider("w3_test")
+
+    return provider
+
+
+class DummyWrapper:
+    address = "0x8e3aab1fc53e8b0f5d987c20b1899a2db3b2f95c"  # random generated address
+    contract = type("Contract", (), {"address": address})()
+
+
 class Counter(wrappers.ETHWrapper):
     eth_contract = "Counter"
     # libraries_required = []
@@ -182,3 +207,29 @@ def test_sign_and_send_interact_with_existing_contract(sign_and_send):
     assert connected.value() == 1
 
     assert counter.value() == 1  # sanity check
+
+
+def test_get_etherscan_url_v2_format(provider_with_etherscan_env):
+    provider = provider_with_etherscan_env
+    chainid = provider.w3.eth.chain_id
+    assert provider.get_etherscan_url() == f"https://api.etherscan.io/v2/api?apikey=abc123&chainid={chainid}&"
+
+
+@responses.activate
+def test_get_first_block_makes_request(provider_with_etherscan_env):
+    provider = provider_with_etherscan_env
+    address = "0x8e3aab1fc53e8b0f5d987c20b1899a2db3b2f95c"
+    chainid = provider.w3.eth.chain_id
+    responses.get(
+        f"https://api.etherscan.io/v2/api?apikey=abc123&chainid={chainid}&"
+        f"&module=account&action=txlist&address={address}&startblock=0&"
+        "endblock=99999999&page=1&offset=10&sort=asc",
+        json={"status": "1", "message": "OK", "result": [{"blockNumber": "1"}]},
+        status=200,
+    )
+
+    block = provider.get_first_block(DummyWrapper())
+    assert block == 1
+
+    assert len(responses.calls) == 1
+    assert responses.calls[0].request.url.startswith("https://api.etherscan.io")