@agoric/fast-usdc 0.1.1-dev-c1d2b71.0 → 0.1.1-dev-7b7ceb9.0

package/package.json

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

package/src/exos/advancer.js

@@ -6,6 +6,7 @@ import { pickFacet } from '@agoric/vat-data';
 import { VowShape } from '@agoric/vow';
 import { E } from '@endo/far';
 import { M, mustMatch } from '@endo/patterns';
+import { Fail, q } from '@endo/errors';
 import {
   CctpTxEvidenceShape,
   AddressHookShape,
@@ -116,6 +117,7 @@ export const prepareAdvancerKit = (
      *   notifyFacet: import('./settler.js').SettlerKit['notify'];
      *   borrowerFacet: LiquidityPoolKit['borrower'];
      *   poolAccount: HostInterface<OrchestrationAccount<{chainId: 'agoric'}>>;
+     *   settlementAddress: ChainAddress;
      *   intermediateRecipient?: ChainAddress;
      * }} config
      */
@@ -145,10 +147,14 @@ export const prepareAdvancerKit = (
               return;
             }
 
-            const { borrowerFacet, poolAccount } = this.state;
+            const { borrowerFacet, poolAccount, settlementAddress } =
+              this.state;
             const { recipientAddress } = evidence.aux;
             const decoded = decodeAddressHook(recipientAddress);
             mustMatch(decoded, AddressHookShape);
+            if (decoded.baseAddress !== settlementAddress.value) {
+              throw Fail`⚠️ baseAddress of address hook ${q(decoded.baseAddress)} does not match the expected address ${q(settlementAddress.value)}`;
+            }
             const { EUD } = /** @type {AddressHook['query']} */ (decoded.query);
             log(`decoded EUD: ${EUD}`);
             // throws if the bech32 prefix is not found
@@ -172,10 +178,10 @@ export const prepareAdvancerKit = (
               harden({ USDC: advanceAmount }),
             );
             void watch(depositV, this.facets.depositHandler, {
-              fullAmount,
               advanceAmount,
               destination,
               forwardingAddress: evidence.tx.forwardingAddress,
+              fullAmount,
               tmpSeat,
               txHash: evidence.txHash,
             });
@@ -271,6 +277,7 @@ export const prepareAdvancerKit = (
         borrowerFacet: M.remotable(),
         poolAccount: M.remotable(),
         intermediateRecipient: M.opt(ChainAddressShape),
+        settlementAddress: M.opt(ChainAddressShape),
       }),
     },
   );

package/src/fast-usdc.contract.js

@@ -179,16 +179,12 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
     },
     async publishAddresses() {
       !baggage.has(ADDRESSES_BAGGAGE_KEY) || Fail`Addresses already published`;
-      const [poolAccountAddress, settlementAccountAddress] =
-        await vowTools.when(
-          vowTools.all([
-            E(poolAccount).getAddress(),
-            E(settlementAccount).getAddress(),
-          ]),
-        );
+      const [poolAccountAddress] = await vowTools.when(
+        vowTools.all([E(poolAccount).getAddress()]),
+      );
       const addresses = harden({
         poolAccount: poolAccountAddress.value,
-        settlementAccount: settlementAccountAddress.value,
+        settlementAccount: settlementAddress.value,
       });
       baggage.init(ADDRESSES_BAGGAGE_KEY, addresses);
       await publishAddresses(storageNode, addresses);
@@ -284,6 +280,8 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
   );
   trace('settlementAccount', settlementAccount);
   trace('poolAccount', poolAccount);
+  const settlementAddress = await E(settlementAccount).getAddress();
+  trace('settlementAddress', settlementAddress);
 
   const [_agoric, _noble, agToNoble] = await vowTools.when(
     chainHub.getChainsAndConnection('agoric', 'noble'),
@@ -300,6 +298,7 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
       borrowerFacet: poolKit.borrower,
       notifyFacet: settlerKit.notify,
       poolAccount,
+      settlementAddress,
     }),
   );
   // Connect evidence stream to advancer