@agoric/fast-usdc 0.1.1-dev-d1ef359.0 → 0.1.1-dev-a27f724.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/fast-usdc",
-  "version": "0.1.1-dev-d1ef359.0+d1ef359",
+  "version": "0.1.1-dev-a27f724.0+a27f724",
   "description": "CLI and library for Fast USDC product",
   "type": "module",
   "files": [
@@ -23,9 +23,9 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-d1ef359.0+d1ef359",
-    "@agoric/vats": "0.15.2-dev-d1ef359.0+d1ef359",
-    "@agoric/zone": "0.2.3-dev-d1ef359.0+d1ef359",
+    "@agoric/swingset-liveslots": "0.10.3-dev-a27f724.0+a27f724",
+    "@agoric/vats": "0.15.2-dev-a27f724.0+a27f724",
+    "@agoric/zone": "0.2.3-dev-a27f724.0+a27f724",
     "@fast-check/ava": "^2.0.1",
     "ava": "^5.3.0",
     "c8": "^10.1.2",
@@ -33,16 +33,16 @@
     "ts-blank-space": "^0.4.4"
   },
   "dependencies": {
-    "@agoric/client-utils": "0.1.1-dev-d1ef359.0+d1ef359",
-    "@agoric/cosmic-proto": "0.4.1-dev-d1ef359.0+d1ef359",
-    "@agoric/ertp": "0.16.3-dev-d1ef359.0+d1ef359",
-    "@agoric/internal": "0.3.3-dev-d1ef359.0+d1ef359",
-    "@agoric/notifier": "0.6.3-dev-d1ef359.0+d1ef359",
-    "@agoric/orchestration": "0.1.1-dev-d1ef359.0+d1ef359",
-    "@agoric/store": "0.9.3-dev-d1ef359.0+d1ef359",
-    "@agoric/vat-data": "0.5.3-dev-d1ef359.0+d1ef359",
-    "@agoric/vow": "0.1.1-dev-d1ef359.0+d1ef359",
-    "@agoric/zoe": "0.26.3-dev-d1ef359.0+d1ef359",
+    "@agoric/client-utils": "0.1.1-dev-a27f724.0+a27f724",
+    "@agoric/cosmic-proto": "0.4.1-dev-a27f724.0+a27f724",
+    "@agoric/ertp": "0.16.3-dev-a27f724.0+a27f724",
+    "@agoric/internal": "0.3.3-dev-a27f724.0+a27f724",
+    "@agoric/notifier": "0.6.3-dev-a27f724.0+a27f724",
+    "@agoric/orchestration": "0.1.1-dev-a27f724.0+a27f724",
+    "@agoric/store": "0.9.3-dev-a27f724.0+a27f724",
+    "@agoric/vat-data": "0.5.3-dev-a27f724.0+a27f724",
+    "@agoric/vow": "0.1.1-dev-a27f724.0+a27f724",
+    "@agoric/zoe": "0.26.3-dev-a27f724.0+a27f724",
     "@cosmjs/proto-signing": "^0.32.4",
     "@cosmjs/stargate": "^0.32.4",
     "@endo/base64": "^1.0.9",
@@ -82,5 +82,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d1ef35965047ef31f0fa5451d4cfb8bd06c59247"
+  "gitHead": "a27f724ae4134ac3b4c094d604afbab58f447b2d"
 }

package/src/fast-usdc.contract.js

