@agoric/orchestration 0.1.1-dev-a61c7fe.0.a61c7fe → 0.1.1-dev-fa97ca2.0.fa97ca2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/orchestration",
-  "version": "0.1.1-dev-a61c7fe.0.a61c7fe",
+  "version": "0.1.1-dev-fa97ca2.0.fa97ca2",
   "description": "Chain abstraction for Agoric's orchestration clients",
   "type": "module",
   "main": "index.js",
@@ -35,19 +35,19 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/async-flow": "0.1.1-dev-a61c7fe.0.a61c7fe",
-    "@agoric/cosmic-proto": "0.4.1-dev-a61c7fe.0.a61c7fe",
-    "@agoric/ertp": "0.16.3-dev-a61c7fe.0.a61c7fe",
-    "@agoric/internal": "0.3.3-dev-a61c7fe.0.a61c7fe",
-    "@agoric/network": "0.1.1-dev-a61c7fe.0.a61c7fe",
-    "@agoric/notifier": "0.6.3-dev-a61c7fe.0.a61c7fe",
-    "@agoric/store": "0.9.3-dev-a61c7fe.0.a61c7fe",
-    "@agoric/time": "0.3.3-dev-a61c7fe.0.a61c7fe",
-    "@agoric/vat-data": "0.5.3-dev-a61c7fe.0.a61c7fe",
-    "@agoric/vats": "0.15.2-dev-a61c7fe.0.a61c7fe",
-    "@agoric/vow": "0.1.1-dev-a61c7fe.0.a61c7fe",
-    "@agoric/zoe": "0.26.3-dev-a61c7fe.0.a61c7fe",
-    "@agoric/zone": "0.2.3-dev-a61c7fe.0.a61c7fe",
+    "@agoric/async-flow": "0.1.1-dev-fa97ca2.0.fa97ca2",
+    "@agoric/cosmic-proto": "0.4.1-dev-fa97ca2.0.fa97ca2",
+    "@agoric/ertp": "0.16.3-dev-fa97ca2.0.fa97ca2",
+    "@agoric/internal": "0.3.3-dev-fa97ca2.0.fa97ca2",
+    "@agoric/network": "0.1.1-dev-fa97ca2.0.fa97ca2",
+    "@agoric/notifier": "0.6.3-dev-fa97ca2.0.fa97ca2",
+    "@agoric/store": "0.9.3-dev-fa97ca2.0.fa97ca2",
+    "@agoric/time": "0.3.3-dev-fa97ca2.0.fa97ca2",
+    "@agoric/vat-data": "0.5.3-dev-fa97ca2.0.fa97ca2",
+    "@agoric/vats": "0.15.2-dev-fa97ca2.0.fa97ca2",
+    "@agoric/vow": "0.1.1-dev-fa97ca2.0.fa97ca2",
+    "@agoric/zoe": "0.26.3-dev-fa97ca2.0.fa97ca2",
+    "@agoric/zone": "0.2.3-dev-fa97ca2.0.fa97ca2",
     "@cosmjs/encoding": "^0.36.0",
     "@endo/base64": "^1.0.12",
     "@endo/errors": "^1.2.13",
@@ -59,7 +59,7 @@
     "bs58": "^6.0.0"
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-a61c7fe.0.a61c7fe",
+    "@agoric/swingset-liveslots": "0.10.3-dev-fa97ca2.0.fa97ca2",
     "@chain-registry/client": "^1.53.194",
     "@cosmjs/amino": "^0.36.0",
     "@cosmjs/proto-signing": "^0.36.0",
@@ -105,5 +105,5 @@
   "typeCoverage": {
     "atLeast": 97.46
   },
-  "gitHead": "a61c7fe585d715bc448459e3de9ac76f7decc3be"
+  "gitHead": "fa97ca2ae838a6234c23709f9488c83232c56b82"
 }

