@agoric/pegasus 0.7.9-pismo-dev-0d5327f.0 → 0.7.10-dev-bf4b59f.0

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [0.7.9](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.7.6...@agoric/pegasus@0.7.9) (2023-05-19)
+
+
+### Bug Fixes
+
+* use `subscribeEach` to get reconnect benefits ([fb24132](https://github.com/Agoric/agoric-sdk/commit/fb24132f9b4e117e56bae2803994e57c188344f3))
+* use atomicTransfers rather than stagings. ([#6577](https://github.com/Agoric/agoric-sdk/issues/6577)) ([65d3f14](https://github.com/Agoric/agoric-sdk/commit/65d3f14c8102993168d2568eed5e6acbcba0c48a))
+
+
+
 ### [0.7.8](https://github.com/Agoric/agoric-sdk/compare/@agoric/pegasus@0.7.7...@agoric/pegasus@0.7.8) (2023-02-17)
 
 **Note:** Version bump only for package @agoric/pegasus

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/pegasus",
-  "version": "0.7.9-pismo-dev-0d5327f.0+0d5327f",
+  "version": "0.7.10-dev-bf4b59f.0+bf4b59f",
   "description": "Peg-as-us contract",
   "type": "module",
   "main": "./src/pegasus.js",
@@ -16,7 +16,7 @@
     "lint-fix": "yarn lint:eslint --fix",
     "lint": "run-s --continue-on-error lint:*",
     "lint:eslint": "eslint .",
-    "lint:types": "tsc --maxNodeModuleJsDepth 4 -p jsconfig.json"
+    "lint:types": "tsc -p jsconfig.json"
   },
   "repository": {
     "type": "git",
@@ -29,25 +29,26 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.5.2-pismo-dev-0d5327f.0+0d5327f",
-    "@agoric/ertp": "0.15.6-pismo-dev-0d5327f.0+0d5327f",
-    "@agoric/nat": "^4.1.0",
-    "@agoric/notifier": "0.5.2-pismo-dev-0d5327f.0+0d5327f",
-    "@agoric/store": "0.8.6-pismo-dev-0d5327f.0+0d5327f",
-    "@agoric/swingset-vat": "0.31.1-pismo-dev-0d5327f.0+0d5327f",
-    "@agoric/vats": "0.13.3-pismo-dev-0d5327f.0+0d5327f",
-    "@agoric/zoe": "0.25.6-pismo-dev-0d5327f.0+0d5327f",
-    "@endo/bundle-source": "^2.3.1",
-    "@endo/captp": "^2.0.15",
-    "@endo/far": "^0.2.11",
-    "@endo/init": "^0.5.49",
-    "@endo/promise-kit": "^0.2.49"
+    "@agoric/assert": "0.6.1-dev-bf4b59f.0+bf4b59f",
+    "@agoric/ertp": "0.16.1-dev-bf4b59f.0+bf4b59f",
+    "@agoric/internal": "0.3.1-dev-bf4b59f.0+bf4b59f",
+    "@agoric/notifier": "0.6.1-dev-bf4b59f.0+bf4b59f",
+    "@agoric/store": "0.9.1-dev-bf4b59f.0+bf4b59f",
+    "@agoric/swingset-vat": "0.32.1-dev-bf4b59f.0+bf4b59f",
+    "@agoric/vats": "0.14.1-dev-bf4b59f.0+bf4b59f",
+    "@agoric/zoe": "0.26.1-dev-bf4b59f.0+bf4b59f",
+    "@endo/bundle-source": "^2.5.1",
+    "@endo/captp": "^3.1.1",
+    "@endo/far": "^0.2.18",
+    "@endo/init": "^0.5.56",
+    "@endo/nat": "^4.1.27",
+    "@endo/promise-kit": "^0.2.56"
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.9.7-pismo-dev-0d5327f.0+0d5327f",
-    "ava": "^4.3.1",
-    "c8": "^7.11.0",
-    "import-meta-resolve": "^1.1.1"
+    "@agoric/deploy-script-support": "0.10.1-dev-bf4b59f.0+bf4b59f",
+    "ava": "^5.2.0",
+    "c8": "^7.13.0",
+    "import-meta-resolve": "^2.2.1"
   },
   "files": [
     "scripts/",
@@ -61,11 +62,8 @@
     ],
     "timeout": "10m"
   },
-  "eslintIgnore": [
-    "bundle-*.js"
-  ],
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0d5327f87310cf523834853b0546d0e217f37009"
+  "gitHead": "bf4b59f2128aca73d786429c6ef4a7c9cdfb6700"
 }

package/scripts/init-core.js

@@ -1,5 +1,6 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */
 export const defaultProposalBuilder = async ({ publishRef, install }) =>
   harden({
     sourceSpec: '../src/proposals/core-proposal.js',

package/src/courier.js

@@ -2,6 +2,7 @@
 import { details as X } from '@agoric/assert';
 
 import { AmountMath } from '@agoric/ertp';
+import { WalletName } from '@agoric/internal';
 import { E, Far } from '@endo/far';
 import { makeOncePromiseKit } from './once-promise-kit.js';
 
@@ -28,7 +29,7 @@ export const getCourierPK = (key, keyToCourierPK) => {
 /**
  * Create the [send, receive] pair.
  *
- * @typedef {import('@agoric/vats/src/nameHub.js').NameHub} NameHub
+ * @typedef {import('@agoric/vats').NameHub} NameHub
  *
  * @typedef {object} CourierArgs
  * @property {ZCF} zcf
@@ -95,7 +96,9 @@ export const makeCourierMaker =
       /** @type {DepositFacet} */
       const depositFacet = await E(board)
         .getValue(depositAddress)
-        .catch(_ => E(namesByAddress).lookup(depositAddress, 'depositFacet'));
+        .catch(_ =>
+          E(namesByAddress).lookup(depositAddress, WalletName.depositFacet),
+        );
 
       const { userSeat, zcfSeat } = zcf.makeEmptySeatKit();
 

package/src/ibc-trace.js

@@ -1,6 +1,6 @@
 // @ts-check
 import { Far } from '@endo/far';
-import { assert, details as X } from '@agoric/assert';
+import { Fail } from '@agoric/assert';
 
 import { parse } from '@agoric/swingset-vat/src/vats/network/multiaddr.js';
 
@@ -8,16 +8,20 @@ import { parse } from '@agoric/swingset-vat/src/vats/network/multiaddr.js';
  * Return a source-prefixed version of the denomination, as specified in
  * ICS20-1.
  *
- * @param {Address} addr
+ * @param {string} addr
  * @param {Denom} denom
  */
 const sourcePrefixedDenom = (addr, denom) => {
   const ma = parse(addr);
 
   const ibcPort = ma.find(([protocol]) => protocol === 'ibc-port');
-  assert(ibcPort, X`${addr} does not contain an IBC port`);
+  if (!ibcPort) {
+    throw Fail`${addr} does not contain an IBC port`;
+  }
   const ibcChannel = ma.find(([protocol]) => protocol === 'ibc-channel');
-  assert(ibcChannel, X`${addr} does not contain an IBC channel`);
+  if (!ibcChannel) {
+    throw Fail`${addr} does not contain an IBC channel`;
+  }
 
   return `${ibcPort[1]}/${ibcChannel[1]}/${denom}`;
 };

package/src/ics20.js

@@ -1,11 +1,11 @@
 // @ts-check
-import { Nat } from '@agoric/nat';
+import { Nat } from '@endo/nat';
 import { Far } from '@endo/far';
-import { assert, details as X } from '@agoric/assert';
+import { assert, details as X, Fail } from '@agoric/assert';
 
 /**
  * @typedef {object} ICS20TransferPacket Packet shape defined at:
- * https://github.com/cosmos/ibc/tree/master/spec/app/ics-020-fungible-token-transfer#data-structures
+ * https://github.com/cosmos/ibc/tree/HEAD/spec/app/ics-020-fungible-token-transfer#data-structures
  * @property {string} amount The extent of the amount
  * @property {Denom} denom The denomination of the amount
  * @property {string} sender The sender address
@@ -22,6 +22,7 @@ export const DUMMY_SENDER_ADDRESS = 'pegasus';
 
 /**
  * @param {string} s
+ * @returns {Record<string, any>}
  */
 const safeJSONParseObject = s => {
   /** @type {unknown} */
@@ -32,8 +33,12 @@ const safeJSONParseObject = s => {
     assert.note(e, X`${s} is not valid JSON`);
     throw e;
   }
-  assert.typeof(obj, 'object', X`${s} is not a JSON object`);
-  assert(obj !== null, X`${s} is null`);
+  if (typeof obj !== 'object') {
+    throw Fail`${s} is not a JSON object`;
+  }
+  if (obj === null) {
+    throw Fail`${s} is null`;
+  }
   return obj;
 };
 
@@ -77,7 +82,6 @@ export const makeICS20TransferPacket = async ({
   depositAddress,
 }) => {
   // We're using Nat as a dynamic check for overflow.
-  // @ts-expect-error - this causes errors on some versions of TS, but not others.
   const stringValue = String(Nat(value));
 
   // Generate the ics20-1 packet.
@@ -100,8 +104,8 @@ export const makeICS20TransferPacket = async ({
  */
 export const assertICS20TransferPacketAck = async ack => {
   const { result, error } = safeJSONParseObject(ack);
-  assert(error === undefined, X`ICS20 transfer error ${error}`);
-  assert(result !== undefined, X`ICS20 transfer missing result in ${ack}`);
+  error === undefined || Fail`ICS20 transfer error ${error}`;
+  result !== undefined || Fail`ICS20 transfer missing result in ${ack}`;
   if (result !== ICS20_TRANSFER_SUCCESS_RESULT) {
     // We don't want to throw an error here, because we want only to be able to
     // differentiate between a transfer that failed and a transfer that succeeded.
@@ -111,7 +115,7 @@ export const assertICS20TransferPacketAck = async ack => {
 
 /**
  * Create results of the transfer.  Acknowledgement shape defined at:
- * https://github.com/cosmos/ibc/tree/master/spec/app/ics-020-fungible-token-transfer#data-structures
+ * https://github.com/cosmos/ibc/tree/HEAD/spec/app/ics-020-fungible-token-transfer#data-structures
  *
  * @param {boolean} success
  * @param {any} error

package/src/pegasus.js

@@ -1,9 +1,12 @@
 // @ts-check
 
-import { assert, details as X } from '@agoric/assert';
+import { assert, details as X, Fail } from '@agoric/assert';
 import { makeLegacyWeakMap, makeLegacyMap } from '@agoric/store';
 import { E, Far } from '@endo/far';
-import { assertProposalShape } from '@agoric/zoe/src/contractSupport/index.js';
+import {
+  assertProposalShape,
+  atomicTransfer,
+} from '@agoric/zoe/src/contractSupport/index.js';
 import { makeSubscriptionKit } from '@agoric/notifier';
 
 import '@agoric/vats/exported.js';
@@ -31,13 +34,13 @@ const TRANSFER_PROPOSAL_SHAPE = {
  * @param {ERef<BoardDepositFacet>} board where to find depositFacets by boardID
  * @param {ERef<NameHub>} namesByAddress where to find depositFacets by bech32
  *
- * @typedef {import('@agoric/vats/src/nameHub.js').NameHub} NameHub
+ * @typedef {import('@agoric/vats').NameHub} NameHub
  */
 const makePegasus = (zcf, board, namesByAddress) => {
   /**
    * @typedef {object} LocalDenomState
-   * @property {Address} localAddr
-   * @property {Address} remoteAddr
+   * @property {string} localAddr
+   * @property {string} remoteAddr
    * @property {LegacyMap<Denom, PromiseRecord<Courier>>} receiveDenomToCourierPK
    * @property {IterationObserver<Denom>} receiveDenomPublication
    * @property {Subscription<Denom>} remoteDenomSubscription
@@ -136,8 +139,7 @@ const makePegasus = (zcf, board, namesByAddress) => {
         // Only continue if the promise isn't already resolved.
         const raceWinner = await Promise.race([promise, null]);
         checkAbort();
-
-        assert(!raceWinner, X`${receiveDenom} is already resolved`);
+        !raceWinner || Fail`${receiveDenom} is already resolved`;
 
         // If rejected, the rejection is returned to our caller, so we have
         // handled it correctly and that flow doesn't need to trigger an
@@ -248,9 +250,13 @@ const makePegasus = (zcf, board, namesByAddress) => {
           winner,
         ) => {
           // Transfer the amount to our backing seat.
-          loser.decrementBy(harden({ [loserKeyword]: amount }));
-          winner.incrementBy(harden({ [winnerKeyword]: amount }));
-          zcf.reallocate(loser, winner);
+          atomicTransfer(
+            zcf,
+            loser,
+            winner,
+            { [loserKeyword]: amount },
+            { [winnerKeyword]: amount },
+          );
         };
 
         // Describe how to retain/redeem real local erights.
@@ -489,7 +495,7 @@ const makePegasus = (zcf, board, namesByAddress) => {
  */
 
 /**
- * @param {ZCF<{board: ERef<BoardDepositFacet>, namesByAddress: ERef<NameHub>}>} zcf
+ * @param {ZCF<{board: ERef<BoardDepositFacet>, namesByAddress: ERef<import('@agoric/vats').NameHub>}>} zcf
  */
 const start = zcf => {
   const { board, namesByAddress } = zcf.getTerms();

package/src/proposals/core-proposal.js

@@ -1,7 +1,7 @@
 // @ts-check
 import { E, Far } from '@endo/far';
 import { makeNameHubKit } from '@agoric/vats/src/nameHub.js';
-import { observeIteration } from '@agoric/notifier';
+import { observeIteration, subscribeEach } from '@agoric/notifier';
 
 export const CONTRACT_NAME = 'Pegasus';
 
@@ -56,7 +56,7 @@ harden(startPegasus);
 /**
  * @param {Port} port
  * @param {*} pegasus
- * @param {NameAdmin} pegasusConnectionsAdmin
+ * @param {import('@agoric/vats').NameAdmin} pegasusConnectionsAdmin
  */
 export const addPegasusTransferPort = async (
   port,
@@ -64,7 +64,7 @@ export const addPegasusTransferPort = async (
   pegasusConnectionsAdmin,
 ) => {
   const { handler, subscription } = await E(pegasus).makePegasusConnectionKit();
-  observeIteration(subscription, {
+  observeIteration(subscribeEach(subscription), {
     updateState(connectionState) {
       const { localAddr, actions } = connectionState;
       if (actions) {

package/src/types.js

@@ -5,7 +5,6 @@
 /**
  * @typedef {string} Denom
  * @typedef {string} DepositAddress
- * @typedef {string} Address
  */
 
 /**
@@ -25,10 +24,10 @@
 
 /**
  * @typedef {object} DenomTransformer
- * @property {(remoteDenom: Denom, localAddr: Address, remoteAddr: Address)
+ * @property {(remoteDenom: Denom, localAddr: string, remoteAddr: string)
  *   => Promise<{ sendDenom: Denom, receiveDenom: Denom }>
  * } getDenomsForLocalPeg
- * @property {(remoteDenom: Denom, localAddr: Address, remoteAddr: Address)
+ * @property {(remoteDenom: Denom, localAddr: string, remoteAddr: string)
  *   => Promise<{ sendDenom: Denom, receiveDenom: Denom }>
  * } getDenomsForRemotePeg
  */
@@ -101,8 +100,8 @@
 /**
  * @typedef {object} PegasusConnection
  * @property {PegasusConnectionActions} [actions]
- * @property {Address} localAddr
- * @property {Address} remoteAddr
+ * @property {string} localAddr
+ * @property {string} remoteAddr
  * @property {Subscription<Denom>} [remoteDenomSubscription]
  */