@agoric/fast-usdc 0.1.1-dev-b5d1abe.0 → 0.1.1-dev-537ffd0.0

package/package.json

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

package/src/exos/advancer.js

@@ -23,7 +23,7 @@ import { makeFeeTools } from '../utils/fees.js';
  * @import {ZoeTools} from '@agoric/orchestration/src/utils/zoe-tools.js';
  * @import {VowTools} from '@agoric/vow';
  * @import {Zone} from '@agoric/zone';
- * @import {CctpTxEvidence, AddressHook, EvmHash, FeeConfig, LogFn, NobleAddress, EvidenceWithRisk} from '../types.js';
+ * @import {AddressHook, EvmHash, FeeConfig, LogFn, NobleAddress, EvidenceWithRisk} from '../types.js';
  * @import {StatusManager} from './status-manager.js';
  * @import {LiquidityPoolKit} from './liquidity-pool.js';
  */
@@ -213,14 +213,20 @@ export const prepareAdvancerKit = (
          * @param {AdvancerVowCtx & { tmpSeat: ZCFSeat }} ctx
          */
         onFulfilled(result, ctx) {
-          const { poolAccount, intermediateRecipient } = this.state;
+          const { poolAccount, intermediateRecipient, settlementAddress } =
+            this.state;
           const { destination, advanceAmount, tmpSeat: _, ...detail } = ctx;
-          const transferV = E(poolAccount).transfer(
-            destination,
-            { denom: usdc.denom, value: advanceAmount.value },
-            { forwardOpts: { intermediateRecipient } },
-          );
-          return watch(transferV, this.facets.transferHandler, {
+          const amount = harden({
+            denom: usdc.denom,
+            value: advanceAmount.value,
+          });
+          const transferOrSendV =
+            destination.chainId === settlementAddress.chainId
+              ? E(poolAccount).send(destination, amount)
+              : E(poolAccount).transfer(destination, amount, {
+                  forwardOpts: { intermediateRecipient },
+                });
+          return watch(transferOrSendV, this.facets.transferHandler, {
             destination,
             advanceAmount,
             ...detail,
@@ -253,17 +259,13 @@ export const prepareAdvancerKit = (
       },
       transferHandler: {
         /**
-         * @param {unknown} result TODO confirm this is not a bigint (sequence)
+         * @param {undefined} result
          * @param {AdvancerVowCtx} ctx
          */
         onFulfilled(result, ctx) {
           const { notifyFacet } = this.state;
           const { advanceAmount, destination, ...detail } = ctx;
-          log('Advance transfer fulfilled', {
-            advanceAmount,
-            destination,
-            result,
-          });
+          log('Advance succeeded', { advanceAmount, destination });
           // During development, due to a bug, this call threw.
           // The failure was silent (no diagnostics) due to:
           //  - #10576 Vows do not report unhandled rejections
@@ -278,7 +280,7 @@ export const prepareAdvancerKit = (
          */
         onRejected(error, ctx) {
           const { notifyFacet } = this.state;
-          log('Advance transfer rejected', error);
+          log('Advance failed', error);
           const { advanceAmount: _, ...restCtx } = ctx;
           notifyFacet.notifyAdvancingResult(restCtx, false);
         },

package/src/utils/chain-policies.js

@@ -0,0 +1,75 @@
+/** @import {ChainPolicy} from '../types.js'; */
+
+/** @satisfies {Record<'MAINNET'| 'TESTNET', Record<string, ChainPolicy>>} */
+export const ChainPolicies = /** @type {const} */ ({
+  MAINNET: {
+    Arbitrum: {
+      attenuatedCttpBridgeAddress: '0xe298b93ffB5eA1FB628e0C0D55A43aeaC268e347',
+      cctpTokenMessengerAddress: '0x19330d10D9Cc8751218eaf51E8885D058642E08A',
+      chainId: 42161,
+      confirmations: 2, // TODO placeholder
+    },
+    Base: {
+      attenuatedCttpBridgeAddress: '0xB6615B2662b35fc3533F8479002e62D0523341De',
+      cctpTokenMessengerAddress: '0x1682Ae6375C4E4A97e4B583BC394c861A46D8962',
+      chainId: 8453,
+      confirmations: 2, // TODO placeholder
+    },
+    Ethereum: {
+      attenuatedCttpBridgeAddress: '0xBC8552339dA68EB65C8b88B414B5854E0E366cFc',
+      cctpTokenMessengerAddress: '0xBd3fa81B58Ba92a82136038B25aDec7066af3155',
+      chainId: 1,
+      confirmations: 2, // TODO placeholder
+    },
+    Optimism: {
+      attenuatedCttpBridgeAddress: '0x48C5417ED570928eC85D5e3AD4e7E0EeD7dB1E2A',
+      cctpTokenMessengerAddress: '0x2B4069517957735bE00ceE0fadAE88a26365528f',
+      chainId: 10,
+      confirmations: 2, // TODO placeholder
+    },
+    Polygon: {
+      attenuatedCttpBridgeAddress: '0x32cb9574650AFF312c80edc4B4343Ff5500767cA',
+      cctpTokenMessengerAddress: '0x9daF8c91AEFAE50b9c0E69629D3F6Ca40cA3B3FE',
+      chainId: 137,
+      confirmations: 2, // TODO placeholder
+    },
+  },
+  TESTNET: {
+    // Arbitrum Sepolia
+    Arbitrum: {
+      attenuatedCttpBridgeAddress: '0xTODO',
+      cctpTokenMessengerAddress: '0x9f3B8679c73C2Fef8b59B4f3444d4e156fb70AA5',
+      chainId: 421614,
+      confirmations: 2, // TODO placeholder
+    },
+    // Base Sepolia
+    Base: {
+      attenuatedCttpBridgeAddress: '0xTODO',
+      cctpTokenMessengerAddress: '0x9f3B8679c73C2Fef8b59B4f3444d4e156fb70AA5',
+      chainId: 84532,
+      confirmations: 2, // TODO placeholder
+    },
+    // Ethereum Sepolia
+    Ethereum: {
+      attenuatedCttpBridgeAddress: '0xTODO',
+      cctpTokenMessengerAddress: '0x9f3B8679c73C2Fef8b59B4f3444d4e156fb70AA5',
+      chainId: 11155111,
+      confirmations: 2, // TODO placeholder
+    },
+    // OP Sepolia
+    Optimism: {
+      attenuatedCttpBridgeAddress: '0xTODO',
+      cctpTokenMessengerAddress: '0x9f3B8679c73C2Fef8b59B4f3444d4e156fb70AA5',
+      chainId: 11155420,
+      confirmations: 2, // TODO placeholder
+    },
+    // Polygon PoS Amoy
+    Polygon: {
+      attenuatedCttpBridgeAddress: '0xTODO',
+      cctpTokenMessengerAddress: '0x9f3B8679c73C2Fef8b59B4f3444d4e156fb70AA5',
+      chainId: 80002,
+      confirmations: 2, // TODO placeholder
+    },
+  },
+});
+harden(ChainPolicies);

package/src/utils/deploy-config.js

@@ -1,5 +1,6 @@
 import { denomHash, withChainCapabilities } from '@agoric/orchestration';
 import fetchedChainInfo from '@agoric/orchestration/src/fetched-chain-info.js';
+import { ChainPolicies } from './chain-policies.js';
 
 /**
  * @import {FastUSDCConfig} from '@agoric/fast-usdc/src/types.js'
@@ -41,6 +42,10 @@ const agoricAssetInfo = defaultAssetInfo.filter(
   ([_d, i]) => i.chainName === 'agoric',
 );
 
+/** ABI for DepositForBurn event in TokenMessenger contract */
+const DepositForBurnEvent =
+  'DepositForBurn(uint64,address,uint256,address,bytes32,uint32,bytes32,bytes32)';
+
 /**
  * @type {Record<string, Pick<FastUSDCConfig, 'oracles' | 'feedPolicy' | 'chainInfo' | 'assetInfo' >>}
  *
@@ -62,16 +67,8 @@ export const configurations = {
     feedPolicy: {
       nobleAgoricChannelId: 'channel-does-not-exist',
       nobleDomainId: 4,
-      chainPolicies: {
-        Arbitrum: {
-          attenuatedCttpBridgeAddress:
-            '0xe298b93ffB5eA1FB628e0C0D55A43aeaC268e347',
-          cctpTokenMessengerAddress:
-            '0x19330d10D9Cc8751218eaf51E8885D058642E08A',
-          chainId: 42161,
-          confirmations: 2,
-        },
-      },
+      chainPolicies: ChainPolicies.TESTNET,
+      eventFilter: DepositForBurnEvent,
     },
     chainInfo: /** @type {Record<string, CosmosChainInfo & Passable>} */ (
       withChainCapabilities({
@@ -91,16 +88,8 @@ export const configurations = {
     feedPolicy: {
       nobleAgoricChannelId: 'channel-21',
       nobleDomainId: 4,
-      chainPolicies: {
-        Arbitrum: {
-          attenuatedCttpBridgeAddress:
-            '0xe298b93ffB5eA1FB628e0C0D55A43aeaC268e347',
-          cctpTokenMessengerAddress:
-            '0x19330d10D9Cc8751218eaf51E8885D058642E08A',
-          chainId: 42161,
-          confirmations: 2,
-        },
-      },
+      chainPolicies: ChainPolicies.MAINNET,
+      eventFilter: DepositForBurnEvent,
     },
     chainInfo: /** @type {Record<string, CosmosChainInfo & Passable>} */ (
       withChainCapabilities(fetchedChainInfo)
@@ -118,14 +107,8 @@ export const configurations = {
     feedPolicy: {
       nobleAgoricChannelId: 'TODO',
       nobleDomainId: 4,
-      chainPolicies: {
-        Arbitrum: {
-          attenuatedCttpBridgeAddress: '0xTODO',
-          cctpTokenMessengerAddress: '0xTODO',
-          chainId: 421614,
-          confirmations: 2,
-        },
-      },
+      chainPolicies: ChainPolicies.TESTNET,
+      eventFilter: DepositForBurnEvent,
     },
     chainInfo: /** @type {Record<string, CosmosChainInfo & Passable>} */ (
       withChainCapabilities(fetchedChainInfo) // TODO: use devnet values
@@ -140,14 +123,8 @@ export const configurations = {
     feedPolicy: {
       nobleAgoricChannelId: 'TODO',
       nobleDomainId: 4,
-      chainPolicies: {
-        Arbitrum: {
-          attenuatedCttpBridgeAddress: '0xTODO',
-          cctpTokenMessengerAddress: '0xTODO',
-          chainId: 421614,
-          confirmations: 2,
-        },
-      },
+      chainPolicies: ChainPolicies.TESTNET,
+      eventFilter: DepositForBurnEvent,
     },
     chainInfo: /** @type {Record<string, CosmosChainInfo & Passable>} */ (
       withChainCapabilities(fetchedChainInfo) // TODO: use emerynet values