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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/package.json +16 -16
  2. package/src/examples/stake-bld.contract.d.ts.map +1 -1
  3. package/src/examples/stake-bld.contract.js +1 -2
  4. package/src/examples/stake-ica.contract.d.ts.map +1 -1
  5. package/src/examples/stake-ica.contract.js +1 -2
  6. package/src/examples/swap-anything.contract.d.ts +1 -1
  7. package/src/examples/swap-anything.contract.d.ts.map +1 -1
  8. package/src/examples/swap-anything.contract.js +5 -11
  9. package/src/utils/start-helper.d.ts +13 -4
  10. package/src/utils/start-helper.d.ts.map +1 -1
  11. package/src/utils/start-helper.js +10 -9
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@agoric/orchestration",
3
- "version": "0.1.1-dev-a61c7fe.0.a61c7fe",
3
+ "version": "0.1.1-dev-fa97ca2.0.fa97ca2",
4
4
  "description": "Chain abstraction for Agoric's orchestration clients",
5
5
  "type": "module",
6
6
  "main": "index.js",
@@ -35,19 +35,19 @@
35
35
  },
36
36
  "homepage": "https://github.com/Agoric/agoric-sdk#readme",
37
37
  "dependencies": {
38
- "@agoric/async-flow": "0.1.1-dev-a61c7fe.0.a61c7fe",
39
- "@agoric/cosmic-proto": "0.4.1-dev-a61c7fe.0.a61c7fe",
40
- "@agoric/ertp": "0.16.3-dev-a61c7fe.0.a61c7fe",
41
- "@agoric/internal": "0.3.3-dev-a61c7fe.0.a61c7fe",
42
- "@agoric/network": "0.1.1-dev-a61c7fe.0.a61c7fe",
43
- "@agoric/notifier": "0.6.3-dev-a61c7fe.0.a61c7fe",
44
- "@agoric/store": "0.9.3-dev-a61c7fe.0.a61c7fe",
45
- "@agoric/time": "0.3.3-dev-a61c7fe.0.a61c7fe",
46
- "@agoric/vat-data": "0.5.3-dev-a61c7fe.0.a61c7fe",
47
- "@agoric/vats": "0.15.2-dev-a61c7fe.0.a61c7fe",
48
- "@agoric/vow": "0.1.1-dev-a61c7fe.0.a61c7fe",
49
- "@agoric/zoe": "0.26.3-dev-a61c7fe.0.a61c7fe",
50
- "@agoric/zone": "0.2.3-dev-a61c7fe.0.a61c7fe",
38
+ "@agoric/async-flow": "0.1.1-dev-fa97ca2.0.fa97ca2",
39
+ "@agoric/cosmic-proto": "0.4.1-dev-fa97ca2.0.fa97ca2",
40
+ "@agoric/ertp": "0.16.3-dev-fa97ca2.0.fa97ca2",
41
+ "@agoric/internal": "0.3.3-dev-fa97ca2.0.fa97ca2",
42
+ "@agoric/network": "0.1.1-dev-fa97ca2.0.fa97ca2",
43
+ "@agoric/notifier": "0.6.3-dev-fa97ca2.0.fa97ca2",
44
+ "@agoric/store": "0.9.3-dev-fa97ca2.0.fa97ca2",
45
+ "@agoric/time": "0.3.3-dev-fa97ca2.0.fa97ca2",
46
+ "@agoric/vat-data": "0.5.3-dev-fa97ca2.0.fa97ca2",
47
+ "@agoric/vats": "0.15.2-dev-fa97ca2.0.fa97ca2",
48
+ "@agoric/vow": "0.1.1-dev-fa97ca2.0.fa97ca2",
49
+ "@agoric/zoe": "0.26.3-dev-fa97ca2.0.fa97ca2",
50
+ "@agoric/zone": "0.2.3-dev-fa97ca2.0.fa97ca2",
51
51
  "@cosmjs/encoding": "^0.36.0",
52
52
  "@endo/base64": "^1.0.12",
53
53
  "@endo/errors": "^1.2.13",
@@ -59,7 +59,7 @@
59
59
  "bs58": "^6.0.0"
60
60
  },
