@agoric/fast-usdc 0.1.1-dev-3cbd11f.0 → 0.1.1-dev-4b5dff2.0

package/package.json

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

package/src/cli/operator-commands.js

@@ -3,7 +3,6 @@
  * @import {Command} from 'commander';
  * @import {OfferSpec} from '@agoric/smart-wallet/src/offers.js';
  * @import {ExecuteOfferAction} from '@agoric/smart-wallet/src/smartWallet.js';
- * @import {OperatorKit} from '../exos/operator-kit.js';
  */
 
 import {
@@ -13,7 +12,7 @@ import {
 import { mustMatch } from '@agoric/internal';
 import { Nat } from '@endo/nat';
 import { InvalidArgumentError } from 'commander';
-import { INVITATION_MAKERS_DESC } from '../exos/transaction-feed.js';
+import { INVITATION_MAKERS_DESC } from '../operator-kit-interface.js';
 import { CctpTxEvidenceShape } from '../type-guards.js';
 import { outputActionAndHint } from './bridge-action.js';
 
@@ -128,9 +127,7 @@ export const addOperatorCommands = (
         invitationSpec: {
           source: 'continuing',
           previousOffer: previousOfferId,
-          /** @type {string & keyof OperatorKit['invitationMakers'] } */
           invitationMakerName: 'SubmitEvidence',
-          /** @type {Parameters<OperatorKit['invitationMakers']['SubmitEvidence']> } */
           invitationArgs: [evidence],
         },
         proposal: {},

package/src/operator-kit-interface.js

@@ -0,0 +1,29 @@
+import { M } from '@endo/patterns';
+import { CctpTxEvidenceShape, RiskAssessmentShape } from './type-guards.js';
+
+/**
+ * @import {Zone} from '@agoric/zone';
+ * @import {CctpTxEvidence, RiskAssessment} from '@agoric/fast-usdc/src/types.js';
+ */
+
+/** Name in the invitation purse (keyed also by this contract instance) */
+export const INVITATION_MAKERS_DESC = 'oracle operator invitation';
+
+export const OperatorKitI = {
+  admin: M.interface('Admin', {
+    disable: M.call().returns(),
+  }),
+
+  invitationMakers: M.interface('InvitationMakers', {
+    SubmitEvidence: M.call(CctpTxEvidenceShape)
+      .optional(RiskAssessmentShape)
+      .returns(M.promise()),
+  }),
+
+  operator: M.interface('Operator', {
+    submitEvidence: M.call(CctpTxEvidenceShape)
+      .optional(RiskAssessmentShape)
+      .returns(),
+    getStatus: M.call().returns(M.record()),
+  }),
+};

package/src/pool-share-math.js

@@ -14,7 +14,7 @@ const { add, isEmpty, isEqual, isGTE, make, makeEmpty, subtract } = AmountMath;
  * @import {Amount, Brand, DepositFacet, NatValue, Payment, Ratio} from '@agoric/ertp';
  * @import {Allocation} from '@agoric/zoe';
  * @import {PoolStats} from './types.js';
- * @import {RepayAmountKWR} from './exos/liquidity-pool.js';
+ * @import {RepayAmountKWR} from './utils/fees.js';
  */
 
 /**

package/src/type-guards.js

@@ -10,9 +10,9 @@ import { PendingTxStatus } from './constants.js';
 /**
  * @import {Amount, Brand, NatValue, Payment} from '@agoric/ertp';
  * @import {TypedPattern} from '@agoric/internal';
- * @import {FastUsdcTerms} from './fast-usdc.contract.js';
+ * @import {CosmosChainInfo, Denom, DenomDetail, OrchestrationAccount, IBCConnectionInfo} from '@agoric/orchestration';
  * @import {USDCProposalShapes} from './pool-share-math.js';
- * @import {CctpTxEvidence, FastUSDCConfig, FeeConfig, PendingTx, PoolMetrics, ChainPolicy, FeedPolicy, AddressHook, EvmAddress, EvmHash, RiskAssessment, EvidenceWithRisk} from './types.js';
+ * @import {CctpTxEvidence, FastUSDCConfig, FastUsdcTerms, FeeConfig, PendingTx, PoolMetrics, ChainPolicy, FeedPolicy, AddressHook, EvmAddress, EvmHash, RiskAssessment, EvidenceWithRisk} from './types.js';
  */
 
 /**

package/src/types.ts

@@ -10,8 +10,7 @@ import type { IBCChannelID } from '@agoric/vats';
 import type { Amount } from '@agoric/ertp';
 import type { CopyRecord, Passable } from '@endo/pass-style';
 import type { PendingTxStatus, TxStatus } from './constants.js';
-import type { FastUsdcTerms } from './fast-usdc.contract.js';
-import type { RepayAmountKWR } from './exos/liquidity-pool.js';
+import type { RepayAmountKWR } from './utils/fees.js';
 
 /**
  * Block hash is calculated using the keccak256 algorithm that always results
@@ -137,6 +136,10 @@ export type FeedPolicy = {
   eventFilter?: string;
 } & CopyRecord;
 
+export type FastUsdcTerms = {
+  usdcDenom: Denom;
+};
+
 export type FastUSDCConfig = {
   terms: FastUsdcTerms;
   oracles: Record<string, string>;
@@ -157,4 +160,3 @@ export type AddressHook = {
 };
 
 export type * from './constants.js';
-export type { LiquidityPoolKit } from './exos/liquidity-pool.js';

package/src/utils/fees.js

@@ -9,7 +9,22 @@ const { add, isGTE, subtract } = AmountMath;
 /**
  * @import {Amount} from '@agoric/ertp';
  * @import {FeeConfig} from '../types.js';
- * @import {RepayAmountKWR} from '../exos/liquidity-pool.js';
+ */
+
+/**
+ * @typedef {{
+ *  Principal: Amount<'nat'>;
+ *  PoolFee: Amount<'nat'>;
+ *  ContractFee: Amount<'nat'>;
+ * }} RepayAmountKWR
+ */
+
+/**
+ * @typedef {{
+ *  Principal: Payment<'nat'>;
+ *  PoolFee: Payment<'nat'>;
+ *  ContractFee: Payment<'nat'>;
+ * }} RepayPaymentKWR
  */
 
 /** @param {FeeConfig} feeConfig */

package/tools/mock-evidence.ts

@@ -0,0 +1,141 @@
+import { encodeAddressHook } from '@agoric/cosmic-proto/address-hooks.js';
+import { buildVTransferEvent } from '@agoric/orchestration/tools/ibc-mocks.js';
+import fetchedChainInfo from '@agoric/orchestration/src/fetched-chain-info.js';
+import type { CosmosChainAddress } from '@agoric/orchestration';
+import type { VTransferIBCEvent } from '@agoric/vats';
+import type { CctpTxEvidence, EvmAddress } from '../src/types.js';
+
+const mockScenarios = [
+  'AGORIC_PLUS_OSMO',
+  'AGORIC_PLUS_DYDX',
+  'AGORIC_PLUS_AGORIC',
+  'AGORIC_NO_PARAMS',
+  'AGORIC_UNKNOWN_EUD',
+] as const;
+
+export type MockScenario = (typeof mockScenarios)[number];
+
+export const Senders = {
+  default: '0xDefaultFakeEthereumAddress',
+} as unknown as Record<string, EvmAddress>;
+
+const blockTimestamp = 1632340000n;
+
+export const MockCctpTxEvidences: Record<
+  MockScenario,
+  (receiverAddress?: string) => CctpTxEvidence
+> = {
+  AGORIC_PLUS_OSMO: (receiverAddress?: string) => ({
+    blockHash:
+      '0x90d7343e04f8160892e94f02d6a9b9f255663ed0ac34caca98544c8143fee665',
+    blockNumber: 21037663n,
+    blockTimestamp,
+    txHash:
+      '0xc81bc6105b60a234c7c50ac17816ebcd5561d366df8bf3be59ff387552761702',
+    tx: {
+      amount: 150000000n,
+      forwardingAddress: 'noble1x0ydg69dh6fqvr27xjvp6maqmrldam6yfelqkd',
+      sender: Senders.default,
+    },
+    aux: {
+      forwardingChannel: 'channel-21',
+      recipientAddress:
+        receiverAddress ||
+        encodeAddressHook(settlementAddress.value, {
+          EUD: 'osmo183dejcnmkka5dzcu9xw6mywq0p2m5peks28men',
+        }),
+    },
+    chainId: 1,
+  }),
+  AGORIC_PLUS_DYDX: (receiverAddress?: string) => ({
+    blockHash:
+      '0x80d7343e04f8160892e94f02d6a9b9f255663ed0ac34caca98544c8143fee699',
+    blockNumber: 21037669n,
+    blockTimestamp,
+    txHash:
+      '0xd81bc6105b60a234c7c50ac17816ebcd5561d366df8bf3be59ff387552761799',
+    tx: {
+      amount: 300000000n,
+      forwardingAddress: 'noble1x0ydg69dh6fqvr27xjvp6maqmrldam6yfelktz',
+      sender: Senders.default,
+    },
+    aux: {
+      forwardingChannel: 'channel-21',
+      recipientAddress:
+        receiverAddress ||
+        encodeAddressHook(settlementAddress.value, {
+          EUD: 'dydx183dejcnmkka5dzcu9xw6mywq0p2m5peks28men',
+        }),
+    },
+    chainId: 1,
+  }),
+  AGORIC_PLUS_AGORIC: (receiverAddress?: string) => ({
+    blockHash:
+      '0x80d7343e04f8160892e94f02d6a9b9f255663ed0ac34caca98544c8143fee6z9',
+    blockNumber: 21037600n,
+    blockTimestamp,
+    txHash:
+      '0xd81bc6105b60a234c7c50ac17816ebcd5561d366df8bf3be59ff3875527617z9',
+    tx: {
+      amount: 250000000n,
+      forwardingAddress: 'noble17ww3rfusv895d92c0ncgj0fl9trntn70jz7hd5',
+      sender: Senders.default,
+    },
+    aux: {
+      forwardingChannel: 'channel-21',
+      recipientAddress:
+        receiverAddress ||
+        encodeAddressHook(settlementAddress.value, {
+          EUD: 'agoric13rj0cc0hm5ac2nt0sdup2l7gvkx4v9tyvgq3h2',
+        }),
+    },
+    chainId: 1,
+  }),
+  AGORIC_NO_PARAMS: (receiverAddress?: string) => ({
+    blockHash:
+      '0x70d7343e04f8160892e94f02d6a9b9f255663ed0ac34caca98544c8143fee699',
+    blockNumber: 21037669n,
+    blockTimestamp,
+    txHash:
+      '0xa81bc6105b60a234c7c50ac17816ebcd5561d366df8bf3be59ff387552761799',
+    tx: {
+      amount: 200000000n,
+      forwardingAddress: 'noble1x0ydg69dh6fqvr27xjvp6maqmrldam6yfelyyy',
+      sender: Senders.default,
+    },
+    aux: {
+      forwardingChannel: 'channel-21',
+      recipientAddress: receiverAddress || settlementAddress.value,
+    },
+    chainId: 1,
+  }),
+  AGORIC_UNKNOWN_EUD: (receiverAddress?: string) => ({
+    blockHash:
+      '0x70d7343e04f8160892e94f02d6a9b9f255663ed0ac34caca98544c8143fee699',
+    blockNumber: 21037669n,
+    blockTimestamp,
+    txHash:
+      '0xa81bc6105b60a234c7c50ac17816ebcd5561d366df8bf3be59ff387552761799',
+    tx: {
+      amount: 200000000n,
+      forwardingAddress: 'noble1x0ydg69dh6fqvr27xjvp6maqmrldam6yfelyyy',
+      sender: Senders.default,
+    },
+    aux: {
+      forwardingChannel: 'channel-21',
+      recipientAddress:
+        receiverAddress ||
+        encodeAddressHook(settlementAddress.value, {
+          EUD: 'random1addr',
+        }),
+    },
+    chainId: 1,
+  }),
+};
+
+export const settlementAddress: CosmosChainAddress = harden({
+  chainId: 'agoric-3',
+  encoding: 'bech32' as const,
+  // Random value, copied from tests of address hooks
+  value: 'agoric16kv2g7snfc4q24vg3pjdlnnqgngtjpwtetd2h689nz09lcklvh5s8u37ek',
+});

package/src/add-operators.core.js

@@ -1,63 +0,0 @@
-import { makeTracer } from '@agoric/internal';
-import { inviteOracles } from './utils/core-eval.js';
-
-/**
- * @import {ManifestBundleRef} from '@agoric/deploy-script-support/src/externalTypes.js'
- * @import {BootstrapManifest} from '@agoric/vats/src/core/lib-boot.js'
- * @import {LegibleCapData} from './utils/config-marshal.js'
- * @import {FastUSDCConfig} from './types.js'
- * @import {FastUSDCCorePowers, FastUSDCKit} from './start-fast-usdc.core.js';
- */
-
-const trace = makeTracer('FUSD-AddOperators', true);
-
-/**
- * @throws if oracle smart wallets are not yet provisioned
- *
- * @param {BootstrapPowers & FastUSDCCorePowers } powers
- * @param {{ options: LegibleCapData<FastUSDCConfig> }} config
- */
-export const addOperators = async (
-  { consume: { namesByAddress, fastUsdcKit } },
-  config,
-) => {
-  trace(addOperators.name);
-
-  const kit = await fastUsdcKit;
-
-  const { creatorFacet } = kit;
-
-  trace(config);
-
-  // @ts-expect-error XXX LegibleCapData typedef
-  const { oracles } = config.options.structure;
-
-  await inviteOracles({ creatorFacet, namesByAddress }, oracles);
-};
-harden(addOperators);
-
-/**
- * @param {{
- *   restoreRef: (b: ERef<ManifestBundleRef>) => Promise<Installation>;
- * }} utils
- * @param {{
- *   options: LegibleCapData<FastUSDCConfig>;
- * }} param1
- */
-export const getManifestForAddOperators = ({ restoreRef: _ }, { options }) => {
-  return {
-    /** @type {BootstrapManifest} */
-    manifest: {
-      [addOperators.name]: {
-        consume: {
-          fastUsdcKit: true,
-
-          // widely shared: name services
-          agoricNames: true,
-          namesByAddress: true,
-        },
-      },
-    },
-    options,
-  };
-};

package/src/distribute-fees.core.js

@@ -1,93 +0,0 @@
-/** @file core eval module to collect fees. */
-import { AmountMath } from '@agoric/ertp';
-import { floorMultiplyBy } from '@agoric/zoe/src/contractSupport/index.js';
-import { E } from '@endo/far';
-import { makeTracer } from '@agoric/internal';
-import { fromExternalConfig } from './utils/config-marshal.js';
-
-/**
- * @import {Amount, Brand, DepositFacet, Ratio} from '@agoric/ertp';
- * @import {FastUSDCCorePowers} from '@agoric/fast-usdc/src/start-fast-usdc.core.js';
- * @import {CopyRecord} from '@endo/pass-style'
- * @import {BootstrapManifestPermit} from '@agoric/vats/src/core/lib-boot.js'
- * @import {LegibleCapData} from './utils/config-marshal.js'
- */
-
-/**
- * @typedef {{ destinationAddress: string } &
- *  ({ feePortion: Ratio} | {fixedFees: Amount<'nat'>}) &
- *  CopyRecord
- * } FeeDistributionTerms
- */
-
-const kwUSDC = 'USDC'; // keyword in AmountKeywordRecord
-const issUSDC = 'USDC'; // issuer name
-
-const trace = makeTracer('FUCF', true);
-
-/**
- * @param {BootstrapPowers & FastUSDCCorePowers } permittedPowers
- * @param {{ options: LegibleCapData<{ feeTerms: FeeDistributionTerms}> }} config
- */
-export const distributeFees = async (permittedPowers, config) => {
-  trace('distributeFees...', config.options);
-
-  const { agoricNames, namesByAddress, zoe } = permittedPowers.consume;
-  /** @type {Brand<'nat'>} */
-  const usdcBrand = await E(agoricNames).lookup('brand', issUSDC);
-  /** @type {{ feeTerms: FeeDistributionTerms}} */
-  const { feeTerms: terms } = fromExternalConfig(config.options, {
-    USDC: usdcBrand,
-  });
-
-  const { creatorFacet } = await permittedPowers.consume.fastUsdcKit;
-  const want = {
-    [kwUSDC]: await ('fixedFees' in terms
-      ? terms.fixedFees
-      : E(creatorFacet)
-          .getContractFeeBalance()
-          .then(balance => floorMultiplyBy(balance, terms.feePortion))),
-  };
-  const proposal = harden({ want });
-
-  /** @type {DepositFacet} */
-  const depositFacet = await E(namesByAddress).lookup(
-    terms.destinationAddress,
-    'depositFacet',
-  );
-  trace('to:', terms.destinationAddress, depositFacet);
-
-  const toWithdraw = await E(creatorFacet).makeWithdrawFeesInvitation();
-  trace('invitation:', toWithdraw, 'proposal:', proposal);
-  const seat = E(zoe).offer(toWithdraw, proposal);
-  const result = await E(seat).getOfferResult();
-  trace('offer result', result);
-  const payout = await E(seat).getPayout(kwUSDC);
-  /** @type {Amount<'nat'>} */
-  // @ts-expect-error USDC is a nat brand
-  const rxd = await E(depositFacet).receive(payout);
-  trace('received', rxd);
-  if (!AmountMath.isGTE(rxd, proposal.want[kwUSDC])) {
-    trace('🚨 expected', proposal.want[kwUSDC], 'got', rxd);
-  }
-  trace('done');
-};
-harden(distributeFees);
-
-/** @satisfies {BootstrapManifestPermit} */
-const permit = {
-  consume: {
-    fastUsdcKit: true,
-    agoricNames: true,
-    namesByAddress: true,
-    zoe: true,
-  },
-};
-
-/**
- * @param {unknown} _utils
- * @param {Parameters<typeof distributeFees>[1]} config
- */
-export const getManifestForDistributeFees = (_utils, { options }) => {
-  return { manifest: { [distributeFees.name]: permit }, options };
-};