package/src/examples/stake-bld.contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stake-bld.contract.d.ts","sourceRoot":"","sources":["stake-bld.contract.js"],"names":[],"mappings":"AAsCO,2BAVI,GAAG,eACH;IACN,WAAW,EAAE,OAAO,OAAO,CAAC,CAAC;IAC7B,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;IACjC,YAAY,EAAE,YAAY,CAAC;CAC5B,WACO,OAAO,kBAAkB,EAAE,OAAO;;QA2EvC;;WAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA6BH;;WAEG;;;GAaR;yBAvIqB,aAAa;6BAJT,cAAc;4BACf,kBAAkB;gCAEd,gCAAgC;kCAD9B,cAAc"}
+{"version":3,"file":"stake-bld.contract.d.ts","sourceRoot":"","sources":["stake-bld.contract.js"],"names":[],"mappings":"AAsCO,2BAVI,GAAG,eACH;IACN,WAAW,EAAE,OAAO,OAAO,CAAC,CAAC;IAC7B,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;IACjC,YAAY,EAAE,YAAY,CAAC;CAC5B,WACO,OAAO,kBAAkB,EAAE,OAAO;;QA0EvC;;WAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA6BH;;WAEG;;;GAaR;yBAtIqB,aAAa;6BAJT,cAAc;4BACf,kBAAkB;gCAEd,gCAAgC;kCAD9B,cAAc"}

package/src/examples/stake-bld.contract.js

@@ -40,8 +40,7 @@ export const start = async (zcf, privateArgs, baggage) => {
   const zone = makeDurableZone(baggage);
 
   const { marshaller: remoteMarshaller } = privateArgs;
-  // TODO(https://github.com/Agoric/agoric-sdk/issues/12109):
-  // once withOrchestration provides a wrapped marshaller, don't re-wrap.
+  //  withOrchestration() provides this but this contract shows how to use orchestration without that
   const cachingMarshaller = wrapRemoteMarshaller(remoteMarshaller);
 
   const { makeRecorderKit } = prepareRecorderKitMakers(

package/src/examples/stake-ica.contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stake-ica.contract.d.ts","sourceRoot":"","sources":["stake-ica.contract.js"],"names":[],"mappings":"AAiBA;;;;;;;;GAQG;AAEH,yCAAyC;AACzC,mBADW,aAAa,OAAO,KAAK,CAAC,CAelC;AAEH;;;;;;cAAsD;AAuB/C,2BAVI,IAAI,aAAa,CAAC,eAClB;IACN,WAAW,EAAE,OAAO,OAAO,CAAC,CAAC;IAC7B,uBAAuB,EAAE,uBAAuB,CAAC;IACjD,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;IACjC,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,KAAK,EAAE,YAAY,CAAC;CACrB,WACO,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wBAwHur6C,CAAC;;;;;;;;;GAJzs6C;4BArIY;IACR,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,eAAe,CAAC;IAClC,sBAAsB,EAAE,eAAe,CAAC;IACxC,UAAU,EAAE,OAAO,CAAC;CACrB;yBAmIU,OAAO,KAAK;kCAnK+B,aAAa;yBAAb,aAAa;6BAC3B,cAAc;4BAHvB,kBAAkB;6CAC2B,uBAAuB;kCAGvE,cAAc;6BALnB,kBAAkB;mDAMI,uBAAuB;2BAJQ,uBAAuB;gCAC7C,aAAa;qCAC3B,cAAc"}
+{"version":3,"file":"stake-ica.contract.d.ts","sourceRoot":"","sources":["stake-ica.contract.js"],"names":[],"mappings":"AAiBA;;;;;;;;GAQG;AAEH,yCAAyC;AACzC,mBADW,aAAa,OAAO,KAAK,CAAC,CAelC;AAEH;;;;;;cAAsD;AAuB/C,2BAVI,IAAI,aAAa,CAAC,eAClB;IACN,WAAW,EAAE,OAAO,OAAO,CAAC,CAAC;IAC7B,uBAAuB,EAAE,uBAAuB,CAAC;IACjD,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;IACjC,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,KAAK,EAAE,YAAY,CAAC;CACrB,WACO,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wBAuHyt6C,CAAC;;;;;;;;;GAJ3u6C;4BApIY;IACR,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,eAAe,CAAC;IAClC,sBAAsB,EAAE,eAAe,CAAC;IACxC,UAAU,EAAE,OAAO,CAAC;CACrB;yBAkIU,OAAO,KAAK;kCAlK+B,aAAa;yBAAb,aAAa;6BAC3B,cAAc;4BAHvB,kBAAkB;6CAC2B,uBAAuB;kCAGvE,cAAc;6BALnB,kBAAkB;mDAMI,uBAAuB;2BAJQ,uBAAuB;gCAC7C,aAAa;qCAC3B,cAAc"}

package/src/examples/stake-ica.contract.js

@@ -85,8 +85,7 @@ export const start = async (zcf, privateArgs, baggage) => {
       ),
   });
 
