@agoric/orchestration 0.1.1-dev-5b02250.0 → 0.1.1-dev-a4a571e.0

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@agoric/orchestration",
3
- "version": "0.1.1-dev-5b02250.0+5b02250",
3
+ "version": "0.1.1-dev-a4a571e.0+a4a571e",
4
4
  "description": "Chain abstraction for Agoric's orchestration clients",
5
5
  "type": "module",
6
6
  "main": "index.js",
@@ -33,19 +33,19 @@
33
33
  },
34
34
  "homepage": "https://github.com/Agoric/agoric-sdk#readme",
35
35
  "dependencies": {
36
- "@agoric/async-flow": "0.1.1-dev-5b02250.0+5b02250",
37
- "@agoric/cosmic-proto": "0.4.1-dev-5b02250.0+5b02250",
38
- "@agoric/ertp": "0.16.3-dev-5b02250.0+5b02250",
39
- "@agoric/internal": "0.3.3-dev-5b02250.0+5b02250",
40
- "@agoric/network": "0.1.1-dev-5b02250.0+5b02250",
41
- "@agoric/notifier": "0.6.3-dev-5b02250.0+5b02250",
42
- "@agoric/store": "0.9.3-dev-5b02250.0+5b02250",
43
- "@agoric/time": "0.3.3-dev-5b02250.0+5b02250",
44
- "@agoric/vat-data": "0.5.3-dev-5b02250.0+5b02250",
45
- "@agoric/vats": "0.15.2-dev-5b02250.0+5b02250",
46
- "@agoric/vow": "0.1.1-dev-5b02250.0+5b02250",
47
- "@agoric/zoe": "0.26.3-dev-5b02250.0+5b02250",
48
- "@agoric/zone": "0.2.3-dev-5b02250.0+5b02250",
36
+ "@agoric/async-flow": "0.1.1-dev-a4a571e.0+a4a571e",
37
+ "@agoric/cosmic-proto": "0.4.1-dev-a4a571e.0+a4a571e",
38
+ "@agoric/ertp": "0.16.3-dev-a4a571e.0+a4a571e",
39
+ "@agoric/internal": "0.3.3-dev-a4a571e.0+a4a571e",
40
+ "@agoric/network": "0.1.1-dev-a4a571e.0+a4a571e",
41
+ "@agoric/notifier": "0.6.3-dev-a4a571e.0+a4a571e",
42
+ "@agoric/store": "0.9.3-dev-a4a571e.0+a4a571e",
43
+ "@agoric/time": "0.3.3-dev-a4a571e.0+a4a571e",
44
+ "@agoric/vat-data": "0.5.3-dev-a4a571e.0+a4a571e",
45
+ "@agoric/vats": "0.15.2-dev-a4a571e.0+a4a571e",
46
+ "@agoric/vow": "0.1.1-dev-a4a571e.0+a4a571e",
47
+ "@agoric/zoe": "0.26.3-dev-a4a571e.0+a4a571e",
48
+ "@agoric/zone": "0.2.3-dev-a4a571e.0+a4a571e",
49
49
  "@endo/base64": "^1.0.5",
50
50
  "@endo/errors": "^1.2.2",
51
51
  "@endo/far": "^1.1.2",
@@ -90,5 +90,5 @@
90
90
  "typeCoverage": {
91
91
  "atLeast": 97.1
92
92
  },
93
- "gitHead": "5b02250485741cf4306996ddc79072a906e58c4a"
93
+ "gitHead": "a4a571ef63fbbed00cf76d946f2bc90c65abfac1"
94
94
  }
@@ -1,24 +1,18 @@
1
- import type { AnyJson } from '@agoric/cosmic-proto';
1
+ import type { AnyJson, TypedJson } from '@agoric/cosmic-proto';
2
2
  import type { Delegation, Redelegation, UnbondingDelegation } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/staking.js';
3
3
  import type { TxBody } from '@agoric/cosmic-proto/cosmos/tx/v1beta1/tx.js';
