amend arkiv.transfer_eth to allow for NamedAccount as recipient

Author: Matthias Zimmermann

.env.testing

@@ -2,8 +2,8 @@
 # Copy this to .env and modify as needed
 
 # External Node Configuration (uncomment to use external node instead of testcontainers)
-RPC_URL=https://intproxy.hoodi.arkiv.network/rpc
-WS_URL=wss://intproxy.hoodi.arkiv.network/rpc/ws
+RPC_URL=https://kaolin.hoodi.arkiv.network/rpc
+WS_URL=wss://kaolin.hoodi.arkiv.network/rpc/ws
 
 # External Wallet Configuration (required when using external node)
 WALLET_FILE_1=wallet_alice.json

src/arkiv/module.py

@@ -8,6 +8,8 @@
 from web3 import Web3
 from web3.types import TxParams, TxReceipt
 
+from arkiv.account import NamedAccount
+
 from .contract import EVENTS_ABI, FUNCTIONS_ABI, STORAGE_ADDRESS
 from .types import (
     ALL,
@@ -174,7 +176,12 @@ def entity_exists(self, entity_key: EntityKey) -> bool:
         except Exception:
             return False
 
-    def transfer_eth(self, to: ChecksumAddress, amount_wei: int) -> TxHash:
+    def transfer_eth(
+        self,
+        to: NamedAccount | ChecksumAddress,
+        amount_wei: int,
+        wait_for_confirmation: bool = True,
+    ) -> TxHash:
         """
         Transfer ETH to the given address.
 
@@ -185,14 +192,28 @@ def transfer_eth(self, to: ChecksumAddress, amount_wei: int) -> TxHash:
         Returns:
             Transaction hash of the transfer
         """
+        to_address: ChecksumAddress = to.address if isinstance(to, NamedAccount) else to
         tx_hash_bytes = self.client.eth.send_transaction(
             {
-                "to": to,
+                "to": to_address,
                 "value": Web3.to_wei(amount_wei, "wei"),
                 "gas": 21000,  # Standard gas for ETH transfer
             }
         )
         tx_hash = TxHash(HexStr(tx_hash_bytes.to_0x_hex()))
+        logger.info(f"TX sent: Transferring {amount_wei} wei to {to}: {tx_hash}")
+
+        if wait_for_confirmation:
+            logger.info("Waiting for TX confirmation ...")
+            tx_receipt: TxReceipt = self.client.eth.wait_for_transaction_receipt(
+                tx_hash
+            )
+            tx_status: int = tx_receipt["status"]
+            if tx_status != TX_SUCCESS:
+                raise RuntimeError(f"Transaction failed with status {tx_status}")
+
+            logger.info(f"TX confirmed: {tx_receipt}")
+
         return tx_hash
 
     def get_entity(self, entity_key: EntityKey, fields: int = ALL) -> Entity:

tests/test_arkiv_fixture.py

@@ -81,3 +81,49 @@ def test_arkiv_accounts_are_funded(
     assert account_2_balance > 0, "Fixture account 2 should be funded"
 
     logger.info("Arkiv fixture accounts are funded (balances > 0)")
+
+
+def test_arkiv_transfer_eth_account(
+    arkiv_client_http: Arkiv, account_1: NamedAccount, account_2: NamedAccount
+) -> None:
+    """Test that ETH (GLM) transfer works."""
+    account_1_balance_before = arkiv_client_http.eth.get_balance(account_1.address)
+    account_2_balance_before = arkiv_client_http.eth.get_balance(account_2.address)
+    amount = 42
+
+    arkiv_client_http.arkiv.transfer_eth(account_2, amount)
+
+    account_1_balance_after = arkiv_client_http.eth.get_balance(account_1.address)
+    account_2_balance_after = arkiv_client_http.eth.get_balance(account_2.address)
+
+    assert account_2_balance_after == account_2_balance_before + amount, (
+        "Account 2 balance should increase by transfer amount"
+    )
+    assert account_1_balance_after <= account_1_balance_before - amount, (
+        "Account 1 balance should decrease by transfer amount"
+    )
+
+    logger.info("Arkiv ETH transfer between accounts succeeded (to: NamedAccount)")
+
+
+def test_arkiv_transfer_eth_address(
+    arkiv_client_http: Arkiv, account_1: NamedAccount, account_2: NamedAccount
+) -> None:
+    """Test that ETH (GLM) transfer works."""
+    account_1_balance_before = arkiv_client_http.eth.get_balance(account_1.address)
+    account_2_balance_before = arkiv_client_http.eth.get_balance(account_2.address)
+    amount = 42
+
+    arkiv_client_http.arkiv.transfer_eth(account_2.address, amount)
+
+    account_1_balance_after = arkiv_client_http.eth.get_balance(account_1.address)
+    account_2_balance_after = arkiv_client_http.eth.get_balance(account_2.address)
+
+    assert account_2_balance_after == account_2_balance_before + amount, (
+        "Account 2 balance should increase by transfer amount"
+    )
+    assert account_1_balance_after <= account_1_balance_before - amount, (
+        "Account 1 balance should decrease by transfer amount"
+    )
+
+    logger.info("Arkiv ETH transfer between accounts succeeded (to: checksum address)")