chore(orca.contract.js): removed retriable wrapper

chore(orca.flows.js): removed transfer retriable from createAndFund orchestration handler

chore(contract): fixed linting issues from changes

Author: Jovonni

contract/src/orca.contract.js

@@ -1,10 +1,7 @@
 import { AmountShape } from '@agoric/ertp';
 import { makeTracer } from '@agoric/internal';
 import { withOrchestration } from '@agoric/orchestration/src/utils/start-helper.js';
-import { atomicTransfer } from '@agoric/zoe/src/contractSupport/index.js';
 import { InvitationShape } from '@agoric/zoe/src/typeGuards.js';
-import { Fail } from '@endo/errors';
-import { E } from '@endo/far';
 import { M } from '@endo/patterns';
 import * as flows from './orca.flows.js';
 
@@ -73,110 +70,14 @@ const contract = async (
   zcf,
   privateArgs,
   zone,
-  { orchestrateAll, vowTools, zoeTools },
+  { orchestrateAll, zoeTools },
 ) => {
   trace('inside start function: v1.1.95');
   trace('privateArgs', privateArgs);
 
-  const wrapper = () => {
-    const transfer = vowTools.retriable(
-      zone,
-      'transfer',
-      /**
-       * @type {Transfer}
-       */
-      async (
-        srcSeat,
-        localAccount,
-        remoteAccount,
-        give,
-        amt,
-        localAddress,
-        remoteAddress,
-      ) => {
-        !srcSeat.hasExited() || Fail`The seat cannot have exited.`;
-        const { zcfSeat: tempSeat, userSeat: userSeatP } =
-          zcf.makeEmptySeatKit();
-        trace('tempSeat:', tempSeat);
-        const userSeat = await userSeatP;
-        trace('userSeat:', userSeat);
-        trace('storageNode', privateArgs.storageNode);
-        atomicTransfer(zcf, srcSeat, tempSeat, give);
-        tempSeat.exit();
-
-        const pmt = await E(userSeat).getPayout('Deposit');
-        trace('pmt:', pmt);
-        trace('amt:', amt);
-
-        // NOTE: with watch
-        // const promises = Object.entries(give).map(async ([kw, _amount]) => {
-        //   trace("kw::", kw)
-        //   trace("_amount", _amount)
-        //   trace("amt", amt)
-        // });
-        // const watcher = zone.exo(
-        //   `watcher-transfer-${localAddress.value}-to-${remoteAddress.value}`, // Error: key (a string) has already been used in this zone and incarnation -- perhaps use timestamp or offerid as well?
-        //    M.interface('watcher for transfer', {
-        //       onFulfilled: M.call(M.any()).optional(M.any()).returns(VowShape),
-        //     }
-        //   ),
-        //   {
-        //     /**
-        //      * @param {any} _result
-        //      * @param {bigint} value
-        //      */
-        //     onFulfilled(
-        //       _result,
-        //       value
-        //     ) {
-        //       trace("inside onFulfilled:", value)
-        //       return watch(localAccount.transfer(
-        //         {
-        //           denom: "ubld",
-        //           value: value/2n,
-        //         },
-        //         remoteAddress
-        //       ))
-        //     },
-        //   },
-        // );
-        // trace("about to watch transfer, watcher v0.16")
-        // trace("watcher", watcher)
-        // watch(
-        //   E(localAccount).deposit(pmt),
-        //   watcher,
-        //   BigInt(amt.value),
-        // );
-        // await Promise.all(promises);
-
-        // NOTE: without watcher
-        await E(localAccount).deposit(pmt);
-        await localAccount.transfer(
-          {
-            denom: 'ubld',
-            value: amt.value / 2n,
-          },
-          remoteAddress,
-        );
-
-        // const localAccountBalance = await localAccount.getBalance(amt.brand)
-        // const remoteAccountbalance = await remoteAccount.getBalance(amt.brand)
-        // trace("localaccount balance: ", localAccountBalance);
-        // trace("remoteaccount balance: ", remoteAccountbalance);
-      },
-    );
-    return harden({
-      transfer,
-    });
-  };
-
-  const wrap = wrapper();
-  trace('wrapper.transfer', wrapper);
-
   // @ts-expect-error XXX ZCFSeat not Passable
   const { makeAccount, makeCreateAndFund } = orchestrateAll(flows, {
     localTransfer: zoeTools.localTransfer,
-    transfer: wrap.transfer,
     // write: E(storageNode).write),
     // makeChildNode: E(storageNode).makeChildNode,
     // setValue: E(storageNode).setValue,

contract/src/orca.flows.js

@@ -44,15 +44,15 @@ harden(makeAccount);
  *
  * @param {Orchestrator} orch
  * @param {object} ctx
- * @param {Transfer} ctx.transfer
+ * @param {ZoeTools['localTransfer']} ctx.localTransfer
  * @param {StorageNode['setValue']} ctx.setValue
  * @param {ZCFSeat} seat
  * @param {{ chainName: string }} offerArgs
  */
 export const makeCreateAndFund = async (
   orch,
   {
-    transfer,
+    localTransfer,
     // write,
     // makeChildNode,
     setValue,
@@ -100,14 +100,12 @@ export const makeCreateAndFund = async (
   trace('remoteAddress', remoteAddress);
   trace('fund new orch account');
   trace('seat', seat);
-  trace('transfer', transfer);
-  await transfer(
-    seat,
-    localAccount,
-    remoteAccount,
-    give,
-    amt,
-    localAddress,
+  await localTransfer(seat, localAccount, give);
+  await localAccount.transfer(
+    {
+      denom: 'ubld',
+      value: amt.value / 2n,
+    },
     remoteAddress,
   );
   seat.exit();