@virtuals-protocol/acp-node 0.1.0-beta.14 → 0.1.0-beta.16

package/dist/index.js

@@ -69,7 +69,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@virtuals-protocol/acp-node",
-      version: "0.1.0-beta.14",
+      version: "0.1.0-beta.16",
       main: "./dist/index.js",
       module: "./dist/index.mjs",
       types: "./dist/index.d.ts",
@@ -812,18 +812,25 @@ var baseSepoliaAcpConfig = {
   contractAddress: "0xD1D196Ac27Fd386dDc04879a86C074aBF3AD9d0f",
   virtualsTokenAddress: "0xbfAB80ccc15DF6fb7185f9498d6039317331846a",
   alchemyRpcUrl: "https://alchemy-proxy.virtuals.io/api/proxy/rpc",
-  acpUrl: "https://acpx-staging.virtuals.io"
+  acpUrl: "https://acpx-staging.virtuals.io",
+  priorityFeeMultiplier: 2,
+  maxFeePerGas: 2e7,
+  maxPriorityFeePerGas: 21e6
 };
 var baseAcpConfig = {
   chain: import_infra.base,
   contractAddress: "0x6a1FE26D54ab0d3E1e3168f2e0c0cDa5cC0A0A4A",
   virtualsTokenAddress: "0x0b3e328455c4059EEb9e3f84b5543F74E24e7E1b",
   alchemyRpcUrl: "https://alchemy-proxy-prod.virtuals.io/api/proxy/rpc",
-  acpUrl: "https://acpx.virtuals.io"
+  acpUrl: "https://acpx.virtuals.io",
+  priorityFeeMultiplier: 2,
+  maxFeePerGas: 2e7,
+  maxPriorityFeePerGas: 21e6
 };
 
 // src/acpContractClient.ts
 var import_viem = require("viem");
