@continuumdao/ctm-mpc-defi 0.2.61 → 0.2.63

package/dist/protocols/evm/railgun/index.cjs

@@ -1114,6 +1114,18 @@ function orderBroadcasterChoices(rows) {
 function defaultBroadcasterChoice(rows) {
   return rows.find((row) => row.coversGas) ?? rows[0];
 }
+function currentBroadcasterChoice(rows, feesId, railgunAddress, refused) {
+  const id = feesId.trim();
+  if (id && !refused.has(id)) {
+    const exact = rows.find((row2) => row2.feesId === id);
+    if (exact) return { row: exact, refreshed: false };
+  }
+  const address = railgunAddress.trim();
+  if (!address) return void 0;
+  const same = rows.filter((row2) => row2.railgunAddress === address && !refused.has(row2.feesId));
+  const row = same.find((item) => item.coversGas) ?? same[0];
+  return row ? { row, refreshed: true } : void 0;
+}
 function nextCoveringBroadcaster(rows, refused) {
   return rows.find((row) => row.coversGas && !refused.has(row.feesId));
 }
@@ -1350,9 +1362,11 @@ async function listRailgunBroadcasters(args) {
     tokenDecimals: row.tokenDecimals
   }));
 }
-function broadcasterNote(row, switching) {
+function broadcasterNote(row, mode) {
   const ratioLabel = row.ratio ? `${row.ratio}:1` : "the selected fee";
-  return switching ? `Trying the next broadcaster at ${ratioLabel}` : `Broadcaster ${ratioLabel}`;
+  if (mode === "next") return `Trying the next broadcaster at ${ratioLabel}`;
+  if (mode === "refreshed") return `The chosen fee expired. Broadcaster ${ratioLabel}`;
+  return `Broadcaster ${ratioLabel}`;
 }
 function poiListsPresent(pois) {
   return Object.values(pois).some((leaves) => Object.keys(leaves).length > 0);
@@ -1417,7 +1431,9 @@ async function submitFreshProof(args) {
   }
   await args.assertSpendable?.();
   const refused = /* @__PURE__ */ new Set();
-  let feesId = args.broadcasterFeesId?.trim() ?? "";
+  const chosenFeesId = args.broadcasterFeesId?.trim() ?? "";
+  const chosenAddress = args.broadcasterAddress?.trim() ?? "";
+  let feesId = chosenFeesId;
   let lastError = new Error("No Railgun broadcaster is available for this token.");
   let builds = 0;
   while (builds < MAX_GAS_BROADCASTERS) {
@@ -1430,11 +1446,8 @@ async function submitFreshProof(args) {
       kind: args.kind,
       waitMs: BROADCASTER_PROOF_WAIT_MS
     });
-    const requested = feesId && !refused.has(feesId) ? rows.find((row2) => row2.feesId === feesId) : void 0;
-    if (builds === 0 && args.broadcasterFeesId?.trim() && !requested) {
-      throw new Error("That broadcaster fee expired. Refresh the list and choose again.");
-    }
-    const row = requested ?? nextCoveringBroadcaster(rows, refused) ?? (refused.size === 0 ? defaultBroadcasterChoice(rows) : void 0);
+    const picked = refused.size === 0 ? currentBroadcasterChoice(rows, feesId, chosenAddress, refused) : void 0;
+    const row = picked?.row ?? nextCoveringBroadcaster(rows, refused) ?? (refused.size === 0 ? defaultBroadcasterChoice(rows) : void 0);
     if (!row || !broadcasterFeeStillValid(row.expiration)) {
       if (!row) break;
       refused.add(row.feesId);
@@ -1444,7 +1457,9 @@ async function submitFreshProof(args) {
     }
     builds += 1;
     feesId = row.feesId;
-    args.onBroadcasterNote?.(broadcasterNote(row, refused.size > 0));
+    const replaced = Boolean(chosenFeesId) && row.feesId !== chosenFeesId;
+    const mode = refused.size > 0 ? "next" : replaced ? "refreshed" : "selected";
+    args.onBroadcasterNote?.(broadcasterNote(row, mode));
     const broadcaster = row.selected;
     const proved = await args.build(broadcaster);
     if (!broadcasterFeeStillValid(broadcaster.tokenFee.expiration)) {
@@ -1641,6 +1656,7 @@ async function provePrivateTransfer(args) {
     kind: "transfer",
     chain,
     tokenAddress,
+    broadcasterAddress: args.broadcasterAddress,
     broadcasterFeesId: args.broadcasterFeesId,
     onBroadcasterSearch: args.onBroadcasterSearch,
     onBroadcasterNote: args.onBroadcasterNote,
@@ -1727,6 +1743,7 @@ async function proveUnshield(args) {
     kind: "unshield",
     chain,
     tokenAddress,
+    broadcasterAddress: args.broadcasterAddress,
     broadcasterFeesId: args.broadcasterFeesId,
     onBroadcasterSearch: args.onBroadcasterSearch,
     onBroadcasterNote: args.onBroadcasterNote,