@agether/sdk 2.2.0 → 2.3.1

package/dist/cli.js

@@ -887,9 +887,20 @@ var init_MorphoClient = __esm({
         const weiAmount = import_ethers.ethers.parseUnits(amount, colInfo.decimals);
         const morphoAddr = this.config.contracts.morphoBlue;
         const colToken = new import_ethers.Contract(colInfo.address, ERC20_ABI, this._signer);
-        const transferTx = await colToken.transfer(acctAddr, weiAmount);
-        await transferTx.wait();
-        this._refreshSigner();
+        const acctBalance = await colToken.balanceOf(acctAddr);
+        if (acctBalance < weiAmount) {
+          const shortfall = weiAmount - acctBalance;
+          const eoaBalance = await colToken.balanceOf(await this.getSignerAddress());
+          if (eoaBalance < shortfall) {
+            throw new AgetherError(
+              `Insufficient ${tokenSymbol}. Need ${amount}, AgentAccount has ${import_ethers.ethers.formatUnits(acctBalance, colInfo.decimals)}, EOA has ${import_ethers.ethers.formatUnits(eoaBalance, colInfo.decimals)}.`,
+              "INSUFFICIENT_BALANCE"
+            );
+          }
+          const transferTx = await colToken.transfer(acctAddr, shortfall);
+          await transferTx.wait();
+          this._refreshSigner();
+        }
         const targets = [colInfo.address, morphoAddr];
         const values = [0n, 0n];
         const datas = [
@@ -964,9 +975,20 @@ var init_MorphoClient = __esm({
         const borrowWei = import_ethers.ethers.parseUnits(borrowUsdcAmount, 6);
         const morphoAddr = this.config.contracts.morphoBlue;
         const colToken = new import_ethers.Contract(colInfo.address, ERC20_ABI, this._signer);
-        const transferTx = await colToken.transfer(acctAddr, colWei);
-        await transferTx.wait();
-        this._refreshSigner();
+        const acctBalance = await colToken.balanceOf(acctAddr);
+        if (acctBalance < colWei) {
+          const shortfall = colWei - acctBalance;
+          const eoaBalance = await colToken.balanceOf(await this.getSignerAddress());
+          if (eoaBalance < shortfall) {
+            throw new AgetherError(
+              `Insufficient ${tokenSymbol}. Need ${collateralAmount}, AgentAccount has ${import_ethers.ethers.formatUnits(acctBalance, colInfo.decimals)}, EOA has ${import_ethers.ethers.formatUnits(eoaBalance, colInfo.decimals)}.`,
+              "INSUFFICIENT_BALANCE"
+            );
+          }
+          const transferTx = await colToken.transfer(acctAddr, shortfall);
+          await transferTx.wait();
+          this._refreshSigner();
+        }
         const targets = [colInfo.address, morphoAddr, morphoAddr];
         const values = [0n, 0n, 0n];
         const datas = [
@@ -1280,7 +1302,9 @@ var init_MorphoClient = __esm({
        */
       async _submitUserOp(callData) {
         const sender = await this.getAccountAddress();
-        const nonce = await this.entryPoint.getNonce(sender, 0);
+        const validatorAddr = this.config.contracts.erc8004ValidationModule;
+        const nonceKey = BigInt(validatorAddr) << 32n;
+        const nonce = await this.entryPoint.getNonce(sender, nonceKey);
         const feeData = await this.provider.getFeeData();
         const maxFeePerGas = feeData.maxFeePerGas ?? import_ethers.ethers.parseUnits("0.5", "gwei");
         const maxPriorityFeePerGas = feeData.maxPriorityFeePerGas ?? import_ethers.ethers.parseUnits("0.1", "gwei");
@@ -1289,6 +1313,18 @@ var init_MorphoClient = __esm({
         const preVerificationGas = 100000n;
         const accountGasLimits = this._packUint128(verificationGasLimit, callGasLimit);
         const gasFees = this._packUint128(maxPriorityFeePerGas, maxFeePerGas);
+        const requiredPrefund = (verificationGasLimit + callGasLimit + preVerificationGas) * maxFeePerGas;
+        const accountBalance = await this.provider.getBalance(sender);
+        if (accountBalance < requiredPrefund) {
+          const topUp = requiredPrefund - accountBalance;
+          const topUpWithBuffer = topUp * 120n / 100n;
+          const fundTx = await this._signer.sendTransaction({
+            to: sender,
+            value: topUpWithBuffer
+          });
+          await fundTx.wait();
+          this._refreshSigner();
+        }
         const userOp = {
           sender,
           nonce,

package/dist/index.js

@@ -1136,9 +1136,20 @@ var MorphoClient = class {
     const weiAmount = import_ethers2.ethers.parseUnits(amount, colInfo.decimals);
     const morphoAddr = this.config.contracts.morphoBlue;
     const colToken = new import_ethers2.Contract(colInfo.address, ERC20_ABI, this._signer);
-    const transferTx = await colToken.transfer(acctAddr, weiAmount);
-    await transferTx.wait();
-    this._refreshSigner();
+    const acctBalance = await colToken.balanceOf(acctAddr);
+    if (acctBalance < weiAmount) {
+      const shortfall = weiAmount - acctBalance;
+      const eoaBalance = await colToken.balanceOf(await this.getSignerAddress());
+      if (eoaBalance < shortfall) {
+        throw new AgetherError(
+          `Insufficient ${tokenSymbol}. Need ${amount}, AgentAccount has ${import_ethers2.ethers.formatUnits(acctBalance, colInfo.decimals)}, EOA has ${import_ethers2.ethers.formatUnits(eoaBalance, colInfo.decimals)}.`,
+          "INSUFFICIENT_BALANCE"
+        );
+      }
+      const transferTx = await colToken.transfer(acctAddr, shortfall);
+      await transferTx.wait();
+      this._refreshSigner();
+    }
     const targets = [colInfo.address, morphoAddr];
     const values = [0n, 0n];
     const datas = [
@@ -1213,9 +1224,20 @@ var MorphoClient = class {
     const borrowWei = import_ethers2.ethers.parseUnits(borrowUsdcAmount, 6);
     const morphoAddr = this.config.contracts.morphoBlue;
     const colToken = new import_ethers2.Contract(colInfo.address, ERC20_ABI, this._signer);
-    const transferTx = await colToken.transfer(acctAddr, colWei);
-    await transferTx.wait();
-    this._refreshSigner();
+    const acctBalance = await colToken.balanceOf(acctAddr);
+    if (acctBalance < colWei) {
+      const shortfall = colWei - acctBalance;
+      const eoaBalance = await colToken.balanceOf(await this.getSignerAddress());
+      if (eoaBalance < shortfall) {
+        throw new AgetherError(
+          `Insufficient ${tokenSymbol}. Need ${collateralAmount}, AgentAccount has ${import_ethers2.ethers.formatUnits(acctBalance, colInfo.decimals)}, EOA has ${import_ethers2.ethers.formatUnits(eoaBalance, colInfo.decimals)}.`,
+          "INSUFFICIENT_BALANCE"
+        );
+      }
+      const transferTx = await colToken.transfer(acctAddr, shortfall);
+      await transferTx.wait();
+      this._refreshSigner();
+    }
     const targets = [colInfo.address, morphoAddr, morphoAddr];
     const values = [0n, 0n, 0n];
     const datas = [
@@ -1529,7 +1551,9 @@ var MorphoClient = class {
    */
   async _submitUserOp(callData) {
     const sender = await this.getAccountAddress();
-    const nonce = await this.entryPoint.getNonce(sender, 0);
+    const validatorAddr = this.config.contracts.erc8004ValidationModule;
+    const nonceKey = BigInt(validatorAddr) << 32n;
+    const nonce = await this.entryPoint.getNonce(sender, nonceKey);
     const feeData = await this.provider.getFeeData();
     const maxFeePerGas = feeData.maxFeePerGas ?? import_ethers2.ethers.parseUnits("0.5", "gwei");
     const maxPriorityFeePerGas = feeData.maxPriorityFeePerGas ?? import_ethers2.ethers.parseUnits("0.1", "gwei");
@@ -1538,6 +1562,18 @@ var MorphoClient = class {
     const preVerificationGas = 100000n;
     const accountGasLimits = this._packUint128(verificationGasLimit, callGasLimit);
     const gasFees = this._packUint128(maxPriorityFeePerGas, maxFeePerGas);
+    const requiredPrefund = (verificationGasLimit + callGasLimit + preVerificationGas) * maxFeePerGas;
+    const accountBalance = await this.provider.getBalance(sender);
+    if (accountBalance < requiredPrefund) {
+      const topUp = requiredPrefund - accountBalance;
+      const topUpWithBuffer = topUp * 120n / 100n;
+      const fundTx = await this._signer.sendTransaction({
+        to: sender,
+        value: topUpWithBuffer
+      });
+      await fundTx.wait();
+      this._refreshSigner();
+    }
     const userOp = {
       sender,
       nonce,

package/dist/index.mjs

@@ -1064,9 +1064,20 @@ var MorphoClient = class {
     const weiAmount = ethers2.parseUnits(amount, colInfo.decimals);
     const morphoAddr = this.config.contracts.morphoBlue;
     const colToken = new Contract2(colInfo.address, ERC20_ABI, this._signer);
-    const transferTx = await colToken.transfer(acctAddr, weiAmount);
-    await transferTx.wait();
-    this._refreshSigner();
+    const acctBalance = await colToken.balanceOf(acctAddr);
+    if (acctBalance < weiAmount) {
+      const shortfall = weiAmount - acctBalance;
+      const eoaBalance = await colToken.balanceOf(await this.getSignerAddress());
+      if (eoaBalance < shortfall) {
+        throw new AgetherError(
+          `Insufficient ${tokenSymbol}. Need ${amount}, AgentAccount has ${ethers2.formatUnits(acctBalance, colInfo.decimals)}, EOA has ${ethers2.formatUnits(eoaBalance, colInfo.decimals)}.`,
+          "INSUFFICIENT_BALANCE"
+        );
+      }
+      const transferTx = await colToken.transfer(acctAddr, shortfall);
+      await transferTx.wait();
+      this._refreshSigner();
+    }
     const targets = [colInfo.address, morphoAddr];
     const values = [0n, 0n];
     const datas = [
@@ -1141,9 +1152,20 @@ var MorphoClient = class {
     const borrowWei = ethers2.parseUnits(borrowUsdcAmount, 6);
     const morphoAddr = this.config.contracts.morphoBlue;
     const colToken = new Contract2(colInfo.address, ERC20_ABI, this._signer);
-    const transferTx = await colToken.transfer(acctAddr, colWei);
-    await transferTx.wait();
-    this._refreshSigner();
+    const acctBalance = await colToken.balanceOf(acctAddr);
+    if (acctBalance < colWei) {
+      const shortfall = colWei - acctBalance;
+      const eoaBalance = await colToken.balanceOf(await this.getSignerAddress());
+      if (eoaBalance < shortfall) {
+        throw new AgetherError(
+          `Insufficient ${tokenSymbol}. Need ${collateralAmount}, AgentAccount has ${ethers2.formatUnits(acctBalance, colInfo.decimals)}, EOA has ${ethers2.formatUnits(eoaBalance, colInfo.decimals)}.`,
+          "INSUFFICIENT_BALANCE"
+        );
+      }
+      const transferTx = await colToken.transfer(acctAddr, shortfall);
+      await transferTx.wait();
+      this._refreshSigner();
+    }
     const targets = [colInfo.address, morphoAddr, morphoAddr];
     const values = [0n, 0n, 0n];
     const datas = [
@@ -1457,7 +1479,9 @@ var MorphoClient = class {
    */
   async _submitUserOp(callData) {
     const sender = await this.getAccountAddress();
-    const nonce = await this.entryPoint.getNonce(sender, 0);
+    const validatorAddr = this.config.contracts.erc8004ValidationModule;
+    const nonceKey = BigInt(validatorAddr) << 32n;
+    const nonce = await this.entryPoint.getNonce(sender, nonceKey);
     const feeData = await this.provider.getFeeData();
     const maxFeePerGas = feeData.maxFeePerGas ?? ethers2.parseUnits("0.5", "gwei");
     const maxPriorityFeePerGas = feeData.maxPriorityFeePerGas ?? ethers2.parseUnits("0.1", "gwei");
@@ -1466,6 +1490,18 @@ var MorphoClient = class {
     const preVerificationGas = 100000n;
     const accountGasLimits = this._packUint128(verificationGasLimit, callGasLimit);
     const gasFees = this._packUint128(maxPriorityFeePerGas, maxFeePerGas);
+    const requiredPrefund = (verificationGasLimit + callGasLimit + preVerificationGas) * maxFeePerGas;
+    const accountBalance = await this.provider.getBalance(sender);
+    if (accountBalance < requiredPrefund) {
+      const topUp = requiredPrefund - accountBalance;
+      const topUpWithBuffer = topUp * 120n / 100n;
+      const fundTx = await this._signer.sendTransaction({
+        to: sender,
+        value: topUpWithBuffer
+      });
+      await fundTx.wait();
+      this._refreshSigner();
+    }
     const userOp = {
       sender,
       nonce,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agether/sdk",
-  "version": "2.2.0",
+  "version": "2.3.1",
   "description": "TypeScript SDK for Agether - autonomous credit for AI agents on Base",
   "main": "dist/index.js",
   "module": "dist/index.mjs",