+var import_op_stack = require("viem/op-stack");
 var MemoType = /* @__PURE__ */ ((MemoType2) => {
   MemoType2[MemoType2["MESSAGE"] = 0] = "MESSAGE";
   MemoType2[MemoType2["CONTEXT_URL"] = 1] = "CONTEXT_URL";
@@ -844,22 +851,30 @@ var AcpJobPhases = /* @__PURE__ */ ((AcpJobPhases2) => {
   return AcpJobPhases2;
 })(AcpJobPhases || {});
 var AcpContractClient = class _AcpContractClient {
-  constructor(walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfig) {
+  constructor(walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfig, customRpcUrl) {
     this.walletPrivateKey = walletPrivateKey;
     this.sessionEntityKeyId = sessionEntityKeyId;
     this.agentWalletAddress = agentWalletAddress;
     this.config = config;
+    this.customRpcUrl = customRpcUrl;
+    this.MAX_RETRIES = 3;
     this.chain = config.chain;
     this.contractAddress = config.contractAddress;
     this.virtualsTokenAddress = config.virtualsTokenAddress;
+    this.customRpcUrl = customRpcUrl;
+    this.customRpcClient = (0, import_viem.createPublicClient)({
+      chain: this.chain,
+      transport: this.customRpcUrl ? (0, import_viem.http)(this.customRpcUrl) : (0, import_viem.http)()
+    }).extend((0, import_op_stack.publicActionsL2)());
   }
-  static build(_0, _1, _2) {
-    return __async(this, arguments, function* (walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfig) {
+  static build(_0, _1, _2, _3) {
+    return __async(this, arguments, function* (walletPrivateKey, sessionEntityKeyId, agentWalletAddress, customRpcUrl, config = baseAcpConfig) {
       const acpContractClient = new _AcpContractClient(
         walletPrivateKey,
         sessionEntityKeyId,
         agentWalletAddress,
-        config
+        config,
+        customRpcUrl
       );
       yield acpContractClient.init();
       return acpContractClient;
@@ -892,6 +907,54 @@ var AcpContractClient = class _AcpContractClient {
   get walletAddress() {
     return this.sessionKeyClient.account.address;
   }
+  calculateGasFees() {
+    return __async(this, null, function* () {
+      const { maxFeePerGas, maxPriorityFeePerGas } = yield this.customRpcClient.estimateFeesPerGas();
+      let finalMaxFeePerGas = maxFeePerGas;
+      let priorityFeeMultiplier = Number(this.config.priorityFeeMultiplier) || 2;
+      const overrideMaxFeePerGas = this.config.maxFeePerGas || maxFeePerGas;
+      const overrideMaxPriorityFeePerGas = this.config.maxPriorityFeePerGas || maxPriorityFeePerGas;
+      finalMaxFeePerGas = BigInt(overrideMaxFeePerGas) + BigInt(overrideMaxPriorityFeePerGas) * BigInt(Math.max(0, priorityFeeMultiplier - 1));
+      return finalMaxFeePerGas;
+    });
+  }
+  handleSendUserOperation(_0) {
+    return __async(this, arguments, function* (data, contractAddress = this.contractAddress) {
+      const payload = {
+        uo: {
+          target: contractAddress,
+          data
+        },
+        overrides: {}
+      };
+      let retries = this.MAX_RETRIES;
+      let finalError;
+      while (retries > 0) {
+        try {
+          if (this.MAX_RETRIES > retries) {
+            const gasFees = yield this.calculateGasFees();
+            payload["overrides"] = {
+              maxFeePerGas: `0x${gasFees.toString(16)}`
+            };
+          }
+          const { hash } = yield this.sessionKeyClient.sendUserOperation(payload);
+          yield this.sessionKeyClient.waitForUserOperationTransaction({
+            hash
+          });
+          return hash;
+        } catch (error) {
+          console.debug("Failed to send user operation", error);
+          retries -= 1;
+          if (retries === 0) {
+            finalError = error;
+            break;
+          }
+          yield new Promise((resolve) => setTimeout(resolve, 2e3 * retries));
+        }
+      }
+      throw new Error(`Failed to send user operation ${finalError}`);
+    });
+  }
   getJobId(hash) {
     return __async(this, null, function* () {
       const result = yield this.sessionKeyClient.getUserOperationReceipt(hash);
@@ -919,98 +982,61 @@ var AcpContractClient = class _AcpContractClient {
             Math.floor(expireAt.getTime() / 1e3)
           ]
         });
-        const { hash } = yield this.sessionKeyClient.sendUserOperation({
-          uo: {
-            target: this.contractAddress,
-            data
-          }
-        });
-        yield this.sessionKeyClient.waitForUserOperationTransaction({
-          hash
-        });
+        const hash = yield this.handleSendUserOperation(data);
         const jobId = yield this.getJobId(hash);
         return { txHash: hash, jobId };
       } catch (error) {
-        console.error(error);
+        console.error(`Failed to create job ${error}`);
         throw new Error("Failed to create job");
       }
     });
   }
   approveAllowance(priceInWei) {
     return __async(this, null, function* () {
-      const data = (0, import_viem.encodeFunctionData)({
-        abi: import_viem.erc20Abi,
-        functionName: "approve",
-        args: [this.contractAddress, priceInWei]
-      });
-      const { hash } = yield this.sessionKeyClient.sendUserOperation({
-        uo: {
-          target: this.virtualsTokenAddress,
-          data
-        }
-      });
-      yield this.sessionKeyClient.waitForUserOperationTransaction({
-        hash
-      });
-      return hash;
+      try {
+        const data = (0, import_viem.encodeFunctionData)({
+          abi: import_viem.erc20Abi,
+          functionName: "approve",
+          args: [this.contractAddress, priceInWei]
+        });
+        return yield this.handleSendUserOperation(
+          data,
+          this.virtualsTokenAddress
+        );
+      } catch (error) {
+        console.error(`Failed to approve allowance ${error}`);
+        throw new Error("Failed to approve allowance");
+      }
     });
   }
   createMemo(jobId, content, type, isSecured, nextPhase) {
     return __async(this, null, function* () {
-      let retries = 3;
-      while (retries > 0) {
-        try {
-          const data = (0, import_viem.encodeFunctionData)({
-            abi: acpAbi_default,
-            functionName: "createMemo",
-            args: [jobId, content, type, isSecured, nextPhase]
-          });
-          const { hash } = yield this.sessionKeyClient.sendUserOperation({
-            uo: {
-              target: this.contractAddress,
-              data
-            }
-          });
-          yield this.sessionKeyClient.waitForUserOperationTransaction({
-            hash
-          });
-          return hash;
-        } catch (error) {
-          console.error(`failed to create memo ${jobId} ${content} ${error}`);
-          retries -= 1;
-          yield new Promise((resolve) => setTimeout(resolve, 2e3 * retries));
-        }
+      try {
+        const data = (0, import_viem.encodeFunctionData)({
+          abi: acpAbi_default,
+          functionName: "createMemo",
+          args: [jobId, content, type, isSecured, nextPhase]
+        });
+        return yield this.handleSendUserOperation(data);
+      } catch (error) {
+        console.error(`Failed to create memo ${jobId} ${content} ${error}`);
+        throw new Error("Failed to create memo");
       }
-      throw new Error("Failed to create memo");
     });
   }
   signMemo(memoId, isApproved, reason) {
     return __async(this, null, function* () {
-      let retries = 3;
-      while (retries > 0) {
-        try {
-          const data = (0, import_viem.encodeFunctionData)({
-            abi: acpAbi_default,
-            functionName: "signMemo",
-            args: [memoId, isApproved, reason]
-          });
-          const { hash } = yield this.sessionKeyClient.sendUserOperation({
-            uo: {
-              target: this.contractAddress,
-              data
-            }
-          });
-          yield this.sessionKeyClient.waitForUserOperationTransaction({
-            hash
-          });
-          return hash;
-        } catch (error) {
-          console.error(`failed to sign memo ${error}`);
-          retries -= 1;
-          yield new Promise((resolve) => setTimeout(resolve, 2e3 * retries));
-        }
+      try {
+        const data = (0, import_viem.encodeFunctionData)({
+          abi: acpAbi_default,
+          functionName: "signMemo",
+          args: [memoId, isApproved, reason]
+        });
+        return yield this.handleSendUserOperation(data);
+      } catch (error) {
+        console.error(`Failed to sign memo ${error}`);
+        throw new Error("Failed to sign memo");
       }
-      throw new Error("Failed to sign memo");
     });
   }
   setBudget(jobId, budget) {
@@ -1021,18 +1047,9 @@ var AcpContractClient = class _AcpContractClient {
           functionName: "setBudget",
           args: [jobId, budget]
         });
-        const { hash } = yield this.sessionKeyClient.sendUserOperation({
-          uo: {
-            target: this.contractAddress,
-            data
-          }
-        });
-        yield this.sessionKeyClient.waitForUserOperationTransaction({
-          hash
-        });
-        return hash;
+        return yield this.handleSendUserOperation(data);
       } catch (error) {
-        console.error(error);
+        console.error(`Failed to set budget ${error}`);
         throw new Error("Failed to set budget");
       }
     });
@@ -1385,7 +1402,7 @@ var AcpClient = class {
     return __async(this, null, function* () {
       return yield this.acpContractClient.createMemo(
         jobId,
-        deliverable,
+        JSON.stringify(deliverable),
         4 /* OBJECT_URL */,
         true,
         4 /* COMPLETED */

package/dist/index.mjs

@@ -44,7 +44,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@virtuals-protocol/acp-node",
-      version: "0.1.0-beta.14",
+      version: "0.1.0-beta.16",
       main: "./dist/index.js",
       module: "./dist/index.mjs",
       types: "./dist/index.d.ts",
@@ -773,18 +773,31 @@ var baseSepoliaAcpConfig = {
   contractAddress: "0xD1D196Ac27Fd386dDc04879a86C074aBF3AD9d0f",
   virtualsTokenAddress: "0xbfAB80ccc15DF6fb7185f9498d6039317331846a",
   alchemyRpcUrl: "https://alchemy-proxy.virtuals.io/api/proxy/rpc",
-  acpUrl: "https://acpx-staging.virtuals.io"
+  acpUrl: "https://acpx-staging.virtuals.io",
+  priorityFeeMultiplier: 2,
+  maxFeePerGas: 2e7,
+  maxPriorityFeePerGas: 21e6
 };
 var baseAcpConfig = {
   chain: base,
   contractAddress: "0x6a1FE26D54ab0d3E1e3168f2e0c0cDa5cC0A0A4A",
   virtualsTokenAddress: "0x0b3e328455c4059EEb9e3f84b5543F74E24e7E1b",
   alchemyRpcUrl: "https://alchemy-proxy-prod.virtuals.io/api/proxy/rpc",
-  acpUrl: "https://acpx.virtuals.io"
+  acpUrl: "https://acpx.virtuals.io",
+  priorityFeeMultiplier: 2,
+  maxFeePerGas: 2e7,
+  maxPriorityFeePerGas: 21e6
 };
 
 // src/acpContractClient.ts
-import { encodeFunctionData, erc20Abi, fromHex } from "viem";
+import {
+  createPublicClient,
+  encodeFunctionData,
+  erc20Abi,
+  fromHex,
+  http
+} from "viem";
+import { publicActionsL2 } from "viem/op-stack";
 var MemoType = /* @__PURE__ */ ((MemoType2) => {
   MemoType2[MemoType2["MESSAGE"] = 0] = "MESSAGE";
   MemoType2[MemoType2["CONTEXT_URL"] = 1] = "CONTEXT_URL";
@@ -805,22 +818,30 @@ var AcpJobPhases = /* @__PURE__ */ ((AcpJobPhases2) => {
   return AcpJobPhases2;
 })(AcpJobPhases || {});
 var AcpContractClient = class _AcpContractClient {
-  constructor(walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfig) {
+  constructor(walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfig, customRpcUrl) {
     this.walletPrivateKey = walletPrivateKey;
     this.sessionEntityKeyId = sessionEntityKeyId;
     this.agentWalletAddress = agentWalletAddress;
     this.config = config;
+    this.customRpcUrl = customRpcUrl;
+    this.MAX_RETRIES = 3;
     this.chain = config.chain;
     this.contractAddress = config.contractAddress;
     this.virtualsTokenAddress = config.virtualsTokenAddress;
+    this.customRpcUrl = customRpcUrl;
+    this.customRpcClient = createPublicClient({
+      chain: this.chain,
+      transport: this.customRpcUrl ? http(this.customRpcUrl) : http()
+    }).extend(publicActionsL2());
   }
-  static build(_0, _1, _2) {
-    return __async(this, arguments, function* (walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfig) {
+  static build(_0, _1, _2, _3) {
+    return __async(this, arguments, function* (walletPrivateKey, sessionEntityKeyId, agentWalletAddress, customRpcUrl, config = baseAcpConfig) {
       const acpContractClient = new _AcpContractClient(
         walletPrivateKey,
         sessionEntityKeyId,
         agentWalletAddress,
-        config
+        config,
+        customRpcUrl
       );
       yield acpContractClient.init();
       return acpContractClient;
@@ -853,6 +874,54 @@ var AcpContractClient = class _AcpContractClient {
   get walletAddress() {
     return this.sessionKeyClient.account.address;
   }
+  calculateGasFees() {
+    return __async(this, null, function* () {
+      const { maxFeePerGas, maxPriorityFeePerGas } = yield this.customRpcClient.estimateFeesPerGas();
+      let finalMaxFeePerGas = maxFeePerGas;
+      let priorityFeeMultiplier = Number(this.config.priorityFeeMultiplier) || 2;
+      const overrideMaxFeePerGas = this.config.maxFeePerGas || maxFeePerGas;
+      const overrideMaxPriorityFeePerGas = this.config.maxPriorityFeePerGas || maxPriorityFeePerGas;
+      finalMaxFeePerGas = BigInt(overrideMaxFeePerGas) + BigInt(overrideMaxPriorityFeePerGas) * BigInt(Math.max(0, priorityFeeMultiplier - 1));
+      return finalMaxFeePerGas;
+    });
+  }
+  handleSendUserOperation(_0) {
+    return __async(this, arguments, function* (data, contractAddress = this.contractAddress) {
+      const payload = {
+        uo: {
+          target: contractAddress,
+          data
+        },
+        overrides: {}
+      };
+      let retries = this.MAX_RETRIES;
+      let finalError;
+      while (retries > 0) {
+        try {
+          if (this.MAX_RETRIES > retries) {
+            const gasFees = yield this.calculateGasFees();
+            payload["overrides"] = {
+              maxFeePerGas: `0x${gasFees.toString(16)}`
+            };
+          }
+          const { hash } = yield this.sessionKeyClient.sendUserOperation(payload);
+          yield this.sessionKeyClient.waitForUserOperationTransaction({
+            hash
+          });
+          return hash;
+        } catch (error) {
+          console.debug("Failed to send user operation", error);
+          retries -= 1;
+          if (retries === 0) {
+            finalError = error;
+            break;
+          }
+          yield new Promise((resolve) => setTimeout(resolve, 2e3 * retries));
+        }
+      }
+      throw new Error(`Failed to send user operation ${finalError}`);
+    });
+  }
   getJobId(hash) {
     return __async(this, null, function* () {
       const result = yield this.sessionKeyClient.getUserOperationReceipt(hash);
@@ -880,98 +949,61 @@ var AcpContractClient = class _AcpContractClient {
             Math.floor(expireAt.getTime() / 1e3)
           ]
         });
-        const { hash } = yield this.sessionKeyClient.sendUserOperation({
-          uo: {
-            target: this.contractAddress,
-            data
-          }
-        });
-        yield this.sessionKeyClient.waitForUserOperationTransaction({
-          hash
-        });
+        const hash = yield this.handleSendUserOperation(data);
         const jobId = yield this.getJobId(hash);
         return { txHash: hash, jobId };
       } catch (error) {
-        console.error(error);
+        console.error(`Failed to create job ${error}`);
         throw new Error("Failed to create job");
       }
     });
   }
   approveAllowance(priceInWei) {
     return __async(this, null, function* () {
-      const data = encodeFunctionData({
-        abi: erc20Abi,
-        functionName: "approve",
-        args: [this.contractAddress, priceInWei]
-      });
-      const { hash } = yield this.sessionKeyClient.sendUserOperation({
-        uo: {
-          target: this.virtualsTokenAddress,
-          data
-        }
-      });
-      yield this.sessionKeyClient.waitForUserOperationTransaction({
-        hash
-      });
-      return hash;
+      try {
+        const data = encodeFunctionData({
+          abi: erc20Abi,
+          functionName: "approve",
+          args: [this.contractAddress, priceInWei]
+        });
+        return yield this.handleSendUserOperation(
+          data,
+          this.virtualsTokenAddress
+        );
+      } catch (error) {
+        console.error(`Failed to approve allowance ${error}`);
+        throw new Error("Failed to approve allowance");
+      }
     });
   }
   createMemo(jobId, content, type, isSecured, nextPhase) {
     return __async(this, null, function* () {
-      let retries = 3;
-      while (retries > 0) {
-        try {
-          const data = encodeFunctionData({
-            abi: acpAbi_default,
-            functionName: "createMemo",
-            args: [jobId, content, type, isSecured, nextPhase]
-          });
-          const { hash } = yield this.sessionKeyClient.sendUserOperation({
-            uo: {
-              target: this.contractAddress,
-              data
-            }
-          });
-          yield this.sessionKeyClient.waitForUserOperationTransaction({
-            hash
-          });
-          return hash;
-        } catch (error) {
-          console.error(`failed to create memo ${jobId} ${content} ${error}`);
-          retries -= 1;
-          yield new Promise((resolve) => setTimeout(resolve, 2e3 * retries));
-        }
+      try {
+        const data = encodeFunctionData({
+          abi: acpAbi_default,
+          functionName: "createMemo",
+          args: [jobId, content, type, isSecured, nextPhase]
+        });
+        return yield this.handleSendUserOperation(data);
+      } catch (error) {
+        console.error(`Failed to create memo ${jobId} ${content} ${error}`);
+        throw new Error("Failed to create memo");
       }
-      throw new Error("Failed to create memo");
     });
   }
   signMemo(memoId, isApproved, reason) {
     return __async(this, null, function* () {
-      let retries = 3;
-      while (retries > 0) {
-        try {
-          const data = encodeFunctionData({
-            abi: acpAbi_default,
-            functionName: "signMemo",
-            args: [memoId, isApproved, reason]
-          });
-          const { hash } = yield this.sessionKeyClient.sendUserOperation({
-            uo: {
-              target: this.contractAddress,
-              data
-            }
-          });
-          yield this.sessionKeyClient.waitForUserOperationTransaction({
-            hash
-          });
-          return hash;
-        } catch (error) {
-          console.error(`failed to sign memo ${error}`);
-          retries -= 1;
-          yield new Promise((resolve) => setTimeout(resolve, 2e3 * retries));
-        }
+      try {
+        const data = encodeFunctionData({
+          abi: acpAbi_default,
+          functionName: "signMemo",
+          args: [memoId, isApproved, reason]
+        });
+        return yield this.handleSendUserOperation(data);
+      } catch (error) {
+        console.error(`Failed to sign memo ${error}`);
+        throw new Error("Failed to sign memo");
       }
-      throw new Error("Failed to sign memo");
     });
   }
   setBudget(jobId, budget) {
@@ -982,18 +1014,9 @@ var AcpContractClient = class _AcpContractClient {
           functionName: "setBudget",
           args: [jobId, budget]
         });
-        const { hash } = yield this.sessionKeyClient.sendUserOperation({
-          uo: {
-            target: this.contractAddress,
-            data
-          }
-        });
-        yield this.sessionKeyClient.waitForUserOperationTransaction({
-          hash
-        });
-        return hash;
+        return yield this.handleSendUserOperation(data);
       } catch (error) {
-        console.error(error);
+        console.error(`Failed to set budget ${error}`);
         throw new Error("Failed to set budget");
       }
     });
@@ -1346,7 +1369,7 @@ var AcpClient = class {
     return __async(this, null, function* () {
       return yield this.acpContractClient.createMemo(
         jobId,
-        deliverable,
+        JSON.stringify(deliverable),
         4 /* OBJECT_URL */,
         true,
         4 /* COMPLETED */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@virtuals-protocol/acp-node",
-  "version": "0.1.0-beta.14",
+  "version": "0.1.0-beta.16",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",