-  // TODO(https://github.com/Agoric/agoric-sdk/issues/12109):
-  // once withOrchestration provides a wrapped marshaller, don't re-wrap.
+  //  withOrchestration() provides this but this contract shows how to use orchestration without that
   const cachingMarshaller = wrapRemoteMarshaller(remoteMarshaller);
 
   const { makeRecorderKit } = prepareRecorderKitMakers(

package/src/examples/swap-anything.contract.d.ts

@@ -12,7 +12,7 @@ export function contract(zcf: ZCF, privateArgs: OrchestrationPowers & {
     chainInfo?: Record<string, CosmosChainInfo>;
     marshaller: Remote<Marshaller>;
     storageNode: Remote<StorageNode>;
-}, zone: Zone, { chainHub, orchestrate, vowTools, zoeTools }: OrchestrationTools): Promise<{
+}, zone: Zone, { cachingMarshaller, chainHub, orchestrate, vowTools, zoeTools }: OrchestrationTools): Promise<{
     publicFacet: import("@endo/exo").Guarded<{
         makeSwapInvitation(): Promise<globalThis.Invitation<Vow<string>, import("./swap-anything.flows.js").SwapInfo>>;
     }>;

package/src/examples/swap-anything.contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"swap-anything.contract.d.ts","sourceRoot":"","sources":["swap-anything.contract.js"],"names":[],"mappings":"AAeA;;;;;GAKG;AAEH,qEAGE;AAmBK,8BAVI,GAAG,eACH,mBAAmB,GAAG;IAC5B,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,CAAC;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC5C,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;CAClC,QACO,IAAI,iDACJ,kBAAkB;;;;;;;;GAkJ5B;AAGD;gBA3JiB,CAAC,KAAK,EAAE,WAAW,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE;gBAC9C,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;gBAC/B,OAAO,UAAU,CAAC;iBACjB,OAAO,WAAW,CAAC;;;;;;;;;GAwJ0C;yCA7KrB,0BAA0B;2BACR,uBAAuB;iCAAvB,uBAAuB;qCAAvB,uBAAuB;4BAHrE,aAAa;0BACpB,cAAc;wCACqB,0BAA0B;yBAFtD,aAAa"}
+{"version":3,"file":"swap-anything.contract.d.ts","sourceRoot":"","sources":["swap-anything.contract.js"],"names":[],"mappings":"AAcA;;;;;GAKG;AAEH,qEAGE;AAmBK,8BAVI,GAAG,eACH,mBAAmB,GAAG;IAC5B,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,CAAC;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC5C,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;CAClC,QACO,IAAI,oEACJ,kBAAkB;;;;;;;;GA6I5B;AAGD;gBAtJiB,CAAC,KAAK,EAAE,WAAW,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE;gBAC9C,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;gBAC/B,OAAO,UAAU,CAAC;iBACjB,OAAO,WAAW,CAAC;;;;;;;;;GAmJ0C;yCAxKrB,0BAA0B;2BACR,uBAAuB;iCAAvB,uBAAuB;qCAAvB,uBAAuB;4BAHrE,aAAa;0BACpB,cAAc;wCACqB,0BAA0B;yBAFtD,aAAa"}