61
61
  "devDependencies": {
62
- "@agoric/swingset-liveslots": "0.10.3-dev-a61c7fe.0.a61c7fe",
62
+ "@agoric/swingset-liveslots": "0.10.3-dev-fa97ca2.0.fa97ca2",
63
63
  "@chain-registry/client": "^1.53.194",
64
64
  "@cosmjs/amino": "^0.36.0",
65
65
  "@cosmjs/proto-signing": "^0.36.0",
@@ -105,5 +105,5 @@
105
105
  "typeCoverage": {
106
106
  "atLeast": 97.46
107
107
  },
108
- "gitHead": "a61c7fe585d715bc448459e3de9ac76f7decc3be"
108
+ "gitHead": "fa97ca2ae838a6234c23709f9488c83232c56b82"
109
109
  }
package/src/examples/stake-bld.contract.d.ts.map CHANGED
@@ -1 +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"}
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;;QA0EvC;;WAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA6BH;;WAEG;;;GAaR;yBAtIqB,aAAa;6BAJT,cAAc;4BACf,kBAAkB;gCAEd,gCAAgC;kCAD9B,cAAc"}
package/src/examples/stake-bld.contract.js CHANGED
@@ -40,8 +40,7 @@ export const start = async (zcf, privateArgs, baggage) => {
40
40
  const zone = makeDurableZone(baggage);
41
41
 
42
42
  const { marshaller: remoteMarshaller } = privateArgs;
43
- // TODO(https://github.com/Agoric/agoric-sdk/issues/12109):
44
- // once withOrchestration provides a wrapped marshaller, don't re-wrap.
43
+ // withOrchestration() provides this but this contract shows how to use orchestration without that
45
44
  const cachingMarshaller = wrapRemoteMarshaller(remoteMarshaller);
46
45
 
47
46
  const { makeRecorderKit } = prepareRecorderKitMakers(
package/src/examples/stake-ica.contract.d.ts.map CHANGED
@@ -1 +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"}
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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;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 CHANGED
@@ -85,8 +85,7 @@ export const start = async (zcf, privateArgs, baggage) => {
85
85
  ),
86
86
  });
87
87
 
88
- // TODO(https://github.com/Agoric/agoric-sdk/issues/12109):
89
- // once withOrchestration provides a wrapped marshaller, don't re-wrap.
88
+ // withOrchestration() provides this but this contract shows how to use orchestration without that
90
89
  const cachingMarshaller = wrapRemoteMarshaller(remoteMarshaller);
91
90
 
