@eulerxyz/euler-v2-sdk 0.1.0-beta → 0.1.2-beta

package/dist/src/services/eulerLabelsService/eulerLabelsService.js

@@ -12,9 +12,6 @@ export class EulerLabelsService {
     resolveLogoUrl(filename) {
         return this.resolveLogoUrlFn ? this.resolveLogoUrlFn(filename) : filename;
     }
-    async fetchEulerLabelsVaults(chainId) {
-        return this.adapter.fetchEulerLabelsVaults(chainId);
-    }
     async fetchEulerLabelsEntities(chainId) {
         return this.adapter.fetchEulerLabelsEntities(chainId);
     }
@@ -28,17 +25,11 @@ export class EulerLabelsService {
         if (vaults.length === 0)
             return;
         const chainId = vaults[0].chainId;
-        const [labelsVaults, labelsEntities, labelsProducts, labelsPoints] = await Promise.all([
-            this.fetchEulerLabelsVaults(chainId).catch(() => ({})),
+        const [labelsEntities, labelsProducts, labelsPoints] = await Promise.all([
             this.fetchEulerLabelsEntities(chainId).catch(() => ({})),
             this.fetchEulerLabelsProducts(chainId).catch(() => ({})),
             this.fetchEulerLabelsPoints(chainId).catch(() => []),
         ]);
-        // Build a lowercase address -> vault label lookup
-        const labelsVaultsLower = new Map();
-        for (const [addr, label] of Object.entries(labelsVaults)) {
-            labelsVaultsLower.set(addr.toLowerCase(), label);
-        }
         // Pre-index products by lowercase vault address for efficient lookup
         const productsByVault = new Map();
         for (const product of Object.values(labelsProducts)) {
@@ -72,45 +63,57 @@ export class EulerLabelsService {
         }
         for (const vault of vaults) {
             const addrLower = vault.address.toLowerCase();
-            const vaultLabel = labelsVaultsLower.get(addrLower);
-            if (!vaultLabel) {
-                vault.populated.labels = true;
-                continue;
-            }
-            // Resolve entities from the vault's entity field
-            const entitySlugs = Array.isArray(vaultLabel.entity)
-                ? vaultLabel.entity
-                : vaultLabel.entity
-                    ? [vaultLabel.entity]
-                    : [];
-            const entities = entitySlugs
-                .map((slug) => labelsEntities[slug])
-                .filter((e) => !!e)
-                .map((e) => ({
-                ...e,
-                logo: e.logo ? this.resolveLogoUrl(e.logo) : e.logo,
-            }));
-            // Find matching products
+            // Resolve products this vault belongs to (with logos)
             const products = (productsByVault.get(addrLower) ?? []).map((p) => ({
                 ...p,
                 logo: p.logo ? this.resolveLogoUrl(p.logo) : undefined,
             }));
-            // Find matching points (collateralVaults only)
+            // Derive curator entities from the vault's products. The product `entity`
+            // field is sometimes a bare string and sometimes an array — normalize to
+            // an array. Dedupe by slug while preserving first-seen order so the
+            // primary curator stays first.
+            const seenEntitySlugs = new Set();
+            const entities = [];
+            for (const product of products) {
+                if (!product.entity)
+                    continue;
+                const slugs = Array.isArray(product.entity)
+                    ? product.entity
+                    : [product.entity];
+                for (const slug of slugs) {
+                    if (seenEntitySlugs.has(slug))
+                        continue;
+                    seenEntitySlugs.add(slug);
+                    const entity = labelsEntities[slug];
+                    if (!entity)
+                        continue;
+                    entities.push({
+                        ...entity,
+                        logo: entity.logo ? this.resolveLogoUrl(entity.logo) : entity.logo,
+                    });
+                }
+            }
+            // Resolve points where this vault is a collateral vault (with logos)
             const points = (pointsByCollateralVault.get(addrLower) ?? []).map((p) => ({
                 ...p,
                 logo: p.logo ? this.resolveLogoUrl(p.logo) : p.logo,
             }));
             const deprecationReason = deprecatedVaultsMap.get(addrLower);
-            vault.eulerLabel = {
-                vault: vaultLabel,
-                entities,
-                products,
-                points,
-                ...(deprecationReason !== undefined && {
-                    deprecated: true,
-                    deprecationReason,
-                }),
-            };
+            const hasAnyLabel = products.length > 0 ||
+                entities.length > 0 ||
+                points.length > 0 ||
+                deprecationReason !== undefined;
+            if (hasAnyLabel) {
+                vault.eulerLabel = {
+                    entities,
+                    products,
+                    points,
+                    ...(deprecationReason !== undefined && {
+                        deprecated: true,
+                        deprecationReason,
+                    }),
+                };
+            }
             vault.populated.labels = true;
         }
     }
@@ -122,16 +125,6 @@ export class EulerLabelsURLAdapter {
         if (buildQuery)
             applyBuildQuery(this, buildQuery);
     }
-    queryEulerLabelsVaults = async (url) => {
-        const response = await fetch(url);
-        if (!response.ok) {
-            throw new Error(`Failed to fetch Euler labels vaults: ${response.statusText}`);
-        }
-        return response.json();
-    };
-    setQueryEulerLabelsVaults(fn) {
-        this.queryEulerLabelsVaults = fn;
-    }
     queryEulerLabelsEntities = async (url) => {
         const response = await fetch(url);
         if (!response.ok) {
@@ -162,9 +155,6 @@ export class EulerLabelsURLAdapter {
     setQueryEulerLabelsPoints(fn) {
         this.queryEulerLabelsPoints = fn;
     }
-    async fetchEulerLabelsVaults(chainId) {
-        return this.queryEulerLabelsVaults(this.config.getEulerLabelsVaultsUrl(chainId));
-    }
     async fetchEulerLabelsEntities(chainId) {
         return this.queryEulerLabelsEntities(this.config.getEulerLabelsEntitiesUrl(chainId));
     }

package/dist/src/services/eulerLabelsService/eulerLabelsService.js.map

@@ -1 +1 @@
-{"version":3,"file":"eulerLabelsService.js","sourceRoot":"","sources":["../../../../src/services/eulerLabelsService/eulerLabelsService.ts"],"names":[],"mappings":"AAQA,OAAO,EAAqB,eAAe,EAAE,MAAM,2BAA2B,CAAC;AA8B/E,MAAM,OAAO,kBAAkB;IAErB;IACA;IAFT,YACS,OAA4B,EAC5B,gBAA+C;QAD/C,YAAO,GAAP,OAAO,CAAqB;QAC5B,qBAAgB,GAAhB,gBAAgB,CAA+B;IACrD,CAAC;IAEJ,UAAU,CAAC,OAA4B;QACtC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;IAED,cAAc,CAAC,QAAgB;QAC9B,OAAO,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC3B,OAAe;QAEf,OAAO,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IACD,KAAK,CAAC,wBAAwB,CAC7B,OAAe;QAEf,OAAO,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;IACvD,CAAC;IACD,KAAK,CAAC,wBAAwB,CAC7B,OAAe;QAEf,OAAO,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;IACvD,CAAC;IACD,KAAK,CAAC,sBAAsB,CAAC,OAAe;QAC3C,OAAO,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,MAAsB;QAC1C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAEhC,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAE,CAAC,OAAO,CAAC;QAEnC,MAAM,CAAC,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,GACjE,MAAM,OAAO,CAAC,GAAG,CAAC;YACjB,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,KAAK,CACzC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAqC,CAC9C;YACD,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,KAAK,CAC3C,GAAG,EAAE,CAAC,CAAC,EAAE,CAAqC,CAC9C;YACD,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,KAAK,CAC3C,GAAG,EAAE,CAAC,CAAC,EAAE,CAAsC,CAC/C;YACD,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,KAAK,CACzC,GAAG,EAAE,CAAC,EAAuB,CAC7B;SACD,CAAC,CAAC;QAEJ,kDAAkD;QAClD,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAA2B,CAAC;QAC7D,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YAC1D,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,KAAK,CAAC,CAAC;QAClD,CAAC;QAED,qEAAqE;QACrE,MAAM,eAAe,GAAG,IAAI,GAAG,EAA+B,CAAC;QAC/D,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;YACrD,KAAK,MAAM,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACxC,MAAM,GAAG,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;gBACpC,MAAM,IAAI,GAAG,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;gBAC5C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACnB,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAChC,CAAC;QACF,CAAC;QAED,4DAA4D;QAC5D,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAkB,CAAC;QACtD,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;YACrD,IAAI,CAAC,OAAO,CAAC,gBAAgB;gBAAE,SAAS;YACxC,KAAK,MAAM,SAAS,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;gBAClD,mBAAmB,CAAC,GAAG,CACtB,SAAS,CAAC,WAAW,EAAE,EACvB,OAAO,CAAC,iBAAiB,IAAI,EAAE,CAC/B,CAAC;YACH,CAAC;QACF,CAAC;QAED,yDAAyD;QACzD,MAAM,uBAAuB,GAAG,IAAI,GAAG,EAA6B,CAAC;QACrE,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;YAClC,IAAI,CAAC,KAAK,CAAC,gBAAgB;gBAAE,SAAS;YACtC,KAAK,MAAM,SAAS,IAAI,KAAK,CAAC,gBAAgB,EAAE,CAAC;gBAChD,MAAM,GAAG,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;gBACpC,MAAM,IAAI,GAAG,uBAAuB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;gBACpD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACjB,uBAAuB,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACxC,CAAC;QACF,CAAC;QAED,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC5B,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAC9C,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACpD,IAAI,CAAC,UAAU,EAAE,CAAC;gBACjB,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC;gBAC9B,SAAS;YACV,CAAC;YAED,iDAAiD;YACjD,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC;gBACnD,CAAC,CAAC,UAAU,CAAC,MAAM;gBACnB,CAAC,CAAC,UAAU,CAAC,MAAM;oBAClB,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC;oBACrB,CAAC,CAAC,EAAE,CAAC;YACP,MAAM,QAAQ,GAAG,WAAW;iBAC1B,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;iBACnC,MAAM,CAAC,CAAC,CAAC,EAAyB,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;iBACzC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACZ,GAAG,CAAC;gBACJ,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;aACnD,CAAC,CAAC,CAAC;YAEL,yBAAyB;YACzB,MAAM,QAAQ,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACnE,GAAG,CAAC;gBACJ,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;aACtD,CAAC,CAAC,CAAC;YAEJ,+CAA+C;YAC/C,MAAM,MAAM,GAAG,CAAC,uBAAuB,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAChE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACP,GAAG,CAAC;gBACJ,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;aACnD,CAAC,CACF,CAAC;YAEF,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAE7D,KAAK,CAAC,UAAU,GAAG;gBAClB,KAAK,EAAE,UAAU;gBACjB,QAAQ;gBACR,QAAQ;gBACR,MAAM;gBACN,GAAG,CAAC,iBAAiB,KAAK,SAAS,IAAI;oBACtC,UAAU,EAAE,IAAI;oBAChB,iBAAiB;iBACjB,CAAC;aACF,CAAC;YACF,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC;QAC/B,CAAC;IACF,CAAC;CACD;AAUD,MAAM,OAAO,qBAAqB;IAEf;IADlB,YACkB,MAAmC,EACpD,UAAyB;QADR,WAAM,GAAN,MAAM,CAA6B;QAGpD,IAAI,UAAU;YAAE,eAAe,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACnD,CAAC;IAED,sBAAsB,GAAG,KAAK,EAC7B,GAAW,EACiC,EAAE;QAC9C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CACd,wCAAwC,QAAQ,CAAC,UAAU,EAAE,CAC7D,CAAC;QACH,CAAC;QACD,OAAO,QAAQ,CAAC,IAAI,EAA+C,CAAC;IACrE,CAAC,CAAC;IAEF,yBAAyB,CAAC,EAAsC;QAC/D,IAAI,CAAC,sBAAsB,GAAG,EAAE,CAAC;IAClC,CAAC;IAED,wBAAwB,GAAG,KAAK,EAC/B,GAAW,EACiC,EAAE;QAC9C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CACd,0CAA0C,QAAQ,CAAC,UAAU,EAAE,CAC/D,CAAC;QACH,CAAC;QACD,OAAO,QAAQ,CAAC,IAAI,EAA+C,CAAC;IACrE,CAAC,CAAC;IAEF,2BAA2B,CAAC,EAAwC;QACnE,IAAI,CAAC,wBAAwB,GAAG,EAAE,CAAC;IACpC,CAAC;IAED,wBAAwB,GAAG,KAAK,EAC/B,GAAW,EACkC,EAAE;QAC/C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CACd,0CAA0C,QAAQ,CAAC,UAAU,EAAE,CAC/D,CAAC;QACH,CAAC;QACD,OAAO,QAAQ,CAAC,IAAI,EAAgD,CAAC;IACtE,CAAC,CAAC;IAEF,2BAA2B,CAAC,EAAwC;QACnE,IAAI,CAAC,wBAAwB,GAAG,EAAE,CAAC;IACpC,CAAC;IAED,sBAAsB,GAAG,KAAK,EAAE,GAAW,EAA8B,EAAE;QAC1E,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CACd,wCAAwC,QAAQ,CAAC,UAAU,EAAE,CAC7D,CAAC;QACH,CAAC;QACD,OAAO,QAAQ,CAAC,IAAI,EAAgC,CAAC;IACtD,CAAC,CAAC;IAEF,yBAAyB,CAAC,EAAsC;QAC/D,IAAI,CAAC,sBAAsB,GAAG,EAAE,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC3B,OAAe;QAEf,OAAO,IAAI,CAAC,sBAAsB,CACjC,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAC5C,CAAC;IACH,CAAC;IACD,KAAK,CAAC,wBAAwB,CAC7B,OAAe;QAEf,OAAO,IAAI,CAAC,wBAAwB,CACnC,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAC9C,CAAC;IACH,CAAC;IACD,KAAK,CAAC,wBAAwB,CAC7B,OAAe;QAEf,OAAO,IAAI,CAAC,wBAAwB,CACnC,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAC9C,CAAC;IACH,CAAC;IACD,KAAK,CAAC,sBAAsB,CAAC,OAAe;QAC3C,OAAO,IAAI,CAAC,sBAAsB,CACjC,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAC5C,CAAC;IACH,CAAC;CACD"}
+{"version":3,"file":"eulerLabelsService.js","sourceRoot":"","sources":["../../../../src/services/eulerLabelsService/eulerLabelsService.ts"],"names":[],"mappings":"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"}

package/dist/src/services/eulerLabelsService/index.d.ts

@@ -1,2 +1,3 @@
 export { EulerLabelsService, EulerLabelsURLAdapter, } from "./eulerLabelsService.js";
 export type { IEulerLabelsService, IEulerLabelsAdapter, EulerLabelsURLAdapterConfig, } from "./eulerLabelsService.js";
+//# sourceMappingURL=index.d.ts.map

package/dist/src/services/eulerLabelsService/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/services/eulerLabelsService/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,kBAAkB,EAClB,qBAAqB,GACrB,MAAM,yBAAyB,CAAC;AACjC,YAAY,EACX,mBAAmB,EACnB,mBAAmB,EACnB,2BAA2B,GAC3B,MAAM,yBAAyB,CAAC"}

package/dist/src/services/executionService/abis/eVaultAbi.d.ts

@@ -1946,3 +1946,4 @@ export declare const eVaultAbi: readonly [{
     readonly name: "E_ZeroShares";
     readonly inputs: readonly [];
 }];
+//# sourceMappingURL=eVaultAbi.d.ts.map

package/dist/src/services/executionService/abis/eVaultAbi.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"eVaultAbi.d.ts","sourceRoot":"","sources":["../../../../../src/services/executionService/abis/eVaultAbi.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAm9EE,CAAC"}

package/dist/src/services/executionService/abis/ethereumVaultConnectorAbi.d.ts

@@ -1068,3 +1068,4 @@ export declare const ethereumVaultConnectorAbi: readonly [{
     readonly name: "TooManyElements";
     readonly inputs: readonly [];
 }];
+//# sourceMappingURL=ethereumVaultConnectorAbi.d.ts.map

package/dist/src/services/executionService/abis/ethereumVaultConnectorAbi.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ethereumVaultConnectorAbi.d.ts","sourceRoot":"","sources":["../../../../../src/services/executionService/abis/ethereumVaultConnectorAbi.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAy2Cd,CAAC"}

package/dist/src/services/executionService/abis/permit2PermitAbi.d.ts

@@ -50,3 +50,4 @@ export declare const permit2PermitAbi: readonly [{
     readonly outputs: readonly [];
     readonly stateMutability: "nonpayable";
 }];
+//# sourceMappingURL=permit2PermitAbi.d.ts.map

package/dist/src/services/executionService/abis/permit2PermitAbi.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"permit2PermitAbi.d.ts","sourceRoot":"","sources":["../../../../../src/services/executionService/abis/permit2PermitAbi.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+BnB,CAAC"}

package/dist/src/services/executionService/abis/swapVerifierAbi.d.ts

@@ -137,3 +137,4 @@ export declare const swapVerifierAbi: readonly [{
     readonly name: "SwapVerifier_transferMin";
     readonly inputs: readonly [];
 }];
+//# sourceMappingURL=swapVerifierAbi.d.ts.map

package/dist/src/services/executionService/abis/swapVerifierAbi.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"swapVerifierAbi.d.ts","sourceRoot":"","sources":["../../../../../src/services/executionService/abis/swapVerifierAbi.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoElB,CAAC"}

package/dist/src/services/executionService/abis/swapperAbi.d.ts

@@ -268,3 +268,4 @@ export declare const swapperAbi: readonly [{
     readonly name: "UniswapV3Handler_InvalidPath";
     readonly inputs: readonly [];
 }];
+//# sourceMappingURL=swapperAbi.d.ts.map

package/dist/src/services/executionService/abis/swapperAbi.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"swapperAbi.d.ts","sourceRoot":"","sources":["../../../../../src/services/executionService/abis/swapperAbi.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAsJb,CAAC"}

package/dist/src/services/executionService/executionService.d.ts

@@ -2,7 +2,7 @@ import { type Hex, type Address, type Abi } from "viem";
 import type { DeploymentService } from "../deploymentService/index.js";
 import type { IWalletService } from "../walletService/index.js";
 import type { EulerPlugin } from "../../plugins/types.js";
-import { type EVCBatchItem, type EncodeDepositArgs, type EncodeMintArgs, type EncodeWithdrawArgs, type EncodeRedeemArgs, type EncodeBorrowArgs, type EncodeLiquidationArgs, type EncodePullDebtArgs, type EncodeRepayWithSwapArgs, type EncodeRepayFromWalletArgs, type EncodeRepayFromDepositArgs, type EncodeSwapDebtArgs, type EncodeTransferArgs, type EncodeDepositWithSwapFromWalletArgs, type EncodeSwapCollateralArgs, type EncodePermit2CallArgs, type GetPermit2TypedDataArgs, type TransactionPlanItem, type TransactionPlan, type PlanDepositArgs, type PlanMintArgs, type PlanWithdrawArgs, type PlanRedeemArgs, type PlanBorrowArgs, type PlanLiquidationArgs, type PlanRepayFromWalletArgs, type PlanRepayFromDepositArgs, type PlanRepayWithSwapArgs, type PlanDepositWithSwapFromWalletArgs, type PlanSwapCollateralArgs, type PlanSwapDebtArgs, type PlanTransferArgs, type PlanPullDebtArgs, type BatchItemDescription, type EncodeMultiplyWithSwapArgs, type EncodeMultiplySameAssetArgs, type PlanMultiplyWithSwapArgs, type PlanMultiplySameAssetArgs, type PermitSingleTypedData, type ResolveRequiredApprovalsArgs, type ResolveRequiredApprovalsWithWalletArgs } from "./executionServiceTypes.js";
+import { type EVCBatchItem, type EncodeDepositArgs, type EncodeMintArgs, type EncodeWithdrawArgs, type EncodeRedeemArgs, type EncodeBorrowArgs, type EncodeLiquidationArgs, type EncodePullDebtArgs, type EncodeRepayWithSwapArgs, type EncodeRepayFromWalletArgs, type EncodeRepayFromDepositArgs, type EncodeSwapDebtArgs, type EncodeTransferArgs, type EncodeDepositWithSwapFromWalletArgs, type EncodeSwapFromWalletArgs, type EncodeSwapCollateralArgs, type EncodePermit2CallArgs, type GetPermit2TypedDataArgs, type TransactionPlanItem, type TransactionPlan, type PlanDepositArgs, type PlanMintArgs, type PlanWithdrawArgs, type PlanRedeemArgs, type PlanBorrowArgs, type PlanLiquidationArgs, type PlanRepayFromWalletArgs, type PlanRepayFromDepositArgs, type PlanRepayWithSwapArgs, type PlanDepositWithSwapFromWalletArgs, type PlanSwapFromWalletArgs, type PlanSwapCollateralArgs, type PlanSwapDebtArgs, type PlanTransferArgs, type PlanPullDebtArgs, type BatchItemDescription, type EncodeMultiplyWithSwapArgs, type EncodeMultiplySameAssetArgs, type PlanMultiplyWithSwapArgs, type PlanMultiplySameAssetArgs, type PermitSingleTypedData, type ResolveRequiredApprovalsArgs, type ResolveRequiredApprovalsWithWalletArgs } from "./executionServiceTypes.js";
 export interface IExecutionService {
     encodeBatch(items: EVCBatchItem[]): Hex;
     encodeDeposit(args: EncodeDepositArgs): EVCBatchItem[];
@@ -16,6 +16,7 @@ export interface IExecutionService {
     encodeRepayFromDeposit(args: EncodeRepayFromDepositArgs): EVCBatchItem[];
     encodeRepayWithSwap(args: EncodeRepayWithSwapArgs): EVCBatchItem[];
     encodeDepositWithSwapFromWallet(args: EncodeDepositWithSwapFromWalletArgs): EVCBatchItem[];
+    encodeSwapFromWallet(args: EncodeSwapFromWalletArgs): EVCBatchItem[];
     encodeSwapCollateral(args: EncodeSwapCollateralArgs): EVCBatchItem[];
     encodeSwapDebt(args: EncodeSwapDebtArgs): EVCBatchItem[];
     encodeTransfer(args: EncodeTransferArgs): EVCBatchItem[];
@@ -33,6 +34,7 @@ export interface IExecutionService {
     planRepayFromDeposit(args: PlanRepayFromDepositArgs): TransactionPlan;
     planRepayWithSwap(args: PlanRepayWithSwapArgs): TransactionPlan;
     planDepositWithSwapFromWallet(args: PlanDepositWithSwapFromWalletArgs): TransactionPlan;
+    planSwapFromWallet(args: PlanSwapFromWalletArgs): TransactionPlan;
     planSwapCollateral(args: PlanSwapCollateralArgs): TransactionPlan;
     planSwapDebt(args: PlanSwapDebtArgs): TransactionPlan;
     planTransfer(args: PlanTransferArgs): TransactionPlan;
@@ -237,7 +239,6 @@ export declare class ExecutionService implements IExecutionService {
      * @param args.fromAsset - Underlying asset of fromVault (must equal liabilityAsset)
      * @param args.disableControllerOnMax - When isMax, whether to disable controller for receiver (default true)
      * @param args.isMax - If true, repays full debt (amount used for withdraw sizing where applicable)
-     * @param args.liabilityPermit2 - Optional Permit2 for liability asset when path uses transfer/repay
      * @returns Array of EVC batch items. Throws if fromAsset !== liabilityAsset.
      */
     encodeRepayFromDeposit(args: EncodeRepayFromDepositArgs): EVCBatchItem[];
@@ -267,6 +268,20 @@ export declare class ExecutionService implements IExecutionService {
      * @returns Array of EVC batch items (transferFromSender, swap, verify, optional enableCollateral)
      */
     encodeDepositWithSwapFromWallet(args: EncodeDepositWithSwapFromWalletArgs): EVCBatchItem[];
+    /**
+     * Encodes EVC batch items for swapping a token from the sender's wallet into another token
+     * and transferring the output to `swapQuote.receiver`.
+     * The approval is given to SwapVerifier, then transferFromSender pulls tokens to Swapper,
+     * swap executes, and verifyAmountMinAndTransfer sends the output to the receiver wallet.
+     *
+     * @param args - Wallet-swap encoding arguments
+     * @param args.chainId - Chain ID (unused, kept for encode API symmetry)
+     * @param args.swapQuote - Quote with swap and verify steps (verify type transferMin)
+     * @param args.amount - Amount of input token to transfer from wallet to swapper
+     * @param args.sender - Wallet address providing the tokens (onBehalfOfAccount for transferFromSender)
+     * @returns Array of EVC batch items (transferFromSender, swap, verify)
+     */
+    encodeSwapFromWallet(args: EncodeSwapFromWalletArgs): EVCBatchItem[];
     /**
      * Encodes EVC batch items for swapping collateral: withdraw from vaultIn → swap → verify/skim to receiver; optional enable/disable collateral.
      * Swap quote should come from swapService.fetchDepositQuote() or match the same structure (verify type skimMin).
@@ -543,6 +558,18 @@ export declare class ExecutionService implements IExecutionService {
      * @returns Array of transaction plan items (approval to SwapVerifier + EVC batch)
      */
     planDepositWithSwapFromWallet(args: PlanDepositWithSwapFromWalletArgs): TransactionPlan;
+    /**
+     * Builds a transaction plan for swapping a token from the sender's wallet into another
+     * token and transferring the output to the quote receiver.
+     *
+     * @param args - Wallet-swap plan arguments
+     * @param args.swapQuote - Quote from swap service; must use transferOutputToReceiver / transferMin verification
+     * @param args.amount - Amount of input token to transfer from wallet
+     * @param args.tokenIn - Input token address (for approval to SwapVerifier)
+     * @param args.account - Account entity; used for chainId and owner
+     * @returns Array of transaction plan items (approval to SwapVerifier + EVC batch)
+     */
+    planSwapFromWallet(args: PlanSwapFromWalletArgs): TransactionPlan;
     /**
      * Builds a transaction plan for swapping collateral from one vault to another (withdraw → swap → deposit/skim).
      *
@@ -617,3 +644,4 @@ export declare class ExecutionService implements IExecutionService {
      */
     planMultiplySameAsset(args: PlanMultiplySameAssetArgs): TransactionPlan;
 }
+//# sourceMappingURL=executionService.d.ts.map

package/dist/src/services/executionService/executionService.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"executionService.d.ts","sourceRoot":"","sources":["../../../../src/services/executionService/executionService.ts"],"names":[],"mappings":"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"}

package/dist/src/services/executionService/executionService.js

@@ -5,6 +5,12 @@ import { permit2PermitAbi } from "./abis/permit2PermitAbi.js";
 import { swapperAbi } from "./abis/swapperAbi.js";
 import { swapVerifierAbi } from "./abis/swapVerifierAbi.js";
 import { PERMIT2_TYPES, } from "./executionServiceTypes.js";
+const TOKENS_REQUIRING_ZERO_APPROVAL_RESET = {
+    1: [getAddress("0xdAC17F958D2ee523a2206206994597C13D831ec7")],
+};
+function requiresZeroApprovalReset(chainId, token) {
+    return (TOKENS_REQUIRING_ZERO_APPROVAL_RESET[chainId]?.some((resetToken) => resetToken === getAddress(token)) ?? false);
+}
 const PERMIT2_SIG_WINDOW = 60n * 60n;
 const WAD = 10n ** 18n;
 // TODO explain how this service is coupled to the concrete abis of ERC4626, permit2 and EVK.
@@ -545,11 +551,10 @@ export class ExecutionService {
      * @param args.fromAsset - Underlying asset of fromVault (must equal liabilityAsset)
      * @param args.disableControllerOnMax - When isMax, whether to disable controller for receiver (default true)
      * @param args.isMax - If true, repays full debt (amount used for withdraw sizing where applicable)
-     * @param args.liabilityPermit2 - Optional Permit2 for liability asset when path uses transfer/repay
      * @returns Array of EVC batch items. Throws if fromAsset !== liabilityAsset.
      */
     encodeRepayFromDeposit(args) {
-        const { chainId, liabilityVault, liabilityAsset, liabilityAmount, from, receiver, fromVault, fromAsset, disableControllerOnMax = true, isMax = false, liabilityPermit2, } = args;
+        const { chainId, liabilityVault, liabilityAsset, liabilityAmount, from, receiver, fromVault, fromAsset, disableControllerOnMax = true, isMax = false, } = args;
         // PATH 1: Same asset, same vault - use repayWithShares
         if (fromAsset === liabilityAsset && fromVault === liabilityVault) {
             return this.encodeRepayWithSharesSameAssetAndVault({
@@ -564,7 +569,6 @@ export class ExecutionService {
         // PATH 2: Same asset, different vault
         if (fromAsset === liabilityAsset) {
             return this.encodeRepayWithSharesSameAssetDifferentVault({
-                chainId,
                 fromVault,
                 toVault: liabilityVault,
                 amount: liabilityAmount,
@@ -572,7 +576,6 @@ export class ExecutionService {
                 from,
                 isMax,
                 disableControllerOnMax,
-                permit2: liabilityPermit2,
             });
         }
         throw new Error("encodeRepayFromDeposit only supports same-asset paths");
@@ -685,6 +688,53 @@ export class ExecutionService {
         }
         return items;
     }
+    /**
+     * Encodes EVC batch items for swapping a token from the sender's wallet into another token
+     * and transferring the output to `swapQuote.receiver`.
+     * The approval is given to SwapVerifier, then transferFromSender pulls tokens to Swapper,
+     * swap executes, and verifyAmountMinAndTransfer sends the output to the receiver wallet.
+     *
+     * @param args - Wallet-swap encoding arguments
+     * @param args.chainId - Chain ID (unused, kept for encode API symmetry)
+     * @param args.swapQuote - Quote with swap and verify steps (verify type transferMin)
+     * @param args.amount - Amount of input token to transfer from wallet to swapper
+     * @param args.sender - Wallet address providing the tokens (onBehalfOfAccount for transferFromSender)
+     * @returns Array of EVC batch items (transferFromSender, swap, verify)
+     */
+    encodeSwapFromWallet(args) {
+        const { swapQuote, amount, sender } = args;
+        const items = [];
+        if (swapQuote.verify.type !== "transferMin") {
+            throw new Error("Invalid swap quote type for wallet swap - must be transferMin");
+        }
+        items.push({
+            targetContract: swapQuote.verify.verifierAddress,
+            onBehalfOfAccount: sender,
+            value: 0n,
+            data: encodeFunctionData({
+                abi: swapVerifierAbi,
+                functionName: "transferFromSender",
+                args: [
+                    swapQuote.tokenIn.address,
+                    amount,
+                    swapQuote.swap.swapperAddress,
+                ],
+            }),
+        });
+        items.push({
+            targetContract: swapQuote.swap.swapperAddress,
+            onBehalfOfAccount: sender,
+            value: 0n,
+            data: swapQuote.swap.swapperData,
+        });
+        items.push({
+            targetContract: swapQuote.verify.verifierAddress,
+            onBehalfOfAccount: sender,
+            value: 0n,
+            data: swapQuote.verify.verifierData,
+        });
+        return items;
+    }
     /**
      * Encodes EVC batch items for swapping collateral: withdraw from vaultIn → swap → verify/skim to receiver; optional enable/disable collateral.
      * Swap quote should come from swapService.fetchDepositQuote() or match the same structure (verify type skimMin).
@@ -1118,8 +1168,8 @@ export class ExecutionService {
     /**
      * Encodes batch items for repaying with shares from same asset but different vault
      */
-    encodeRepayWithSharesSameAssetDifferentVault({ chainId, fromVault, toVault, amount, // if isMax, this should be the total current debt
-    receiver, from, isMax, disableControllerOnMax, permit2, }) {
+    encodeRepayWithSharesSameAssetDifferentVault({ fromVault, toVault, amount, // if isMax, this should be the total current debt
+    receiver, from, isMax, disableControllerOnMax, }) {
         const items = [];
         if (isMax) {
             // if amount was max uint, skim and repay with shares would not revert if after withdraw funds were skimmed
@@ -1146,7 +1196,7 @@ export class ExecutionService {
             // 2. Skim exact withdrawal amount to liability vault
             items.push({
                 targetContract: toVault,
-                onBehalfOfAccount: from,
+                onBehalfOfAccount: receiver,
                 value: 0n,
                 data: encodeFunctionData({
                     abi: eVaultAbi,
@@ -1174,7 +1224,7 @@ export class ExecutionService {
         }
         else {
             // For partial repay: withdraw, then repay exact amount
-            // 1. Withdraw from collateral vault
+            // 1. Withdraw from source vault directly to the liability vault.
             items.push({
                 targetContract: fromVault,
                 onBehalfOfAccount: from,
@@ -1182,21 +1232,31 @@ export class ExecutionService {
                 data: encodeFunctionData({
                     abi: eVaultAbi,
                     functionName: "withdraw",
-                    args: [amount, from, from],
+                    args: [amount, toVault, from],
                 }),
             });
-            // 2. Repay exact amount
-            const repayItems = this.encodeRepayFromWallet({
-                chainId,
-                sender: from,
-                liabilityVault: toVault,
-                liabilityAmount: amount,
-                receiver,
-                disableControllerOnMax,
-                isMax,
-                permit2,
+            // 2. Skim the received assets into the borrow sub-account.
+            items.push({
+                targetContract: toVault,
+                onBehalfOfAccount: receiver,
+                value: 0n,
+                data: encodeFunctionData({
+                    abi: eVaultAbi,
+                    functionName: "skim",
+                    args: [amount, receiver],
+                }),
+            });
+            // 3. Burn the skimmed shares to repay debt.
+            items.push({
+                targetContract: toVault,
+                onBehalfOfAccount: receiver,
+                value: 0n,
+                data: encodeFunctionData({
+                    abi: eVaultAbi,
+                    functionName: "repayWithShares",
+                    args: [amount > 0n ? amount - 1n : 0n, receiver],
+                }),
             });
-            items.push(...repayItems);
         }
         return items;
     }
@@ -1237,6 +1297,13 @@ export class ExecutionService {
                         args: [approvalSpender, approvalAmount],
                     }),
                 });
+                const addApproveWithOptionalReset = (approvalSpender, approvalAmount, currentAllowance) => {
+                    if (currentAllowance > 0n &&
+                        requiresZeroApprovalReset(chainId, token)) {
+                        resolvedItems.push(makeApprove(approvalSpender, 0n));
+                    }
+                    resolvedItems.push(makeApprove(approvalSpender, approvalAmount));
+                };
                 const makePermit2 = (permit2Spender, permit2Amount) => ({
                     type: "permit2",
                     token,
@@ -1275,7 +1342,7 @@ export class ExecutionService {
                     }
                     // If assetForPermit2 is insufficient, we need both approval and permit2 signature
                     if (!hasSufficientPermit2Allowance) {
-                        resolvedItems.push(makeApprove(permit2, unlimitedApproval ? maxUint256 : amount));
+                        addApproveWithOptionalReset(permit2, unlimitedApproval ? maxUint256 : amount, assetForPermit2);
                         resolvedItems.push(makePermit2(spender, unlimitedApproval ? maxUint160 : amount));
                     }
                     else {
@@ -1293,7 +1360,7 @@ export class ExecutionService {
                         approval.resolved = [];
                         continue;
                     }
-                    resolvedItems.push(makeApprove(spender, unlimitedApproval ? maxUint256 : amount));
+                    addApproveWithOptionalReset(spender, unlimitedApproval ? maxUint256 : amount, assetForVault);
                     approval.resolved = resolvedItems;
                 }
             }
@@ -1673,29 +1740,22 @@ export class ExecutionService {
             // This path requires a swap, which is handled by planRepayWithSwap
             throw new Error("planRepayFromDeposit only supports same-asset paths. Use planRepayWithSwap for different assets.");
         }
-        // If same asset, different vault, we might need approval for the withdraw/repay path
-        if (fromVault !== liabilityVault) {
-            // Add approval requirement (will be resolved later with Wallet data)
-            plan.push({
-                type: "requiredApproval",
-                token: liabilityAsset,
-                owner: account.owner,
-                spender: liabilityVault,
-                amount: liabilityAmount,
-            });
-        }
+        const isMax = liabilityAmount === maxUint256;
+        const amount = isMax && fromVault !== liabilityVault
+            ? liabilityPosition.borrowed
+            : liabilityAmount;
         // Build EVC batch items
         const batchItems = this.encodeRepayFromDeposit({
             chainId: account.chainId,
             liabilityVault,
             liabilityAsset,
-            liabilityAmount,
-            from: receiver,
+            liabilityAmount: amount,
+            from: fromAccount,
             receiver,
             fromVault,
             fromAsset,
             disableControllerOnMax: true,
-            isMax: liabilityAmount === maxUint256,
+            isMax,
             // Permit2 is handled separately in the plan
         });
         plan.push({
@@ -1784,6 +1844,39 @@ export class ExecutionService {
         });
         return plan;
     }
+    /**
+     * Builds a transaction plan for swapping a token from the sender's wallet into another
+     * token and transferring the output to the quote receiver.
+     *
+     * @param args - Wallet-swap plan arguments
+     * @param args.swapQuote - Quote from swap service; must use transferOutputToReceiver / transferMin verification
+     * @param args.amount - Amount of input token to transfer from wallet
+     * @param args.tokenIn - Input token address (for approval to SwapVerifier)
+     * @param args.account - Account entity; used for chainId and owner
+     * @returns Array of transaction plan items (approval to SwapVerifier + EVC batch)
+     */
+    planSwapFromWallet(args) {
+        const { swapQuote, amount, tokenIn, account } = args;
+        const plan = [];
+        plan.push({
+            type: "requiredApproval",
+            token: tokenIn,
+            owner: account.owner,
+            spender: swapQuote.verify.verifierAddress,
+            amount,
+        });
+        const batchItems = this.encodeSwapFromWallet({
+            chainId: account.chainId,
+            swapQuote,
+            amount,
+            sender: account.owner,
+        });
+        plan.push({
+            type: "evcBatch",
+            items: batchItems,
+        });
+        return plan;
+    }
     /**
      * Builds a transaction plan for swapping collateral from one vault to another (withdraw → swap → deposit/skim).
      *