@agoric/orchestration 0.1.1-dev-90906b1.0 → 0.1.1-dev-4202f3e.0

package/src/proposals/start-stakeBld.js

@@ -9,7 +9,13 @@ const trace = makeTracer('StartStakeBld', true);
  * @param {BootstrapPowers & {installation: {consume: {stakeBld: Installation<import('../../src/examples/stakeBld.contract.js').start>}}}} powers
  */
 export const startStakeBld = async ({
-  consume: { board, chainStorage, localchain, startUpgradable },
+  consume: {
+    board,
+    chainStorage,
+    chainTimerService: chainTimerServiceP,
+    localchain,
+    startUpgradable,
+  },
   installation: {
     consume: { stakeBld },
   },
@@ -28,15 +34,21 @@ export const startStakeBld = async ({
   // NB: committee must only publish what it intended to be public
   const marshaller = await E(board).getPublishingMarshaller();
 
-  // FIXME this isn't detecting missing privateArgs
+  const [timerService, timerBrand] = await Promise.all([
+    chainTimerServiceP,
+    chainTimerServiceP.then(ts => E(ts).getTimerBrand()),
+  ]);
+
   /** @type {StartUpgradableOpts<import('../../src/examples/stakeBld.contract.js').start>} */
   const startOpts = {
     label: 'stakeBld',
     installation: stakeBld,
-    issuerKeywordRecord: harden({ BLD: await stakeIssuer }),
+    issuerKeywordRecord: harden({ In: await stakeIssuer }),
     terms: {},
     privateArgs: {
       localchain: await localchain,
+      timerService,
+      timerBrand,
       storageNode,
       marshaller,
     },
@@ -54,6 +66,7 @@ export const getManifestForStakeBld = ({ restoreRef }, { installKeys }) => {
         consume: {
           board: true,
           chainStorage: true,
+          chainTimerService: true,
           localchain: true,
           startUpgradable: true,
         },

package/src/typeGuards.d.ts

@@ -25,4 +25,5 @@ export namespace ChainAmountShape {
 }
 export const AmountArgShape: import("@endo/patterns").Matcher;
 export const DelegationShape: import("@endo/patterns").Matcher;
+export const IBCTransferOptionsShape: import("@endo/patterns").Matcher;
 //# sourceMappingURL=typeGuards.d.ts.map

package/src/typeGuards.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typeGuards.d.ts","sourceRoot":"","sources":["typeGuards.js"],"names":[],"mappings":"AAIA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;AAiBH,8DAAkE;AAElE,+DAA0C"}
+{"version":3,"file":"typeGuards.d.ts","sourceRoot":"","sources":["typeGuards.js"],"names":[],"mappings":"AAGA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;AAiBH,8DAAkE;AAElE,+DAA0C;AAE1C,uEAUE"}

package/src/typeGuards.js

@@ -1,4 +1,3 @@
-// @ts-check
 import { AmountShape } from '@agoric/ertp';
 import { M } from '@endo/patterns';
 
@@ -26,3 +25,15 @@ export const ChainAmountShape = harden({ denom: M.string(), value: M.nat() });
 export const AmountArgShape = M.or(AmountShape, ChainAmountShape);
 
 export const DelegationShape = M.record(); // TODO: DelegationShape fields
+
+export const IBCTransferOptionsShape = M.splitRecord(
+  {},
+  {
+    timeoutTimestamp: M.bigint(),
+    timeoutHeight: {
+      revisionHeight: M.bigint(),
+      revisionNumber: M.bigint(),
+    },
+    memo: M.string(),
+  },
+);

package/src/utils/mockChainInfo.d.ts

@@ -0,0 +1,4 @@
+export function prepareMockChainInfo(zone: Zone): Pick<CosmosChainInfo, "connections" | "chainId">;
+import type { Zone } from '@agoric/zone';
+import type { CosmosChainInfo } from '../cosmos-api.js';
+//# sourceMappingURL=mockChainInfo.d.ts.map

package/src/utils/mockChainInfo.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mockChainInfo.d.ts","sourceRoot":"","sources":["mockChainInfo.js"],"names":[],"mappings":"AAyEO,mGAYN;0BA3EsB,cAAc;qCACgB,kBAAkB"}

package/src/utils/mockChainInfo.js

@@ -0,0 +1,86 @@
+/**
+ * @file Mocked Chain Info object until #8879
+ */
+import {
+  Order,
+  State as IBCChannelState,
+} from '@agoric/cosmic-proto/ibc/core/channel/v1/channel.js';
+import { State as IBCConnectionState } from '@agoric/cosmic-proto/ibc/core/connection/v1/connection.js';
+
+/**
+ * @import {Zone} from '@agoric/zone';
+ * @import {CosmosChainInfo, IBCConnectionInfo} from '../cosmos-api.js';
+ */
+
+/**
+ * currently keyed by ChainId, as this is what we have
+ * available in ChainAddress to determine the correct IBCChannelID's
+ * for a .transfer() msg.
+ * @type {Record<string, IBCConnectionInfo>}
+ */
+const connectionEntries = harden({
+  cosmoslocal: {
+    id: 'connection-1',
+    client_id: '07-tendermint-3',
+    counterparty: {
+      client_id: '07-tendermint-2',
+      connection_id: 'connection-1',
+      prefix: {
+        key_prefix: '',
+      },
+    },
+    state: IBCConnectionState.STATE_OPEN,
+    transferChannel: {
+      portId: 'transfer',
+      channelId: 'channel-1',
+      counterPartyChannelId: 'channel-1',
+      counterPartyPortId: 'transfer',
+      ordering: Order.ORDER_UNORDERED,
+      state: IBCChannelState.STATE_OPEN,
+      version: 'ics20-1',
+    },
+    versions: [{ identifier: '', features: ['', ''] }],
+    delay_period: 0n,
+  },
+  osmosislocal: {
+    id: 'connection-0',
+    client_id: '07-tendermint-2',
+    counterparty: {
+      client_id: '07-tendermint-2',
+      connection_id: 'connection-1',
+      prefix: {
+        key_prefix: '',
+      },
+    },
+    state: IBCConnectionState.STATE_OPEN,
+    transferChannel: {
+      portId: 'transfer',
+      channelId: 'channel-0',
+      counterPartyChannelId: 'channel-1',
+      counterPartyPortId: 'transfer',
+      ordering: Order.ORDER_UNORDERED,
+      state: IBCChannelState.STATE_OPEN,
+      version: 'ics20-1',
+    },
+    versions: [{ identifier: '', features: ['', ''] }],
+    delay_period: 0n,
+  },
+});
+
+/**
+ * @param {Zone} zone
+ * @returns {Pick<CosmosChainInfo, 'connections' | 'chainId'>}
+ */
+export const prepareMockChainInfo = zone => {
+  const agoricConnections =
+    /** @type {import('@agoric/store').MapStore<string, IBCConnectionInfo>} */ (
+      zone.mapStore('ibcConnections')
+    );
+
+  agoricConnections.addAll(Object.entries(connectionEntries));
+
+  return harden({
+    chainId: 'agoriclocal',
+    connections: agoricConnections,
+  });
+};

package/src/utils/time.d.ts

@@ -0,0 +1,25 @@
+/**
+ * @param {TimerService} timer
+ * @param {TimerBrand} timerBrand
+ */
+export function makeTimestampHelper(timer: TimerService, timerBrand: TimerBrand): {
+    /**
+     * Takes the current time from ChainTimerService and adds a relative
+     * time to determine a timeout timestamp in nanoseconds.
+     * Useful for {@link MsgTransfer.timeoutTimestamp}.
+     * @param {RelativeTimeRecord} [relativeTime] defaults to 5 minutes
+     * @returns {Promise<bigint>} Timeout timestamp in absolute nanoseconds since unix epoch
+     */
+    getTimeoutTimestampNS(relativeTime?: RelativeTimeRecord | undefined): Promise<bigint>;
+};
+/**
+ * @import {RelativeTimeRecord, TimerBrand, TimerService} from '@agoric/time';
+ * @import {MsgTransfer} from '@agoric/cosmic-proto/ibc/applications/transfer/v1/tx.js';
+ */
+export const SECONDS_PER_MINUTE: 60n;
+export const NANOSECONDS_PER_SECOND: 1000000000n;
+export type TimestampHelper = Awaited<ReturnType<typeof makeTimestampHelper>>;
+import type { TimerService } from '@agoric/time';
+import type { TimerBrand } from '@agoric/time';
+import type { RelativeTimeRecord } from '@agoric/time';
+//# sourceMappingURL=time.d.ts.map

package/src/utils/time.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"time.d.ts","sourceRoot":"","sources":["time.js"],"names":[],"mappings":"AAWA;;;GAGG;AACH;IAEI;;;;;;OAMG;0EADU,OAAO,CAAC,MAAM,CAAC;EAa/B;AAhCD;;;GAGG;AAEH,qCAAsC;AACtC,iDAAqD;8BA4BvC,OAAO,CAAC,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;kCAjCE,cAAc;gCAAd,cAAc;wCAAd,cAAc"}

package/src/utils/time.js

@@ -0,0 +1,38 @@
+import { E } from '@endo/far';
+import { TimeMath } from '@agoric/time';
+
+/**
+ * @import {RelativeTimeRecord, TimerBrand, TimerService} from '@agoric/time';
+ * @import {MsgTransfer} from '@agoric/cosmic-proto/ibc/applications/transfer/v1/tx.js';
+ */
+
+export const SECONDS_PER_MINUTE = 60n;
+export const NANOSECONDS_PER_SECOND = 1_000_000_000n;
+
+/**
+ * @param {TimerService} timer
+ * @param {TimerBrand} timerBrand
+ */
+export function makeTimestampHelper(timer, timerBrand) {
+  return harden({
+    /**
+     * Takes the current time from ChainTimerService and adds a relative
+     * time to determine a timeout timestamp in nanoseconds.
+     * Useful for {@link MsgTransfer.timeoutTimestamp}.
+     * @param {RelativeTimeRecord} [relativeTime] defaults to 5 minutes
+     * @returns {Promise<bigint>} Timeout timestamp in absolute nanoseconds since unix epoch
+     */
+    async getTimeoutTimestampNS(relativeTime) {
+      const currentTime = await E(timer).getCurrentTimestamp();
+      const timeout =
+        relativeTime ||
+        TimeMath.coerceRelativeTimeRecord(SECONDS_PER_MINUTE * 5n, timerBrand);
+      return (
+        TimeMath.addAbsRel(currentTime, timeout).absValue *
+        NANOSECONDS_PER_SECOND
+      );
+    },
+  });
+}
+
+/** @typedef {Awaited<ReturnType<typeof makeTimestampHelper>>} TimestampHelper */

package/src/exos/localchainAccountKit.d.ts

@@ -1,62 +0,0 @@
-export function prepareLocalchainAccountKit(baggage: import("@agoric/swingset-liveslots").Baggage, makeRecorderKit: import("@agoric/zoe/src/contractSupport/recorder.js").MakeRecorderKit, zcf: ZCF): (account: import("@endo/exo").Guarded<{
-    getAddress(): Promise<string>;
-    deposit(payment: Payment<"nat">, optAmountShape?: Pattern): Promise<globalThis.Amount>;
-    withdraw(amount: Amount<// must be the fully synchronous maker because the kit is held in durable state
-    "nat">): Promise<globalThis.Payment>;
-    executeTx<MT extends {
-        '@type': string;
-    }[]>(messages: MT): Promise<{ [K in keyof MT]: import("@agoric/cosmic-proto/vatsafe").ResponseTo<MT[K]>; }>;
-}>, storageNode: globalThis.StorageNode) => import("@endo/exo").GuardedKit<{
-    helper: {
-        /** @throws if this holder no longer owns the account */
-        owned(): import("@endo/exo").Guarded<{
-            getAddress(): Promise<string>;
-            deposit(payment: Payment<"nat">, optAmountShape?: Pattern): Promise<globalThis.Amount>;
-            withdraw(amount: Amount<// must be the fully synchronous maker because the kit is held in durable state
-            "nat">): Promise<globalThis.Payment>;
-            executeTx<MT extends {
-                '@type': string;
-            }[]>(messages: MT): Promise<{ [K in keyof MT]: import("@agoric/cosmic-proto/vatsafe").ResponseTo<MT[K]>; }>;
-        }>;
-        getUpdater(): import("@agoric/zoe/src/contractSupport/recorder.js").Recorder<LocalChainAccountNotification>;
-    };
-    invitationMakers: {
-        Delegate(validatorAddress: any, amount: any): Promise<Invitation<(import("@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js").MsgDelegateResponse & {
-            '@type': "/cosmos.staking.v1beta1.MsgDelegateResponse";
-        })[], undefined>>;
-        CloseAccount(): never;
-        TransferAccount(): never;
-    };
-    holder: {
-        getPublicTopics(): {
-            account: {
-                description: string;
-                subscriber: globalThis.Subscriber<LocalChainAccountNotification>;
-                storagePath: Promise<string>;
-            };
-        };
-        /**
-         *
-         * @param {string} validatorAddress
-         * @param {Amount<'nat'>} ertpAmount
-         */
-        makeDelegateInvitation(validatorAddress: string, ertpAmount: Amount<"nat">): Promise<Invitation<(import("@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js").MsgDelegateResponse & {
-            '@type': "/cosmos.staking.v1beta1.MsgDelegateResponse";
-        })[], undefined>>;
-        makeCloseAccountInvitation(): never;
-        /**
-         * Starting a transfer revokes the account holder. The associated updater
-         * will get a special notification that the account is being transferred.
-         */
-        makeTransferAccountInvitation(): never;
-    };
-}>;
-export type LocalChainAccountNotification = {
-    address: string;
-};
-export type State = {
-    topicKit: import("@agoric/zoe/src/contractSupport/recorder.js").RecorderKit<LocalChainAccountNotification>;
-    account: import("@agoric/vats/src/localchain.js").LocalChainAccount | null;
-};
-export type LocalchainAccountKit = ReturnType<ReturnType<typeof prepareLocalchainAccountKit>>;
-//# sourceMappingURL=localchainAccountKit.d.ts.map

package/src/exos/localchainAccountKit.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"localchainAccountKit.d.ts","sourceRoot":"","sources":["localchainAccountKit.js"],"names":[],"mappings":"AAyCO,qDAJI,OAAO,4BAA4B,EAAE,OAAO,mBAC5C,OAAO,6CAA6C,EAAE,eAAe,OACrE,GAAG;;qBAKL,QAAQ,KACjB,CAAC,mBACqB,OAAO;qBAcF,OACrB,+EAA+E;IAE/E,KAFC,CAAC;;;mBAgBM,EAAE;;;QARR,wDAAwD;;;6BAzBvD,QAAQ,KACjB,CAAC,mBACqB,OAAO;6BAcF,OACrB,+EAA+E;YAE/E,KAFC,CAAC;;;2BAgBM,EAAE;;;;;;;;;;;;;;;;;;;QA6BR;;;;WAIG;iDAFQ,MAAM,cACN,MAAM,CAAC,KAAK,CAAC;;;;QAiCxB;;;WAGG;;;GAQV;;aA3Ia,MAAM;;oBAIP;IACZ,QAAY,EAAE,OAAO,6CAA6C,EAAE,WAAW,CAAC,6BAA6B,CAAC,CAAC;IAC/G,OAAW,EAAE,OAAO,gCAAgC,EAAE,iBAAiB,GAAG,IAAI,CAAC;CAC5E;mCAqIU,UAAU,CAAC,UAAU,CAAC,OAAO,2BAA2B,CAAC,CAAC"}

package/src/exos/localchainAccountKit.js

@@ -1,155 +0,0 @@
-/** @file Use-object for the owner of a localchain account */
-import { typedJson } from '@agoric/cosmic-proto/vatsafe';
-import { AmountShape } from '@agoric/ertp';
-import { makeTracer } from '@agoric/internal';
-import { UnguardedHelperI } from '@agoric/internal/src/typeGuards.js';
-import { M, prepareExoClassKit } from '@agoric/vat-data';
-import { TopicsRecordShape } from '@agoric/zoe/src/contractSupport/index.js';
-import { E } from '@endo/far';
-
-const trace = makeTracer('LCAH');
-
-const { Fail } = assert;
-/**
- * @typedef {object} LocalChainAccountNotification
- * @property {string} address
- */
-
-/**
- * @typedef {{
- *   topicKit: import('@agoric/zoe/src/contractSupport/recorder.js').RecorderKit<LocalChainAccountNotification>;
- *   account: import('@agoric/vats/src/localchain.js').LocalChainAccount | null;
- * }} State
- */
-
-const HolderI = M.interface('holder', {
-  getPublicTopics: M.call().returns(TopicsRecordShape),
-  makeDelegateInvitation: M.call(M.string(), AmountShape).returns(M.promise()),
-  makeCloseAccountInvitation: M.call().returns(M.promise()),
-  makeTransferAccountInvitation: M.call().returns(M.promise()),
-});
-
-/** @type {{ [name: string]: [description: string, valueShape: Pattern] }} */
-const PUBLIC_TOPICS = {
-  account: ['Account holder status', M.any()],
-};
-
-/**
- * @param {import('@agoric/swingset-liveslots').Baggage} baggage
- * @param {import('@agoric/zoe/src/contractSupport/recorder.js').MakeRecorderKit} makeRecorderKit
- * @param {ZCF} zcf
- */
-export const prepareLocalchainAccountKit = (baggage, makeRecorderKit, zcf) => {
-  const makeAccountHolderKit = prepareExoClassKit(
-    baggage,
-    'Account Holder',
-    {
-      helper: UnguardedHelperI,
-      holder: HolderI,
-      invitationMakers: M.interface('invitationMakers', {
-        Delegate: HolderI.payload.methodGuards.makeDelegateInvitation,
-        CloseAccount: HolderI.payload.methodGuards.makeCloseAccountInvitation,
-        TransferAccount:
-          HolderI.payload.methodGuards.makeTransferAccountInvitation,
-      }),
-    },
-    /**
-     * @param {import('@agoric/vats/src/localchain.js').LocalChainAccount} account
-     * @param {StorageNode} storageNode
-     * @returns {State}
-     */
-    (account, storageNode) => {
-      // must be the fully synchronous maker because the kit is held in durable state
-      // @ts-expect-error XXX Patterns
-      const topicKit = makeRecorderKit(storageNode, PUBLIC_TOPICS.account[1]);
-
-      return { account, topicKit };
-    },
-    {
-      helper: {
-        /** @throws if this holder no longer owns the account */
-        owned() {
-          const { account } = this.state;
-          if (!account) {
-            throw Fail`Using account holder after transfer`;
-          }
-          return account;
-        },
-        getUpdater() {
-          return this.state.topicKit.recorder;
-        },
-      },
-      invitationMakers: {
-        Delegate(validatorAddress, amount) {
-          return this.facets.holder.makeDelegateInvitation(
-            validatorAddress,
-            amount,
-          );
-        },
-        CloseAccount() {
-          return this.facets.holder.makeCloseAccountInvitation();
-        },
-        TransferAccount() {
-          return this.facets.holder.makeTransferAccountInvitation();
-        },
-      },
-      holder: {
-        getPublicTopics() {
-          const { topicKit } = this.state;
-          return harden({
-            account: {
-              description: PUBLIC_TOPICS.account[0],
-              subscriber: topicKit.subscriber,
-              storagePath: topicKit.recorder.getStoragePath(),
-            },
-          });
-        },
-        /**
-         *
-         * @param {string} validatorAddress
-         * @param {Amount<'nat'>} ertpAmount
-         */
-        async makeDelegateInvitation(validatorAddress, ertpAmount) {
-          trace('makeDelegateInvitation', validatorAddress, ertpAmount);
-
-          // FIXME get values from proposal or args
-          // FIXME brand handling and amount scaling
-          const amount = {
-            amount: String(ertpAmount.value),
-            denom: 'ubld',
-          };
-
-          return zcf.makeInvitation(async seat => {
-            // TODO should it allow delegating more BLD?
-            seat.exit();
-            const lca = this.facets.helper.owned();
-            trace('lca', lca);
-            const delegatorAddress = await E(lca).getAddress();
-            trace('delegatorAddress', delegatorAddress);
-            const result = await E(lca).executeTx([
-              typedJson('/cosmos.staking.v1beta1.MsgDelegate', {
-                amount,
-                validatorAddress,
-                delegatorAddress,
-              }),
-            ]);
-            trace('got result', result);
-            return result;
-          }, 'Delegate');
-        },
-        makeCloseAccountInvitation() {
-          throw Error('not yet implemented');
-        },
-        /**
-         * Starting a transfer revokes the account holder. The associated updater
-         * will get a special notification that the account is being transferred.
-         */
-        makeTransferAccountInvitation() {
-          throw Error('not yet implemented');
-        },
-      },
-    },
-  );
-  return makeAccountHolderKit;
-};
-/** @typedef {ReturnType<ReturnType<typeof prepareLocalchainAccountKit>>} LocalchainAccountKit */