@@ -31,14 +31,13 @@ const ADDRESSES_BAGGAGE_KEY = 'addresses';
 
 /**
  * @import {HostInterface} from '@agoric/async-flow';
- * @import {CosmosChainAddress, CosmosChainInfo, Denom, DenomDetail, OrchestrationAccount} from '@agoric/orchestration';
+ * @import {CosmosChainInfo, Denom, DenomDetail, OrchestrationAccount, IBCConnectionInfo} from '@agoric/orchestration';
  * @import {OrchestrationPowers, OrchestrationTools} from '@agoric/orchestration/src/utils/start-helper.js';
  * @import {Remote} from '@agoric/internal';
  * @import {Marshaller, StorageNode} from '@agoric/internal/src/lib-chainStorage.js'
  * @import {Zone} from '@agoric/zone';
  * @import {OperatorOfferResult} from './exos/transaction-feed.js';
- * @import {OperatorKit} from './exos/operator-kit.js';
- * @import {CctpTxEvidence, ContractRecord, FeeConfig} from './types.js';
+ * @import {ContractRecord, FeeConfig} from './types.js';
  */
 
 /**
@@ -167,7 +166,17 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
     async makeWithdrawFeesInvitation() {
       return poolKit.feeRecipient.makeWithdrawFeesInvitation();
     },
-    async connectToNoble() {
+    /**
+     * @param {string} agoricChainId
+     * @param {string} nobleChainId
+     * @param {IBCConnectionInfo} agoricToNoble
+     */
+    async connectToNoble(agoricChainId, nobleChainId, agoricToNoble) {
+      trace('connectToNoble', agoricChainId, nobleChainId, agoricToNoble);
+      chainHub.updateConnection(agoricChainId, nobleChainId, agoricToNoble);
+      // v1 has `NobleAccount` which we don't expect to ever settle.
+      const nobleAccountV = zone.makeOnce('NobleICA', () => makeNobleAccount());
+
       return vowTools.when(nobleAccountV, nobleAccount => {
         trace('nobleAccount', nobleAccount);
         return vowTools.when(
@@ -212,8 +221,10 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
     getStaticInfo() {
       baggage.has(ADDRESSES_BAGGAGE_KEY) ||
         Fail`no addresses. creator must 'publishAddresses' first`;
+      /** @type {ContractRecord} */
+      const addresses = baggage.get(ADDRESSES_BAGGAGE_KEY);
       return harden({
-        [ADDRESSES_BAGGAGE_KEY]: baggage.get(ADDRESSES_BAGGAGE_KEY),
+        [ADDRESSES_BAGGAGE_KEY]: addresses,
       });
     },
   });
@@ -258,8 +269,6 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
     );
   }
 
-  const nobleAccountV = zone.makeOnce('NobleAccount', () => makeNobleAccount());
-
   const feedKit = zone.makeOnce('Feed Kit', () => makeFeedKit());
 
   const poolAccountV = zone.makeOnce('PoolAccount', () => makeLocalAccount());
@@ -279,12 +288,14 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
   const [_agoric, _noble, agToNoble] = await vowTools.when(
     chainHub.getChainsAndConnection('agoric', 'noble'),
   );
