mech-client 0.14.1__py3-none-any.whl → 0.15.1__py3-none-any.whl

{mech_client-0.14.1.dist-info → mech_client-0.15.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-mech_client/__init__.py,sha256=qXP3KYo0kVvrn4GI8u6T0gw5y9DiN6Ryz_hOfpB6RIE,43
+mech_client/__init__.py,sha256=Iu9RKNRKh9xSx9NxEMVPqWsKtDpP6qgpMbbJeGBd7V8,43
 mech_client/abis/AgentMech.json,sha256=IEbs_xBGunBu5h-uT5DvIty8Zw412QoPI46S_DUMYNw,18082
 mech_client/abis/AgentRegistry.json,sha256=2qmXeFINZWz9pyOma6Bq67kMDSUI1lD7WvgHLwuETD8,24723
 mech_client/abis/AgreementStoreManager.base.json,sha256=_ljdIZcfFGmFzBHUTfhA4X0382ZHHpkdr_CziTwUETo,34360
@@ -30,72 +30,46 @@ mech_client/abis/SubscriptionToken.base.json,sha256=5StPEyfRvDMTqtQPO-KakXXZqobX
 mech_client/abis/TransferNFTCondition.base.json,sha256=71O_3itHBz9qPtoTLev8_a7KxlcQfIZSfxK2562lkqw,42540
 mech_client/abis/TransferNFTCondition.gnosis.json,sha256=-huhxV54eoNY8mR9WtQdmSgQDgaKiUi0PULJ4HEshWw,42540
 mech_client/acn.py,sha256=Rj_jLPvJ5loDQfGbu3a_O24cJC4SwIErLceSz_zVYS8,5356
-mech_client/cli.py,sha256=pDyWyx47X_-j1HFkp7yL627RE5W2-zqClciA5amV7bE,19275
-mech_client/configs/mechs.json,sha256=P27UibjGSlmRt199AEWi2xBHrjCnSk6p7KSbZ9nRSiY,5601
+mech_client/cli.py,sha256=4atyFMnVqN0TqczoI935hQKOD500ktt2dztUMFUPH8U,27631
+mech_client/configs/mechs.json,sha256=eR0yoNNtGozNB0w4KMx9E9dxM-zI10EhDSKnBuw8nP0,5099
 mech_client/delivery.py,sha256=PU_qSzP5juDRHiKQsyg6TH9oacc8nRoRY9BQBBe_fW0,5588
 mech_client/fetch_ipfs_hash.py,sha256=tg_hYVf4deXl89x3SOBrGFUthaSeN_Vg_OHDtfjdbp4,2752
 mech_client/helpers/__init__.py,sha256=nmQig1EqBQ9EMOpgdykP3a6_2NWcoVH3-lnyHP5n0ws,1196
-mech_client/helpers/acn/README.md,sha256=WMXR2Lk0IpWjr3vpZ8cxcTHk4gwsx4wC06UPkwj9dbQ,1641
-mech_client/helpers/acn/__init__.py,sha256=3Yd1hUTcrtp0Kb1VmnOTC3_r-_69ozhzMqLlkNC6MkU,1141
-mech_client/helpers/acn/acn.proto,sha256=Ev0f8tQJjnTaK-mdpNLItVRgJ7VibtCeGBTcKz8nfX4,1543
-mech_client/helpers/acn/acn_pb2.py,sha256=NnS-rspsKz9ImoLWp8P9FSBNwGJYuj1mRCw8A1bHydQ,4350
-mech_client/helpers/acn/custom_types.py,sha256=x2YMQuxd86QDjkCr__SuhcDmlGP8qI-qJRg1XqIlBRw,7982
-mech_client/helpers/acn/dialogues.py,sha256=44IExYaKk9zxeu0L6G5grUUX62Px6Lv0Kfp8u56-uJs,4443
-mech_client/helpers/acn/message.py,sha256=d918VwybycjtwplngmPV-xbSRmgSwEHYFZnpC3xZz10,10272
-mech_client/helpers/acn/protocol.yaml,sha256=nA6sZ48dPR_3cmRb5BuaQbhHFA9uJkMlTnGmz9bbV_0,1233
-mech_client/helpers/acn/serialization.py,sha256=3vccK7L4i8ybtgYAUO7N550_6lTBV10EsT26qmCd2lM,6592
-mech_client/helpers/acn/tests/__init__.py,sha256=rIdXnZmrjQFe_nuseQ8CIOIELdYDihx9MNQehcbenYw,847
-mech_client/helpers/acn/tests/test_acn.py,sha256=wM1SZ4iW20PFNu-491KUFyuvICDM_EkjNLZxzguqO5w,8965
-mech_client/helpers/acn/tests/test_acn_dialogues.py,sha256=HWW7KO78lYzTEwMxFzOpdRh2LUaiBtrpUsjG3jfKuU8,1964
-mech_client/helpers/acn/tests/test_acn_messages.py,sha256=aMESOF6vsIBNDcMRbptZNiToluMyVF-0MhPa8X5H1Go,4332
-mech_client/helpers/acn_data_share/README.md,sha256=LpamqskB0GnXpt_JhxPmtoN7FNejpUcrNxK2RSDAzew,577
-mech_client/helpers/acn_data_share/__init__.py,sha256=vI8z6p5Y2EBCzliS8mWYAskAqGeX5BoZogOATuXzZnE,1219
-mech_client/helpers/acn_data_share/acn_data_share.proto,sha256=um_1JPkgwwKO-3OILxpokpZ8nXcyjCNIuU0I9t2Tziw,271
-mech_client/helpers/acn_data_share/acn_data_share_pb2.py,sha256=E_X7d4q8P3P4aEqvKEYcCaEcpK7HL533rjn9auNw4Jo,1475
-mech_client/helpers/acn_data_share/dialogues.py,sha256=_FnqWAW2ijPq6PBpq5EIwNx0EB9hIbCH-2k1eL5IufM,4078
-mech_client/helpers/acn_data_share/message.py,sha256=57k0dKwKA0zGZw9MJkyHywdNhfCy0egN_lagRUZen_U,7742
-mech_client/helpers/acn_data_share/protocol.yaml,sha256=vcxMleXQcIx_q-5mW4hR3LIYF_sTVOt4XT-LhwWxBeM,1052
-mech_client/helpers/acn_data_share/serialization.py,sha256=uctnEpdnXLl5VsJjiS0AanPzYzC53cjollFJyjHXyL4,4617
-mech_client/helpers/acn_data_share/tests/test_acn_data_share_dialogues.py,sha256=3bbX52BLXMMxEOLWpq3iC9KL4eCy_qLxzTFlHWZzNm0,1835
-mech_client/helpers/acn_data_share/tests/test_acn_data_share_messages.py,sha256=j5H8SRCWh8hR_q5cTPTm7Q_l4L1uiuEUcTgpWDj-fTI,2021
-mech_client/helpers/p2p_libp2p_client/README.md,sha256=6x9s6P7TdKkcvAS1wMFHXRz4aIaLZhyi0OnUgbEvpKM,631
-mech_client/helpers/p2p_libp2p_client/__init__.py,sha256=-GOP3D_JnmXTDomrMLCbnRk7vRQmihIqTYvyIPzx-q4,879
-mech_client/helpers/p2p_libp2p_client/connection.py,sha256=b5jfcUeSoNrUw8DOSTCbK4DTi-N8bf2_pdogUOz0ep0,28606
-mech_client/helpers/p2p_libp2p_client/connection.yaml,sha256=nMiHnU_dv9EFjVNqZ-0SAnoATfadJSad-JsbDvk97Mk,1790
-mech_client/interact.py,sha256=YvqUppI3m8hXbEfGLvWc05taYOINk0h02MfCgSuAT1A,21126
-mech_client/marketplace_interact.py,sha256=h7_71joPy-dDG36MYIT9L4COkbevlo2BTXiN25NesoM,35934
+mech_client/interact.py,sha256=yj9pBM6PcgoalNTkdECdsvD1X5CJjffu0vnQePFCHjk,21347
+mech_client/marketplace_interact.py,sha256=LIXz9_hHM_6PRo_PTWAKplWlkdR6cNA22HRv7qTyzM4,41048
 mech_client/mech_marketplace_subgraph.py,sha256=X_ypxfokN-YBtsUCVOHUecsinkbRDZ5fR5WCkid1ntM,3153
 mech_client/mech_marketplace_tool_management.py,sha256=G1O0ajbeltRM5FpqPfmn2C4QRrwqf5HfWKUH2VKn6UA,7365
 mech_client/mech_tool_management.py,sha256=NQFmVzzGZsIkeHokDPWXGHwa8u-pyQIMPR1Q5H81bKw,7806
 mech_client/prompt_to_ipfs.py,sha256=XqSIBko15MEkpWOQNT97fRI6jNxMF5EDBDEPOJFdhyk,2533
 mech_client/push_to_ipfs.py,sha256=IfvgaPU79N_ZmCPF9d7sPCYz2uduZH0KjT_HQ2LHXoQ,2059
-mech_client/subgraph.py,sha256=UjQRa2wjCDac8XbOhe-JtB9Wyu4vr5D45mATFTNaAR4,2403
+mech_client/safe.py,sha256=kn28VpgIKRZfo2BvHobkaAPIu1QJMq34GxOipxBJj1w,2420
+mech_client/subgraph.py,sha256=Zv1OqauTyeSJhTgmYAVvdzo3gd3WvhI6XZt2uFC9jPs,1833
 mech_client/to_png.py,sha256=pjUcFJ63MJj_r73eqnfqCWMtlpsrj6H4ZmgvIEmRcFw,2581
 mech_client/wss.py,sha256=NoWAzvAjzbnPX9aeLkdiRKGjIX4rptyhcnZyRxCqV_8,8097
 scripts/__init__.py,sha256=I8VcZ7sjlAw171Er7B6mumpMLfrynrWie4YoeJIayno,26
 scripts/benchmark.sh,sha256=qgfYEI5u8Qd-vqaD3xZktuubXyz0sdHE1_9qg6stEzs,935
 scripts/bump.py,sha256=2o4MsFGG_ix4UXscekfX7dqpM-q-T4mTwkHw_KtA8mk,9503
-scripts/deposit_native.py,sha256=A66o74w7Mg9VS7uh3xWGg6gu3x6iE9tyHUbhl1usmjw,3902
-scripts/deposit_token.py,sha256=PGJszulGTk4utrKIhqtaiP_yKzs8nV9inNAHSUdvxtM,6067
-scripts/nvm_subscribe.py,sha256=N3I9r9ugTf_HMfQSAGeKq0TcInJsWI8rYQVF57AmmFM,1473
+scripts/deposit_native.py,sha256=lF8XMvpBo3Z--bR0FOk8fb1SFAgO6FXND5sNg-VK6uU,4850
+scripts/deposit_token.py,sha256=fHOjvR5byIolpexmM9BxQHP889K5Dxp2pv7wdNnlUyY,8810
+scripts/nvm_subscribe.py,sha256=Cnyq2XIoOkR3djIQwXj6WHKXMBWeNVVwl1ET5y4t5bk,1846
 scripts/nvm_subscription/contracts/agreement_manager.py,sha256=JFP5YJTbo_1liZTBmnkvHtRm-0Dfmp-gyRkXHPdzPG8,1466
-scripts/nvm_subscription/contracts/base_contract.py,sha256=DR_GfPZo9i47o3AYAxGR6hjc0KhHQY1dJ2yRXJ8I9DE,2868
+scripts/nvm_subscription/contracts/base_contract.py,sha256=CfifvIsZaaR1rElv2CbB24LUEecw60iGNzo8MNITrJM,3120
 scripts/nvm_subscription/contracts/did_registry.py,sha256=yoWp2V29qFozgGsndKiExpF-yQ13TfCZmGGWb1DRmS8,3108
 scripts/nvm_subscription/contracts/escrow_payment.py,sha256=7B-TdZYq9ELj58jWhD-2RcdGg-pYWYxuRnhQXx6K9TA,2856
 scripts/nvm_subscription/contracts/lock_payment.py,sha256=_nRRkjnHgThSqAQ91bIwGq18yvWVPItAY2JfEz8aWOk,2556
 scripts/nvm_subscription/contracts/nft.py,sha256=NOOCNcPd0fP7gtShH1fECpSR_hUBcihIcoEaEj8tZN4,1287
-scripts/nvm_subscription/contracts/nft_sales.py,sha256=pjCrAgebDL7pet3gxL5TjkPRUwZGu1S95SGILJ2wiKk,4700
-scripts/nvm_subscription/contracts/subscription_provider.py,sha256=cVjoZ4yEKR8mJOFYrlsKrVD_A18i6qplGgvw3cKwh5E,3981
-scripts/nvm_subscription/contracts/token.py,sha256=NrVnxlcP2J0QyiuPbVIoeSEPHEEUU0IXTmC6AYc1i7w,2728
+scripts/nvm_subscription/contracts/nft_sales.py,sha256=qGd6B6gN2zKl8fQXpSBUb_74FrtgBkAFq1KEqQETaqU,4587
+scripts/nvm_subscription/contracts/subscription_provider.py,sha256=jdFxmqN_KsZreb0LRnmGCN6T4OrTCdlJoWsJYMkId9M,3864
+scripts/nvm_subscription/contracts/token.py,sha256=SQmNLJzhcmNJRQ7A4-ZpN1ThPxOClDwsNRfFIMiw_JM,3164
 scripts/nvm_subscription/contracts/transfer_nft.py,sha256=Z3IlfBYVQLT4WhI5cszruHCKBrwQGTBuZrlQQcuEN3s,2681
 scripts/nvm_subscription/envs/base.env,sha256=mI2loQ5Dt-rkZzuzmgyNiV-fUutwN89kOsEmygG4K78,528
 scripts/nvm_subscription/envs/gnosis.env,sha256=mDCb1wEY4fRQYJQuyqg2b4qTFQtHHopRaKYCXTCeACM,554
-scripts/nvm_subscription/manager.py,sha256=y0Qh0aVAmOPB4Ytt93alIarSvhrQpC-lRYNAY09GRZ0,10054
+scripts/nvm_subscription/manager.py,sha256=Ibx_QN8IzkbDGlqHutADl5Wj2a92FOQeXaxSRIoK4MA,13600
 scripts/nvm_subscription/resources/networks.json,sha256=xH0P3YkgkMTkQdahVKO0kI9m6ybJ67iwHApstUlfRmw,2359
-scripts/utils.py,sha256=lXjY3s1HvNHT2fXm2fBpZtVvlQaqW288Y2S-s3rpSDM,3248
-scripts/whitelist.py,sha256=uWgX2E19_NS1rK3QfxSyata4ZLIqGVZAKrX8zXpuk_g,448
-mech_client-0.14.1.dist-info/LICENSE,sha256=mdBDB-mWKV5Cz4ejBzBiKqan6Z8zVLAh9xwM64O2FW4,11339
-mech_client-0.14.1.dist-info/METADATA,sha256=BSNMj9w5rxKExrNp8yFucgnCW4KIS4meMfYvv10_uM0,29678
-mech_client-0.14.1.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-mech_client-0.14.1.dist-info/entry_points.txt,sha256=SbRMRsayzD8XfNXhgwPuXEqQsdZ5Bw9XDPnUuaDExyY,45
-mech_client-0.14.1.dist-info/RECORD,,
+scripts/utils.py,sha256=bbupA1PwBbVlMRojCFXEvj20eGAZ37PYRM2XsiwT85U,3332
+scripts/whitelist.py,sha256=7PDGrl5GADe6kphxAH02oR5xalYYQovUfBz-xPjUnxw,604
+mech_client-0.15.1.dist-info/LICENSE,sha256=mdBDB-mWKV5Cz4ejBzBiKqan6Z8zVLAh9xwM64O2FW4,11339
+mech_client-0.15.1.dist-info/METADATA,sha256=NrLR6xHEj9ICvf0tZbQsQswFHI-N88UVYKN0XEymB0I,31133
+mech_client-0.15.1.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+mech_client-0.15.1.dist-info/entry_points.txt,sha256=SbRMRsayzD8XfNXhgwPuXEqQsdZ5Bw9XDPnUuaDExyY,45
+mech_client-0.15.1.dist-info/RECORD,,

scripts/deposit_native.py

@@ -30,15 +30,19 @@ from .utils import (
     CHAIN_TO_NATIVE_BALANCE_TRACKER,
 )
 from mech_client.wss import wait_for_receipt
+from mech_client.safe import send_safe_tx, EthereumClient
 
 
 def deposit(
     ledger_api: EthereumApi,
     crypto: EthereumCrypto,
+    ethereum_client: EthereumClient,
+    agent_mode: bool,
+    safe_address: Optional[str],
     to: str,
     amount: int,
 ) -> str:
-    sender = crypto.address
+    sender = safe_address or crypto.address
 
     try:
         print("Fetching user balance")
@@ -56,27 +60,42 @@ def deposit(
 
     try:
         print("Sending deposit tx")
-        raw_transaction = ledger_api.get_transfer_transaction(
-            sender_address=sender,
-            destination_address=to,
-            amount=amount,
-            tx_fee=50000,
-            tx_nonce="0x",
+        if not agent_mode:
+            raw_transaction = ledger_api.get_transfer_transaction(
+                sender_address=sender,
+                destination_address=to,
+                amount=amount,
+                tx_fee=50000,
+                tx_nonce="0x",
+            )
+            signed_transaction = crypto.sign_transaction(raw_transaction)
+            transaction_digest = ledger_api.send_signed_transaction(
+                signed_transaction,
+                raise_on_try=True,
+            )
+            return transaction_digest
+
+        transaction_digest = send_safe_tx(
+            ethereum_client=ethereum_client,
+            tx_data="0x",
+            to_adress=to,
+            safe_address=str(safe_address),
+            signer_pkey=crypto.private_key,
+            value=amount,
         )
-        signed_transaction = crypto.sign_transaction(raw_transaction)
-        transaction_digest = ledger_api.send_signed_transaction(
-            signed_transaction,
-            raise_on_try=True,
-        )
-        return transaction_digest
+        return transaction_digest.hex()
+
     except Exception as e:  # pylint: disable=broad-except
         print(f"Error occured while sending the transaction: {e}")
         return str(e)
 
 
 def main(
+    agent_mode: bool,
     amount: str,
+    safe_address: Optional[str] = None,
     private_key_path: Optional[str] = None,
+    private_key_password: Optional[str] = None,
     chain_config: Optional[str] = None,
 ) -> None:
     """Runs the deposit functionality for the native mech type"""
@@ -88,6 +107,8 @@ def main(
     private_key_path = private_key_path or PRIVATE_KEY_FILE_PATH
 
     mech_config = get_mech_config(chain_config)
+    ledger_rpc = mech_config.ledger_config.address
+    ethereum_client = EthereumClient(ledger_rpc)
     ledger_config = mech_config.ledger_config
     ledger_api = EthereumApi(**asdict(ledger_config))
 
@@ -95,14 +116,25 @@ def main(
         raise FileNotFoundError(
             f"Private key file `{private_key_path}` does not exist!"
         )
-    crypto = EthereumCrypto(private_key_path=private_key_path)
+    crypto = EthereumCrypto(
+        private_key_path=private_key_path, password=private_key_password
+    )
 
-    print(f"Sender address: {crypto.address}")
+    sender = safe_address or crypto.address
+    print(f"Sender address: {sender}")
 
     chain_id = mech_config.ledger_config.chain_id
     to = CHAIN_TO_NATIVE_BALANCE_TRACKER[chain_id]
 
-    deposit_tx = deposit(ledger_api, crypto, to, amount_to_deposit)
+    deposit_tx = deposit(
+        ledger_api,
+        crypto,
+        ethereum_client,
+        agent_mode,
+        safe_address,
+        to,
+        amount_to_deposit,
+    )
     if not deposit_tx:
         print("Unable to deposit")
         sys.exit(1)

scripts/deposit_token.py

@@ -36,6 +36,7 @@ from .utils import (
     get_token_balance_tracker_contract,
 )
 from mech_client.wss import wait_for_receipt
+from mech_client.safe import get_safe_nonce, send_safe_tx, EthereumClient
 
 
 def check_token_balance(token_contract: Web3Contract, sender: str, amount: int) -> None:
@@ -56,31 +57,62 @@ def check_token_balance(token_contract: Web3Contract, sender: str, amount: int)
 def approve(
     crypto: EthereumCrypto,
     ledger_api: EthereumApi,
+    ethereum_client: EthereumClient,
+    agent_mode: bool,
+    safe_address: Optional[str],
     token_contract: Web3Contract,
     token_balance_tracker_contract: Web3Contract,
     amount: int,
 ) -> str:
-    sender = crypto.address
+    # Tokens will be on the safe and EOA pays for gas
+    # so for agent mode, sender has to be safe
+    sender = safe_address or crypto.address
 
     print("Sending approve tx")
     try:
         tx_args = {"sender_address": sender, "value": 0, "gas": 60000}
-        raw_transaction = ledger_api.build_transaction(
-            contract_instance=token_contract,
-            method_name="approve",
-            method_args={
-                "_to": token_balance_tracker_contract.address,
-                "_value": amount,
-            },
-            tx_args=tx_args,
-            raise_on_try=True,
+        method_name = "approve"
+        method_args = {
+            "_to": token_balance_tracker_contract.address,
+            "_value": amount,
+        }
+
+        if not agent_mode:
+            raw_transaction = ledger_api.build_transaction(
+                contract_instance=token_contract,
+                method_name="approve",
+                method_args={
+                    "_to": token_balance_tracker_contract.address,
+                    "_value": amount,
+                },
+                tx_args=tx_args,
+                raise_on_try=True,
+            )
+            signed_transaction = crypto.sign_transaction(raw_transaction)
+            transaction_digest = ledger_api.send_signed_transaction(
+                signed_transaction,
+                raise_on_try=True,
+            )
+            return transaction_digest
+
+        function = token_contract.functions[method_name](**method_args)
+        transaction = function.build_transaction(
+            {
+                "chainId": int(ledger_api._chain_id),
+                "gas": 0,
+                "nonce": get_safe_nonce(ethereum_client, str(safe_address)),
+            }
         )
-        signed_transaction = crypto.sign_transaction(raw_transaction)
-        transaction_digest = ledger_api.send_signed_transaction(
-            signed_transaction,
-            raise_on_try=True,
+        transaction_digest = send_safe_tx(
+            ethereum_client=ethereum_client,
+            tx_data=transaction["data"],
+            to_adress=token_contract.address,
+            safe_address=str(safe_address),
+            signer_pkey=crypto.private_key,
+            value=0,
         )
-        return transaction_digest
+        return transaction_digest.hex()
+
     except Exception as e:  # pylint: disable=broad-except
         print(f"Error occured while sending the transaction: {e}")
         return str(e)
@@ -89,35 +121,66 @@ def approve(
 def deposit(
     ledger_api: EthereumApi,
     crypto: EthereumCrypto,
+    ethereum_client: EthereumClient,
+    agent_mode: bool,
+    safe_address: Optional[str],
     token_balance_tracker_contract: Web3Contract,
     amount: int,
 ) -> str:
-    sender = crypto.address
+    # Tokens will be on the safe and EOA pays for gas
+    # so for agent mode, sender has to be safe
+    sender = safe_address or crypto.address
 
     print("Sending deposit tx")
     try:
         tx_args = {"sender_address": sender, "value": 0, "gas": 100000}
-        raw_transaction = ledger_api.build_transaction(
-            contract_instance=token_balance_tracker_contract,
-            method_name="deposit",
-            method_args={"amount": amount},
-            tx_args=tx_args,
-            raise_on_try=True,
+        method_name = "deposit"
+        method_args = {"amount": amount}
+
+        if not agent_mode:
+            raw_transaction = ledger_api.build_transaction(
+                contract_instance=token_balance_tracker_contract,
+                method_name=method_name,
+                method_args=method_args,
+                tx_args=tx_args,
+                raise_on_try=True,
+            )
+            signed_transaction = crypto.sign_transaction(raw_transaction)
+            transaction_digest = ledger_api.send_signed_transaction(
+                signed_transaction,
+                raise_on_try=True,
+            )
+            return transaction_digest
+
+        function = token_balance_tracker_contract.functions[method_name](**method_args)
+        transaction = function.build_transaction(
+            {
+                "chainId": int(ledger_api._chain_id),
+                "gas": 0,
+                "nonce": get_safe_nonce(ethereum_client, str(safe_address)),
+            }
         )
-        signed_transaction = crypto.sign_transaction(raw_transaction)
-        transaction_digest = ledger_api.send_signed_transaction(
-            signed_transaction,
-            raise_on_try=True,
+        transaction_digest = send_safe_tx(
+            ethereum_client=ethereum_client,
+            tx_data=transaction["data"],
+            to_adress=token_balance_tracker_contract.address,
+            safe_address=str(safe_address),
+            signer_pkey=crypto.private_key,
+            value=0,
         )
-        return transaction_digest
+        return transaction_digest.hex()
+
     except Exception as e:  # pylint: disable=broad-except
         print(f"Error occured while sending the transaction: {e}")
         return str(e)
 
 
 def main(
+    agent_mode: bool,
     amount: str,
+    safe_address: Optional[str] = None,
     private_key_path: Optional[str] = None,
+    private_key_password: Optional[str] = None,
     chain_config: Optional[str] = None,
 ) -> None:
     """Runs the deposit functionality for the token mech type"""
@@ -129,6 +192,8 @@ def main(
     private_key_path = private_key_path or PRIVATE_KEY_FILE_PATH
 
     mech_config = get_mech_config(chain_config)
+    ledger_rpc = mech_config.ledger_config.address
+    ethereum_client = EthereumClient(ledger_rpc)
     ledger_config = mech_config.ledger_config
     ledger_api = EthereumApi(**asdict(ledger_config))
 
@@ -136,9 +201,9 @@ def main(
         raise FileNotFoundError(
             f"Private key file `{private_key_path}` does not exist!"
         )
-    crypto = EthereumCrypto(private_key_path=private_key_path)
-
-    print(f"Sender address: {crypto.address}")
+    crypto = EthereumCrypto(
+        private_key_path=private_key_path, password=private_key_password
+    )
 
     chain_id = mech_config.ledger_config.chain_id
     token_balance_tracker_contract = get_token_balance_tracker_contract(
@@ -146,11 +211,19 @@ def main(
     )
     token_contract = get_token_contract(ledger_api, chain_id)
 
-    check_token_balance(token_contract, crypto.address, amount_to_deposit)
+    # Tokens will be on the safe and EOA pays for gas
+    # so for agent mode, sender has to be safe
+    sender = safe_address or crypto.address
+    print(f"Sender address: {sender}")
+
+    check_token_balance(token_contract, sender, amount_to_deposit)
 
     approve_tx = approve(
         crypto,
         ledger_api,
+        ethereum_client,
+        agent_mode,
+        safe_address,
         token_contract,
         token_balance_tracker_contract,
         amount_to_deposit,
@@ -169,6 +242,9 @@ def main(
     deposit_tx = deposit(
         ledger_api,
         crypto,
+        ethereum_client,
+        agent_mode,
+        safe_address,
         token_balance_tracker_contract,
         amount_to_deposit,
     )

scripts/nvm_subscribe.py

@@ -3,6 +3,7 @@ import sys
 from dotenv import load_dotenv
 from typing import Optional, Dict
 from pathlib import Path
+from aea_ledger_ethereum import EthereumCrypto
 from mech_client.interact import PRIVATE_KEY_FILE_PATH
 from web3 import Web3
 from scripts.nvm_subscription.manager import NVMSubscriptionManager
@@ -16,8 +17,11 @@ CHAIN_TO_ENVS: Dict[str, Path] = {
 
 
 def main(
+    agent_mode: bool,
     private_key_path: str,
+    private_key_password: Optional[str],
     chain_config: str,
+    safe_address: Optional[str] = None,
 ) -> None:
 
     chain_env = CHAIN_TO_ENVS.get(chain_config)
@@ -33,18 +37,22 @@ def main(
             f"Private key file `{private_key_path}` does not exist!"
         )
 
-    with open(private_key_path, "r") as file:
-        content = file.read()
-
-    WALLET_PVT_KEY = content
+    crypto = EthereumCrypto(
+        private_key_path=private_key_path,
+        password=private_key_password,
+    )
+    WALLET_PVT_KEY = crypto.private_key
     PLAN_DID = os.environ["PLAN_DID"]
     NETWORK = os.environ["NETWORK_NAME"]
     CHAIN_ID = int(os.environ["CHAIN_ID"])
-    SENDER = Web3().eth.account.from_key(WALLET_PVT_KEY).address
+    # NVM Subscription has to be purchased for the safe and EOA pays for gas
+    # so for agent mode, sender has to be safe
+    EOA = Web3().eth.account.from_key(WALLET_PVT_KEY).address
+    SENDER = safe_address or EOA
 
     print(f"Sender address: {SENDER}")
 
-    manager = NVMSubscriptionManager(NETWORK, WALLET_PVT_KEY)
+    manager = NVMSubscriptionManager(NETWORK, SENDER, agent_mode, safe_address)
     tx_receipt = manager.create_subscription(PLAN_DID, WALLET_PVT_KEY, CHAIN_ID)
 
     print("Subscription created successfully")

scripts/nvm_subscription/contracts/base_contract.py

@@ -27,7 +27,15 @@ class BaseContract:
         self.w3 = w3
         self.name = name
         self.chain_id = self.w3.eth.chain_id
-        self.chain_name = "gnosis" if self.chain_id == 100 else "base"
+        chain_name_by_id = {
+            100: "gnosis",
+            8453: "base",
+            137: "polygon",
+        }
+        self.chain_name = chain_name_by_id.get(self.chain_id)
+        if not self.chain_name:
+            raise ValueError(f"Unsupported chain id {self.chain_id}; no matching contract artifacts found")
+
         logger.debug(f"Initializing contract wrapper for '{self.name}'")
         self.contract = self._load_contract()  # Load contract from artifact
 

scripts/nvm_subscription/contracts/nft_sales.py

@@ -41,6 +41,7 @@ class NFTSalesTemplateContract(BaseContract):
         amounts: List[int],
         receivers: List[str],
         sender: str,
+        nonce: int,
         value_eth: float,
         gas: int = 600_000,
         chain_id: int = 100
@@ -80,7 +81,6 @@ class NFTSalesTemplateContract(BaseContract):
 
         # Convert sender to a checksum address to ensure type safety
         sender_address: ChecksumAddress = self.w3.to_checksum_address(sender)
-        nonce = self.w3.eth.get_transaction_count(sender_address)
         logger.debug(f"Nonce for sender {sender_address}: {nonce}")
 
         latest_block = self.w3.eth.get_block("latest")
@@ -107,9 +107,7 @@ class NFTSalesTemplateContract(BaseContract):
             "gas": gas,
             "nonce": nonce,
         })
-        gas = self.w3.eth.estimate_gas(tx)
         tx.update({
-            "gas": gas,
             "maxFeePerGas": base_fee + max_priority_fee,
             "maxPriorityFeePerGas": max_priority_fee,
         })

scripts/nvm_subscription/contracts/subscription_provider.py

@@ -33,8 +33,9 @@ class SubscriptionProvider(BaseContract):
         fulfill_for_delegate_params: tuple,
         fulfill_params: tuple,
         sender: str,
+        nonce: int,
         value_eth: float,
-        gas: int = 450_000,
+        gas: int = 500_000,
         chain_id: int = 100,
     ) -> Dict[str, Any]:
         """
@@ -67,7 +68,6 @@ class SubscriptionProvider(BaseContract):
 
         # Convert sender to a checksum address to ensure type safety
         sender_address: ChecksumAddress = self.w3.to_checksum_address(sender)
-        nonce = self.w3.eth.get_transaction_count(sender_address)
         logger.debug(f"Nonce for sender {sender_address}: {nonce}")
 
         latest_block = self.w3.eth.get_block("latest")
@@ -93,10 +93,8 @@ class SubscriptionProvider(BaseContract):
                 }
             )
         )
-        gas = self.w3.eth.estimate_gas(tx)
         tx.update(
             {
-                "gas": gas,
                 "maxFeePerGas": base_fee + max_priority_fee,
                 "maxPriorityFeePerGas": max_priority_fee,
             }

scripts/nvm_subscription/contracts/token.py

@@ -1,6 +1,6 @@
 # subscription/contracts/transfer_nft.py
 import logging
-from typing import Union
+from typing import Union, Dict, Any
 from web3 import Web3
 from eth_typing import ChecksumAddress
 from web3.types import ENS
@@ -26,14 +26,35 @@ class SubscriptionToken(BaseContract):
         super().__init__(w3, name="SubscriptionToken")
         logger.info("Token initialized")
 
+    def get_balance(
+        self, sender: Union[ChecksumAddress, ENS]
+    ) -> int:
+        """
+        Gets the user token balance.
+
+        Args:
+            sender (ChecksumAddress | ENS): User address.
+
+        Returns:
+            int: The user's token balance.
+        """
+        sender_address: ChecksumAddress = self.w3.to_checksum_address(sender)
+
+        balance = (
+            self.functions().balanceOf(sender_address).call()
+        )
+        logger.debug(f"Fetched Token Balance: {balance}")
+        return balance
+
     def build_approve_token_tx(
         self,
         sender: Union[ChecksumAddress, ENS],
         to: Union[ChecksumAddress, ENS],
         amount: int,
+        nonce: int,
         gas: int = 60_000,
         chain_id: int = 100,
-    ) -> bytes:
+    ) -> Dict[str, Any]:
         """
         Compute the hash of parameters for the transfer condition.
 
@@ -50,7 +71,6 @@ class SubscriptionToken(BaseContract):
         logger.debug("Approving token...")
         sender_address: ChecksumAddress = self.w3.to_checksum_address(sender)
         to_address: ChecksumAddress = self.w3.to_checksum_address(to)
-        nonce = self.w3.eth.get_transaction_count(sender_address)
         logger.debug(f"Nonce for sender {sender_address}: {nonce}")
 
         latest_block = self.w3.eth.get_block("latest")
@@ -73,10 +93,8 @@ class SubscriptionToken(BaseContract):
                 }
             )
         )
-        gas = self.w3.eth.estimate_gas(tx)
         tx.update(
             {
-                "gas": gas,
                 "maxFeePerGas": base_fee + max_priority_fee,
                 "maxPriorityFeePerGas": max_priority_fee,
             }