move sender propery bag down a layer to ics packet

Agoric · Nov 9, 2023 · e59d677 · e59d677
1 parent a3129ed
commit e59d677
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/packages/pegasus/src/ics20.js b/packages/pegasus/src/ics20.js
@@ -89,7 +89,7 @@ export const makeICS20TransferPacket = async ({
   remoteDenom,
   depositAddress,
   memo,
-  opts,
+  opts: { sender = DEFAULT_SENDER_ADDRESS },
 }) => {
   // We're using Nat as a dynamic check for overflow.
   const stringValue = String(Nat(value));
@@ -100,7 +100,7 @@ export const makeICS20TransferPacket = async ({
     amount: stringValue,
     denom: remoteDenom,
     receiver: depositAddress,
-    sender: opts.sender,
+    sender,
     memo,
   };
 

diff --git a/packages/pegasus/src/pegasus.js b/packages/pegasus/src/pegasus.js
@@ -14,7 +14,7 @@ import '@agoric/zoe/exported.js';
 
 import '../exported.js';
 import { IBCSourceTraceDenomTransformer } from './ibc-trace.js';
-import { DEFAULT_SENDER_ADDRESS, ICS20TransferProtocol } from './ics20.js';
+import { ICS20TransferProtocol } from './ics20.js';
 import { makeCourierMaker, getCourierPK } from './courier.js';
 
 const DEFAULT_DENOM_TRANSFORMER = IBCSourceTraceDenomTransformer;
@@ -113,7 +113,7 @@ const makePegasus = (zcf, board, namesByAddress) => {
     transferProtocol,
     denomTransformer,
   }) => {
-    let checkAbort = () => {};
+    let checkAbort = () => { };
 
     /** @type {Set<Peg>} */
     const pegs = new Set();
@@ -143,7 +143,7 @@ const makePegasus = (zcf, board, namesByAddress) => {
         // If rejected, the rejection is returned to our caller, so we have
         // handled it correctly and that flow doesn't need to trigger an
         // additional UnhandledRejectionWarning in our vat.
-        promise.catch(() => {});
+        promise.catch(() => { });
         reject(assert.error(X`${receiveDenom} is temporarily unavailable`));
 
         // Allow new transfers to be initiated after this rejection.
@@ -460,12 +460,7 @@ const makePegasus = (zcf, board, namesByAddress) => {
      * @param {SenderOptions} [opts] additional sender options
      * @returns {Promise<Invitation>} to transfer, make an offer of { give: { Transfer: pegAmount } } to this invitation
      */
-    async makeInvitationToTransfer(
-      pegP,
-      depositAddress,
-      memo = '',
-      opts = { sender: DEFAULT_SENDER_ADDRESS },
-    ) {
+    async makeInvitationToTransfer(pegP, depositAddress, memo = '', opts = {}) {
       // Verify the peg.
       const peg = await pegP;
       const denomState = pegToDenomState.get(peg);

diff --git a/packages/pegasus/src/types.js b/packages/pegasus/src/types.js
@@ -115,5 +115,5 @@
 
 /**
  * @typedef {object} SenderOptions
- * @property {string} sender the sender to attach to ics transfer packet
+ * @property {string} [sender] the sender address attached to the packet to receive any refund
  */