4
- import { MsgTransfer } from '@agoric/cosmic-proto/ibc/applications/transfer/v1/tx.js';
4
+ import type { MsgTransfer } from '@agoric/cosmic-proto/ibc/applications/transfer/v1/tx.js';
5
5
  import type { State as IBCChannelState, Order } from '@agoric/cosmic-proto/ibc/core/channel/v1/channel.js';
6
6
  import type { State as IBCConnectionState } from '@agoric/cosmic-proto/ibc/core/connection/v1/connection.js';
7
7
  import type { Brand, Purse, Payment, Amount } from '@agoric/ertp/src/types.js';
8
8
  import type { Port } from '@agoric/network';
9
- import { IBCChannelID, type IBCConnectionID } from '@agoric/vats';
9
+ import type { IBCChannelID, IBCConnectionID } from '@agoric/vats';
10
10
  import type { LocalIbcAddress, RemoteIbcAddress } from '@agoric/vats/tools/ibc-utils.js';
11
11
  import type { AmountArg, ChainAddress, DenomAmount } from './types.js';
12
- /** A helper type for type extensions. */
13
- export type TypeUrl = string;
14
- export type Proto3JSONMsg = {
15
- '@type': TypeUrl;
16
- value: Record<string, unknown>;
17
- };
18
12
  /** An address for a validator on some blockchain, e.g., cosmos, eth, etc. */
19
13
  export type CosmosValidatorAddress = ChainAddress & {
20
- address: `${string}valoper${string}`;
21
- addressEncoding: 'bech32';
14
+ value: `${string}valoper${string}`;
15
+ encoding: 'bech32';
22
16
  };
23
17
  /** Represents an IBC Connection between two chains, which can contain multiple Channels. */