-  const settlerKit = makeSettler({
-    repayer: poolKit.repayer,
-    sourceChannel: agToNoble.transferChannel.counterPartyChannelId,
-    remoteDenom: 'uusdc',
-    settlementAccount,
-  });
+  const settlerKit = zone.makeOnce('settlerKit', () =>
+    makeSettler({
+      repayer: poolKit.repayer,
+      sourceChannel: agToNoble.transferChannel.counterPartyChannelId,
+      remoteDenom: 'uusdc',
+      settlementAccount,
+    }),
+  );
 
   const advancer = zone.makeOnce('Advancer', () =>
     makeAdvancer({

package/src/start-fast-usdc.core.js

@@ -181,7 +181,13 @@ export const startFastUSDC = async (
   const addresses = await E(kit.creatorFacet).publishAddresses();
   trace('contract orch account addresses', addresses);
   if (!net.noNoble) {
-    const addr = await E(kit.creatorFacet).connectToNoble();
+    const { agoric, noble } = privateArgs.chainInfo;
+    const agoricToNoble = agoric.connections[noble.chainId];
+    const addr = await E(kit.creatorFacet).connectToNoble(
+      agoric.chainId,
+      noble.chainId,
+      agoricToNoble,
+    );
     trace('noble intermediate recipient', addr);
   }
   trace('startFastUSDC done', instance);

package/src/update-noble-ica.core.js

@@ -0,0 +1,108 @@
+/** @file core-eval to 1) update ChainInfo 2) re-request the Noble ICA `intermediateRecipient` */
+
+import { E } from '@endo/far';
+import { makeTracer } from '@agoric/internal';
+
+const trace = makeTracer('FUSD-2', true);
+
+/**
+ * @import {CopyRecord} from '@endo/pass-style'
+ * @import {IBCConnectionInfo} from '@agoric/orchestration'
+ * @import {ManifestBundleRef} from '@agoric/deploy-script-support/src/externalTypes.js'
+ * @import {BootstrapManifest} from '@agoric/vats/src/core/lib-boot.js'
+ * @import {FastUSDCCorePowers} from './start-fast-usdc.core.js'
+ * @import {ContractRecord} from './types.js'
+ */
+
+/**
+ * @typedef {object} UpdateOpts
+ * @property {IBCConnectionInfo} [agoricToNoble]
+ * @property {{bundleID: BundleID}} [fastUsdcCode]
+ */
+
+const config = /** @type {const} */ ({
+  MAINNET: {
+    agoricToNoble: {
+      id: 'connection-72',
+      client_id: '07-tendermint-77',
+      counterparty: {
+        client_id: '07-tendermint-32',
+        connection_id: 'connection-38', // was: connection-40
+      },
+      state: 3,
+      transferChannel: {
+        channelId: 'channel-62',
+        portId: 'transfer',
+        counterPartyChannelId: 'channel-21',
+        counterPartyPortId: 'transfer',
+        ordering: 0,
+        state: 3,
+        version: 'ics20-1',
+      },
+    },
+  },
+});
+harden(config);
+
+/**
+ * @param {BootstrapPowers & FastUSDCCorePowers} powers
+ * @param {object} [config]
+ * @param {UpdateOpts} [config.options]
+ */
+export const updateNobleICA = async (
+  { consume: { chainStorage, fastUsdcKit } },
+  { options = {} } = {},
+) => {
+  trace('options', options);
+  const {
+    agoricToNoble = config.MAINNET.agoricToNoble,
+    fastUsdcCode = assert.fail('missing bundleID'),
+  } = options;
+  const { adminFacet, creatorFacet, privateArgs, publicFacet } =
+    await fastUsdcKit;
+  trace('got privateArgs', Object.keys(privateArgs));
+
+  const upgraded = await E(adminFacet).upgradeContract(
+    fastUsdcCode.bundleID,
+    privateArgs,
+  );
+  trace(upgraded);
+
+  const { agoric, noble } = privateArgs.chainInfo;
+  const nobleICAaddr = await E(creatorFacet).connectToNoble(
+    agoric.chainId,
+    noble.chainId,
+    agoricToNoble,
+  );
+  trace('noble ICA', nobleICAaddr);
+
+  // publish ICA addr with the other addresses
+  const contractName = 'fastUsdc';
+  const contractNode = E(chainStorage)?.makeChildNode(contractName);
+  const { addresses } = await E(publicFacet).getStaticInfo();
+  /** @type {ContractRecord} */
+  const addrs = { ...addresses, nobleICA: nobleICAaddr.value };
+  void E(contractNode)?.setValue(JSON.stringify(addrs));
+};
+
+/**
+ * @param {unknown} _utils
+ * @param {{
+ *   installKeys: { fastUsdc: ERef<ManifestBundleRef> };
+ *   options: Omit<UpdateOpts, 'fastUsdcCode'> & CopyRecord;
+ * }} opts
+ */
+export const getManifestForUpdateNobleICA = (
+  _utils,
+  { installKeys, options },
+) => {
+  return {
+    /** @type {BootstrapManifest} */
+    manifest: {
+      [updateNobleICA.name]: {
+        consume: { chainStorage: true, fastUsdcKit: true },
+      },
+    },
+    options: { ...options, fastUsdcCode: installKeys.fastUsdc },
+  };
+};