@agoric/fast-usdc 0.1.1-dev-545fc58.0 → 0.1.1-dev-36f6b6e.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/fast-usdc",
-  "version": "0.1.1-dev-545fc58.0+545fc58",
+  "version": "0.1.1-dev-36f6b6e.0+36f6b6e",
   "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-545fc58.0+545fc58",
-    "@agoric/vats": "0.15.2-dev-545fc58.0+545fc58",
-    "@agoric/zone": "0.2.3-dev-545fc58.0+545fc58",
+    "@agoric/swingset-liveslots": "0.10.3-dev-36f6b6e.0+36f6b6e",
+    "@agoric/vats": "0.15.2-dev-36f6b6e.0+36f6b6e",
+    "@agoric/zone": "0.2.3-dev-36f6b6e.0+36f6b6e",
     "@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-545fc58.0+545fc58",
-    "@agoric/cosmic-proto": "0.4.1-dev-545fc58.0+545fc58",
-    "@agoric/ertp": "0.16.3-dev-545fc58.0+545fc58",
-    "@agoric/internal": "0.3.3-dev-545fc58.0+545fc58",
-    "@agoric/notifier": "0.6.3-dev-545fc58.0+545fc58",
-    "@agoric/orchestration": "0.1.1-dev-545fc58.0+545fc58",
-    "@agoric/store": "0.9.3-dev-545fc58.0+545fc58",
-    "@agoric/vat-data": "0.5.3-dev-545fc58.0+545fc58",
-    "@agoric/vow": "0.1.1-dev-545fc58.0+545fc58",
-    "@agoric/zoe": "0.26.3-dev-545fc58.0+545fc58",
+    "@agoric/client-utils": "0.1.1-dev-36f6b6e.0+36f6b6e",
+    "@agoric/cosmic-proto": "0.4.1-dev-36f6b6e.0+36f6b6e",
+    "@agoric/ertp": "0.16.3-dev-36f6b6e.0+36f6b6e",
+    "@agoric/internal": "0.3.3-dev-36f6b6e.0+36f6b6e",
+    "@agoric/notifier": "0.6.3-dev-36f6b6e.0+36f6b6e",
+    "@agoric/orchestration": "0.1.1-dev-36f6b6e.0+36f6b6e",
+    "@agoric/store": "0.9.3-dev-36f6b6e.0+36f6b6e",
+    "@agoric/vat-data": "0.5.3-dev-36f6b6e.0+36f6b6e",
+    "@agoric/vow": "0.1.1-dev-36f6b6e.0+36f6b6e",
+    "@agoric/zoe": "0.26.3-dev-36f6b6e.0+36f6b6e",
     "@cosmjs/proto-signing": "^0.32.4",
     "@cosmjs/stargate": "^0.32.4",
     "@endo/base64": "^1.0.9",
@@ -82,5 +82,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "545fc5891467147be545b6d3fa765b2e60dde261"
+  "gitHead": "36f6b6ee97589b9e0cc9d784b2386951666d4698"
 }

package/src/fast-usdc.contract.js

@@ -175,7 +175,12 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
       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());
+      // Including the connection_id in the zone key lets us use
+      // this before and after null-upgrade in multichain-testing.
+      const nobleAccountV = zone.makeOnce(
+        `NobleICA-${agoricToNoble.counterparty.connection_id}`,
+        () => makeNobleAccount(),
+      );
 
       return vowTools.when(nobleAccountV, nobleAccount => {
         trace('nobleAccount', nobleAccount);

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

@@ -7,14 +7,39 @@ import { feedPolicies } from './utils/chain-policies.js';
 
 const trace = makeTracer('FUSD-2', true);
 
+// avoid importing all of @agoric/ertp
+/** @type {typeof import('@agoric/ertp').AmountMath.make} */
+// @ts-expect-error AssetKind conditionals aren't captured
+const make = (brand, value) => harden({ brand, value });
+/** @type {typeof import('@agoric/zoe/src/contractSupport/ratio').makeRatio} */
+const makeRatio = (numerator, numeratorBrand, denominator = 100n) =>
+  harden({
+    numerator: make(numeratorBrand, numerator),
+    denominator: make(numeratorBrand, denominator),
+  });
+
 /**
  * @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, FeedPolicy} from './types.js'
+ * @import {ContractRecord, FeeConfig, FeedPolicy} from './types.js'
+ */
+
+/**
+ * Update feeConfig.variableRate to 0.5%, i.e. 5n/1000n
+ *
+ * @param {FeeConfig} feeConfigPre
+ * @param {Brand<'nat'>} usdcBrand
+ * @param {Ratio} [variableRate]
+ * @returns {FeeConfig}
  */
+const updateFeeConfig = (
+  feeConfigPre,
+  usdcBrand,
+  variableRate = makeRatio(5n, usdcBrand, 1000n),
+) => harden({ ...feeConfigPre, variableRate });
 
 /**
  * @typedef {object} UpdateOpts
@@ -46,13 +71,15 @@ const config = /** @type {const} */ ({
 });
 harden(config);
 
+const { keys } = Object;
+
 /**
  * @param {BootstrapPowers & FastUSDCCorePowers} powers
  * @param {object} [config]
  * @param {UpdateOpts} [config.options]
  */
 export const updateNobleICA = async (
-  { consume: { chainStorage, fastUsdcKit } },
+  { consume: { chainStorage, fastUsdcKit }, produce },
   { options = {} } = {},
 ) => {
   trace('options', options);
@@ -60,17 +87,29 @@ export const updateNobleICA = async (
     agoricToNoble = config.MAINNET.agoricToNoble,
     fastUsdcCode = assert.fail('missing bundleID'),
   } = options;
-  const { adminFacet, creatorFacet, privateArgs, publicFacet } =
-    await fastUsdcKit;
-  trace('upgradeContract follows with privateArgs:', Object.keys(privateArgs));
+  const kitPre = await fastUsdcKit;
+  trace('fastUsdcKit.privateArgs keys:', keys(kitPre.privateArgs));
+  const { adminFacet, creatorFacet, publicFacet } = kitPre;
+
+  const { brand: usdcBrand } = kitPre.privateArgs.feeConfig.flat;
+  // TODO: update agoricToNoble in kitPost.privateArgs.chainInfo too
+  const kitPost = harden({
+    ...kitPre,
+    privateArgs: {
+      ...kitPre.privateArgs,
+      feeConfig: updateFeeConfig(kitPre.privateArgs.feeConfig, usdcBrand),
+    },
+  });
   const upgraded = await E(adminFacet).upgradeContract(
     fastUsdcCode.bundleID,
-    privateArgs,
+    kitPost.privateArgs,
   );
   trace(`DON'T PANIC if you see "CORE_EVAL failed" from v1 above. See #11013`);
   trace('fastUsdc upgraded', upgraded);
+  produce.fastUsdcKit.reset();
+  produce.fastUsdcKit.resolve(kitPost);
 
-  const { agoric, noble } = privateArgs.chainInfo;
+  const { agoric, noble } = kitPre.privateArgs.chainInfo;
   const nobleICAaddr = await E(creatorFacet).connectToNoble(
     agoric.chainId,
     noble.chainId,
@@ -112,6 +151,7 @@ export const getManifestForUpdateNobleICA = (
     manifest: {
       [updateNobleICA.name]: {
         consume: { chainStorage: true, fastUsdcKit: true },
+        produce: { fastUsdcKit: true },
       },
       [updateFeedPolicy.name]: {
         consume: { chainStorage: true },