package/src/examples/swap-anything.contract.js

@@ -1,15 +1,14 @@
-import { InvitationShape } from '@agoric/zoe/src/typeGuards.js';
+import { decodeAddressHook } from '@agoric/cosmic-proto/address-hooks.js';
 import { makeTracer } from '@agoric/internal';
-import { wrapRemoteMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
+import { InvitationShape } from '@agoric/zoe/src/typeGuards.js';
 import { E } from '@endo/far';
 import { M } from '@endo/patterns';
-import { decodeAddressHook } from '@agoric/cosmic-proto/address-hooks.js';
 import { prepareChainHubAdmin } from '../exos/chain-hub-admin.js';
+import { AnyNatAmountShape } from '../typeGuards.js';
+import { registerChainsAndAssets } from '../utils/chain-hub-helper.js';
 import { withOrchestration } from '../utils/start-helper.js';
 import * as sharedFlows from './shared.flows.js';
 import { swapAnythingViaHook, swapIt } from './swap-anything.flows.js';
-import { AnyNatAmountShape } from '../typeGuards.js';
-import { registerChainsAndAssets } from '../utils/chain-hub-helper.js';
 
 const trace = makeTracer('SwapAnything.Contract');
 const interfaceTODO = undefined;
@@ -46,7 +45,7 @@ export const contract = async (
   zcf,
   privateArgs,
   zone,
-  { chainHub, orchestrate, vowTools, zoeTools },
+  { cachingMarshaller, chainHub, orchestrate, vowTools, zoeTools },
 ) => {
   const creatorFacet = prepareChainHubAdmin(zone, chainHub);
 
@@ -61,11 +60,6 @@ export const contract = async (
   const log = (msg, level = 'info') =>
     vowTools.watch(E(logNode).setValue(JSON.stringify({ msg, level })));
 
-  const { marshaller: remoteMarshaller } = privateArgs;
-  // TODO(https://github.com/Agoric/agoric-sdk/issues/12109):
-  // once withOrchestration provides a wrapped marshaller, don't re-wrap.
-  const cachingMarshaller = wrapRemoteMarshaller(remoteMarshaller);
-
   const makeLocalAccount = orchestrate(
     'makeLocalAccount',
     {},

package/src/utils/start-helper.d.ts

@@ -1,4 +1,4 @@
-export function provideOrchestration(zcf: ZCF, baggage: Baggage, remotePowers: OrchestrationPowers, marshaller: ERemote<EMarshaller>, opts?: {
+export function provideOrchestration(zcf: ZCF, baggage: Baggage, remotePowers: OrchestrationPowers, remoteMarshaller: Remote<Marshaller>, opts?: {
     chainInfoValueShape?: WithOrchestrationOpts["chainInfoValueShape"];
 }): {
     makeOrchestrateKit: (zone: Zone) => {
@@ -8,6 +8,17 @@ export function provideOrchestration(zcf: ZCF, baggage: Baggage, remotePowers: O
         }>(guestFns: GFM, hostCtx: HC) => { [N in keyof GFM]: HostForGuest<GFM[N]>; };
     };
     baggage: Baggage;
+    cachingMarshaller: {
+        serialize: (val?: Passable) => globalThis.ERef<import("@endo/marshal").CapData<unknown>>;
+        unserialize: (data: import("@endo/marshal").CapData<unknown>) => any;
+        toCapData: (val?: Passable) => globalThis.ERef<import("@endo/marshal").CapData<unknown>>;
+        fromCapData: (data: import("@endo/marshal").CapData<unknown>) => any;
+    } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+        serialize: (val?: Passable) => globalThis.ERef<import("@endo/marshal").CapData<unknown>>;
+        unserialize: (data: import("@endo/marshal").CapData<unknown>) => any;
+        toCapData: (val?: Passable) => globalThis.ERef<import("@endo/marshal").CapData<unknown>>;
+        fromCapData: (data: import("@endo/marshal").CapData<unknown>) => any;
+    }>;
     chainHub: import("@endo/exo").Guarded<{
         registerChain(name: string, chainInfo: import("../orchestration-api.js").ChainInfo): void;
         updateChain(chainName: string, chainInfo: import("../orchestration-api.js").ChainInfo): void;
@@ -101,10 +112,8 @@ export type WithOrchestrationOpts = {
 };
 export type OrchestrationTools = Omit<ReturnType<typeof provideOrchestration>, "zone">;
 import type { Baggage } from '@agoric/vat-data';
-import type { EMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
-import type { ERemote } from '@agoric/internal';
-import type { Zone } from '@agoric/zone';
 import type { Remote } from '@agoric/vow';
+import type { Zone } from '@agoric/zone';
 import type { LocalChain } from '@agoric/vats/src/localchain.js';
 import type { CosmosInterchainService } from '../exos/exo-interfaces.js';
 import type { StorageNode } from '@agoric/internal/src/lib-chainStorage.js';

package/src/utils/start-helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start-helper.d.ts","sourceRoot":"","sources":["start-helper.js"],"names":[],"mappings":"AA+DO,0CARI,GAAG,WACH,OAAO,gBACP,mBAAmB,cACnB,QAAQ,WAAW,CAAC,SAE5B;IAA4D,mBAAmB,GAAvE,qBAAqB,CAAC,qBAAqB,CAAC;CACpD;+BAmGU,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBArEJ,CAAC;;;;;;;;;;;;;;;;;;;;;sBA+JuyV,CAAC;;;;;;;;;;;;;;;;;;;;EAzDrzV;AA+BM,kCAfgC,EAAE,SAA3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAE,EAGhC,EAAE,SAFM,mBAAmB,GAAG;IAC/B,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;CAC/B,EACQ,CAAC,cACH,CACN,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,EACZ,WAAW,EAAE,EAAE,EACf,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,kBAAkB,KACtB,OAAO,CAAC,CAAC,CAAC,SACP,qBAAqB,GACnB,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,CA2BzE;kCA1NU;IACR,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,oBAAoB,EAAE,OAAO,uBAAuB,CAAC,CAAC;IACtD,WAAW,CAAC,EAAE,OAAO,WAAW,CAAC,CAAC;IAClC,YAAY,EAAE,OAAO,YAAY,CAAC,CAAC;IACnC,WAAW,EAAE,OAAO,OAAO,CAAC,CAAC;CAC9B;;;;;;;;;;;;;0BAQU,OAAO;;iCAwJP,IAAI,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,EAAE,MAAM,CAAC;6BA/KzC,kBAAkB;iCAHd,iDAAiD;6BAFrD,kBAAkB;0BAQrB,cAAc;4BADZ,aAAa;gCAJT,gCAAgC;6CAOnB,2BAA2B;iCATvC,0CAA0C;kCAGzC,cAAc;6BAEnB,cAAc;6BAGd,gBAAgB"}
+{"version":3,"file":"start-helper.d.ts","sourceRoot":"","sources":["start-helper.js"],"names":[],"mappings":"AA+DO,0CARI,GAAG,WACH,OAAO,gBACP,mBAAmB,oBACnB,OAAO,UAAU,CAAC,SAE1B;IAA4D,mBAAmB,GAAvE,qBAAqB,CAAC,qBAAqB,CAAC;CACpD;+BAwGU,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBA1Ed,CAAC;;;;;;;;;;;;;;;;;;;;;sBAgKu9V,CAAC;;;;;;;;;;;;;;;;;;;;EApD39V;AA+BM,kCAfgC,EAAE,SAA3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAE,EAGhC,EAAE,SAFM,mBAAmB,GAAG;IAC/B,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;CAC/B,EACQ,CAAC,cACH,CACN,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,EACZ,WAAW,EAAE,EAAE,EACf,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,kBAAkB,KACtB,OAAO,CAAC,CAAC,CAAC,SACP,qBAAqB,GACnB,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,CAsBzE;kCA3NU;IACR,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,oBAAoB,EAAE,OAAO,uBAAuB,CAAC,CAAC;IACtD,WAAW,CAAC,EAAE,OAAO,WAAW,CAAC,CAAC;IAClC,YAAY,EAAE,OAAO,YAAY,CAAC,CAAC;IACnC,WAAW,EAAE,OAAO,OAAO,CAAC,CAAC;CAC9B;;;;;;;;;;;;;0BAQU,OAAO;;iCA8JP,IAAI,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,EAAE,MAAM,CAAC;6BArLzC,kBAAkB;4BAEnB,aAAa;0BACf,cAAc;gCALR,gCAAgC;6CAOnB,2BAA2B;iCATvC,0CAA0C;kCAGzC,cAAc;6BAEnB,cAAc;6BAGd,gBAAgB"}

package/src/utils/start-helper.js

@@ -56,7 +56,7 @@ import { makeZcfTools } from './zcf-tools.js';
  * @param {ZCF} zcf
  * @param {Baggage} baggage
  * @param {OrchestrationPowers} remotePowers
- * @param {ERemote<EMarshaller>} marshaller
+ * @param {Remote<Marshaller>} remoteMarshaller
  * @param {object} [opts]
  * @param {WithOrchestrationOpts['chainInfoValueShape']} [opts.chainInfoValueShape]
  * @internal
@@ -65,7 +65,7 @@ export const provideOrchestration = (
   zcf,
   baggage,
   remotePowers,
-  marshaller,
+  remoteMarshaller,
   opts = {},
 ) => {
   // separate zones
@@ -97,7 +97,12 @@ export const provideOrchestration = (
 
   const zcfTools = makeZcfTools(zcf, vowTools);
 
-  const { makeRecorderKit } = prepareRecorderKitMakers(baggage, marshaller);
+  const cachingMarshaller = wrapRemoteMarshaller(remoteMarshaller);
+
+  const { makeRecorderKit } = prepareRecorderKitMakers(
+    baggage,
+    cachingMarshaller,
+  );
   const makeLocalOrchestrationAccountKit = prepareLocalOrchestrationAccountKit(
     zones.orchestration,
     {
@@ -184,6 +189,7 @@ export const provideOrchestration = (
     ...defaultOrchestrateKit,
     makeOrchestrateKit,
     baggage,
+    cachingMarshaller,
     chainHub,
     vowTools,
     asyncFlowTools,
@@ -228,19 +234,14 @@ export const withOrchestration =
     const { storageNode: _, ...requiredOrchPowers } = allOrchPowers;
     const { publishAccountInfo, chainInfoValueShape } = opts ?? {};
 
-    const cachingMarshaller = wrapRemoteMarshaller(remoteMarshaller);
-
     const { zone, ...tools } = provideOrchestration(
       zcf,
       baggage,
       publishAccountInfo ? allOrchPowers : requiredOrchPowers,
-      cachingMarshaller,
+      remoteMarshaller,
       { chainInfoValueShape },
     );
     const [startResult] = await Promise.all([
-      // TODO(https://github.com/Agoric/agoric-sdk/issues/12109):
-      // pass the cachingMarshaller to orchestrated contracts so they don't
-      // have to wrap it themselves. This requires some generic PA magic.
       contractFn(zcf, privateArgs, zone, tools),
       // Make sure that any errors in async-flow awake abort contract start
       tools.asyncFlowTools.allWokenP,