92
91
  const { makeRecorderKit } = prepareRecorderKitMakers(
package/src/examples/swap-anything.contract.d.ts CHANGED
@@ -12,7 +12,7 @@ export function contract(zcf: ZCF, privateArgs: OrchestrationPowers & {
12
12
  chainInfo?: Record<string, CosmosChainInfo>;
13
13
  marshaller: Remote<Marshaller>;
14
14
  storageNode: Remote<StorageNode>;
15
- }, zone: Zone, { chainHub, orchestrate, vowTools, zoeTools }: OrchestrationTools): Promise<{
15
+ }, zone: Zone, { cachingMarshaller, chainHub, orchestrate, vowTools, zoeTools }: OrchestrationTools): Promise<{
16
16
  publicFacet: import("@endo/exo").Guarded<{
17
17
  makeSwapInvitation(): Promise<globalThis.Invitation<Vow<string>, import("./swap-anything.flows.js").SwapInfo>>;
18
18
  }>;
package/src/examples/swap-anything.contract.d.ts.map CHANGED
@@ -1 +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"}
1
+ {"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 CHANGED
@@ -1,15 +1,14 @@
1
- import { InvitationShape } from '@agoric/zoe/src/typeGuards.js';
1
+ import { decodeAddressHook } from '@agoric/cosmic-proto/address-hooks.js';
2
2
  import { makeTracer } from '@agoric/internal';
3
- import { wrapRemoteMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
3
+ import { InvitationShape } from '@agoric/zoe/src/typeGuards.js';
4
4
  import { E } from '@endo/far';
5
5
  import { M } from '@endo/patterns';
6
- import { decodeAddressHook } from '@agoric/cosmic-proto/address-hooks.js';
7
6
  import { prepareChainHubAdmin } from '../exos/chain-hub-admin.js';
7
+ import { AnyNatAmountShape } from '../typeGuards.js';
8
+ import { registerChainsAndAssets } from '../utils/chain-hub-helper.js';
8
9
  import { withOrchestration } from '../utils/start-helper.js';
9
10
  import * as sharedFlows from './shared.flows.js';
10
11
  import { swapAnythingViaHook, swapIt } from './swap-anything.flows.js';
11
- import { AnyNatAmountShape } from '../typeGuards.js';
12
- import { registerChainsAndAssets } from '../utils/chain-hub-helper.js';
13
12
 
14
13
  const trace = makeTracer('SwapAnything.Contract');
15
14
  const interfaceTODO = undefined;
@@ -46,7 +45,7 @@ export const contract = async (
46
45
  zcf,
47
46
  privateArgs,
48
47
  zone,
49
- { chainHub, orchestrate, vowTools, zoeTools },
48
+ { cachingMarshaller, chainHub, orchestrate, vowTools, zoeTools },
50
49
  ) => {
51
50
  const creatorFacet = prepareChainHubAdmin(zone, chainHub);
52
51
 
@@ -61,11 +60,6 @@ export const contract = async (
61
60
  const log = (msg, level = 'info') =>
62
61
  vowTools.watch(E(logNode).setValue(JSON.stringify({ msg, level })));
63
62
 
64
- const { marshaller: remoteMarshaller } = privateArgs;
65
- // TODO(https://github.com/Agoric/agoric-sdk/issues/12109):
66
- // once withOrchestration provides a wrapped marshaller, don't re-wrap.
67
- const cachingMarshaller = wrapRemoteMarshaller(remoteMarshaller);
68
-
69
63
  const makeLocalAccount = orchestrate(
70
64
  'makeLocalAccount',
71
65
  {},
package/src/utils/start-helper.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- export function provideOrchestration(zcf: ZCF, baggage: Baggage, remotePowers: OrchestrationPowers, marshaller: ERemote<EMarshaller>, opts?: {
1
+ export function provideOrchestration(zcf: ZCF, baggage: Baggage, remotePowers: OrchestrationPowers, remoteMarshaller: Remote<Marshaller>, opts?: {
2
2
  chainInfoValueShape?: WithOrchestrationOpts["chainInfoValueShape"];
3
3
  }): {
4
4
  makeOrchestrateKit: (zone: Zone) => {
@@ -8,6 +8,17 @@ export function provideOrchestration(zcf: ZCF, baggage: Baggage, remotePowers: O
8
8
  }>(guestFns: GFM, hostCtx: HC) => { [N in keyof GFM]: HostForGuest<GFM[N]>; };
9
9
  };
10
10
  baggage: Baggage;
11
+ cachingMarshaller: {
12
+ serialize: (val?: Passable) => globalThis.ERef<import("@endo/marshal").CapData<unknown>>;
13
+ unserialize: (data: import("@endo/marshal").CapData<unknown>) => any;
14
+ toCapData: (val?: Passable) => globalThis.ERef<import("@endo/marshal").CapData<unknown>>;
15
+ fromCapData: (data: import("@endo/marshal").CapData<unknown>) => any;
16
+ } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
17
+ serialize: (val?: Passable) => globalThis.ERef<import("@endo/marshal").CapData<unknown>>;
18
+ unserialize: (data: import("@endo/marshal").CapData<unknown>) => any;
19
+ toCapData: (val?: Passable) => globalThis.ERef<import("@endo/marshal").CapData<unknown>>;
20
+ fromCapData: (data: import("@endo/marshal").CapData<unknown>) => any;
21
+ }>;
11
22
  chainHub: import("@endo/exo").Guarded<{
12
23
  registerChain(name: string, chainInfo: import("../orchestration-api.js").ChainInfo): void;
13
24
  updateChain(chainName: string, chainInfo: import("../orchestration-api.js").ChainInfo): void;
@@ -101,10 +112,8 @@ export type WithOrchestrationOpts = {
101
112
  };
102
113
  export type OrchestrationTools = Omit<ReturnType<typeof provideOrchestration>, "zone">;
103
114
  import type { Baggage } from '@agoric/vat-data';
104
- import type { EMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
105
- import type { ERemote } from '@agoric/internal';
106
- import type { Zone } from '@agoric/zone';
107
115
  import type { Remote } from '@agoric/vow';
116
+ import type { Zone } from '@agoric/zone';
108
117
  import type { LocalChain } from '@agoric/vats/src/localchain.js';
109
118
  import type { CosmosInterchainService } from '../exos/exo-interfaces.js';
110
119
  import type { StorageNode } from '@agoric/internal/src/lib-chainStorage.js';
package/src/utils/start-helper.d.ts.map CHANGED
@@ -1 +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"}
1
+ {"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 CHANGED
@@ -56,7 +56,7 @@ import { makeZcfTools } from './zcf-tools.js';
56
56
  * @param {ZCF} zcf
57
57
  * @param {Baggage} baggage
58
58
  * @param {OrchestrationPowers} remotePowers
59
- * @param {ERemote<EMarshaller>} marshaller
59
+ * @param {Remote<Marshaller>} remoteMarshaller
60
60
  * @param {object} [opts]
61
61
  * @param {WithOrchestrationOpts['chainInfoValueShape']} [opts.chainInfoValueShape]
62
62
  * @internal
@@ -65,7 +65,7 @@ export const provideOrchestration = (
65
65
  zcf,
66
66
  baggage,
67
67
  remotePowers,
68
- marshaller,
68
+ remoteMarshaller,
69
69
  opts = {},
70
70
  ) => {
71
71
  // separate zones
@@ -97,7 +97,12 @@ export const provideOrchestration = (
97
97
 
98
98
  const zcfTools = makeZcfTools(zcf, vowTools);
99
99
 
100
- const { makeRecorderKit } = prepareRecorderKitMakers(baggage, marshaller);
100
+ const cachingMarshaller = wrapRemoteMarshaller(remoteMarshaller);
101
+
102
+ const { makeRecorderKit } = prepareRecorderKitMakers(
103
+ baggage,
104
+ cachingMarshaller,
105
+ );
101
106
  const makeLocalOrchestrationAccountKit = prepareLocalOrchestrationAccountKit(
102
107
  zones.orchestration,
103
108
  {
@@ -184,6 +189,7 @@ export const provideOrchestration = (
184
189
  ...defaultOrchestrateKit,
185
190
  makeOrchestrateKit,
186
191
  baggage,
192
+ cachingMarshaller,
187
193
  chainHub,
188
194
  vowTools,
189
195
  asyncFlowTools,
@@ -228,19 +234,14 @@ export const withOrchestration =
228
234
  const { storageNode: _, ...requiredOrchPowers } = allOrchPowers;
229
235
  const { publishAccountInfo, chainInfoValueShape } = opts ?? {};
230
236
 
231
- const cachingMarshaller = wrapRemoteMarshaller(remoteMarshaller);
232
-
233
237
  const { zone, ...tools } = provideOrchestration(
234
238
  zcf,
235
239
  baggage,
236
240
  publishAccountInfo ? allOrchPowers : requiredOrchPowers,
237
- cachingMarshaller,
241
+ remoteMarshaller,
238
242
  { chainInfoValueShape },
239
243
  );
240
244
  const [startResult] = await Promise.all([
241
- // TODO(https://github.com/Agoric/agoric-sdk/issues/12109):
242
- // pass the cachingMarshaller to orchestrated contracts so they don't
243
- // have to wrap it themselves. This requires some generic PA magic.
244
245
  contractFn(zcf, privateArgs, zone, tools),
245
246
  // Make sure that any errors in async-flow awake abort contract start
246
247
  tools.asyncFlowTools.allWokenP,