24
18
  export type IBCConnectionInfo = {
@@ -137,7 +131,7 @@ export interface IcaAccount {
137
131
  * @param msgs - records for the transaction
138
132
  * @returns acknowledgement string
139
133
  */
140
- executeTx: (msgs: Proto3JSONMsg[]) => Promise<string>;
134
+ executeTx: (msgs: TypedJson[]) => Promise<string>;
141
135
  /**
142
136
  * Submit a transaction on behalf of the remote account for execution on the remote chain.
143
137
  * @param msgs - records for the transaction
@@ -1 +1 @@
1
- {"version":3,"file":"cosmos-api.d.ts","sourceRoot":"","sources":["cosmos-api.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cosmos-api.d.ts","sourceRoot":"","sources":["cosmos-api.ts"],"names":[],"mappings":"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"}
package/src/cosmos-api.ts CHANGED
@@ -1,11 +1,11 @@
1
- import type { AnyJson } from '@agoric/cosmic-proto';
1
+ import type { AnyJson, TypedJson } from '@agoric/cosmic-proto';
2
2
  import type {
3
3
  Delegation,
4
4
  Redelegation,
5
5
  UnbondingDelegation,
6
6
  } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/staking.js';
7
7
  import type { TxBody } from '@agoric/cosmic-proto/cosmos/tx/v1beta1/tx.js';
8
- import { MsgTransfer } from '@agoric/cosmic-proto/ibc/applications/transfer/v1/tx.js';
8
+ import type { MsgTransfer } from '@agoric/cosmic-proto/ibc/applications/transfer/v1/tx.js';
9
9
  import type {
10
10
  State as IBCChannelState,
11
11
  Order,
@@ -13,27 +13,18 @@ import type {
13
13
  import type { State as IBCConnectionState } from '@agoric/cosmic-proto/ibc/core/connection/v1/connection.js';
14
14
  import type { Brand, Purse, Payment, Amount } from '@agoric/ertp/src/types.js';
15
15
  import type { Port } from '@agoric/network';
16
- import { IBCChannelID, type IBCConnectionID } from '@agoric/vats';
16
+ import type { IBCChannelID, IBCConnectionID } from '@agoric/vats';
17
17
  import type {
18
18
  LocalIbcAddress,
19
19
  RemoteIbcAddress,
20
20
  } from '@agoric/vats/tools/ibc-utils.js';
21
21
  import type { AmountArg, ChainAddress, DenomAmount } from './types.js';
22
22
 
23
- /** A helper type for type extensions. */
24
- export type TypeUrl = string;
25
-
26
- // TODO move into cosmic-proto
27
- export type Proto3JSONMsg = {
28
- '@type': TypeUrl;
29
- value: Record<string, unknown>;
30
- };
31
-
32
23
  /** An address for a validator on some blockchain, e.g., cosmos, eth, etc. */
33
24
  export type CosmosValidatorAddress = ChainAddress & {
34
- // TODO document why this is the format
35
- address: `${string}valoper${string}`;
36
- addressEncoding: 'bech32';
25
+ // infix for Validator Operator https://docs.cosmos.network/main/learn/beginner/accounts#addresses
26
+ value: `${string}valoper${string}`;
27
+ encoding: 'bech32';
37
28
  };
38
29
 
39
30
  /** Represents an IBC Connection between two chains, which can contain multiple Channels. */
@@ -183,7 +174,7 @@ export interface IcaAccount {
183
174
  * @param msgs - records for the transaction
184
175
  * @returns acknowledgement string
185
176
  */
186
- executeTx: (msgs: Proto3JSONMsg[]) => Promise<string>;
177
+ executeTx: (msgs: TypedJson[]) => Promise<string>;
187
178
  /**
188
179
  * Submit a transaction on behalf of the remote account for execution on the remote chain.
189
180
  * @param msgs - records for the transaction
@@ -74,8 +74,8 @@ const sendItFn = async (
74
74
  await contractState.account?.transfer(
75
75
  { denom, value: amt.value },
76
76
  {
77
- address: destAddr,
78
- addressEncoding: 'bech32',
77
+ value: destAddr,
78
+ encoding: 'bech32',
79
79
  chainId,
80
80
  },
81
81
  );
@@ -63,8 +63,8 @@ export const start = async (zcf, privateArgs, baggage) => {
63
63
  return makeLocalOrchestrationAccountKit({
64
64
  account,
65
65
  address: harden({
66
- address,
67
- addressEncoding: 'bech32',
66
+ value: address,
67
+ encoding: 'bech32',
68
68
  chainId: 'local',
69
69
  }),
70
70
  storageNode: privateArgs.storageNode,
@@ -99,7 +99,7 @@ export const start = async (zcf, privateArgs, baggage) => {
99
99
  const accountAddress = await E(account).getAddress();
100
100
  trace('account address', accountAddress);
101
101
  const accountNode = await E(accountsStorageNode).makeChildNode(
102
- accountAddress.address,
102
+ accountAddress.value,
103
103
  );
104
104
  const holder = makeCosmosOrchestrationAccount(accountAddress, bondDenom, {
105
105
  account,
@@ -188,9 +188,9 @@ export const prepareChainAccountKit = (zone, { watch, asVow }) =>
188
188
  this.state.chainAddress = harden({
189
189
  // FIXME need a fallback value like icacontroller-1-connection-1 if this fails
190
190
  // https://github.com/Agoric/agoric-sdk/issues/9066
191
- address: findAddressField(remoteAddr) || UNPARSABLE_CHAIN_ADDRESS,
191
+ value: findAddressField(remoteAddr) || UNPARSABLE_CHAIN_ADDRESS,
192
192
  chainId: this.state.chainId,
193
- addressEncoding: 'bech32',
193
+ encoding: 'bech32',
194
194
  });
195
195
  },
196
196
  /**
@@ -356,8 +356,8 @@ export const prepareCosmosOrchestrationAccountKit = (
356
356
  const results = E(helper.owned()).executeEncodedTx([
357
357
  Any.toJSON(
358
358
  MsgDelegate.toProtoMsg({
359
- delegatorAddress: chainAddress.address,
360
- validatorAddress: validator.address,
359
+ delegatorAddress: chainAddress.value,
360
+ validatorAddress: validator.value,
361
361
  amount: helper.amountToCoin(amount),
362
362
  }),
363
363
  ),
@@ -385,9 +385,9 @@ export const prepareCosmosOrchestrationAccountKit = (
385
385
  const results = E(helper.owned()).executeEncodedTx([
386
386
  Any.toJSON(
387
387
  MsgBeginRedelegate.toProtoMsg({
388
- delegatorAddress: chainAddress.address,
389
- validatorSrcAddress: srcValidator.address,
390
- validatorDstAddress: dstValidator.address,
388
+ delegatorAddress: chainAddress.value,
389
+ validatorSrcAddress: srcValidator.value,
390
+ validatorDstAddress: dstValidator.value,
391
391
  amount: helper.amountToCoin(amount),
392
392
  }),
393
393
  ),
@@ -410,8 +410,8 @@ export const prepareCosmosOrchestrationAccountKit = (
410
410
  const { helper } = this.facets;
411
411
  const { chainAddress } = this.state;
412
412
  const msg = MsgWithdrawDelegatorReward.toProtoMsg({
413
- delegatorAddress: chainAddress.address,
414
- validatorAddress: validator.address,
413
+ delegatorAddress: chainAddress.value,
414
+ validatorAddress: validator.value,
415
415
  });
416
416
  const account = helper.owned();
417
417
 
@@ -435,7 +435,7 @@ export const prepareCosmosOrchestrationAccountKit = (
435
435
  const results = E(icqConnection).query([
436
436
  toRequestQueryJson(
437
437
  QueryBalanceRequest.toProtoMsg({
438
- address: chainAddress.address,
438
+ address: chainAddress.value,
439
439
  denom,
440
440
  }),
441
441
  ),
@@ -475,7 +475,7 @@ export const prepareCosmosOrchestrationAccountKit = (
475
475
  delegations.map(d =>
476
476
  Any.toJSON(
477
477
  MsgUndelegate.toProtoMsg({
478
- delegatorAddress: chainAddress.address,
478
+ delegatorAddress: chainAddress.value,
479
479
  validatorAddress: d.validatorAddress,
480
480
  amount: { denom: bondDenom, amount: d.shares },
481
481
  }),
@@ -27,9 +27,9 @@ export function prepareLocalChainFacade(zone: Zone, powers: LocalChainFacadePowe
27
27
  };
28
28
  makeAccountWatcher: {
29
29
  /**
30
- * @param {[LocalChainAccount, ChainAddress['address']]} results
30
+ * @param {[LocalChainAccount, ChainAddress['value']]} results
31
31
  */
32
- onFulfilled([account, address]: [LocalChainAccount, ChainAddress["address"]]): import("@endo/exo").Guarded<{
32
+ onFulfilled([account, address]: [LocalChainAccount, ChainAddress["value"]]): import("@endo/exo").Guarded<{
33
33
  getBalance(denom: import("../orchestration-api.js").DenomArg): Vow<import("../orchestration-api.js").DenomAmount>;
34
34
  getBalances(): Vow<never>;
35
35
  getPublicTopics(): {
@@ -1 +1 @@
1
- {"version":3,"file":"local-chain-facade.d.ts","sourceRoot":"","sources":["local-chain-facade.js"],"names":[],"mappings":"AA0GO,8CAHI,IAAI,UACJ,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;QAtCzB,oEAAoE;uBAAtD,IAAI,aAAa,qBAAqB,SAAS,CAAC,CAAC,CAAC;;;QAchE;;WAEG;wCADQ,CAAC,iBAAiB,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;cA4B9D;qCA1FY;IACZ,gCAAoC,EAAE,gCAAgC,CAAC;IACvE,aAAiB,EAAE,OAAO,oBAAoB,CAAC,CAAC;IAChD,WAAe,EAAE,OAAO,WAAW,CAAC,CAAC;IACrC,KAAS,EAAE,OAAO,YAAY,CAAC,CAAC;IAChC,UAAc,EAAE,OAAO,UAAU,CAAC,CAAC;IACnC,QAAY,EAAE,QAAQ,CAAC;CACpB;mCAsFU,UAAU,CAAC,OAAO,uBAAuB,CAAC;0BAxGjC,mBAAmB;uCAOwE,aAAa;yBAH/F,aAAa;+BAGqE,aAAa;0CAAb,aAAa;kCAAb,aAAa;uCAJ/E,gCAAgC;kCAIkC,aAAa;sDAD5E,kCAAkC;0CAD9C,eAAe;4BAH7B,kBAAkB;kCADZ,cAAc;gCAEG,gCAAgC;8BAChD,aAAa"}
1
+ {"version":3,"file":"local-chain-facade.d.ts","sourceRoot":"","sources":["local-chain-facade.js"],"names":[],"mappings":"AA0GO,8CAHI,IAAI,UACJ,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;QAtCzB,oEAAoE;uBAAtD,IAAI,aAAa,qBAAqB,SAAS,CAAC,CAAC,CAAC;;;QAchE;;WAEG;wCADQ,CAAC,iBAAiB,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;cA4B5D;qCA1FY;IACZ,gCAAoC,EAAE,gCAAgC,CAAC;IACvE,aAAiB,EAAE,OAAO,oBAAoB,CAAC,CAAC;IAChD,WAAe,EAAE,OAAO,WAAW,CAAC,CAAC;IACrC,KAAS,EAAE,OAAO,YAAY,CAAC,CAAC;IAChC,UAAc,EAAE,OAAO,UAAU,CAAC,CAAC;IACnC,QAAY,EAAE,QAAQ,CAAC;CACpB;mCAsFU,UAAU,CAAC,OAAO,uBAAuB,CAAC;0BAxGjC,mBAAmB;uCAOwE,aAAa;yBAH/F,aAAa;+BAGqE,aAAa;0CAAb,aAAa;kCAAb,aAAa;uCAJ/E,gCAAgC;kCAIkC,aAAa;sDAD5E,kCAAkC;0CAD9C,eAAe;4BAH7B,kBAAkB;kCADZ,cAAc;gCAEG,gCAAgC;8BAChD,aAAa"}
@@ -79,15 +79,15 @@ const prepareLocalChainFacadeKit = (
79
79
  },
80
80
  makeAccountWatcher: {
81
81
  /**
82
- * @param {[LocalChainAccount, ChainAddress['address']]} results
82
+ * @param {[LocalChainAccount, ChainAddress['value']]} results
83
83
  */
84
84
  onFulfilled([account, address]) {
85
85
  const { localChainInfo } = this.state;
86
86
  const { holder } = makeLocalOrchestrationAccountKit({
87
87
  account,
88
88
  address: harden({
89
- address,
90
- addressEncoding: 'bech32',
89
+ value: address,
90
+ encoding: 'bech32',
91
91
  chainId: localChainInfo.chainId,
92
92
  }),
93
93
  // FIXME storage path https://github.com/Agoric/agoric-sdk/issues/9066
@@ -233,8 +233,8 @@ export const prepareLocalOrchestrationAccountKit = (
233
233
  amount: String(amount.value),
234
234
  denom: amount.denom,
235
235
  },
236
- sender: this.state.address.address,
237
- receiver: destination.address,
236
+ sender: this.state.address.value,
237
+ receiver: destination.value,
238
238
  timeoutHeight: opts?.timeoutHeight ?? {
239
239
  revisionHeight: 0n,
240
240
  revisionNumber: 0n,
@@ -338,7 +338,7 @@ export const prepareLocalOrchestrationAccountKit = (
338
338
  typedJson('/cosmos.staking.v1beta1.MsgDelegate', {
339
339
  amount,
340
340
  validatorAddress,
341
- delegatorAddress: this.state.address.address,
341
+ delegatorAddress: this.state.address.value,
342
342
  }),
343
343
  ]),
344
344
  this.facets.extractFirstResultWatcher,
@@ -361,7 +361,7 @@ export const prepareLocalOrchestrationAccountKit = (
361
361
  typedJson('/cosmos.staking.v1beta1.MsgUndelegate', {
362
362
  amount,
363
363
  validatorAddress,
364
- delegatorAddress: this.state.address.address,
364
+ delegatorAddress: this.state.address.value,
365
365
  }),
366
366
  ]),
367
367
  this.facets.undelegateWatcher,
@@ -39,8 +39,9 @@ export type AmountArg = DenomAmount | Amount;
39
39
  export type ChainAddress = {
40
40
  /** e.g. 1 for Ethereum, agoric-3 for Agoric, cosmoshub-4 for Cosmos */
41
41
  chainId: string;
42
- address: string;
43
- addressEncoding: 'bech32' | 'ethereum';
42
+ /** The address value used on-chain */
43
+ value: string;
44
+ encoding: 'bech32' | 'ethereum';
44
45
  };
45
46
  export type OrchestrationAccount<CI extends ChainInfo> = OrchestrationAccountI & (CI extends CosmosChainInfo ? CosmosChainAccountMethods<CI> : never);
46
47
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"orchestration-api.d.ts","sourceRoot":"","sources":["orchestration-api.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"orchestration-api.d.ts","sourceRoot":"","sources":["orchestration-api.ts"],"names":[],"mappings":"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"}
@@ -58,9 +58,9 @@ export type AmountArg = DenomAmount | Amount;
58
58
  export type ChainAddress = {
59
59
  /** e.g. 1 for Ethereum, agoric-3 for Agoric, cosmoshub-4 for Cosmos */
60
60
  chainId: string;
61
- address: string;
62
- // TODO what's the right way to scope the address? it's not chainId
63
- addressEncoding: 'bech32' | 'ethereum';
61
+ /** The address value used on-chain */
62
+ value: string;
63
+ encoding: 'bech32' | 'ethereum';
64
64
  };
65
65
 
66
66
  export type OrchestrationAccount<CI extends ChainInfo> = OrchestrationAccountI &
@@ -8,24 +8,25 @@ export const OutboundConnectionHandlerI: import("@endo/patterns").InterfaceGuard
8
8
  onClose: import("@endo/patterns").MethodGuard;
9
9
  }>;
10
10
  export namespace ChainAddressShape {
11
- let address: import("@endo/patterns").Matcher;
12
11
  let chainId: import("@endo/patterns").Matcher;
13
- let addressEncoding: import("@endo/patterns").Matcher;
14
- }
15
- export namespace Proto3Shape {
16
- let typeUrl: import("@endo/patterns").Matcher;
12
+ let encoding: import("@endo/patterns").Matcher;
17
13
  let value: import("@endo/patterns").Matcher;
18
14
  }
19
- export namespace CoinShape {
15
+ export namespace Proto3Shape {
16
+ export let typeUrl: import("@endo/patterns").Matcher;
20
17
  let value_1: import("@endo/patterns").Matcher;
21
18
  export { value_1 as value };
19
+ }
20
+ export namespace CoinShape {
21
+ let value_2: import("@endo/patterns").Matcher;
22
+ export { value_2 as value };
22
23
  export let denom: import("@endo/patterns").Matcher;
23
24
  }
24
25
  export namespace ChainAmountShape {
25
26
  let denom_1: import("@endo/patterns").Matcher;
26
27
  export { denom_1 as denom };
27
- let value_2: import("@endo/patterns").Matcher;
28
- export { value_2 as value };
28
+ let value_3: import("@endo/patterns").Matcher;
29
+ export { value_3 as value };
29
30
  }
30
31
  export const AmountArgShape: import("@endo/patterns").Matcher;
31
32
  export namespace DelegationShape {
@@ -44,8 +45,8 @@ export const DenomShape: import("@endo/patterns").Matcher;
44
45
  export const BrandInfoShape: import("@endo/patterns").Matcher;
45
46
  export namespace DenomAmountShape {
46
47
  export { DenomShape as denom };
47
- let value_3: import("@endo/patterns").Matcher;
48
- export { value_3 as value };
48
+ let value_4: import("@endo/patterns").Matcher;
49
+ export { value_4 as value };
49
50
  }
50
51
  /** @see {Chain} */
51
52
  export const ChainFacadeI: import("@endo/patterns").InterfaceGuard<{
@@ -1 +1 @@
1
- {"version":3,"file":"typeGuards.d.ts","sourceRoot":"","sources":["typeGuards.js"],"names":[],"mappings":"AAIA;;;;GAIG;AACH;;;GAQE;;;;;;;;;;;;;;;;;;;;;AAiBF,8DAAkE;;;;;AAOlE,uEAUE;AAEF,iEAA4C;AAC5C,mEAQG;AACH,oEAA+C;AAC/C,sEAYG;AAEH,oEAUE;AAGF,8DAAsC;AACtC,sEAAuE;AACvE,0DAAqC;AAErC,8DAAsC;;;;;;AAItC,mBAAmB;AACnB;;;GAGG"}
1
+ {"version":3,"file":"typeGuards.d.ts","sourceRoot":"","sources":["typeGuards.js"],"names":[],"mappings":"AAIA;;;;GAIG;AACH;;;GAQE;;;;;;;;;;;;;;;;;;;;;;AAiBF,8DAAkE;;;;;AAOlE,uEAUE;AAEF,iEAA4C;AAC5C,mEAQG;AACH,oEAA+C;AAC/C,sEAYG;AAEH,oEAUE;AAGF,8DAAsC;AACtC,sEAAuE;AACvE,0DAAqC;AAErC,8DAAsC;;;;;;AAItC,mBAAmB;AACnB;;;GAGG"}
package/src/typeGuards.js CHANGED
@@ -18,9 +18,9 @@ export const OutboundConnectionHandlerI = M.interface(
18
18
  );
19
19
 
20
20
  export const ChainAddressShape = {
21
- address: M.string(),
22
21
  chainId: M.string(),
23
- addressEncoding: M.string(),
22
+ encoding: M.string(),
23
+ value: M.string(),
24
24
  };
25
25
 
26
26
  export const Proto3Shape = {
@@ -7,7 +7,7 @@ export function makeICAChannelAddress(hostConnectionId: IBCConnectionID, control
7
7
  export function makeICQChannelAddress(controllerConnectionId: IBCConnectionID, { version }?: {
8
8
  version?: string;
9
9
  } | undefined): RemoteIbcAddress;
10
- export function findAddressField(remoteAddressString: RemoteIbcAddress): ChainAddress["address"] | undefined;
10
+ export function findAddressField(remoteAddressString: RemoteIbcAddress): ChainAddress["value"] | undefined;
11
11
  import type { IBCConnectionID } from '@agoric/vats';
12
12
  import type { RemoteIbcAddress } from '@agoric/vats/tools/ibc-utils.js';
13
13
  import type { ChainAddress } from '../types.js';
@@ -1 +1 @@
1
- {"version":3,"file":"address.d.ts","sourceRoot":"","sources":["address.js"],"names":[],"mappings":"AAoBO,wDAXI,eAAe,0BACf,eAAe;;;;;gBAQb,gBAAgB,CAuB5B;AAQM,8DAJI,eAAe;cACH,MAAM;gBAChB,gBAAgB,CAQ5B;AAaM,sDAJI,gBAAgB,GAEd,YAAY,CAAC,SAAS,CAAC,GAAG,SAAS,CAW/C;qCA1EiC,cAAc;sCAEb,iCAAiC;kCADrC,aAAa"}
1
+ {"version":3,"file":"address.d.ts","sourceRoot":"","sources":["address.js"],"names":[],"mappings":"AAoBO,wDAXI,eAAe,0BACf,eAAe;;;;;gBAQb,gBAAgB,CAuB5B;AAQM,8DAJI,eAAe;cACH,MAAM;gBAChB,gBAAgB,CAQ5B;AAaM,sDAJI,gBAAgB,GAEd,YAAY,CAAC,OAAO,CAAC,GAAG,SAAS,CAW7C;qCA1EiC,cAAc;sCAEb,iCAAiC;kCADrC,aAAa"}
@@ -64,7 +64,7 @@ harden(makeICQChannelAddress);
64
64
  *
65
65
  * @param {RemoteIbcAddress} remoteAddressString - remote address string,
66
66
  * including version
67
- * @returns {ChainAddress['address'] | undefined} returns undefined on error
67
+ * @returns {ChainAddress['value'] | undefined} returns undefined on error
68
68
  */
69
69
  export const findAddressField = remoteAddressString => {
70
70
  try {
package/src/utils/orc.js CHANGED
@@ -12,8 +12,8 @@ export const orcUtils = {
12
12
  return {
13
13
  toAccount: {
14
14
  chainId: 'osmosis-test',
15
- address: 'osmo1234',
16
- addressEncoding: 'bech32',
15
+ value: 'osmo1234',
16
+ encoding: 'bech32',
17
17
  },
18
18
  };
19
19
  },
@@ -30,8 +30,8 @@ export const orcUtils = {
30
30
  return {
31
31
  toAccount: {
32
32
  chainId: 'osmosis-test',
33
- address: 'osmo1234',
34
- addressEncoding: 'bech32',
33
+ value: 'osmo1234',
34
+ encoding: 'bech32',
35
35
  },
36
36
  };
37
37
  },
@@ -1 +1 @@
1
- {"version":3,"file":"start-helper.d.ts","sourceRoot":"","sources":["start-helper.js"],"names":[],"mappings":"AAwCO,0CALI,GAAG,WACH,OAAO,gBACP,mBAAmB,cACnB,UAAU;;;;;;;;;;;;;;;;;wCAyCV,GAAG;;;;4PA6BO,GACjB,4CAA4E,GAAG;;;;;;EAFlF;kCArFY;IACZ,UAAc,EAAE,OAAO,UAAU,CAAC,CAAC;IACnC,oBAAwB,EAAE,OAAO,oBAAoB,CAAC,CAAC;IACvD,WAAe,EAAE,OAAO,WAAW,CAAC,CAAC;IACrC,YAAgB,EAAE,OAAO,YAAY,CAAC,CAAC;IACvC,WAAe,EAAE,OAAO,OAAO,CAAC,CAAC;CAC9B;6BAbsB,kBAAkB;gCAFf,gCAAgC;4BAIpC,aAAa;0CACC,eAAe;kCAJX,cAAc;6BAE/B,cAAc"}
1
+ {"version":3,"file":"start-helper.d.ts","sourceRoot":"","sources":["start-helper.js"],"names":[],"mappings":"AAwCO,0CALI,GAAG,WACH,OAAO,gBACP,mBAAmB,cACnB,UAAU;;;;;;;;;;;;;;;;;wCA4Cd,GAAG;;;;4PA4BiB,GAAa,4CAGP,GAAG;;;;;;EAFnC;kCAzFY;IACZ,UAAc,EAAE,OAAO,UAAU,CAAC,CAAC;IACnC,oBAAwB,EAAE,OAAO,oBAAoB,CAAC,CAAC;IACvD,WAAe,EAAE,OAAO,WAAW,CAAC,CAAC;IACrC,YAAgB,EAAE,OAAO,YAAY,CAAC,CAAC;IACvC,WAAe,EAAE,OAAO,OAAO,CAAC,CAAC;CAC9B;6BAbsB,kBAAkB;gCAFf,gCAAgC;4BAIpC,aAAa;0CACC,eAAe;kCAJX,cAAc;6BAE/B,cAAc"}
@@ -44,6 +44,10 @@ export const provideOrchestration = (
44
44
  remotePowers,
45
45
  marshaller,
46
46
  ) => {
47
+ zcf.setTestJig(() => ({
48
+ baggage,
49
+ }));
50
+
47
51
  const zone = makeDurableZone(baggage);
48
52
  const { agoricNames, timerService } = remotePowers;
49
53