@relayprotocol/relay-sdk 5.2.2 → 5.2.3

package/_esm/src/utils/prepareBatchTransaction.js

@@ -1,30 +1,58 @@
+/**
+ * Returns true when the step sequence can be collapsed into a single atomic
+ * batch transaction.
+ *
+ * Supported shapes:
+ *   [approve, swap | deposit]                     // standard 2-step flow
+ *   [approve, approve, swap | deposit]            // zero-reset flow (e.g. USDT on Ethereum)
+ *   [approve, ..., approve, swap | deposit]       // N leading approvals + terminal
+ *
+ * Every item in every step must be incomplete — any already-executed item
+ * means we're in the middle of a partial run and should not re-batch.
+ */
 export function canBatchTransactions(steps) {
-    const firstStep = steps[0];
-    const secondStep = steps[1];
-    const hasIncompleteApproval = firstStep?.items?.some((item) => item.status === 'incomplete');
-    const hasIncompleteDeposit = secondStep?.items?.some((item) => item.status === 'incomplete');
-    return (firstStep?.id === 'approve' &&
-        (secondStep?.id === 'deposit' || secondStep?.id === 'swap') &&
-        hasIncompleteApproval &&
-        hasIncompleteDeposit);
+    if (!steps || steps.length < 2)
+        return false;
+    const terminalStep = steps[steps.length - 1];
+    const prefixSteps = steps.slice(0, -1);
+    const terminalIsSwapOrDeposit = terminalStep?.id === 'swap' || terminalStep?.id === 'deposit';
+    if (!terminalIsSwapOrDeposit)
+        return false;
+    const prefixAllApprovals = prefixSteps.every((step) => step?.id === 'approve');
+    if (!prefixAllApprovals)
+        return false;
+    const allStepsHaveIncomplete = steps.every((step) => step?.items?.some((item) => item.status === 'incomplete'));
+    return allStepsHaveIncomplete;
 }
+/**
+ * Flattens N approval steps + terminal (swap|deposit) step into a single
+ * batched step whose items will be submitted together via EIP-5792
+ * `wallet_sendCalls`.
+ *
+ * The first item stays `incomplete` so the executeSteps iterator picks it as
+ * the active step item; all subsequent items are pre-marked `complete` so the
+ * iterator doesn't try to execute them again as separate transactions after
+ * the batch lands.
+ */
 export function prepareBatchTransaction(steps) {
-    const secondStepId = steps[1]?.id; // deposit or swap
+    const terminalStep = steps[steps.length - 1];
+    const terminalId = terminalStep?.id; // deposit or swap
+    const allItems = steps.flatMap((step) => step.items || []);
+    const batchedItems = allItems.map((item, index) => {
+        if (index === 0)
+            return item;
+        // mark non-leading items as complete so we only fire the batch once
+        item.status = 'complete';
+        item.progressState = 'complete';
+        return item;
+    });
     const batchedStep = {
-        id: `approve-and-${secondStepId}`,
+        id: `approve-and-${terminalId}`,
         action: 'Confirm transaction in your wallet',
-        description: `Batching approval and ${secondStepId} transactions`,
+        description: `Batching approval and ${terminalId} transactions`,
         kind: 'transaction',
-        items: [
-            ...(steps[0].items || []),
-            ...(steps[1].items || []).map((item) => {
-                // mark the second step as complete
-                item.status = 'complete';
-                item.progressState = 'complete';
-                return item;
-            })
-        ],
-        requestId: steps[1].requestId ?? steps[0].requestId
+        items: batchedItems,
+        requestId: terminalStep?.requestId ?? steps[0]?.requestId
     };
     return batchedStep;
 }

