chore: Sync Endo #8651

kriskowal · 2023-12-12T20:38:53Z

This change brings Agoric SDK in sync with the latest versions from Endo as of December 12, 2023.

This includes syncing up breaking changes with interface guards. Where invalid call guards would silently allow an invocation previously, they now throw. Several interface guards needed fixing.

Some accommodations were necessary for the new __getMethodNames__ and __getInterfaceGuard__ protocols.

The algorithm for performing a speculative integration with an Endo branch required an adjustment to ensure that types were generated correctly.

For reasons opaque to the integrator, this required:

many type imports to qualify the .js extension. The only relevant change from the Endo side is that many packages provide generated .d.ts types now.
@agoric/timeto have atypesfield pointing atindex.js`, which by dint of fortunate coïncidence is a valid TypeScript definition file.
a type error to be suppressed in @agoric/zone that only causes a type error in integration with @agoric/vats.

packages/zoe/test/unitTests/test-zoe.js

turadg · 2023-12-12T22:10:13Z

packages/inter-protocol/src/price/roundsManager.js

-          getRoundData: M.call(M.any()).returns(M.promise()),
-          getRoundStatus: M.call(M.any()).returns(M.record()),
-          oracleRoundStateSuggestRound: M.call(M.any()).returns(M.record()),
+          authenticateQuote: M.call().rest(M.any()).returns(M.any()),


This should take one quote,

agoric-sdk/packages/zoe/tools/manualPriceAuthority.js

Lines 39 to 45 in a271af9

/** @param {PriceQuoteValue} quote */

const authenticateQuote = quote => {

const quoteAmount = AmountMath.make(brand, harden(quote));

const quotePayment = quoteMint.mintPayment(quoteAmount);

return harden({ quoteAmount, quotePayment });

};

const calcAmountOut = amountIn => {

I'll push accurate guards.

Better guards would certainly be nice, but can happen after this PR. Thus, I won't withhold approval waiting for this conversation to be resolved.

turadg · 2023-12-12T22:11:03Z

packages/SwingSet/src/controller/controller.js

refactor: Make all TS import extensions explicit

Why?

Tsc made me do it. I do not know why tsc insisted, but it did.

turadg · 2023-12-12T22:12:03Z

packages/inter-protocol/src/price/fluxAggregatorKit.js

+ * @typedef {import('@agoric/time').RelativeTime} RelativeTime // TODO: use
+ *   RelativeTime, not RelativeTimeValue


this TODO is odd. perhaps it's meant to be a deprecated type?

turadg · 2023-12-12T22:12:58Z

packages/zone/src/durable.js

@@ -89,6 +89,10 @@ export const makeDurableZone = (baggage, baseLabel = 'durableZone') => {
  /** @type {import('.').Zone['exoClass']} */
  const exoClass = (...args) => prepareExoClass(baggage, ...args);
  /** @type {import('.').Zone['exoClassKit']} */
+  // @ts-ignore This type check regressed inexplicably with the release


I'll take a look at fixing this before approving

Likewise, although it would be nice to get this resolved now, it can happen after this PR, so I won't withhold approval waiting for it.

turadg · 2023-12-12T22:14:33Z

package.json

@@ -10,7 +10,7 @@
  "type": "module",
  "packageManager": "yarn@1.22.19",
  "devDependencies": {
-    "@endo/eslint-plugin": "^0.5.1",
+    "@endo/eslint-plugin": "^1.0.0",


these 1.0s, will they all be semver? Are Endo maintainers committed to major very bump for all breaking changes? do deep imports count as the package API?

Deep imports are expressly forbidden by an "exports" directive in every public Endo package except captp, far, lockdown, and marshal, and these must be fixed.

Endo has for some time committed to backward-compatibility for dependents using the default carat (^) range, which is more strict than semver.

endojs/endo#1907

Tracking the broader issue for Agoric SDK #8679

erights · 2023-12-12T22:39:57Z

This change brings Agoric SDK in sync with the latest versions from Endo as of December 12, 2003.

Wow, that's a long time ago!

erights

LGTM!!!

erights · 2023-12-20T23:14:52Z

packages/inter-protocol/src/price/roundsManager.js

-          getRoundData: M.call(M.any()).returns(M.promise()),
-          getRoundStatus: M.call(M.any()).returns(M.record()),
-          oracleRoundStateSuggestRound: M.call(M.any()).returns(M.record()),
+          authenticateQuote: M.call().rest(M.any()).returns(M.any()),


Better guards would certainly be nice, but can happen after this PR. Thus, I won't withhold approval waiting for this conversation to be resolved.

erights · 2023-12-20T23:16:21Z

packages/zone/src/durable.js

@@ -89,6 +89,10 @@ export const makeDurableZone = (baggage, baseLabel = 'durableZone') => {
  /** @type {import('.').Zone['exoClass']} */
  const exoClass = (...args) => prepareExoClass(baggage, ...args);
  /** @type {import('.').Zone['exoClassKit']} */
+  // @ts-ignore This type check regressed inexplicably with the release


Likewise, although it would be nice to get this resolved now, it can happen after this PR, so I won't withhold approval waiting for it.

…ation tests

…sages

kriskowal mentioned this pull request Dec 12, 2023

Sync Endo 2023-11 #8514

Closed

kriskowal added the force:integration Force integration tests to run on PR label Dec 12, 2023

kriskowal marked this pull request as ready for review December 12, 2023 21:23

kriskowal requested review from mhofman, turadg and michaelfig December 12, 2023 21:29

turadg reviewed Dec 12, 2023

View reviewed changes

erights mentioned this pull request Dec 15, 2023

DO NOT MERGE: experiment w 8651 #8667

Closed

kriskowal force-pushed the kris-sync-endo-2023-12-12-20-31-15 branch 8 times, most recently from 3d3a6f3 to 89c2b4b Compare December 20, 2023 21:41

kriskowal requested a review from erights December 20, 2023 22:25

erights approved these changes Dec 20, 2023

View reviewed changes

kriskowal and others added 11 commits December 20, 2023 17:34

fix(ci): Generate types when syncing Endo

ec6fad9

fix(zoe): Accommodate exo-stensibility by relaxing method name enumer…

59ab3c5

…ation tests

fix(zoe): Golden error regexp tolerant across endo versions

7cc4f96

fix(vats): Shape of NameHub lookupAdmin rest args

ad575b0

fix(inter-protocol): Relax rounds manager interface guards

ce4cc47

fix(inter-protocol): Satisfy interface guard in mock

fe8ff26

refactor(base-zone): Complete Endo migration

c6c6944

refactor: Make all TS import extensions explicit

9aa5868

fix(time): Export top-level types

cffa8c0

fix(zone): Ignore type error that occurrs only integration with vats

014fb5b

chore: Sync Endo versions

3844fcc

kriskowal added 6 commits December 20, 2023 17:34

chore: Update yarn.lock

055f68e

chore: Deduplicate yarn.lock

2b28332

chore: Reupdate yarn.lock

b48ccf2

chore: Bump xsnap meter type

552cdda

chore(swingset-vat): Update xsnap store test snapshots

157e0e5

refactor(zoe): Remove accommodation for old interface guard error mes…

69884dd

…sages

kriskowal force-pushed the kris-sync-endo-2023-12-12-20-31-15 branch from 89c2b4b to 69884dd Compare December 21, 2023 01:34

kriskowal added the automerge:rebase Automatically rebase updates, then merge label Dec 21, 2023

mergify bot merged commit 4f72580 into master Dec 21, 2023
72 of 79 checks passed

mergify bot deleted the kris-sync-endo-2023-12-12-20-31-15 branch December 21, 2023 02:08

This was referenced Dec 21, 2023

Endo sync types #8688

Merged

all imports .js #8689

Draft

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: Sync Endo #8651

chore: Sync Endo #8651

kriskowal commented Dec 12, 2023 •

edited

Loading

turadg Dec 12, 2023

erights Dec 20, 2023

turadg Dec 12, 2023

kriskowal Dec 19, 2023

turadg Dec 12, 2023

turadg Dec 12, 2023

erights Dec 20, 2023

turadg Dec 12, 2023

kriskowal Dec 19, 2023

kriskowal Dec 20, 2023

kriskowal Dec 20, 2023

erights commented Dec 12, 2023

erights left a comment

erights Dec 20, 2023

erights Dec 20, 2023

	/** @param {PriceQuoteValue} quote */
	const authenticateQuote = quote => {
	const quoteAmount = AmountMath.make(brand, harden(quote));
	const quotePayment = quoteMint.mintPayment(quoteAmount);
	return harden({ quoteAmount, quotePayment });
	};
	const calcAmountOut = amountIn => {

		* @typedef {import('@agoric/time').RelativeTime} RelativeTime // TODO: use
		* RelativeTime, not RelativeTimeValue

chore: Sync Endo #8651

chore: Sync Endo #8651

Conversation

kriskowal commented Dec 12, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

erights commented Dec 12, 2023

erights left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kriskowal commented Dec 12, 2023 •

edited

Loading