@zircuit/ovault-evm 0.0.1 → 0.0.2

package/dist/oVaultSync/transfer.d.ts

@@ -77,7 +77,7 @@ export declare class OVaultSyncMessageBuilder {
         amount: bigint;
         spender: `0x${string}`;
         usePermit: boolean;
-        needsResetApproval: boolean | undefined;
+        needsResetApproval: boolean;
         nonce?: undefined;
         tokenName?: undefined;
         tokenVersion?: undefined;

package/dist/oVaultSync/transfer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transfer.d.ts","sourceRoot":"","sources":["../../src/oVaultSync/transfer.ts"],"names":[],"mappings":"AAeA,OAAO,EACL,gBAAgB,EAChB,UAAU,EACV,eAAe,EACf,6BAA6B,EAE7B,gBAAgB,EACjB,MAAM,UAAU,CAAC;AAKlB,qBAAa,wBAAwB;IACnC,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAMlC;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAUjC;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,YAAY;IAM3B,MAAM,CAAC,oBAAoB,CAAC,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM;IA2BtE;;;;;OAKG;IACH,MAAM,CAAC,4BAA4B,CAAC,KAAK,EAAE,eAAe;;;;;sBAoBrB,KAAK,MAAM,EAAE;oBAC1B,KAAK,MAAM,EAAE;;;IAOrC;;;;;OAKG;WACU,iBAAiB,CAC5B,KAAK,EAAE,6BAA6B,GACnC,OAAO,CAAC;QACT,SAAS,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IAuDF;;;;;;OAMG;WACU,oBAAoB,CAC/B,KAAK,EAAE,eAAe,EACtB,gBAAgB,UAAO;;;;WA0EZ,aAAa,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,eAAe;;;;IAyCzE,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,MAAU;WAW7C,eAAe,CAAC,KAAK,EAAE,eAAe;;;;;sBAjNd,KAAK,MAAM,EAAE;oBAC1B,KAAK,MAAM,EAAE;;;WA8PxB,aAAa,CAAC,KAAK,EAAE,eAAe;;;;;eA6GZ,MAAM;mBACE,MAAM;;;;;;;;;;;;;IA0BnD;;;OAGG;IACH,MAAM,CAAC,iBAAiB,CACtB,IAAI,EAAE,gBAAgB,GACrB,6BAA6B;IAmFhC;;;;;OAKG;WACU,oBAAoB,CAC/B,KAAK,EAAE,gBAAgB,GACtB,OAAO,CAAC,gBAAgB,CAAC;IAyG5B;;;;;;;OAOG;IACH,MAAM,CAAC,wBAAwB,CAC7B,MAAM,EAAE,gBAAgB,EACxB,UAAU,CAAC,EAAE,SAAS;QACpB,MAAM;QACN,MAAM,GAAG,MAAM;QACf,KAAK,MAAM,EAAE;QACb,KAAK,MAAM,EAAE;KACd,GACA;QAAE,EAAE,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,IAAI,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;CAoB7D"}
+{"version":3,"file":"transfer.d.ts","sourceRoot":"","sources":["../../src/oVaultSync/transfer.ts"],"names":[],"mappings":"AAeA,OAAO,EACL,gBAAgB,EAChB,UAAU,EACV,eAAe,EACf,6BAA6B,EAE7B,gBAAgB,EACjB,MAAM,UAAU,CAAC;AAKlB,qBAAa,wBAAwB;IACnC,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAMlC;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAUjC;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,YAAY;IAM3B,MAAM,CAAC,oBAAoB,CAAC,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM;IA2BtE;;;;;OAKG;IACH,MAAM,CAAC,4BAA4B,CAAC,KAAK,EAAE,eAAe;;;;;sBAoBrB,KAAK,MAAM,EAAE;oBAC1B,KAAK,MAAM,EAAE;;;IAOrC;;;;;OAKG;WACU,iBAAiB,CAC5B,KAAK,EAAE,6BAA6B,GACnC,OAAO,CAAC;QACT,SAAS,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IAuDF;;;;;;OAMG;WACU,oBAAoB,CAC/B,KAAK,EAAE,eAAe,EACtB,gBAAgB,UAAO;;;;WA0EZ,aAAa,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,eAAe;;;;IAyCzE,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,MAAU;WAW7C,eAAe,CAAC,KAAK,EAAE,eAAe;;;;;sBAjNd,KAAK,MAAM,EAAE;oBAC1B,KAAK,MAAM,EAAE;;;WA8PxB,aAAa,CAAC,KAAK,EAAE,eAAe;;;;;eA6GZ,MAAM;mBACE,MAAM;;;;;;;;;;;;;IA+BnD;;;OAGG;IACH,MAAM,CAAC,iBAAiB,CACtB,IAAI,EAAE,gBAAgB,GACrB,6BAA6B;IAmFhC;;;;;OAKG;WACU,oBAAoB,CAC/B,KAAK,EAAE,gBAAgB,GACtB,OAAO,CAAC,gBAAgB,CAAC;IAyG5B;;;;;;;OAOG;IACH,MAAM,CAAC,wBAAwB,CAC7B,MAAM,EAAE,gBAAgB,EACxB,UAAU,CAAC,EAAE,SAAS;QACpB,MAAM;QACN,MAAM,GAAG,MAAM;QACf,KAAK,MAAM,EAAE;QACb,KAAK,MAAM,EAAE;KACd,GACA;QAAE,EAAE,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,IAAI,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;CAoB7D"}

package/dist/oVaultSync/transfer.js

@@ -338,9 +338,13 @@ export class OVaultSyncMessageBuilder {
                 console.warn("Failed to fetch nonce for permit, falling back to approval:", error);
             }
         }
-        // Some tokens (like USDT) require approval to be set to 0 before changing to a new value
-        // If there's an existing non-zero allowance, we need a two-step approval
-        const needsResetApproval = requiresZeroApprovalReset && allowance > 0n && allowance < amount;
+        // Some underlying tokens (like USDT) require approval to be set to 0
+        // before changing to a new value.
+        const isUnderlyingTokenApproval = approvingTokenAddress.toLowerCase() === tokenAddress.toLowerCase();
+        const needsResetApproval = isUnderlyingTokenApproval &&
+            requiresZeroApprovalReset === true &&
+            allowance > 0n &&
+            allowance < amount;
         return {
             tokenAddress: approvingTokenAddress,
             amount,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zircuit/ovault-evm",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Zircuit OVault Implementation SDK",
   "keywords": [
     "LayerZero",

package/src/oVaultSync/transfer.ts

@@ -487,10 +487,15 @@ export class OVaultSyncMessageBuilder {
       }
     }
 
-    // Some tokens (like USDT) require approval to be set to 0 before changing to a new value
-    // If there's an existing non-zero allowance, we need a two-step approval
+    // Some underlying tokens (like USDT) require approval to be set to 0
+    // before changing to a new value.
+    const isUnderlyingTokenApproval =
+      approvingTokenAddress.toLowerCase() === tokenAddress.toLowerCase();
     const needsResetApproval =
-      requiresZeroApprovalReset && allowance > 0n && allowance < amount;
+      isUnderlyingTokenApproval &&
+      requiresZeroApprovalReset === true &&
+      allowance > 0n &&
+      allowance < amount;
 
     return {
       tokenAddress: approvingTokenAddress,