package/_esm/src/utils/prepareBatchTransaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"prepareBatchTransaction.js","sourceRoot":"","sources":["../../../src/utils/prepareBatchTransaction.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,oBAAoB,CAAC,KAAuB;IAC1D,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;IAC1B,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;IAE3B,MAAM,qBAAqB,GAAG,SAAS,EAAE,KAAK,EAAE,IAAI,CAClD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,YAAY,CACvC,CAAA;IACD,MAAM,oBAAoB,GAAG,UAAU,EAAE,KAAK,EAAE,IAAI,CAClD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,YAAY,CACvC,CAAA;IAED,OAAO,CACL,SAAS,EAAE,EAAE,KAAK,SAAS;QAC3B,CAAC,UAAU,EAAE,EAAE,KAAK,SAAS,IAAI,UAAU,EAAE,EAAE,KAAK,MAAM,CAAC;QAC3D,qBAAqB;QACrB,oBAAoB,CACrB,CAAA;AACH,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,KAAuB;IAC7D,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA,CAAC,kBAAkB;IAEpD,MAAM,WAAW,GAAG;QAClB,EAAE,EAAE,eAAe,YAAY,EAAS;QACxC,MAAM,EAAE,oCAAoC;QAC5C,WAAW,EAAE,yBAAyB,YAAY,eAAe;QACjE,IAAI,EAAE,aAAsB;QAC5B,KAAK,EAAE;YACL,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;YACzB,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACrC,mCAAmC;gBACnC,IAAI,CAAC,MAAM,GAAG,UAAU,CAAA;gBACxB,IAAI,CAAC,aAAa,GAAG,UAAU,CAAA;gBAC/B,OAAO,IAAI,CAAA;YACb,CAAC,CAAC;SACH;QACD,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;KACpD,CAAA;IAED,OAAO,WAAW,CAAA;AACpB,CAAC"}
+{"version":3,"file":"prepareBatchTransaction.js","sourceRoot":"","sources":["../../../src/utils/prepareBatchTransaction.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,oBAAoB,CAAC,KAAuB;IAC1D,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,KAAK,CAAA;IAE5C,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IAC5C,MAAM,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAEtC,MAAM,uBAAuB,GAC3B,YAAY,EAAE,EAAE,KAAK,MAAM,IAAI,YAAY,EAAE,EAAE,KAAK,SAAS,CAAA;IAC/D,IAAI,CAAC,uBAAuB;QAAE,OAAO,KAAK,CAAA;IAE1C,MAAM,kBAAkB,GAAG,WAAW,CAAC,KAAK,CAC1C,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,KAAK,SAAS,CACjC,CAAA;IACD,IAAI,CAAC,kBAAkB;QAAE,OAAO,KAAK,CAAA;IAErC,MAAM,sBAAsB,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAClD,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,YAAY,CAAC,CAC1D,CAAA;IACD,OAAO,sBAAsB,CAAA;AAC/B,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,uBAAuB,CAAC,KAAuB;IAC7D,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IAC5C,MAAM,UAAU,GAAG,YAAY,EAAE,EAAE,CAAA,CAAC,kBAAkB;IAEtD,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAA;IAE1D,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QAChD,IAAI,KAAK,KAAK,CAAC;YAAE,OAAO,IAAI,CAAA;QAC5B,oEAAoE;QACpE,IAAI,CAAC,MAAM,GAAG,UAAU,CAAA;QACxB,IAAI,CAAC,aAAa,GAAG,UAAU,CAAA;QAC/B,OAAO,IAAI,CAAA;IACb,CAAC,CAAC,CAAA;IAEF,MAAM,WAAW,GAAG;QAClB,EAAE,EAAE,eAAe,UAAU,EAAS;QACtC,MAAM,EAAE,oCAAoC;QAC5C,WAAW,EAAE,yBAAyB,UAAU,eAAe;QAC/D,IAAI,EAAE,aAAsB;QAC5B,KAAK,EAAE,YAAY;QACnB,SAAS,EAAE,YAAY,EAAE,SAAS,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,SAAS;KAC1D,CAAA;IAED,OAAO,WAAW,CAAA;AACpB,CAAC"}

package/_esm/src/version.js

@@ -1,2 +1,2 @@
-export const SDK_VERSION = '5.2.2';
+export const SDK_VERSION = '5.2.3';
 //# sourceMappingURL=version.js.map