diff --git a/packages/ERTP/src/amountMath.js b/packages/ERTP/src/amountMath.js
index 002051cc3b2..8a3677f3c1d 100644
--- a/packages/ERTP/src/amountMath.js
+++ b/packages/ERTP/src/amountMath.js
@@ -1,11 +1,11 @@
-import { q, Fail } from '@endo/errors';
-import { passStyleOf, assertRemotable, assertRecord } from '@endo/marshal';
-
import { M, matches } from '@agoric/store';
+import { Fail, q } from '@endo/errors';
+import { assertRecord, assertRemotable, passStyleOf } from '@endo/marshal';
+
+import { copyBagMathHelpers } from './mathHelpers/copyBagMathHelpers.js';
+import { copySetMathHelpers } from './mathHelpers/copySetMathHelpers.js';
import { natMathHelpers } from './mathHelpers/natMathHelpers.js';
import { setMathHelpers } from './mathHelpers/setMathHelpers.js';
-import { copySetMathHelpers } from './mathHelpers/copySetMathHelpers.js';
-import { copyBagMathHelpers } from './mathHelpers/copyBagMathHelpers.js';
/**
* @import {CopyBag, CopySet} from '@endo/patterns';
diff --git a/packages/ERTP/src/displayInfo.js b/packages/ERTP/src/displayInfo.js
index ab197558f15..1e3d7622885 100644
--- a/packages/ERTP/src/displayInfo.js
+++ b/packages/ERTP/src/displayInfo.js
@@ -1,7 +1,7 @@
// @jessie-check
-import { Fail } from '@endo/errors';
import { mustMatch } from '@agoric/store';
+import { Fail } from '@endo/errors';
import { DisplayInfoShape } from './typeGuards.js';
diff --git a/packages/ERTP/src/issuerKit.js b/packages/ERTP/src/issuerKit.js
index 479eff192f2..e0b6dadb321 100644
--- a/packages/ERTP/src/issuerKit.js
+++ b/packages/ERTP/src/issuerKit.js
@@ -1,11 +1,11 @@
// @jessie-check
-import { assert, Fail } from '@endo/errors';
import { assertPattern } from '@agoric/store';
import { makeScalarBigMapStore } from '@agoric/vat-data';
import { makeDurableZone } from '@agoric/zone/durable.js';
+import { assert, Fail } from '@endo/errors';
-import { AssetKind, assertAssetKind } from './amountMath.js';
+import { assertAssetKind, AssetKind } from './amountMath.js';
import { coerceDisplayInfo } from './displayInfo.js';
import { preparePaymentLedger } from './paymentLedger.js';
diff --git a/packages/ERTP/src/legacy-payment-helpers.js b/packages/ERTP/src/legacy-payment-helpers.js
index bb8f22749a3..ae04d82aa62 100644
--- a/packages/ERTP/src/legacy-payment-helpers.js
+++ b/packages/ERTP/src/legacy-payment-helpers.js
@@ -1,8 +1,9 @@
// @jessie-check
+import { mustMatch } from '@agoric/store';
import { Fail } from '@endo/errors';
import { E } from '@endo/far';
-import { mustMatch } from '@agoric/store';
+
import { AmountMath } from './amountMath.js';
/**
diff --git a/packages/ERTP/src/mathHelpers/copyBagMathHelpers.js b/packages/ERTP/src/mathHelpers/copyBagMathHelpers.js
index 38be056bcee..de38e94f8a7 100644
--- a/packages/ERTP/src/mathHelpers/copyBagMathHelpers.js
+++ b/packages/ERTP/src/mathHelpers/copyBagMathHelpers.js
@@ -1,14 +1,14 @@
// @jessie-check
import {
+ bagDisjointSubtract,
+ bagIsSuperbag,
+ bagUnion,
+ getCopyBagEntries,
keyEQ,
+ M,
makeCopyBag,
mustMatch,
- M,
- getCopyBagEntries,
- bagIsSuperbag,
- bagUnion,
- bagDisjointSubtract,
} from '@agoric/store';
/** @import {MathHelpers} from '../types.js' */
diff --git a/packages/ERTP/src/mathHelpers/copySetMathHelpers.js b/packages/ERTP/src/mathHelpers/copySetMathHelpers.js
index 04828c846c9..adf41eeb8a7 100644
--- a/packages/ERTP/src/mathHelpers/copySetMathHelpers.js
+++ b/packages/ERTP/src/mathHelpers/copySetMathHelpers.js
@@ -1,14 +1,14 @@
// @jessie-check
import {
+ getCopySetKeys,
keyEQ,
+ M,
makeCopySet,
mustMatch,
- M,
- getCopySetKeys,
- setIsSuperset,
- setDisjointUnion,
setDisjointSubtract,
+ setDisjointUnion,
+ setIsSuperset,
} from '@agoric/store';
/**
diff --git a/packages/ERTP/src/mathHelpers/natMathHelpers.js b/packages/ERTP/src/mathHelpers/natMathHelpers.js
index 969ed7b4630..21778c6c5c1 100644
--- a/packages/ERTP/src/mathHelpers/natMathHelpers.js
+++ b/packages/ERTP/src/mathHelpers/natMathHelpers.js
@@ -1,7 +1,7 @@
// @jessie-check
import { Fail } from '@endo/errors';
-import { Nat, isNat } from '@endo/nat';
+import { isNat, Nat } from '@endo/nat';
/** @import {MathHelpers, NatValue} from '../types.js' */
diff --git a/packages/ERTP/src/mathHelpers/setMathHelpers.js b/packages/ERTP/src/mathHelpers/setMathHelpers.js
index 564c8ae656b..c02bd8f698f 100644
--- a/packages/ERTP/src/mathHelpers/setMathHelpers.js
+++ b/packages/ERTP/src/mathHelpers/setMathHelpers.js
@@ -1,14 +1,14 @@
// @jessie-check
-import { passStyleOf } from '@endo/marshal';
import {
assertKey,
- elementsIsSuperset,
- elementsDisjointUnion,
- elementsDisjointSubtract,
coerceToElements,
elementsCompare,
+ elementsDisjointSubtract,
+ elementsDisjointUnion,
+ elementsIsSuperset,
} from '@agoric/store';
+import { passStyleOf } from '@endo/marshal';
/** @import {MathHelpers, SetValue} from '../types.js' */
diff --git a/packages/ERTP/src/paymentLedger.js b/packages/ERTP/src/paymentLedger.js
index 45835366b5d..90c422ab67e 100644
--- a/packages/ERTP/src/paymentLedger.js
+++ b/packages/ERTP/src/paymentLedger.js
@@ -3,13 +3,13 @@
///
/* eslint-disable no-use-before-define */
-import { X, q, Fail, annotateError } from '@endo/errors';
+import { keyEQ, M, mustMatch } from '@agoric/store';
+import { annotateError, Fail, q, X } from '@endo/errors';
import { isPromise } from '@endo/promise-kit';
-import { mustMatch, M, keyEQ } from '@agoric/store';
+
import { AmountMath } from './amountMath.js';
import { preparePaymentKind } from './payment.js';
import { preparePurseKind } from './purse.js';
-
import { BrandI, makeIssuerInterfaces } from './typeGuards.js';
/**
diff --git a/packages/ERTP/src/purse.js b/packages/ERTP/src/purse.js
index 323b7c8d24a..aacc008e8bb 100644
--- a/packages/ERTP/src/purse.js
+++ b/packages/ERTP/src/purse.js
@@ -1,8 +1,9 @@
-import { Fail } from '@endo/errors';
import { M, makeCopySet } from '@agoric/store';
+import { Fail } from '@endo/errors';
+
import { AmountMath } from './amountMath.js';
-import { makeTransientNotifierKit } from './transientNotifier.js';
import { makeAmountStore } from './amountStore.js';
+import { makeTransientNotifierKit } from './transientNotifier.js';
/** @import {Amount, AssetKind, AmountValue, AssetKindForValue, RecoverySetsOption, Brand, Payment} from './types.js' */
diff --git a/packages/ERTP/src/transientNotifier.js b/packages/ERTP/src/transientNotifier.js
index 112c358a5a2..f7cee6100d7 100644
--- a/packages/ERTP/src/transientNotifier.js
+++ b/packages/ERTP/src/transientNotifier.js
@@ -1,8 +1,8 @@
// @jessie-check
-import { makeScalarBigWeakMapStore } from '@agoric/vat-data';
-import { provideLazy } from '@agoric/store';
import { makeNotifierKit } from '@agoric/notifier';
+import { provideLazy } from '@agoric/store';
+import { makeScalarBigWeakMapStore } from '@agoric/vat-data';
/**
* @import {Purse} from './types.js';
diff --git a/packages/ERTP/src/typeGuards.js b/packages/ERTP/src/typeGuards.js
index 4e4f38f7f04..4392cc877df 100644
--- a/packages/ERTP/src/typeGuards.js
+++ b/packages/ERTP/src/typeGuards.js
@@ -1,6 +1,6 @@
// @jessie-check
-import { M, matches, getInterfaceGuardPayload } from '@endo/patterns';
+import { getInterfaceGuardPayload, M, matches } from '@endo/patterns';
/** @import {AmountValue, AssetKindForValue, AssetValueForKind, Brand, MathHelpers} from './types.js' */
export const BrandShape = M.remotable('Brand');
diff --git a/packages/ERTP/test/swingsetTests/basicFunctionality/basicFunctionality.test.js b/packages/ERTP/test/swingsetTests/basicFunctionality/basicFunctionality.test.js
index 41e989a5919..ff086d2d44b 100644
--- a/packages/ERTP/test/swingsetTests/basicFunctionality/basicFunctionality.test.js
+++ b/packages/ERTP/test/swingsetTests/basicFunctionality/basicFunctionality.test.js
@@ -1,6 +1,6 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { loadBasedir, buildVatController } from '@agoric/swingset-vat';
+import { buildVatController, loadBasedir } from '@agoric/swingset-vat';
async function main(basedir, argv) {
const dir = new URL(`../${basedir}`, import.meta.url).pathname;
diff --git a/packages/ERTP/test/swingsetTests/basicFunctionality/bootstrap.js b/packages/ERTP/test/swingsetTests/basicFunctionality/bootstrap.js
index eee1378397a..98e0e973e0d 100644
--- a/packages/ERTP/test/swingsetTests/basicFunctionality/bootstrap.js
+++ b/packages/ERTP/test/swingsetTests/basicFunctionality/bootstrap.js
@@ -1,7 +1,8 @@
-import { E } from '@endo/eventual-send';
import { assert, X } from '@endo/errors';
+import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { makeIssuerKit, AmountMath } from '../../../src/index.js';
+
+import { AmountMath, makeIssuerKit } from '../../../src/index.js';
export function buildRootObject(vatPowers, vatParameters) {
const arg0 = vatParameters.argv[0];
diff --git a/packages/ERTP/test/swingsetTests/basicFunctionality/vat-alice.js b/packages/ERTP/test/swingsetTests/basicFunctionality/vat-alice.js
index e95bf9a9b89..f2f999b0178 100644
--- a/packages/ERTP/test/swingsetTests/basicFunctionality/vat-alice.js
+++ b/packages/ERTP/test/swingsetTests/basicFunctionality/vat-alice.js
@@ -1,5 +1,6 @@
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
+
import { AmountMath } from '../../../src/index.js';
import {
claim,
diff --git a/packages/ERTP/test/swingsetTests/ertpService/bootstrap-ertp-service-upgrade.js b/packages/ERTP/test/swingsetTests/ertpService/bootstrap-ertp-service-upgrade.js
index d5d14f0e01e..bae0f37b8c0 100644
--- a/packages/ERTP/test/swingsetTests/ertpService/bootstrap-ertp-service-upgrade.js
+++ b/packages/ERTP/test/swingsetTests/ertpService/bootstrap-ertp-service-upgrade.js
@@ -1,5 +1,6 @@
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
+
import { AmountMath } from '../../../src/index.js';
const mintInto = (kit, purse, value) =>
diff --git a/packages/ERTP/test/swingsetTests/ertpService/ertp-service-upgrade.test.js b/packages/ERTP/test/swingsetTests/ertpService/ertp-service-upgrade.test.js
index 186c0d3fb2a..246fd6d73a3 100644
--- a/packages/ERTP/test/swingsetTests/ertpService/ertp-service-upgrade.test.js
+++ b/packages/ERTP/test/swingsetTests/ertpService/ertp-service-upgrade.test.js
@@ -1,7 +1,7 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { assert } from '@endo/errors';
import { buildVatController } from '@agoric/swingset-vat';
+import { assert } from '@endo/errors';
const bfile = name => new URL(name, import.meta.url).pathname;
diff --git a/packages/ERTP/test/swingsetTests/ertpService/vat-ertp-service.js b/packages/ERTP/test/swingsetTests/ertpService/vat-ertp-service.js
index f675ea609d3..b10476c7bcb 100644
--- a/packages/ERTP/test/swingsetTests/ertpService/vat-ertp-service.js
+++ b/packages/ERTP/test/swingsetTests/ertpService/vat-ertp-service.js
@@ -1,9 +1,9 @@
-import { Far } from '@endo/marshal';
import {
makeScalarBigMapStore,
prepareSingleton,
provideDurableSetStore,
} from '@agoric/vat-data';
+import { Far } from '@endo/marshal';
import {
AssetKind,
diff --git a/packages/ERTP/test/swingsetTests/splitPayments/bootstrap.js b/packages/ERTP/test/swingsetTests/splitPayments/bootstrap.js
index 5e99e872799..0c294e97e6a 100644
--- a/packages/ERTP/test/swingsetTests/splitPayments/bootstrap.js
+++ b/packages/ERTP/test/swingsetTests/splitPayments/bootstrap.js
@@ -1,7 +1,8 @@
-import { E } from '@endo/eventual-send';
import { assert, X } from '@endo/errors';
+import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { makeIssuerKit, AmountMath } from '../../../src/index.js';
+
+import { AmountMath, makeIssuerKit } from '../../../src/index.js';
export function buildRootObject(vatPowers, vatParameters) {
const arg0 = vatParameters.argv[0];
diff --git a/packages/ERTP/test/swingsetTests/splitPayments/splitPayments.test.js b/packages/ERTP/test/swingsetTests/splitPayments/splitPayments.test.js
index ec07baf1936..527a8422f33 100644
--- a/packages/ERTP/test/swingsetTests/splitPayments/splitPayments.test.js
+++ b/packages/ERTP/test/swingsetTests/splitPayments/splitPayments.test.js
@@ -1,6 +1,6 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { loadBasedir, buildVatController } from '@agoric/swingset-vat';
+import { buildVatController, loadBasedir } from '@agoric/swingset-vat';
async function main(basedir, argv) {
const dir = new URL(`../${basedir}/`, import.meta.url).pathname;
diff --git a/packages/ERTP/test/swingsetTests/splitPayments/vat-alice.js b/packages/ERTP/test/swingsetTests/splitPayments/vat-alice.js
index c61edee397a..49efeae2968 100644
--- a/packages/ERTP/test/swingsetTests/splitPayments/vat-alice.js
+++ b/packages/ERTP/test/swingsetTests/splitPayments/vat-alice.js
@@ -1,5 +1,6 @@
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
+
import { AmountMath } from '../../../src/index.js';
import { split } from '../../../src/legacy-payment-helpers.js';
diff --git a/packages/ERTP/test/types.test-d.ts b/packages/ERTP/test/types.test-d.ts
index 41102e8629e..b0bdbea1495 100644
--- a/packages/ERTP/test/types.test-d.ts
+++ b/packages/ERTP/test/types.test-d.ts
@@ -1,6 +1,7 @@
import { Far } from '@endo/marshal';
import type { Key } from '@endo/patterns';
import { expectType } from 'tsd';
+
import { AmountMath, AssetKind } from '../src/index.js';
import type {
Amount,
diff --git a/packages/ERTP/test/unitTests/amountProperties.test.js b/packages/ERTP/test/unitTests/amountProperties.test.js
index fabe0ebb3f3..b56612b06a9 100644
--- a/packages/ERTP/test/unitTests/amountProperties.test.js
+++ b/packages/ERTP/test/unitTests/amountProperties.test.js
@@ -1,4 +1,5 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+
import { makeCopyBag } from '@agoric/store';
import { fc } from '@fast-check/ava';
diff --git a/packages/ERTP/test/unitTests/inputValidation.test.js b/packages/ERTP/test/unitTests/inputValidation.test.js
index 1f87699fc6d..31344f500b0 100644
--- a/packages/ERTP/test/unitTests/inputValidation.test.js
+++ b/packages/ERTP/test/unitTests/inputValidation.test.js
@@ -2,7 +2,8 @@ import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { AssetKind, makeIssuerKit, AmountMath } from '../../src/index.js';
+
+import { AmountMath, AssetKind, makeIssuerKit } from '../../src/index.js';
import { claim, combine } from '../../src/legacy-payment-helpers.js';
/** @import {Amount, Issuer} from '../../src/types.js' */
diff --git a/packages/ERTP/test/unitTests/interfaces.test.js b/packages/ERTP/test/unitTests/interfaces.test.js
index 6f77919ece0..1526f6afa5e 100644
--- a/packages/ERTP/test/unitTests/interfaces.test.js
+++ b/packages/ERTP/test/unitTests/interfaces.test.js
@@ -1,7 +1,8 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
import { getInterfaceOf } from '@endo/marshal';
-import { makeIssuerKit, AmountMath } from '../../src/index.js';
+
+import { AmountMath, makeIssuerKit } from '../../src/index.js';
test('interfaces - particular implementation', t => {
const allegedName = 'bucks';
diff --git a/packages/ERTP/test/unitTests/issuerObj.test.js b/packages/ERTP/test/unitTests/issuerObj.test.js
index a4e08c9de21..2531dd94cb5 100644
--- a/packages/ERTP/test/unitTests/issuerObj.test.js
+++ b/packages/ERTP/test/unitTests/issuerObj.test.js
@@ -1,7 +1,8 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
import { E } from '@endo/eventual-send';
-import { AssetKind, makeIssuerKit, AmountMath } from '../../src/index.js';
+
+import { AmountMath, AssetKind, makeIssuerKit } from '../../src/index.js';
import {
claim,
combine,
diff --git a/packages/ERTP/test/unitTests/legacy-payment-helpers.test.js b/packages/ERTP/test/unitTests/legacy-payment-helpers.test.js
index 43eee8e7e6d..4f715793f2b 100644
--- a/packages/ERTP/test/unitTests/legacy-payment-helpers.test.js
+++ b/packages/ERTP/test/unitTests/legacy-payment-helpers.test.js
@@ -1,6 +1,6 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { makeIssuerKit, AmountMath } from '../../src/index.js';
+import { AmountMath, makeIssuerKit } from '../../src/index.js';
import { combine, split } from '../../src/legacy-payment-helpers.js';
const { isEqual } = AmountMath;
diff --git a/packages/ERTP/test/unitTests/mathHelpers/copyBagMathHelpers.test.js b/packages/ERTP/test/unitTests/mathHelpers/copyBagMathHelpers.test.js
index 1f71539d790..3e10bf2f22e 100644
--- a/packages/ERTP/test/unitTests/mathHelpers/copyBagMathHelpers.test.js
+++ b/packages/ERTP/test/unitTests/mathHelpers/copyBagMathHelpers.test.js
@@ -1,9 +1,10 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { makeTagged } from '@endo/marshal';
+
import {
getCopyBagEntries,
makeCopyBagFromElements as makeBag,
} from '@agoric/store';
+import { makeTagged } from '@endo/marshal';
import { AmountMath as m, AssetKind } from '../../../src/index.js';
import { mockCopyBagBrand as mockBrand } from './mockBrand.js';
diff --git a/packages/ERTP/test/unitTests/mathHelpers/copySetMathHelpers.test.js b/packages/ERTP/test/unitTests/mathHelpers/copySetMathHelpers.test.js
index a0171c5fa38..73901798f12 100644
--- a/packages/ERTP/test/unitTests/mathHelpers/copySetMathHelpers.test.js
+++ b/packages/ERTP/test/unitTests/mathHelpers/copySetMathHelpers.test.js
@@ -1,4 +1,5 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+
import { getCopySetKeys, makeCopySet } from '@agoric/store';
import { AmountMath as m, AssetKind } from '../../../src/index.js';
diff --git a/packages/ERTP/test/unitTests/mathHelpers/mockBrand.js b/packages/ERTP/test/unitTests/mathHelpers/mockBrand.js
index a4ad9feeeeb..24d290ad274 100644
--- a/packages/ERTP/test/unitTests/mathHelpers/mockBrand.js
+++ b/packages/ERTP/test/unitTests/mathHelpers/mockBrand.js
@@ -1,4 +1,5 @@
import { Far } from '@endo/marshal';
+
import { AssetKind } from '../../../src/index.js';
/** @import {Brand} from '@agoric/ertp/src/types.js'; */
diff --git a/packages/ERTP/test/unitTests/mathHelpers/natMathHelpers.test.js b/packages/ERTP/test/unitTests/mathHelpers/natMathHelpers.test.js
index 9e19389a8b4..9ff5ad9cfba 100644
--- a/packages/ERTP/test/unitTests/mathHelpers/natMathHelpers.test.js
+++ b/packages/ERTP/test/unitTests/mathHelpers/natMathHelpers.test.js
@@ -1,7 +1,8 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { M } from '@agoric/store';
+import { M } from '@agoric/store';
import { Far } from '@endo/marshal';
+
import { AmountMath as m, AssetKind } from '../../../src/index.js';
import { mockNatBrand as mockBrand } from './mockBrand.js';
diff --git a/packages/ERTP/test/unitTests/mintObj.test.js b/packages/ERTP/test/unitTests/mintObj.test.js
index 782f4cd5917..1c2e76fd34e 100644
--- a/packages/ERTP/test/unitTests/mintObj.test.js
+++ b/packages/ERTP/test/unitTests/mintObj.test.js
@@ -1,10 +1,10 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { assert } from '@endo/errors';
import { initEmpty, M } from '@agoric/store';
-
import { defineDurableKind, makeKindHandle } from '@agoric/vat-data';
-import { makeIssuerKit, AssetKind, AmountMath } from '../../src/index.js';
+import { assert } from '@endo/errors';
+
+import { AmountMath, AssetKind, makeIssuerKit } from '../../src/index.js';
import { claim, combine } from '../../src/legacy-payment-helpers.js';
test('mint.getIssuer', t => {
diff --git a/packages/ERTP/test/unitTests/recovery.test.js b/packages/ERTP/test/unitTests/recovery.test.js
index 92713b8ef83..551fff610ec 100644
--- a/packages/ERTP/test/unitTests/recovery.test.js
+++ b/packages/ERTP/test/unitTests/recovery.test.js
@@ -1,7 +1,8 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+
import { getCopySetKeys, keyEQ, makeCopySet } from '@agoric/store';
-import { makeIssuerKit, AmountMath } from '../../src/index.js';
+import { AmountMath, makeIssuerKit } from '../../src/index.js';
const { isEmpty, isEqual } = AmountMath;
const emptySet = makeCopySet([]);
diff --git a/packages/SwingSet/demo/encouragementBot/bootstrap.js b/packages/SwingSet/demo/encouragementBot/bootstrap.js
index 4418a521ee4..4682da8e8a7 100644
--- a/packages/SwingSet/demo/encouragementBot/bootstrap.js
+++ b/packages/SwingSet/demo/encouragementBot/bootstrap.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
console.log(`=> loading bootstrap.js`);
diff --git a/packages/SwingSet/demo/encouragementBot/vat-user.js b/packages/SwingSet/demo/encouragementBot/vat-user.js
index acde1c8473e..db0337619d3 100644
--- a/packages/SwingSet/demo/encouragementBot/vat-user.js
+++ b/packages/SwingSet/demo/encouragementBot/vat-user.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject(vatPowers) {
const log = vatPowers.testLog;
diff --git a/packages/SwingSet/demo/encouragementBotComms/bootstrap.js b/packages/SwingSet/demo/encouragementBotComms/bootstrap.js
index 3242b58d9e4..09470111d01 100644
--- a/packages/SwingSet/demo/encouragementBotComms/bootstrap.js
+++ b/packages/SwingSet/demo/encouragementBotComms/bootstrap.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
console.log(`=> loading bootstrap.js`);
diff --git a/packages/SwingSet/demo/encouragementBotComms/vat-user.js b/packages/SwingSet/demo/encouragementBotComms/vat-user.js
index 343ff6b630c..f9766a5b36f 100644
--- a/packages/SwingSet/demo/encouragementBotComms/vat-user.js
+++ b/packages/SwingSet/demo/encouragementBotComms/vat-user.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject(vatPowers) {
const log = vatPowers.testLog;
diff --git a/packages/SwingSet/misc-tools/baggage-check-tool.js b/packages/SwingSet/misc-tools/baggage-check-tool.js
index 024ddefa019..328dda0ff9f 100644
--- a/packages/SwingSet/misc-tools/baggage-check-tool.js
+++ b/packages/SwingSet/misc-tools/baggage-check-tool.js
@@ -1,6 +1,8 @@
-import process from 'process';
-import sqlite3 from 'better-sqlite3';
import '@endo/init/debug.js';
+
+import sqlite3 from 'better-sqlite3';
+import process from 'process';
+
import { checkBaggage } from '../tools/baggage-check.js';
function main() {
diff --git a/packages/SwingSet/misc-tools/build-mezzanine-db.js b/packages/SwingSet/misc-tools/build-mezzanine-db.js
index 05cd0544286..74f4ff777c1 100644
--- a/packages/SwingSet/misc-tools/build-mezzanine-db.js
+++ b/packages/SwingSet/misc-tools/build-mezzanine-db.js
@@ -1,11 +1,10 @@
/* eslint-disable camelcase */
// import '@endo/init';
+import sqlite3 from 'better-sqlite3';
import fs from 'fs';
-import zlib from 'zlib';
import process from 'process';
import readline from 'readline';
-
-import sqlite3 from 'better-sqlite3';
+import zlib from 'zlib';
function makeDB(dbPath) {
const db = sqlite3(dbPath);
diff --git a/packages/SwingSet/misc-tools/classify-promises.js b/packages/SwingSet/misc-tools/classify-promises.js
index 410d2b9dbd8..b41d5d5ecc4 100755
--- a/packages/SwingSet/misc-tools/classify-promises.js
+++ b/packages/SwingSet/misc-tools/classify-promises.js
@@ -1,14 +1,15 @@
#!/usr/bin/env node
// @ts-nocheck XXX
/* eslint no-labels: "off", no-extra-label: "off", no-underscore-dangle: "off" */
-import process from 'process';
-import sqlite3 from 'better-sqlite3';
-import yargsParser from 'yargs-parser';
import '@endo/init/debug.js';
-import { makeStandinPromise, krefOf } from '@agoric/kmarshal';
+
+import { krefOf, makeStandinPromise } from '@agoric/kmarshal';
import { Far } from '@endo/far';
import { makeMarshal } from '@endo/marshal';
import { M, matches, mustMatch } from '@endo/patterns';
+import sqlite3 from 'better-sqlite3';
+import process from 'process';
+import yargsParser from 'yargs-parser';
const EX_USAGE = 64;
const {
diff --git a/packages/SwingSet/misc-tools/db-delete.js b/packages/SwingSet/misc-tools/db-delete.js
index 599f6754a5f..176151320ca 100755
--- a/packages/SwingSet/misc-tools/db-delete.js
+++ b/packages/SwingSet/misc-tools/db-delete.js
@@ -1,8 +1,9 @@
#!/usr/bin/env node
// @ts-nocheck
import '@endo/init';
-import process from 'process';
+
import { openSwingStore } from '@agoric/swing-store';
+import process from 'process';
const log = console.log;
diff --git a/packages/SwingSet/misc-tools/db-get.js b/packages/SwingSet/misc-tools/db-get.js
index 7964b2c5304..a52028fd453 100755
--- a/packages/SwingSet/misc-tools/db-get.js
+++ b/packages/SwingSet/misc-tools/db-get.js
@@ -1,8 +1,9 @@
#!/usr/bin/env node
// @ts-nocheck
import '@endo/init';
-import process from 'process';
+
import { openSwingStore } from '@agoric/swing-store';
+import process from 'process';
const log = console.log;
diff --git a/packages/SwingSet/misc-tools/db-set.js b/packages/SwingSet/misc-tools/db-set.js
index 0bd69dbce62..ffe30a0a318 100755
--- a/packages/SwingSet/misc-tools/db-set.js
+++ b/packages/SwingSet/misc-tools/db-set.js
@@ -1,8 +1,9 @@
#!/usr/bin/env node
// @ts-nocheck
import '@endo/init';
-import process from 'process';
+
import { openSwingStore } from '@agoric/swing-store';
+import process from 'process';
const log = console.log;
diff --git a/packages/SwingSet/misc-tools/extract-bundle-from-kerneldb.js b/packages/SwingSet/misc-tools/extract-bundle-from-kerneldb.js
index 0a71459b92f..49990d2b0d4 100644
--- a/packages/SwingSet/misc-tools/extract-bundle-from-kerneldb.js
+++ b/packages/SwingSet/misc-tools/extract-bundle-from-kerneldb.js
@@ -1,9 +1,10 @@
// @ts-check
import '@endo/init';
-import process from 'process';
-import fs from 'fs';
+
import { isSwingStore, openSwingStore } from '@agoric/swing-store';
+import fs from 'fs';
+import process from 'process';
const argv = process.argv.splice(2);
const dirPath = argv[0];
diff --git a/packages/SwingSet/misc-tools/extract-contract-from-transcript.js b/packages/SwingSet/misc-tools/extract-contract-from-transcript.js
index 5f9eb928c96..b202fd37692 100644
--- a/packages/SwingSet/misc-tools/extract-contract-from-transcript.js
+++ b/packages/SwingSet/misc-tools/extract-contract-from-transcript.js
@@ -1,11 +1,11 @@
// @ts-nocheck
-import fs from 'fs';
-import zlib from 'zlib';
-import readline from 'readline';
-import process from 'process';
import '@endo/init';
import { decodeBase64 } from '@endo/base64';
+import fs from 'fs';
+import process from 'process';
+import readline from 'readline';
+import zlib from 'zlib';
// Given a transcript (produced by
// e.g. extract-transcript-from-slogfile.js), which is assumed to be a
diff --git a/packages/SwingSet/misc-tools/extract-transcript-from-kerneldb.js b/packages/SwingSet/misc-tools/extract-transcript-from-kerneldb.js
index aa2c5638cd9..5348b795427 100644
--- a/packages/SwingSet/misc-tools/extract-transcript-from-kerneldb.js
+++ b/packages/SwingSet/misc-tools/extract-transcript-from-kerneldb.js
@@ -1,9 +1,10 @@
// @ts-nocheck
import '@endo/init';
-import process from 'process';
-import fs from 'fs';
+
import { isSwingStore, openSwingStore } from '@agoric/swing-store';
+import fs from 'fs';
+import process from 'process';
const argv = process.argv.splice(2);
const dirPath = argv[0];
diff --git a/packages/SwingSet/misc-tools/extract-transcript-from-slogfile.js b/packages/SwingSet/misc-tools/extract-transcript-from-slogfile.js
index f3ff7a35687..75483edc6b8 100644
--- a/packages/SwingSet/misc-tools/extract-transcript-from-slogfile.js
+++ b/packages/SwingSet/misc-tools/extract-transcript-from-slogfile.js
@@ -1,8 +1,8 @@
// @ts-nocheck
import fs from 'fs';
-import zlib from 'zlib';
-import readline from 'readline';
import process from 'process';
+import readline from 'readline';
+import zlib from 'zlib';
async function run() {
const args = process.argv.slice(2);
diff --git a/packages/SwingSet/misc-tools/extract-vat-from-transcript.js b/packages/SwingSet/misc-tools/extract-vat-from-transcript.js
index 987b24b8b22..9cc3551dbf0 100644
--- a/packages/SwingSet/misc-tools/extract-vat-from-transcript.js
+++ b/packages/SwingSet/misc-tools/extract-vat-from-transcript.js
@@ -1,11 +1,11 @@
// @ts-nocheck
-import fs from 'fs';
-import zlib from 'zlib';
-import readline from 'readline';
-import process from 'process';
import '@endo/init';
import { decodeBase64 } from '@endo/base64';
+import fs from 'fs';
+import process from 'process';
+import readline from 'readline';
+import zlib from 'zlib';
async function run() {
const args = process.argv.slice(2);
diff --git a/packages/SwingSet/misc-tools/extract-xs-snapshot.js b/packages/SwingSet/misc-tools/extract-xs-snapshot.js
index 6beb5df4871..7f98c5e69a1 100644
--- a/packages/SwingSet/misc-tools/extract-xs-snapshot.js
+++ b/packages/SwingSet/misc-tools/extract-xs-snapshot.js
@@ -1,10 +1,11 @@
// @ts-nocheck
import '@endo/init';
-import process from 'process';
-import fs from 'fs';
+
import { isSwingStore, openSwingStore } from '@agoric/swing-store';
import { E } from '@endo/far';
+import fs from 'fs';
+import process from 'process';
const argv = process.argv.splice(2);
const dirPath = argv[0];
diff --git a/packages/SwingSet/misc-tools/replace-bundle.js b/packages/SwingSet/misc-tools/replace-bundle.js
index 6d444f72f7e..dd3d0aee5b4 100755
--- a/packages/SwingSet/misc-tools/replace-bundle.js
+++ b/packages/SwingSet/misc-tools/replace-bundle.js
@@ -2,9 +2,10 @@
// @ts-nocheck
import '@endo/init';
-import process from 'process';
+
import { openSwingStore } from '@agoric/swing-store';
import bundleSource from '@endo/bundle-source';
+import process from 'process';
const log = console.log;
diff --git a/packages/SwingSet/misc-tools/replay-transcript.js b/packages/SwingSet/misc-tools/replay-transcript.js
index 1dfdc5c1322..8ce69e2bce5 100644
--- a/packages/SwingSet/misc-tools/replay-transcript.js
+++ b/packages/SwingSet/misc-tools/replay-transcript.js
@@ -2,33 +2,34 @@
/* global WeakRef FinalizationRegistry */
-import fs from 'fs';
import '@agoric/internal/src/install-ses-debug.js';
-import zlib from 'zlib';
-import readline from 'readline';
-import process from 'process';
-import { spawn } from 'child_process';
-import { promisify } from 'util';
-import { createHash } from 'crypto';
-import { Readable, finished as finishedCallback } from 'stream';
-import { performance } from 'perf_hooks';
-import { tmpName, dirSync as tmpDirSync } from 'tmp';
-import sqlite3 from 'better-sqlite3';
-import yargsParser from 'yargs-parser';
import { makeMeasureSeconds } from '@agoric/internal';
+import engineGC from '@agoric/internal/src/lib-nodejs/engine-gc.js';
+import { makeGcAndFinalize } from '@agoric/internal/src/lib-nodejs/gc-and-finalize.js';
+import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
import { makeWithQueue } from '@agoric/internal/src/queue.js';
import { makeSnapStore } from '@agoric/swing-store';
-import { getLockdownBundle } from '@agoric/xsnap-lockdown';
import { getSupervisorBundle } from '@agoric/swingset-xsnap-supervisor';
-import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
-import { makeGcAndFinalize } from '@agoric/internal/src/lib-nodejs/gc-and-finalize.js';
-import engineGC from '@agoric/internal/src/lib-nodejs/engine-gc.js';
+import { getLockdownBundle } from '@agoric/xsnap-lockdown';
+import sqlite3 from 'better-sqlite3';
+import { spawn } from 'child_process';
+import { createHash } from 'crypto';
+import fs from 'fs';
+import { performance } from 'perf_hooks';
+import process from 'process';
+import readline from 'readline';
+import { finished as finishedCallback, Readable } from 'stream';
+import { dirSync as tmpDirSync, tmpName } from 'tmp';
+import { promisify } from 'util';
+import yargsParser from 'yargs-parser';
+import zlib from 'zlib';
+
import { makeStartXSnap } from '../src/controller/startXSnap.js';
-import { makeXsSubprocessFactory } from '../src/kernel/vat-loader/manager-subprocess-xsnap.js';
+import { makeDummyMeterControl } from '../src/kernel/dummyMeterControl.js';
import { makeLocalVatManagerFactory } from '../src/kernel/vat-loader/manager-local.js';
+import { makeXsSubprocessFactory } from '../src/kernel/vat-loader/manager-subprocess-xsnap.js';
import { makeSyscallSimulator } from '../src/kernel/vat-warehouse.js';
-import { makeDummyMeterControl } from '../src/kernel/dummyMeterControl.js';
/**
* @import {SnapStore} from '@agoric/swing-store';
diff --git a/packages/SwingSet/src/controller/controller.js b/packages/SwingSet/src/controller/controller.js
index 3321d1f92a6..894b824eced 100644
--- a/packages/SwingSet/src/controller/controller.js
+++ b/packages/SwingSet/src/controller/controller.js
@@ -1,38 +1,37 @@
/* global globalThis, WeakRef, FinalizationRegistry */
-import process from 'process';
-import crypto from 'crypto';
-import { performance } from 'perf_hooks';
+import engineGC from '@agoric/internal/src/lib-nodejs/engine-gc.js';
+import { makeGcAndFinalize } from '@agoric/internal/src/lib-nodejs/gc-and-finalize.js';
+import { startSubprocessWorker } from '@agoric/internal/src/lib-nodejs/spawnSubprocessWorker.js';
+import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
+import { krefOf, kslot } from '@agoric/kmarshal';
+import { initSwingStore } from '@agoric/swing-store';
+import { checkBundle } from '@endo/check-bundle/lite.js';
+import { assert, Fail } from '@endo/errors';
+import { importBundle } from '@endo/import-bundle';
+import { M, mustMatch } from '@endo/patterns';
+import anylogger from 'anylogger';
import { spawn as ambientSpawn } from 'child_process';
+import crypto from 'crypto';
import fs from 'fs';
-import { tmpName } from 'tmp';
-import anylogger from 'anylogger';
import microtime from 'microtime';
+import { performance } from 'perf_hooks';
+import process from 'process';
+import { tmpName } from 'tmp';
-import { assert, Fail } from '@endo/errors';
-import { importBundle } from '@endo/import-bundle';
-import { initSwingStore } from '@agoric/swing-store';
-
-import { mustMatch, M } from '@endo/patterns';
-import { checkBundle } from '@endo/check-bundle/lite.js';
-import engineGC from '@agoric/internal/src/lib-nodejs/engine-gc.js';
-import { startSubprocessWorker } from '@agoric/internal/src/lib-nodejs/spawnSubprocessWorker.js';
-import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
-import { makeGcAndFinalize } from '@agoric/internal/src/lib-nodejs/gc-and-finalize.js';
-import { kslot, krefOf } from '@agoric/kmarshal';
-import { insistStorageAPI } from '../lib/storageAPI.js';
import { insistCapData } from '../lib/capdata.js';
-import {
- buildKernelBundle,
- swingsetIsInitialized,
- initializeSwingset,
-} from './initializeSwingset.js';
+import { insistStorageAPI } from '../lib/storageAPI.js';
import {
makeWorkerBundleHandler,
makeXsnapBundleData,
} from './bundle-handler.js';
-import { makeStartXSnap } from './startXSnap.js';
+import {
+ buildKernelBundle,
+ initializeSwingset,
+ swingsetIsInitialized,
+} from './initializeSwingset.js';
import { makeStartSubprocessWorkerNode } from './startNodeSubprocess.js';
+import { makeStartXSnap } from './startXSnap.js';
/**
* @typedef { import('../types-internal.js').VatID } VatID
diff --git a/packages/SwingSet/src/controller/initializeKernel.js b/packages/SwingSet/src/controller/initializeKernel.js
index aa84c4b0216..65cb23e1e51 100644
--- a/packages/SwingSet/src/controller/initializeKernel.js
+++ b/packages/SwingSet/src/controller/initializeKernel.js
@@ -1,20 +1,21 @@
/* eslint-disable no-use-before-define */
+import { kser, kunser } from '@agoric/kmarshal';
import { assert, Fail } from '@endo/errors';
-import { makeMarshal } from '@endo/marshal';
import { Far } from '@endo/far';
-import { kser, kunser } from '@agoric/kmarshal';
-import { assertKnownOptions } from '../lib/assertOptions.js';
-import { insistVatID } from '../lib/id.js';
-import { makeVatSlot } from '../lib/parseVatSlots.js';
-import { insistStorageAPI } from '../lib/storageAPI.js';
-import { makeVatOptionRecorder } from '../lib/recordVatOptions.js';
+import { makeMarshal } from '@endo/marshal';
+
+import { exportRootObject } from '../kernel/kernel.js';
+import { makeKernelQueueHandler } from '../kernel/kernelQueue.js';
import makeKernelKeeper, {
DEFAULT_DELIVERIES_PER_BOYD,
DEFAULT_GC_KREFS_PER_BOYD,
} from '../kernel/state/kernelKeeper.js';
-import { exportRootObject } from '../kernel/kernel.js';
-import { makeKernelQueueHandler } from '../kernel/kernelQueue.js';
+import { assertKnownOptions } from '../lib/assertOptions.js';
+import { insistVatID } from '../lib/id.js';
+import { makeVatSlot } from '../lib/parseVatSlots.js';
+import { makeVatOptionRecorder } from '../lib/recordVatOptions.js';
+import { insistStorageAPI } from '../lib/storageAPI.js';
/**
* @typedef { import('../types-external.js').SwingSetKernelConfig } SwingSetKernelConfig
diff --git a/packages/SwingSet/src/controller/initializeSwingset.js b/packages/SwingSet/src/controller/initializeSwingset.js
index be85b28e066..517c8630e27 100644
--- a/packages/SwingSet/src/controller/initializeSwingset.js
+++ b/packages/SwingSet/src/controller/initializeSwingset.js
@@ -1,23 +1,23 @@
/* global process */
-import fs from 'fs';
-import path from 'path';
+import '../types-ambient.js';
-import { assert, Fail } from '@endo/errors';
import { makeTracer } from '@agoric/internal';
import { mustMatch } from '@agoric/store';
import bundleSource from '@endo/bundle-source';
+import { assert, Fail } from '@endo/errors';
+import fs from 'fs';
import { resolve as resolveModuleSpecifier } from 'import-meta-resolve';
-import { ManagerType } from '../typeGuards.js';
+import path from 'path';
+
import { provideBundleCache } from '../../tools/bundleTool.js';
import { kdebugEnable } from '../lib/kdebug.js';
import { insistStorageAPI } from '../lib/storageAPI.js';
-import { initializeKernel } from './initializeKernel.js';
+import { ManagerType } from '../typeGuards.js';
import {
makeWorkerBundleHandler,
makeXsnapBundleData,
} from './bundle-handler.js';
-
-import '../types-ambient.js';
+import { initializeKernel } from './initializeKernel.js';
const trace = makeTracer('IniSwi', false);
diff --git a/packages/SwingSet/src/controller/startXSnap.js b/packages/SwingSet/src/controller/startXSnap.js
index f5d7f311120..6fe79f447d6 100644
--- a/packages/SwingSet/src/controller/startXSnap.js
+++ b/packages/SwingSet/src/controller/startXSnap.js
@@ -1,7 +1,7 @@
-import path from 'path';
+import { recordXSnap, xsnap } from '@agoric/xsnap';
import { Fail } from '@endo/errors';
import { type as osType } from 'os';
-import { xsnap, recordXSnap } from '@agoric/xsnap';
+import path from 'path';
const NETSTRING_MAX_CHUNK_SIZE = 12_000_000;
diff --git a/packages/SwingSet/src/controller/upgradeSwingset.js b/packages/SwingSet/src/controller/upgradeSwingset.js
index 87195b8cfae..c855caf9242 100644
--- a/packages/SwingSet/src/controller/upgradeSwingset.js
+++ b/packages/SwingSet/src/controller/upgradeSwingset.js
@@ -1,6 +1,6 @@
import {
- DEFAULT_REAP_DIRT_THRESHOLD_KEY,
DEFAULT_GC_KREFS_PER_BOYD,
+ DEFAULT_REAP_DIRT_THRESHOLD_KEY,
getAllDynamicVats,
getAllStaticVats,
} from '../kernel/state/kernelKeeper.js';
diff --git a/packages/SwingSet/src/devices/bundle/device-bundle.js b/packages/SwingSet/src/devices/bundle/device-bundle.js
index 88f87ffd8da..fe5226159cd 100644
--- a/packages/SwingSet/src/devices/bundle/device-bundle.js
+++ b/packages/SwingSet/src/devices/bundle/device-bundle.js
@@ -1,4 +1,5 @@
import { assert } from '@endo/errors';
+
import { buildSerializationTools } from '../lib/deviceTools.js';
/*
diff --git a/packages/SwingSet/src/devices/command/command.js b/packages/SwingSet/src/devices/command/command.js
index d2d3a0e73a9..cf8a508edb0 100644
--- a/packages/SwingSet/src/devices/command/command.js
+++ b/packages/SwingSet/src/devices/command/command.js
@@ -1,6 +1,6 @@
import { Fail } from '@endo/errors';
-import { makePromiseKit } from '@endo/promise-kit';
import { Nat } from '@endo/nat';
+import { makePromiseKit } from '@endo/promise-kit';
export default function buildCommand(broadcastCallback) {
broadcastCallback || Fail`broadcastCallback must be provided.`;
diff --git a/packages/SwingSet/src/devices/command/device-command.js b/packages/SwingSet/src/devices/command/device-command.js
index e9fe2e7a533..1a5c9554dff 100644
--- a/packages/SwingSet/src/devices/command/device-command.js
+++ b/packages/SwingSet/src/devices/command/device-command.js
@@ -1,6 +1,6 @@
import { Fail } from '@endo/errors';
-import { Nat } from '@endo/nat';
import { Far } from '@endo/far';
+import { Nat } from '@endo/nat';
export function buildRootDeviceNode(tools) {
const { SO, getDeviceState, setDeviceState, endowments } = tools;
diff --git a/packages/SwingSet/src/devices/lib/deviceTools.js b/packages/SwingSet/src/devices/lib/deviceTools.js
index 9b5c91aaf28..ca892dc674d 100644
--- a/packages/SwingSet/src/devices/lib/deviceTools.js
+++ b/packages/SwingSet/src/devices/lib/deviceTools.js
@@ -1,6 +1,7 @@
import { assert, Fail } from '@endo/errors';
-import { makeMarshal } from '@endo/marshal';
import { Far } from '@endo/far';
+import { makeMarshal } from '@endo/marshal';
+
import { parseVatSlot } from '../../lib/parseVatSlots.js';
// raw devices can use this to build a set of convenience tools for
diff --git a/packages/SwingSet/src/devices/mailbox/device-mailbox.js b/packages/SwingSet/src/devices/mailbox/device-mailbox.js
index ae4bf5cfc30..4402695b483 100644
--- a/packages/SwingSet/src/devices/mailbox/device-mailbox.js
+++ b/packages/SwingSet/src/devices/mailbox/device-mailbox.js
@@ -1,6 +1,6 @@
import { assert, Fail } from '@endo/errors';
-import { Nat } from '@endo/nat';
import { Far } from '@endo/far';
+import { Nat } from '@endo/nat';
export function buildRootDeviceNode(tools) {
const { SO, getDeviceState, setDeviceState, endowments } = tools;
diff --git a/packages/SwingSet/src/devices/plugin/device-plugin.js b/packages/SwingSet/src/devices/plugin/device-plugin.js
index f71d57e2738..4c2d878bdf5 100644
--- a/packages/SwingSet/src/devices/plugin/device-plugin.js
+++ b/packages/SwingSet/src/devices/plugin/device-plugin.js
@@ -1,5 +1,5 @@
-import { Fail } from '@endo/errors';
import { makeCapTP } from '@endo/captp';
+import { Fail } from '@endo/errors';
import { Far } from '@endo/far';
export function buildRootDeviceNode(tools) {
diff --git a/packages/SwingSet/src/devices/timer/device-timer.js b/packages/SwingSet/src/devices/timer/device-timer.js
index 99ca76322a4..8549e76250d 100644
--- a/packages/SwingSet/src/devices/timer/device-timer.js
+++ b/packages/SwingSet/src/devices/timer/device-timer.js
@@ -22,9 +22,9 @@
* expose only capabilities that don't reveal them.
*/
-import { Nat } from '@endo/nat';
import { assert, Fail } from '@endo/errors';
import { Far } from '@endo/far';
+import { Nat } from '@endo/nat';
// Since we use harden when saving the state, we need to copy the arrays so they
// will continue to be mutable. each record inside handlers is immutable, so we
diff --git a/packages/SwingSet/src/devices/timer/timer.js b/packages/SwingSet/src/devices/timer/timer.js
index 3fa0361cacc..017513c81b0 100644
--- a/packages/SwingSet/src/devices/timer/timer.js
+++ b/packages/SwingSet/src/devices/timer/timer.js
@@ -1,6 +1,5 @@
-import { Nat } from '@endo/nat';
-
import { Fail } from '@endo/errors';
+import { Nat } from '@endo/nat';
/**
* Endowments for a Timer device that can be made available to SwingSet vats.
diff --git a/packages/SwingSet/src/devices/vat-admin/device-vat-admin.js b/packages/SwingSet/src/devices/vat-admin/device-vat-admin.js
index dd4843bd253..67b493aaa35 100644
--- a/packages/SwingSet/src/devices/vat-admin/device-vat-admin.js
+++ b/packages/SwingSet/src/devices/vat-admin/device-vat-admin.js
@@ -1,8 +1,9 @@
-import { Nat } from '@endo/nat';
-import { assert } from '@endo/errors';
import { kunser } from '@agoric/kmarshal';
-import { buildSerializationTools } from '../lib/deviceTools.js';
+import { assert } from '@endo/errors';
+import { Nat } from '@endo/nat';
+
import { insistVatID } from '../../lib/id.js';
+import { buildSerializationTools } from '../lib/deviceTools.js';
/*
diff --git a/packages/SwingSet/src/kernel/deviceManager.js b/packages/SwingSet/src/kernel/deviceManager.js
index 77ecd002098..85158c6d348 100644
--- a/packages/SwingSet/src/kernel/deviceManager.js
+++ b/packages/SwingSet/src/kernel/deviceManager.js
@@ -1,8 +1,9 @@
+import '../types-ambient.js';
+
import { assert, Fail } from '@endo/errors';
-import { makeDeviceSlots } from './deviceSlots.js';
-import { insistCapData } from '../lib/capdata.js';
-import '../types-ambient.js';
+import { insistCapData } from '../lib/capdata.js';
+import { makeDeviceSlots } from './deviceSlots.js';
/* The DeviceManager is much simpler than the VatManager, because the feature
* set is smaller:
diff --git a/packages/SwingSet/src/kernel/deviceSlots.js b/packages/SwingSet/src/kernel/deviceSlots.js
index 609edc0837a..e9b620b0284 100644
--- a/packages/SwingSet/src/kernel/deviceSlots.js
+++ b/packages/SwingSet/src/kernel/deviceSlots.js
@@ -1,12 +1,13 @@
-import { Remotable, makeMarshal } from '@endo/marshal';
-import { passStyleOf } from '@endo/far';
import { assert, Fail } from '@endo/errors';
+import { passStyleOf } from '@endo/far';
+import { makeMarshal, Remotable } from '@endo/marshal';
+
+import { insistCapData } from '../lib/capdata.js';
import {
insistVatType,
makeVatSlot,
parseVatSlot,
} from '../lib/parseVatSlots.js';
-import { insistCapData } from '../lib/capdata.js';
// 'makeDeviceSlots' is a subset of makeLiveSlots, for device code
diff --git a/packages/SwingSet/src/kernel/deviceTranslator.js b/packages/SwingSet/src/kernel/deviceTranslator.js
index 6152e4b4943..6c7eff5bc79 100644
--- a/packages/SwingSet/src/kernel/deviceTranslator.js
+++ b/packages/SwingSet/src/kernel/deviceTranslator.js
@@ -1,10 +1,11 @@
// @ts-nocheck
import { assert, Fail } from '@endo/errors';
-import { insistMessage } from '../lib/message.js';
-import { insistKernelType } from './parseKernelSlots.js';
-import { insistVatType, parseVatSlot } from '../lib/parseVatSlots.js';
+
import { insistCapData } from '../lib/capdata.js';
import { kdebug } from '../lib/kdebug.js';
+import { insistMessage } from '../lib/message.js';
+import { insistVatType, parseVatSlot } from '../lib/parseVatSlots.js';
+import { insistKernelType } from './parseKernelSlots.js';
import { assertValidVatstoreKey } from './vatTranslator.js';
/*
diff --git a/packages/SwingSet/src/kernel/gc-actions.js b/packages/SwingSet/src/kernel/gc-actions.js
index ccc378fbbe9..fef247355da 100644
--- a/packages/SwingSet/src/kernel/gc-actions.js
+++ b/packages/SwingSet/src/kernel/gc-actions.js
@@ -1,6 +1,7 @@
import { Fail } from '@endo/errors';
-import { insistKernelType } from './parseKernelSlots.js';
+
import { insistVatID } from '../lib/id.js';
+import { insistKernelType } from './parseKernelSlots.js';
/** @import {TotalMap} from '@agoric/internal'; */
diff --git a/packages/SwingSet/src/kernel/kernel.js b/packages/SwingSet/src/kernel/kernel.js
index b6e11dbd714..7c3627cbef7 100644
--- a/packages/SwingSet/src/kernel/kernel.js
+++ b/packages/SwingSet/src/kernel/kernel.js
@@ -1,43 +1,44 @@
/* global globalThis */
-import { assert, Fail } from '@endo/errors';
-import { isNat } from '@endo/nat';
-import { mustMatch, M } from '@endo/patterns';
-import { importBundle } from '@endo/import-bundle';
import { objectMetaMap, PromiseAllOrErrors } from '@agoric/internal';
import { makeUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
import { kser, kslot, makeError } from '@agoric/kmarshal';
+import { assert, Fail } from '@endo/errors';
+import { importBundle } from '@endo/import-bundle';
+import { isNat } from '@endo/nat';
+import { M, mustMatch } from '@endo/patterns';
+
import { assertKnownOptions } from '../lib/assertOptions.js';
-import { foreverPolicy } from '../lib/runPolicies.js';
-import { makeVatManagerFactory } from './vat-loader/manager-factory.js';
-import { makeVatWarehouse } from './vat-warehouse.js';
-import makeDeviceManager from './deviceManager.js';
-import makeKernelKeeper, {
- CURRENT_SCHEMA_VERSION,
-} from './state/kernelKeeper.js';
+import { extractSingleSlot, insistCapData } from '../lib/capdata.js';
+import { insistDeviceID, insistVatID } from '../lib/id.js';
import {
+ extractMethod,
kdebug,
kdebugEnable,
legibilizeMessageArgs,
- extractMethod,
} from '../lib/kdebug.js';
-import { insistKernelType, parseKernelSlot } from './parseKernelSlots.js';
-import { parseVatSlot } from '../lib/parseVatSlots.js';
-import { extractSingleSlot, insistCapData } from '../lib/capdata.js';
import { insistMessage, insistVatDeliveryResult } from '../lib/message.js';
-import { insistDeviceID, insistVatID } from '../lib/id.js';
-import { updateWorkerOptions } from '../lib/workerOptions.js';
+import { parseVatSlot } from '../lib/parseVatSlots.js';
import { makeVatOptionRecorder } from '../lib/recordVatOptions.js';
-import { makeKernelQueueHandler } from './kernelQueue.js';
-import { makeKernelSyscallHandler } from './kernelSyscall.js';
-import { makeSlogger, makeDummySlogger } from './slogger.js';
-import { makeDummyMeterControl } from './dummyMeterControl.js';
+import { foreverPolicy } from '../lib/runPolicies.js';
+import { updateWorkerOptions } from '../lib/workerOptions.js';
import { getKpidsToRetire } from './cleanup.js';
-import { processGCActionSet } from './gc-actions.js';
-import { makeVatLoader } from './vat-loader/vat-loader.js';
+import makeDeviceManager from './deviceManager.js';
import { makeDeviceTranslators } from './deviceTranslator.js';
+import { makeDummyMeterControl } from './dummyMeterControl.js';
+import { processGCActionSet } from './gc-actions.js';
+import { makeKernelQueueHandler } from './kernelQueue.js';
+import { makeKernelSyscallHandler } from './kernelSyscall.js';
import { notifyTermination } from './notifyTermination.js';
+import { insistKernelType, parseKernelSlot } from './parseKernelSlots.js';
+import { makeDummySlogger, makeSlogger } from './slogger.js';
+import makeKernelKeeper, {
+ CURRENT_SCHEMA_VERSION,
+} from './state/kernelKeeper.js';
import { makeVatAdminHooks } from './vat-admin-hooks.js';
+import { makeVatManagerFactory } from './vat-loader/manager-factory.js';
+import { makeVatLoader } from './vat-loader/vat-loader.js';
+import { makeVatWarehouse } from './vat-warehouse.js';
/**
* @import {MeterConsumption, VatDeliveryObject, VatDeliveryResult, VatSyscallObject, VatSyscallResult} from '@agoric/swingset-liveslots';
diff --git a/packages/SwingSet/src/kernel/kernelQueue.js b/packages/SwingSet/src/kernel/kernelQueue.js
index be025b87b57..16a9971964d 100644
--- a/packages/SwingSet/src/kernel/kernelQueue.js
+++ b/packages/SwingSet/src/kernel/kernelQueue.js
@@ -1,8 +1,9 @@
import { kser } from '@agoric/kmarshal';
-import { insistKernelType, parseKernelSlot } from './parseKernelSlots.js';
+
import { insistCapData } from '../lib/capdata.js';
-import { insistMessage } from '../lib/message.js';
import { insistVatID } from '../lib/id.js';
+import { insistMessage } from '../lib/message.js';
+import { insistKernelType, parseKernelSlot } from './parseKernelSlots.js';
/**
* @param {object} tools
diff --git a/packages/SwingSet/src/kernel/kernelSyscall.js b/packages/SwingSet/src/kernel/kernelSyscall.js
index 573b2b351b7..1caa17194da 100644
--- a/packages/SwingSet/src/kernel/kernelSyscall.js
+++ b/packages/SwingSet/src/kernel/kernelSyscall.js
@@ -1,7 +1,8 @@
import { assert, Fail } from '@endo/errors';
-import { insistKernelType } from './parseKernelSlots.js';
+
import { insistCapData } from '../lib/capdata.js';
import { insistDeviceID, insistVatID } from '../lib/id.js';
+import { insistKernelType } from './parseKernelSlots.js';
/** @type { KernelSyscallResult } */
const OKNULL = harden(['ok', null]);
diff --git a/packages/SwingSet/src/kernel/notifyTermination.js b/packages/SwingSet/src/kernel/notifyTermination.js
index 38e9d67ce47..40a5d31331b 100644
--- a/packages/SwingSet/src/kernel/notifyTermination.js
+++ b/packages/SwingSet/src/kernel/notifyTermination.js
@@ -1,4 +1,5 @@
import { kunser } from '@agoric/kmarshal';
+
import { insistCapData } from '../lib/capdata.js';
/**
diff --git a/packages/SwingSet/src/kernel/parseKernelSlots.js b/packages/SwingSet/src/kernel/parseKernelSlots.js
index f4934dbacb0..c99b382aae9 100644
--- a/packages/SwingSet/src/kernel/parseKernelSlots.js
+++ b/packages/SwingSet/src/kernel/parseKernelSlots.js
@@ -1,5 +1,5 @@
-import { Nat } from '@endo/nat';
import { assert, Fail } from '@endo/errors';
+import { Nat } from '@endo/nat';
// Object/promise references (in the kernel) contain a two-tuple of (type,
// index). All object references point to entries in the kernel Object
diff --git a/packages/SwingSet/src/kernel/state/deviceKeeper.js b/packages/SwingSet/src/kernel/state/deviceKeeper.js
index 72200df6698..c25172afa78 100644
--- a/packages/SwingSet/src/kernel/state/deviceKeeper.js
+++ b/packages/SwingSet/src/kernel/state/deviceKeeper.js
@@ -2,11 +2,12 @@
* Kernel's keeper of persistent state for a device.
*/
-import { Nat } from '@endo/nat';
import { assert, Fail } from '@endo/errors';
-import { parseKernelSlot } from '../parseKernelSlots.js';
-import { makeVatSlot, parseVatSlot } from '../../lib/parseVatSlots.js';
+import { Nat } from '@endo/nat';
+
import { insistDeviceID } from '../../lib/id.js';
+import { makeVatSlot, parseVatSlot } from '../../lib/parseVatSlots.js';
+import { parseKernelSlot } from '../parseKernelSlots.js';
import { enumeratePrefixedKeys } from './storageHelper.js';
const FIRST_DEVICE_IMPORTED_OBJECT_ID = 10n;
diff --git a/packages/SwingSet/src/kernel/state/kernelKeeper.js b/packages/SwingSet/src/kernel/state/kernelKeeper.js
index 1d456160bf8..13e61e93eac 100644
--- a/packages/SwingSet/src/kernel/state/kernelKeeper.js
+++ b/packages/SwingSet/src/kernel/state/kernelKeeper.js
@@ -1,36 +1,37 @@
/* eslint-disable no-use-before-define */
-import { Nat, isNat } from '@endo/nat';
import { assert, Fail } from '@endo/errors';
-import {
- initializeVatState,
- makeVatKeeper,
- DEFAULT_REAP_DIRT_THRESHOLD_KEY,
-} from './vatKeeper.js';
-import { initializeDeviceState, makeDeviceKeeper } from './deviceKeeper.js';
-import { parseReachableAndVatSlot } from './reachable.js';
-import { insistStorageAPI } from '../../lib/storageAPI.js';
-import {
- insistKernelType,
- makeKernelSlot,
- parseKernelSlot,
-} from '../parseKernelSlots.js';
+import { isNat, Nat } from '@endo/nat';
+
import { insistCapData } from '../../lib/capdata.js';
-import { insistMessage } from '../../lib/message.js';
import {
insistDeviceID,
insistVatID,
makeDeviceID,
- makeVatID,
makeUpgradeID,
+ makeVatID,
} from '../../lib/id.js';
import { kdebug } from '../../lib/kdebug.js';
+import { insistMessage } from '../../lib/message.js';
+import { insistStorageAPI } from '../../lib/storageAPI.js';
import { KERNEL_STATS_METRICS } from '../metrics.js';
+import {
+ insistKernelType,
+ makeKernelSlot,
+ parseKernelSlot,
+} from '../parseKernelSlots.js';
+import { initializeDeviceState, makeDeviceKeeper } from './deviceKeeper.js';
+import { parseReachableAndVatSlot } from './reachable.js';
import { makeKernelStats } from './stats.js';
import {
+ deletePrefixedKeys,
enumeratePrefixedKeys,
getPrefixedValues,
- deletePrefixedKeys,
} from './storageHelper.js';
+import {
+ DEFAULT_REAP_DIRT_THRESHOLD_KEY,
+ initializeVatState,
+ makeVatKeeper,
+} from './vatKeeper.js';
const enableKernelGC = true;
diff --git a/packages/SwingSet/src/kernel/state/vatKeeper.js b/packages/SwingSet/src/kernel/state/vatKeeper.js
index 7322f34ee37..3d88d0e309f 100644
--- a/packages/SwingSet/src/kernel/state/vatKeeper.js
+++ b/packages/SwingSet/src/kernel/state/vatKeeper.js
@@ -1,16 +1,17 @@
/**
* Kernel's keeper of persistent state for a vat.
*/
-import { Nat } from '@endo/nat';
-import { assert, q, Fail } from '@endo/errors';
+import { assert, Fail, q } from '@endo/errors';
import { isObject } from '@endo/marshal';
-import { parseKernelSlot } from '../parseKernelSlots.js';
-import { makeVatSlot, parseVatSlot } from '../../lib/parseVatSlots.js';
+import { Nat } from '@endo/nat';
+
import { insistVatID } from '../../lib/id.js';
import { kdebug } from '../../lib/kdebug.js';
+import { makeVatSlot, parseVatSlot } from '../../lib/parseVatSlots.js';
+import { parseKernelSlot } from '../parseKernelSlots.js';
import {
- parseReachableAndVatSlot,
buildReachableAndVatSlot,
+ parseReachableAndVatSlot,
} from './reachable.js';
import { enumeratePrefixedKeys } from './storageHelper.js';
diff --git a/packages/SwingSet/src/kernel/vat-admin-hooks.js b/packages/SwingSet/src/kernel/vat-admin-hooks.js
index b72f10a6cc4..20867136dd8 100644
--- a/packages/SwingSet/src/kernel/vat-admin-hooks.js
+++ b/packages/SwingSet/src/kernel/vat-admin-hooks.js
@@ -1,5 +1,6 @@
-import { assert } from '@endo/errors';
import { kser, kunser } from '@agoric/kmarshal';
+import { assert } from '@endo/errors';
+
import { insistVatID } from '../lib/id.js';
export function makeVatAdminHooks(tools) {
diff --git a/packages/SwingSet/src/kernel/vat-loader/manager-factory.js b/packages/SwingSet/src/kernel/vat-loader/manager-factory.js
index cb1b28c68c9..67c6fd93ebc 100644
--- a/packages/SwingSet/src/kernel/vat-loader/manager-factory.js
+++ b/packages/SwingSet/src/kernel/vat-loader/manager-factory.js
@@ -1,4 +1,5 @@
import { assert, Fail } from '@endo/errors';
+
import { assertKnownOptions } from '../../lib/assertOptions.js';
import { makeLocalVatManagerFactory } from './manager-local.js';
import { makeNodeSubprocessFactory } from './manager-subprocess-node.js';
diff --git a/packages/SwingSet/src/kernel/vat-loader/manager-helper.js b/packages/SwingSet/src/kernel/vat-loader/manager-helper.js
index 13a074cf118..fbc42691c72 100644
--- a/packages/SwingSet/src/kernel/vat-loader/manager-helper.js
+++ b/packages/SwingSet/src/kernel/vat-loader/manager-helper.js
@@ -1,5 +1,7 @@
-import { assert } from '@endo/errors';
import '../../types-ambient.js';
+
+import { assert } from '@endo/errors';
+
import {
insistVatDeliveryResult,
insistVatSyscallResult,
diff --git a/packages/SwingSet/src/kernel/vat-loader/manager-local.js b/packages/SwingSet/src/kernel/vat-loader/manager-local.js
index 9261676a1e3..651e2367e97 100644
--- a/packages/SwingSet/src/kernel/vat-loader/manager-local.js
+++ b/packages/SwingSet/src/kernel/vat-loader/manager-local.js
@@ -1,14 +1,15 @@
/* global globalThis */
+import { makeLiveSlots } from '@agoric/swingset-liveslots';
import { assert, Fail } from '@endo/errors';
import { importBundle } from '@endo/import-bundle';
-import { makeLiveSlots } from '@agoric/swingset-liveslots';
-import { makeManagerKit } from './manager-helper.js';
+
import {
makeSupervisorDispatch,
makeSupervisorSyscall,
makeVatConsole,
} from '../../supervisors/supervisor-helper.js';
+import { makeManagerKit } from './manager-helper.js';
export function makeLocalVatManagerFactory({
allVatPowers,
diff --git a/packages/SwingSet/src/kernel/vat-loader/manager-subprocess-node.js b/packages/SwingSet/src/kernel/vat-loader/manager-subprocess-node.js
index 9cfad88feb7..6438568de5f 100644
--- a/packages/SwingSet/src/kernel/vat-loader/manager-subprocess-node.js
+++ b/packages/SwingSet/src/kernel/vat-loader/manager-subprocess-node.js
@@ -3,6 +3,7 @@
import { assert, Fail } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { makePromiseKit } from '@endo/promise-kit';
+
import { makeManagerKit } from './manager-helper.js';
// start a "Worker" (Node's tool for starting new threads) and load a bundle
diff --git a/packages/SwingSet/src/kernel/vat-loader/manager-subprocess-xsnap.js b/packages/SwingSet/src/kernel/vat-loader/manager-subprocess-xsnap.js
index ff9a4bb1d50..87b0c03d36c 100644
--- a/packages/SwingSet/src/kernel/vat-loader/manager-subprocess-xsnap.js
+++ b/packages/SwingSet/src/kernel/vat-loader/manager-subprocess-xsnap.js
@@ -1,12 +1,12 @@
import { synchronizedTee } from '@agoric/internal';
-import { assert, Fail, q } from '@endo/errors';
import { ExitCode } from '@agoric/xsnap/api.js';
-import { makeManagerKit } from './manager-helper.js';
+import { assert, Fail, q } from '@endo/errors';
import {
- insistVatSyscallObject,
insistVatDeliveryResult,
+ insistVatSyscallObject,
} from '../../lib/message.js';
+import { makeManagerKit } from './manager-helper.js';
///
diff --git a/packages/SwingSet/src/kernel/vat-loader/vat-loader.js b/packages/SwingSet/src/kernel/vat-loader/vat-loader.js
index c67fb97fa9c..594e0bc02ed 100644
--- a/packages/SwingSet/src/kernel/vat-loader/vat-loader.js
+++ b/packages/SwingSet/src/kernel/vat-loader/vat-loader.js
@@ -1,4 +1,5 @@
import { assert, Fail } from '@endo/errors';
+
import { assertKnownOptions } from '../../lib/assertOptions.js';
import { makeVatSlot } from '../../lib/parseVatSlots.js';
diff --git a/packages/SwingSet/src/kernel/vat-warehouse.js b/packages/SwingSet/src/kernel/vat-warehouse.js
index 2d4a167c398..3098b19eb9b 100644
--- a/packages/SwingSet/src/kernel/vat-warehouse.js
+++ b/packages/SwingSet/src/kernel/vat-warehouse.js
@@ -1,8 +1,9 @@
import { assert, Fail, q } from '@endo/errors';
import { isNat } from '@endo/nat';
-import { makeVatTranslators } from './vatTranslator.js';
-import { insistVatDeliveryResult } from '../lib/message.js';
+
import djson from '../lib/djson.js';
+import { insistVatDeliveryResult } from '../lib/message.js';
+import { makeVatTranslators } from './vatTranslator.js';
/**
* @import {VatDeliveryObject} from '@agoric/swingset-liveslots'
diff --git a/packages/SwingSet/src/kernel/vatTranslator.js b/packages/SwingSet/src/kernel/vatTranslator.js
index d781a41cf38..d77656f1532 100644
--- a/packages/SwingSet/src/kernel/vatTranslator.js
+++ b/packages/SwingSet/src/kernel/vatTranslator.js
@@ -1,13 +1,14 @@
import { assert, Fail } from '@endo/errors';
-import { insistMessage } from '../lib/message.js';
-import { insistKernelType, parseKernelSlot } from './parseKernelSlots.js';
-import { insistVatType, parseVatSlot } from '../lib/parseVatSlots.js';
+
import { extractSingleSlot, insistCapData } from '../lib/capdata.js';
import {
kdebug,
legibilizeMessageArgs,
legibilizeValue,
} from '../lib/kdebug.js';
+import { insistMessage } from '../lib/message.js';
+import { insistVatType, parseVatSlot } from '../lib/parseVatSlots.js';
+import { insistKernelType, parseKernelSlot } from './parseKernelSlots.js';
export function assertValidVatstoreKey(key) {
assert.typeof(key, 'string');
diff --git a/packages/SwingSet/src/lib/capdata.js b/packages/SwingSet/src/lib/capdata.js
index 84a430f3cc6..3dccb5f9e99 100644
--- a/packages/SwingSet/src/lib/capdata.js
+++ b/packages/SwingSet/src/lib/capdata.js
@@ -1,6 +1,6 @@
+import { krefOf, kunser } from '@agoric/kmarshal';
import { Fail } from '@endo/errors';
import { passStyleOf } from '@endo/far';
-import { kunser, krefOf } from '@agoric/kmarshal';
/**
* Assert function to ensure that something expected to be a capdata object
diff --git a/packages/SwingSet/src/lib/id.js b/packages/SwingSet/src/lib/id.js
index 34d674d1ba6..1051589d112 100644
--- a/packages/SwingSet/src/lib/id.js
+++ b/packages/SwingSet/src/lib/id.js
@@ -1,6 +1,5 @@
-import { Nat } from '@endo/nat';
-
import { Fail } from '@endo/errors';
+import { Nat } from '@endo/nat';
// Vats are identified by an integer index, which (for typechecking purposes)
// is encoded as `vNN`. Devices are similarly identified as `dNN`. Both have
diff --git a/packages/SwingSet/src/lib/makeUndeliverableError.js b/packages/SwingSet/src/lib/makeUndeliverableError.js
index ce9dcec410d..28bede3ecb1 100644
--- a/packages/SwingSet/src/lib/makeUndeliverableError.js
+++ b/packages/SwingSet/src/lib/makeUndeliverableError.js
@@ -11,7 +11,7 @@
// "data is not callable" error is kind of unique to the way swingset handles
// references, so we create a distinct error message.
-import { kunser, kser } from '@agoric/kmarshal';
+import { kser, kunser } from '@agoric/kmarshal';
export function makeUndeliverableError(methargs) {
const method = kunser(methargs)[0];
diff --git a/packages/SwingSet/src/lib/message.js b/packages/SwingSet/src/lib/message.js
index 4f496a6837b..7a2f99a4dfc 100644
--- a/packages/SwingSet/src/lib/message.js
+++ b/packages/SwingSet/src/lib/message.js
@@ -1,4 +1,5 @@
import { assert, Fail } from '@endo/errors';
+
import { insistCapData } from './capdata.js';
/**
diff --git a/packages/SwingSet/src/lib/parseVatSlots.js b/packages/SwingSet/src/lib/parseVatSlots.js
index 7b2dc48c081..b79a9a87209 100644
--- a/packages/SwingSet/src/lib/parseVatSlots.js
+++ b/packages/SwingSet/src/lib/parseVatSlots.js
@@ -1,5 +1,5 @@
-import { Nat } from '@endo/nat';
import { assert, Fail } from '@endo/errors';
+import { Nat } from '@endo/nat';
// NOTE: confusing terminology: "slot" vs. "reference". All these things
// called "slots" are references, but the word "slot" suggests something into
diff --git a/packages/SwingSet/src/lib/recordVatOptions.js b/packages/SwingSet/src/lib/recordVatOptions.js
index f3c6c19c0a5..ff287920698 100644
--- a/packages/SwingSet/src/lib/recordVatOptions.js
+++ b/packages/SwingSet/src/lib/recordVatOptions.js
@@ -1,4 +1,5 @@
import { Fail } from '@endo/errors';
+
import { makeWorkerOptions } from './workerOptions.js';
export const makeVatOptionRecorder = (kernelKeeper, bundleHandler) => {
diff --git a/packages/SwingSet/src/supervisors/subprocess-node/supervisor-subprocess-node.js b/packages/SwingSet/src/supervisors/subprocess-node/supervisor-subprocess-node.js
index 8f1067b84ca..0171b878908 100644
--- a/packages/SwingSet/src/supervisors/subprocess-node/supervisor-subprocess-node.js
+++ b/packages/SwingSet/src/supervisors/subprocess-node/supervisor-subprocess-node.js
@@ -3,23 +3,24 @@
// this file is loaded at the start of a new subprocess
import '@endo/init';
-import anylogger from 'anylogger';
-import fs from 'fs';
-import { Buffer } from 'buffer';
import process from 'node:process';
-import { assert, X, Fail } from '@endo/errors';
-import { importBundle } from '@endo/import-bundle';
-import { makeMarshal } from '@endo/marshal';
+import engineGC from '@agoric/internal/src/lib-nodejs/engine-gc.js';
+import { makeGcAndFinalize } from '@agoric/internal/src/lib-nodejs/gc-and-finalize.js';
+import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
+import { decode, encode } from '@agoric/internal/src/netstring.js';
import {
- makeLiveSlots,
insistVatDeliveryObject,
insistVatSyscallResult,
+ makeLiveSlots,
} from '@agoric/swingset-liveslots';
-import engineGC from '@agoric/internal/src/lib-nodejs/engine-gc.js';
-import { makeGcAndFinalize } from '@agoric/internal/src/lib-nodejs/gc-and-finalize.js';
-import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
-import { encode, decode } from '@agoric/internal/src/netstring.js';
+import { assert, Fail, X } from '@endo/errors';
+import { importBundle } from '@endo/import-bundle';
+import { makeMarshal } from '@endo/marshal';
+import anylogger from 'anylogger';
+import { Buffer } from 'buffer';
+import fs from 'fs';
+
import { makeDummyMeterControl } from '../../kernel/dummyMeterControl.js';
import {
makeSupervisorDispatch,
diff --git a/packages/SwingSet/src/supervisors/supervisor-helper.js b/packages/SwingSet/src/supervisors/supervisor-helper.js
index 434b7693d99..422be5ca096 100644
--- a/packages/SwingSet/src/supervisors/supervisor-helper.js
+++ b/packages/SwingSet/src/supervisors/supervisor-helper.js
@@ -1,8 +1,9 @@
+import '../types-ambient.js';
+
import {
insistVatSyscallObject,
insistVatSyscallResult,
} from '../lib/message.js';
-import '../types-ambient.js';
/**
* @import {VatDeliveryObject} from '@agoric/swingset-liveslots'
diff --git a/packages/SwingSet/src/vats/comms/clist-inbound.js b/packages/SwingSet/src/vats/comms/clist-inbound.js
index 437911b1dc4..fc3dc5ca686 100644
--- a/packages/SwingSet/src/vats/comms/clist-inbound.js
+++ b/packages/SwingSet/src/vats/comms/clist-inbound.js
@@ -1,10 +1,11 @@
import { Fail } from '@endo/errors';
+
+import { cdebug } from './cdebug.js';
import {
flipRemoteSlot,
insistRemoteType,
parseRemoteSlot,
} from './parseRemoteSlot.js';
-import { cdebug } from './cdebug.js';
function rname(remote) {
return `${remote.remoteID()} (${remote.name()})`;
diff --git a/packages/SwingSet/src/vats/comms/clist-kernel.js b/packages/SwingSet/src/vats/comms/clist-kernel.js
index e701091462b..4cb95bacf29 100644
--- a/packages/SwingSet/src/vats/comms/clist-kernel.js
+++ b/packages/SwingSet/src/vats/comms/clist-kernel.js
@@ -1,7 +1,8 @@
import { Fail } from '@endo/errors';
-import { parseVatSlot, insistVatType } from '../../lib/parseVatSlots.js';
-import { parseLocalSlot } from './parseLocalSlots.js';
+
+import { insistVatType, parseVatSlot } from '../../lib/parseVatSlots.js';
import { cdebug } from './cdebug.js';
+import { parseLocalSlot } from './parseLocalSlots.js';
export function makeKernel(state, syscall) {
// *-KernelForLocal: comms vat sending out to kernel
diff --git a/packages/SwingSet/src/vats/comms/clist-outbound.js b/packages/SwingSet/src/vats/comms/clist-outbound.js
index 05739ea9457..c34f9353c93 100644
--- a/packages/SwingSet/src/vats/comms/clist-outbound.js
+++ b/packages/SwingSet/src/vats/comms/clist-outbound.js
@@ -1,11 +1,12 @@
import { Fail } from '@endo/errors';
-import { parseLocalSlot, insistLocalType } from './parseLocalSlots.js';
+
+import { cdebug } from './cdebug.js';
+import { insistLocalType, parseLocalSlot } from './parseLocalSlots.js';
import {
flipRemoteSlot,
insistRemoteType,
parseRemoteSlot,
} from './parseRemoteSlot.js';
-import { cdebug } from './cdebug.js';
function rname(remote) {
return `${remote.remoteID()} (${remote.name()})`;
diff --git a/packages/SwingSet/src/vats/comms/clist-xgress.js b/packages/SwingSet/src/vats/comms/clist-xgress.js
index e72e6503484..6fa7ffb9e05 100644
--- a/packages/SwingSet/src/vats/comms/clist-xgress.js
+++ b/packages/SwingSet/src/vats/comms/clist-xgress.js
@@ -1,7 +1,8 @@
import { Nat } from '@endo/nat';
+
+import { cdebug } from './cdebug.js';
import { insistLocalType } from './parseLocalSlots.js';
import { makeRemoteSlot } from './parseRemoteSlot.js';
-import { cdebug } from './cdebug.js';
export function makeIngressEgress(state, provideLocalForRemote) {
function addEgress(remoteID, remoteRefID, loid) {
diff --git a/packages/SwingSet/src/vats/comms/clist.js b/packages/SwingSet/src/vats/comms/clist.js
index 388b8a2932b..ae1ca2807c6 100644
--- a/packages/SwingSet/src/vats/comms/clist.js
+++ b/packages/SwingSet/src/vats/comms/clist.js
@@ -1,6 +1,6 @@
import { makeInbound } from './clist-inbound.js';
-import { makeOutbound } from './clist-outbound.js';
import { makeKernel } from './clist-kernel.js';
+import { makeOutbound } from './clist-outbound.js';
import { makeIngressEgress } from './clist-xgress.js';
// get-*: the entry must be present
diff --git a/packages/SwingSet/src/vats/comms/controller.js b/packages/SwingSet/src/vats/comms/controller.js
index 8314257eaf7..e74abda93a2 100644
--- a/packages/SwingSet/src/vats/comms/controller.js
+++ b/packages/SwingSet/src/vats/comms/controller.js
@@ -1,6 +1,6 @@
-import { Nat } from '@endo/nat';
+import { krefOf, kser, kslot, kunser } from '@agoric/kmarshal';
import { assert, Fail } from '@endo/errors';
-import { kser, kunser, kslot, krefOf } from '@agoric/kmarshal';
+import { Nat } from '@endo/nat';
// deliverToController() is used for local vats which want to talk to us as a
// vat, rather than as a conduit to talk to remote vats. The bootstrap
diff --git a/packages/SwingSet/src/vats/comms/delivery.js b/packages/SwingSet/src/vats/comms/delivery.js
index bdfd8703226..33a5ba69cc1 100644
--- a/packages/SwingSet/src/vats/comms/delivery.js
+++ b/packages/SwingSet/src/vats/comms/delivery.js
@@ -1,10 +1,11 @@
/* eslint-disable no-use-before-define */
-import { assert, Fail } from '@endo/errors';
import { kser } from '@agoric/kmarshal';
-import { parseLocalSlot, insistLocalType } from './parseLocalSlots.js';
-import { makeUndeliverableError } from '../../lib/makeUndeliverableError.js';
+import { assert, Fail } from '@endo/errors';
+
import { extractSingleSlot, insistCapData } from '../../lib/capdata.js';
+import { makeUndeliverableError } from '../../lib/makeUndeliverableError.js';
+import { insistLocalType, parseLocalSlot } from './parseLocalSlots.js';
import { insistRemoteType } from './parseRemoteSlot.js';
import { insistRemoteID } from './remote.js';
diff --git a/packages/SwingSet/src/vats/comms/dispatch.js b/packages/SwingSet/src/vats/comms/dispatch.js
index 68212073ce6..c66be304bdb 100644
--- a/packages/SwingSet/src/vats/comms/dispatch.js
+++ b/packages/SwingSet/src/vats/comms/dispatch.js
@@ -1,14 +1,14 @@
-import { assert, Fail } from '@endo/errors';
import { kser, kunser } from '@agoric/kmarshal';
-import { makeVatSlot } from '../../lib/parseVatSlots.js';
-import { insistMessage } from '../../lib/message.js';
-import { makeState } from './state.js';
-import { deliverToController } from './controller.js';
-import { insistCapData } from '../../lib/capdata.js';
+import { assert, Fail } from '@endo/errors';
+import { insistCapData } from '../../lib/capdata.js';
+import { insistMessage } from '../../lib/message.js';
+import { makeVatSlot } from '../../lib/parseVatSlots.js';
import { makeCListKit } from './clist.js';
+import { deliverToController } from './controller.js';
import { makeDeliveryKit } from './delivery.js';
import { makeGCKit } from './gc-comms.js';
+import { makeState } from './state.js';
export const debugState = new WeakMap();
diff --git a/packages/SwingSet/src/vats/comms/gc-comms.js b/packages/SwingSet/src/vats/comms/gc-comms.js
index b73bdafb1cd..2dabaed40c4 100644
--- a/packages/SwingSet/src/vats/comms/gc-comms.js
+++ b/packages/SwingSet/src/vats/comms/gc-comms.js
@@ -1,4 +1,5 @@
import { assert, Fail } from '@endo/errors';
+
import { parseVatSlot } from '../../lib/parseVatSlots.js';
import { parseRemoteSlot } from './parseRemoteSlot.js';
diff --git a/packages/SwingSet/src/vats/comms/parseLocalSlots.js b/packages/SwingSet/src/vats/comms/parseLocalSlots.js
index e7b951bcb88..a2f1e094446 100644
--- a/packages/SwingSet/src/vats/comms/parseLocalSlots.js
+++ b/packages/SwingSet/src/vats/comms/parseLocalSlots.js
@@ -1,5 +1,5 @@
-import { Nat } from '@endo/nat';
import { assert, Fail } from '@endo/errors';
+import { Nat } from '@endo/nat';
// Local object/promise references (in the comms vat) contain a two-tuple of
// (type, index). All object references point to entries in the Local Object
diff --git a/packages/SwingSet/src/vats/comms/parseRemoteSlot.js b/packages/SwingSet/src/vats/comms/parseRemoteSlot.js
index a33d66b0d1c..12e381103cd 100644
--- a/packages/SwingSet/src/vats/comms/parseRemoteSlot.js
+++ b/packages/SwingSet/src/vats/comms/parseRemoteSlot.js
@@ -1,5 +1,5 @@
-import { Nat } from '@endo/nat';
import { assert, Fail } from '@endo/errors';
+import { Nat } from '@endo/nat';
// Object/promise references (in remote messages) contain a three-tuple of
// (type, allocator flag, index). The allocator flag inside an inbound
diff --git a/packages/SwingSet/src/vats/comms/remote.js b/packages/SwingSet/src/vats/comms/remote.js
index c39a3e63dc4..ad6d28b4546 100644
--- a/packages/SwingSet/src/vats/comms/remote.js
+++ b/packages/SwingSet/src/vats/comms/remote.js
@@ -1,9 +1,10 @@
-import { Nat } from '@endo/nat';
import { assert, Fail } from '@endo/errors';
-import { parseLocalSlot, insistLocalType } from './parseLocalSlots.js';
+import { Nat } from '@endo/nat';
+
+import { insistLocalType, parseLocalSlot } from './parseLocalSlots.js';
import {
- makeRemoteSlot,
flipRemoteSlot,
+ makeRemoteSlot,
parseRemoteSlot,
} from './parseRemoteSlot.js';
diff --git a/packages/SwingSet/src/vats/comms/state.js b/packages/SwingSet/src/vats/comms/state.js
index 65813f276b7..92ccdf96f64 100644
--- a/packages/SwingSet/src/vats/comms/state.js
+++ b/packages/SwingSet/src/vats/comms/state.js
@@ -1,14 +1,15 @@
-import { Nat } from '@endo/nat';
import { assert, Fail } from '@endo/errors';
+import { Nat } from '@endo/nat';
+
import { insistCapData } from '../../lib/capdata.js';
import {
- makeVatSlot,
insistVatType,
+ makeVatSlot,
parseVatSlot,
} from '../../lib/parseVatSlots.js';
-import { makeLocalSlot, parseLocalSlot } from './parseLocalSlots.js';
-import { initializeRemoteState, makeRemote, insistRemoteID } from './remote.js';
import { cdebug } from './cdebug.js';
+import { makeLocalSlot, parseLocalSlot } from './parseLocalSlots.js';
+import { initializeRemoteState, insistRemoteID, makeRemote } from './remote.js';
const COMMS = 'comms';
const KERNEL = 'kernel';
diff --git a/packages/SwingSet/src/vats/plugin-manager.js b/packages/SwingSet/src/vats/plugin-manager.js
index d16d76e33e1..7d83cfdbbdd 100644
--- a/packages/SwingSet/src/vats/plugin-manager.js
+++ b/packages/SwingSet/src/vats/plugin-manager.js
@@ -1,9 +1,9 @@
import { makeScalarMapStore } from '@agoric/store';
import { makeCapTP } from '@endo/captp';
-import { makePromiseKit } from '@endo/promise-kit';
import { HandledPromise } from '@endo/eventual-send';
+import { E, Far } from '@endo/far';
import { Remotable } from '@endo/marshal';
-import { Far, E } from '@endo/far';
+import { makePromiseKit } from '@endo/promise-kit';
/**
* @template T
diff --git a/packages/SwingSet/src/vats/timer/vat-timer.js b/packages/SwingSet/src/vats/timer/vat-timer.js
index 1f1ce669439..a758d5504d0 100644
--- a/packages/SwingSet/src/vats/timer/vat-timer.js
+++ b/packages/SwingSet/src/vats/timer/vat-timer.js
@@ -1,19 +1,19 @@
/* eslint-disable no-use-before-define */
-import { assert } from '@endo/errors';
-import { Far, E, passStyleOf } from '@endo/far';
-import { makePromiseKit } from '@endo/promise-kit';
-import { Nat } from '@endo/nat';
+import { makeScalarWeakMapStore } from '@agoric/store';
+import { TimeMath } from '@agoric/time';
import {
- provideKindHandle,
- provideDurableMapStore,
- provideDurableWeakMapStore,
defineDurableKindMulti,
prepareKind,
prepareSingleton,
+ provideDurableMapStore,
+ provideDurableWeakMapStore,
+ provideKindHandle,
} from '@agoric/vat-data';
-import { makeScalarWeakMapStore } from '@agoric/store';
-import { TimeMath } from '@agoric/time';
+import { assert } from '@endo/errors';
+import { E, Far, passStyleOf } from '@endo/far';
+import { Nat } from '@endo/nat';
+import { makePromiseKit } from '@endo/promise-kit';
/**
* @import {Passable, RemotableObject} from '@endo/pass-style';
diff --git a/packages/SwingSet/src/vats/vat-admin/vat-vat-admin.js b/packages/SwingSet/src/vats/vat-admin/vat-vat-admin.js
index 965fcb47864..36ef81ee10b 100644
--- a/packages/SwingSet/src/vats/vat-admin/vat-vat-admin.js
+++ b/packages/SwingSet/src/vats/vat-admin/vat-vat-admin.js
@@ -5,18 +5,18 @@
* must ensure that only data goes in and out. It's also responsible for turning
* device affordances into objects that can be used by code in other vats.
*/
-import { Nat, isNat } from '@endo/nat';
-import { q, Fail } from '@endo/errors';
-import { makePromiseKit } from '@endo/promise-kit';
-// import { makeNotifierKit } from '@agoric/notifier'; // XXX RESTORE
-import { Far, E, passStyleOf } from '@endo/far';
import {
- provide,
makeScalarBigMapStore,
makeScalarBigSetStore,
prepareKind,
prepareSingleton,
+ provide,
} from '@agoric/vat-data';
+import { Fail, q } from '@endo/errors';
+// import { makeNotifierKit } from '@agoric/notifier'; // XXX RESTORE
+import { E, Far, passStyleOf } from '@endo/far';
+import { isNat, Nat } from '@endo/nat';
+import { makePromiseKit } from '@endo/promise-kit';
/**
* @import {VatAdminRootDeviceNode} from '../../devices/vat-admin/device-vat-admin.js';
diff --git a/packages/SwingSet/src/vats/vattp/vat-vattp.js b/packages/SwingSet/src/vats/vattp/vat-vattp.js
index 0a4f247290c..81d05617c72 100644
--- a/packages/SwingSet/src/vats/vattp/vat-vattp.js
+++ b/packages/SwingSet/src/vats/vattp/vat-vattp.js
@@ -1,13 +1,13 @@
-import { Fail } from '@endo/errors';
import {
- provide,
defineDurableKindMulti,
makeScalarBigMapStore,
+ provide,
provideDurableMapStore,
provideDurableSetStore,
provideKindHandle,
} from '@agoric/vat-data';
-import { Far, E } from '@endo/far';
+import { Fail } from '@endo/errors';
+import { E, Far } from '@endo/far';
// See ../../docs/delivery.md for a description of the architecture of the
// comms system.
diff --git a/packages/SwingSet/test/abandon-export.test.js b/packages/SwingSet/test/abandon-export.test.js
index d619b93df9a..bf9835994c5 100644
--- a/packages/SwingSet/test/abandon-export.test.js
+++ b/packages/SwingSet/test/abandon-export.test.js
@@ -1,15 +1,16 @@
// @ts-nocheck
-/* eslint-disable import/order */
+
import { test } from '../tools/prepare-test-env-ava.js';
-import buildKernel from '../src/kernel/index.js';
+import { kser, kslot, kunser } from '@agoric/kmarshal';
+
import { initializeKernel } from '../src/controller/initializeKernel.js';
-import { extractMethod } from '../src/lib/kdebug.js';
+import buildKernel from '../src/kernel/index.js';
import makeKernelKeeper, {
CURRENT_SCHEMA_VERSION,
} from '../src/kernel/state/kernelKeeper.js';
-import { makeKernelEndowments, buildDispatch } from './util.js';
-import { kser, kunser, kslot } from '@agoric/kmarshal';
+import { extractMethod } from '../src/lib/kdebug.js';
+import { buildDispatch, makeKernelEndowments } from './util.js';
const makeKernel = async () => {
const endowments = makeKernelEndowments();
diff --git a/packages/SwingSet/test/activityhash-vs-start.test.js b/packages/SwingSet/test/activityhash-vs-start.test.js
index 3271ade555b..9ba5edaa378 100644
--- a/packages/SwingSet/test/activityhash-vs-start.test.js
+++ b/packages/SwingSet/test/activityhash-vs-start.test.js
@@ -2,10 +2,10 @@
import { test } from '../tools/prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { initSwingStore } from '@agoric/swing-store';
-import { initializeSwingset, makeSwingsetController } from '../src/index.js';
+
import { buildTimer } from '../src/devices/timer/timer.js';
+import { initializeSwingset, makeSwingsetController } from '../src/index.js';
const TimerSrc = new URL(
'../src/devices/timer/device-timer.js',
diff --git a/packages/SwingSet/test/basedir-circular/bootstrap.js b/packages/SwingSet/test/basedir-circular/bootstrap.js
index 059f96e7bd8..51fb8d7299c 100644
--- a/packages/SwingSet/test/basedir-circular/bootstrap.js
+++ b/packages/SwingSet/test/basedir-circular/bootstrap.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject() {
return Far('root', {
diff --git a/packages/SwingSet/test/basedir-controller-3/bootstrap.js b/packages/SwingSet/test/basedir-controller-3/bootstrap.js
index 8ac3242fc66..e12e1f5557f 100644
--- a/packages/SwingSet/test/basedir-controller-3/bootstrap.js
+++ b/packages/SwingSet/test/basedir-controller-3/bootstrap.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject(vatPowers) {
return Far('root', {
diff --git a/packages/SwingSet/test/basedir-controller-3/vat-left.js b/packages/SwingSet/test/basedir-controller-3/vat-left.js
index 0ca7f0b49a0..4c7619672a9 100644
--- a/packages/SwingSet/test/basedir-controller-3/vat-left.js
+++ b/packages/SwingSet/test/basedir-controller-3/vat-left.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject(vatPowers) {
return Far('root', {
diff --git a/packages/SwingSet/test/basedir-message-patterns/bootstrap-comms.js b/packages/SwingSet/test/basedir-message-patterns/bootstrap-comms.js
index a25b45f9df0..970683b3c4e 100644
--- a/packages/SwingSet/test/basedir-message-patterns/bootstrap-comms.js
+++ b/packages/SwingSet/test/basedir-message-patterns/bootstrap-comms.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
// machine names, to link vattp messages and loopbox channels
const A = 'A';
diff --git a/packages/SwingSet/test/basedir-message-patterns/bootstrap-local.js b/packages/SwingSet/test/basedir-message-patterns/bootstrap-local.js
index 10fb7adbe42..9c355191bb7 100644
--- a/packages/SwingSet/test/basedir-message-patterns/bootstrap-local.js
+++ b/packages/SwingSet/test/basedir-message-patterns/bootstrap-local.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject(_vatPowers, vatParameters) {
return Far('root', {
diff --git a/packages/SwingSet/test/basedir-message-patterns/vat-a.js b/packages/SwingSet/test/basedir-message-patterns/vat-a.js
index 0f288eb24a3..8ed2f1e1bed 100644
--- a/packages/SwingSet/test/basedir-message-patterns/vat-a.js
+++ b/packages/SwingSet/test/basedir-message-patterns/vat-a.js
@@ -1,4 +1,5 @@
import { Far } from '@endo/far';
+
import { buildPatterns } from '../message-patterns.js';
export function buildRootObject(vatPowers) {
diff --git a/packages/SwingSet/test/basedir-message-patterns/vat-b.js b/packages/SwingSet/test/basedir-message-patterns/vat-b.js
index a30b50f8f1e..c660cd07d1b 100644
--- a/packages/SwingSet/test/basedir-message-patterns/vat-b.js
+++ b/packages/SwingSet/test/basedir-message-patterns/vat-b.js
@@ -1,4 +1,5 @@
import { Far } from '@endo/far';
+
import { buildPatterns } from '../message-patterns.js';
export function buildRootObject(vatPowers) {
diff --git a/packages/SwingSet/test/basedir-message-patterns/vat-c.js b/packages/SwingSet/test/basedir-message-patterns/vat-c.js
index f9f00f9b9cd..5e1154c6669 100644
--- a/packages/SwingSet/test/basedir-message-patterns/vat-c.js
+++ b/packages/SwingSet/test/basedir-message-patterns/vat-c.js
@@ -1,4 +1,5 @@
import { Far } from '@endo/far';
+
import { buildPatterns } from '../message-patterns.js';
export function buildRootObject(vatPowers) {
diff --git a/packages/SwingSet/test/basedir-promises-2/bootstrap.js b/packages/SwingSet/test/basedir-promises-2/bootstrap.js
index 19312d647e6..57a2b3cd294 100644
--- a/packages/SwingSet/test/basedir-promises-2/bootstrap.js
+++ b/packages/SwingSet/test/basedir-promises-2/bootstrap.js
@@ -1,6 +1,6 @@
-import { makePromiseKit } from '@endo/promise-kit';
-import { Far, E } from '@endo/far';
import { Fail } from '@endo/errors';
+import { E, Far } from '@endo/far';
+import { makePromiseKit } from '@endo/promise-kit';
export function buildRootObject(vatPowers, vatParameters) {
const log = vatPowers.testLog;
diff --git a/packages/SwingSet/test/basedir-promises-3/bootstrap.js b/packages/SwingSet/test/basedir-promises-3/bootstrap.js
index a77789bb7c2..e4257d4ff19 100644
--- a/packages/SwingSet/test/basedir-promises-3/bootstrap.js
+++ b/packages/SwingSet/test/basedir-promises-3/bootstrap.js
@@ -1,5 +1,5 @@
+import { E, Far } from '@endo/far';
import { makePromiseKit } from '@endo/promise-kit';
-import { Far, E } from '@endo/far';
export function buildRootObject() {
const pk1 = makePromiseKit();
diff --git a/packages/SwingSet/test/basedir-promises/bootstrap.js b/packages/SwingSet/test/basedir-promises/bootstrap.js
index fe0ba8a5a22..7c5dbe3c1a5 100644
--- a/packages/SwingSet/test/basedir-promises/bootstrap.js
+++ b/packages/SwingSet/test/basedir-promises/bootstrap.js
@@ -1,7 +1,6 @@
-import { makePromiseKit } from '@endo/promise-kit';
-import { Far, E } from '@endo/far';
-
import { Fail } from '@endo/errors';
+import { E, Far } from '@endo/far';
+import { makePromiseKit } from '@endo/promise-kit';
export function buildRootObject(vatPowers, vatParameters) {
const log = vatPowers.testLog;
diff --git a/packages/SwingSet/test/basedir-promises/vat-left.js b/packages/SwingSet/test/basedir-promises/vat-left.js
index 916f97e9429..2a65ad0cf82 100644
--- a/packages/SwingSet/test/basedir-promises/vat-left.js
+++ b/packages/SwingSet/test/basedir-promises/vat-left.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject(vatPowers) {
const log = vatPowers.testLog;
diff --git a/packages/SwingSet/test/basedir-transcript/bootstrap.js b/packages/SwingSet/test/basedir-transcript/bootstrap.js
index 59c59422d73..d695d545680 100644
--- a/packages/SwingSet/test/basedir-transcript/bootstrap.js
+++ b/packages/SwingSet/test/basedir-transcript/bootstrap.js
@@ -1,5 +1,5 @@
-import { Far, E } from '@endo/far';
import { Fail } from '@endo/errors';
+import { E, Far } from '@endo/far';
export function buildRootObject(vatPowers, vatParameters) {
return Far('root', {
diff --git a/packages/SwingSet/test/basedir-transcript/vat-left.js b/packages/SwingSet/test/basedir-transcript/vat-left.js
index 2d2ad679f62..e4ee6bcde32 100644
--- a/packages/SwingSet/test/basedir-transcript/vat-left.js
+++ b/packages/SwingSet/test/basedir-transcript/vat-left.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject(vatPowers) {
const log = vatPowers.testLog;
diff --git a/packages/SwingSet/test/bootstrap-syscall-failure.js b/packages/SwingSet/test/bootstrap-syscall-failure.js
index 7b5e3780046..f10fa561c70 100644
--- a/packages/SwingSet/test/bootstrap-syscall-failure.js
+++ b/packages/SwingSet/test/bootstrap-syscall-failure.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject(vatPowers, vatParameters) {
const { testLog } = vatPowers;
diff --git a/packages/SwingSet/test/bundling/bootstrap-bundles.js b/packages/SwingSet/test/bundling/bootstrap-bundles.js
index 803d6fecde5..f17868a2fe5 100644
--- a/packages/SwingSet/test/bundling/bootstrap-bundles.js
+++ b/packages/SwingSet/test/bundling/bootstrap-bundles.js
@@ -1,5 +1,5 @@
import { assert } from '@endo/errors';
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
import { importBundle } from '@endo/import-bundle';
export function buildRootObject(vatPowers) {
diff --git a/packages/SwingSet/test/bundling/bundles-controller.test.js b/packages/SwingSet/test/bundling/bundles-controller.test.js
index 6c4c6473e52..8b7b1a56e4c 100644
--- a/packages/SwingSet/test/bundling/bundles-controller.test.js
+++ b/packages/SwingSet/test/bundling/bundles-controller.test.js
@@ -2,8 +2,8 @@
import { test } from '../../tools/prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import bundleSource from '@endo/bundle-source';
+
import { buildVatController } from '../../src/index.js';
test('install bundle', async t => {
diff --git a/packages/SwingSet/test/bundling/bundles-kernel.test.js b/packages/SwingSet/test/bundling/bundles-kernel.test.js
index 8ec75bfb38a..d082d5d2206 100644
--- a/packages/SwingSet/test/bundling/bundles-kernel.test.js
+++ b/packages/SwingSet/test/bundling/bundles-kernel.test.js
@@ -1,13 +1,13 @@
-// eslint-disable-next-line import/order
import { test } from '../../tools/prepare-test-env-ava.js';
-import crypto from 'crypto';
+import { decodeBase64 } from '@endo/base64';
import bundleSource from '@endo/bundle-source';
import { parseArchive } from '@endo/compartment-mapper';
-import { decodeBase64 } from '@endo/base64';
-import { makeKernelEndowments } from '../util.js';
-import buildKernel from '../../src/kernel/index.js';
+import crypto from 'crypto';
+
import { initializeKernel } from '../../src/controller/initializeKernel.js';
+import buildKernel from '../../src/kernel/index.js';
+import { makeKernelEndowments } from '../util.js';
test('install bundle', async t => {
const endowments = makeKernelEndowments();
diff --git a/packages/SwingSet/test/bundling/bundles.test.js b/packages/SwingSet/test/bundling/bundles.test.js
index 03004e5b4d3..5ed7ea8924d 100644
--- a/packages/SwingSet/test/bundling/bundles.test.js
+++ b/packages/SwingSet/test/bundling/bundles.test.js
@@ -1,12 +1,13 @@
// @ts-nocheck
-// eslint-disable-next-line import/order
+
import { test } from '../../tools/prepare-test-env-ava.js';
-import fs from 'fs';
+import { krefOf, kunser } from '@agoric/kmarshal';
+import { initSwingStore } from '@agoric/swing-store';
import bundleSource from '@endo/bundle-source';
import { assert } from '@endo/errors';
-import { kunser, krefOf } from '@agoric/kmarshal';
-import { initSwingStore } from '@agoric/swing-store';
+import fs from 'fs';
+
import { initializeSwingset, makeSwingsetController } from '../../src/index.js';
function bfile(name) {
diff --git a/packages/SwingSet/test/change-parameters/bootstrap-change-parameters.js b/packages/SwingSet/test/change-parameters/bootstrap-change-parameters.js
index 908a11fab70..1f37586a904 100644
--- a/packages/SwingSet/test/change-parameters/bootstrap-change-parameters.js
+++ b/packages/SwingSet/test/change-parameters/bootstrap-change-parameters.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject() {
let vatAdmin;
diff --git a/packages/SwingSet/test/change-parameters/change-parameters.test.js b/packages/SwingSet/test/change-parameters/change-parameters.test.js
index 200206f2f85..0d3256735f8 100644
--- a/packages/SwingSet/test/change-parameters/change-parameters.test.js
+++ b/packages/SwingSet/test/change-parameters/change-parameters.test.js
@@ -1,10 +1,11 @@
// @ts-nocheck
-// eslint-disable-next-line import/order
+
import { test } from '../../tools/prepare-test-env-ava.js';
-import { assert } from '@endo/errors';
import { kunser } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
+import { assert } from '@endo/errors';
+
import { initializeSwingset, makeSwingsetController } from '../../src/index.js';
function bfile(name) {
diff --git a/packages/SwingSet/test/clist.test.js b/packages/SwingSet/test/clist.test.js
index 1210fb3afc4..f435d0e667f 100644
--- a/packages/SwingSet/test/clist.test.js
+++ b/packages/SwingSet/test/clist.test.js
@@ -1,8 +1,9 @@
// @ts-nocheck
+
import { test } from '../tools/prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { initSwingStore } from '@agoric/swing-store';
+
import { makeDummySlogger } from '../src/kernel/slogger.js';
import makeKernelKeeper, {
CURRENT_SCHEMA_VERSION,
diff --git a/packages/SwingSet/test/comms.test.js b/packages/SwingSet/test/comms.test.js
index 2c76f65fb24..6f69da82d90 100644
--- a/packages/SwingSet/test/comms.test.js
+++ b/packages/SwingSet/test/comms.test.js
@@ -1,21 +1,22 @@
// @ts-nocheck
+
import { test } from '../tools/prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { kser, kslot } from '@agoric/kmarshal';
+
+import { makeCListKit } from '../src/vats/comms/clist.js';
+import { debugState } from '../src/vats/comms/dispatch.js';
import buildCommsDispatch from '../src/vats/comms/index.js';
import { flipRemoteSlot } from '../src/vats/comms/parseRemoteSlot.js';
import { makeState } from '../src/vats/comms/state.js';
-import { makeCListKit } from '../src/vats/comms/clist.js';
-import { debugState } from '../src/vats/comms/dispatch.js';
+import { commsVatDriver } from './commsVatDriver.js';
import {
+ makeDropExports,
makeMessage,
makeResolve,
- makeDropExports,
makeRetireExports,
makeRetireImports,
} from './util.js';
-import { commsVatDriver } from './commsVatDriver.js';
test('translation', t => {
const s = makeState(null);
diff --git a/packages/SwingSet/test/commsVatDriver.js b/packages/SwingSet/test/commsVatDriver.js
index 21a30e96796..021045ed9f3 100644
--- a/packages/SwingSet/test/commsVatDriver.js
+++ b/packages/SwingSet/test/commsVatDriver.js
@@ -1,8 +1,9 @@
// @ts-nocheck
+import { kser, kslot } from '@agoric/kmarshal';
import { assert, Fail } from '@endo/errors';
-import { kslot, kser } from '@agoric/kmarshal';
-import buildCommsDispatch from '../src/vats/comms/index.js';
+
import { debugState } from '../src/vats/comms/dispatch.js';
+import buildCommsDispatch from '../src/vats/comms/index.js';
import { flipRemoteSlot } from '../src/vats/comms/parseRemoteSlot.js';
import { makeMessage, makeResolutions } from './util.js';
diff --git a/packages/SwingSet/test/controller.test.js b/packages/SwingSet/test/controller.test.js
index 47464616ddb..93b340aa82e 100644
--- a/packages/SwingSet/test/controller.test.js
+++ b/packages/SwingSet/test/controller.test.js
@@ -1,14 +1,15 @@
// @ts-nocheck
-// eslint-disable-next-line import/order
+
import { test } from '../tools/prepare-test-env-ava.js';
-import { spawn } from 'child_process';
-import { kser, kunser, kslot } from '@agoric/kmarshal';
+import { kser, kslot, kunser } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
+import { spawn } from 'child_process';
+
import {
buildVatController,
- loadBasedir,
initializeSwingset,
+ loadBasedir,
makeSwingsetController,
} from '../src/index.js';
import makeKernelKeeper, {
diff --git a/packages/SwingSet/test/definition/vat-definition.test.js b/packages/SwingSet/test/definition/vat-definition.test.js
index dbd266b2de3..c8e2fc52c72 100644
--- a/packages/SwingSet/test/definition/vat-definition.test.js
+++ b/packages/SwingSet/test/definition/vat-definition.test.js
@@ -1,7 +1,7 @@
import { test } from '../../tools/prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { kser } from '@agoric/kmarshal';
+
import { buildVatController } from '../../src/index.js';
test('create with setup and buildRootObject', async t => {
diff --git a/packages/SwingSet/test/demos-comms.test.js b/packages/SwingSet/test/demos-comms.test.js
index 7101b923f63..c19d274d2c5 100644
--- a/packages/SwingSet/test/demos-comms.test.js
+++ b/packages/SwingSet/test/demos-comms.test.js
@@ -1,11 +1,11 @@
import { test } from '../tools/prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { initSwingStore } from '@agoric/swing-store';
+
import { buildLoopbox } from '../src/devices/loopbox/loopbox.js';
import {
- loadBasedir,
initializeSwingset,
+ loadBasedir,
makeSwingsetController,
} from '../src/index.js';
diff --git a/packages/SwingSet/test/demos.test.js b/packages/SwingSet/test/demos.test.js
index 0651099e540..e99504b774f 100644
--- a/packages/SwingSet/test/demos.test.js
+++ b/packages/SwingSet/test/demos.test.js
@@ -1,11 +1,11 @@
import { test } from '../tools/prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { initSwingStore } from '@agoric/swing-store';
+
import { buildLoopbox } from '../src/devices/loopbox/loopbox.js';
import {
- loadBasedir,
initializeSwingset,
+ loadBasedir,
makeSwingsetController,
} from '../src/index.js';
diff --git a/packages/SwingSet/test/device-bridge.test.js b/packages/SwingSet/test/device-bridge.test.js
index c7242646f5d..14d99c80b02 100644
--- a/packages/SwingSet/test/device-bridge.test.js
+++ b/packages/SwingSet/test/device-bridge.test.js
@@ -1,13 +1,13 @@
// @ts-nocheck
+
import { test } from '../tools/prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { initSwingStore } from '@agoric/swing-store';
import {
+ buildBridge,
initializeSwingset,
makeSwingsetController,
- buildBridge,
} from '../src/index.js';
test('bridge device', async t => {
diff --git a/packages/SwingSet/test/device-hooks/device-hooks.test.js b/packages/SwingSet/test/device-hooks/device-hooks.test.js
index d2521cf698c..0bd9b355f95 100644
--- a/packages/SwingSet/test/device-hooks/device-hooks.test.js
+++ b/packages/SwingSet/test/device-hooks/device-hooks.test.js
@@ -1,15 +1,15 @@
// @ts-nocheck
-// eslint-disable-next-line import/order
+
import { test } from '../../tools/prepare-test-env-ava.js';
-import bundleSource from '@endo/bundle-source';
-import { kunser, kser, kslot } from '@agoric/kmarshal';
+import { kser, kslot, kunser } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
+import bundleSource from '@endo/bundle-source';
import {
+ buildKernelBundles,
initializeSwingset,
makeSwingsetController,
- buildKernelBundles,
} from '../../src/index.js';
function dfile(name) {
diff --git a/packages/SwingSet/test/device-mailbox/bootstrap-device-mailbox.js b/packages/SwingSet/test/device-mailbox/bootstrap-device-mailbox.js
index 7e8f6bdf828..7865ee678d1 100644
--- a/packages/SwingSet/test/device-mailbox/bootstrap-device-mailbox.js
+++ b/packages/SwingSet/test/device-mailbox/bootstrap-device-mailbox.js
@@ -1,5 +1,5 @@
-import { Far, E } from '@endo/far';
import { Fail } from '@endo/errors';
+import { E, Far } from '@endo/far';
export function buildRootObject(vatPowers, vatParameters) {
const { D, testLog: log } = vatPowers;
diff --git a/packages/SwingSet/test/device-mailbox/device-mailbox.test.js b/packages/SwingSet/test/device-mailbox/device-mailbox.test.js
index c7091d63824..7b1a3288d00 100644
--- a/packages/SwingSet/test/device-mailbox/device-mailbox.test.js
+++ b/packages/SwingSet/test/device-mailbox/device-mailbox.test.js
@@ -1,19 +1,20 @@
// @ts-nocheck
-// eslint-disable-next-line import/order
+
import { test } from '../../tools/prepare-test-env-ava.js';
-import bundleSource from '@endo/bundle-source';
import { kunser } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
+import bundleSource from '@endo/bundle-source';
+
+import {
+ buildMailbox,
+ buildMailboxStateMap,
+} from '../../src/devices/mailbox/mailbox.js';
import {
+ buildKernelBundles,
initializeSwingset,
makeSwingsetController,
- buildKernelBundles,
} from '../../src/index.js';
-import {
- buildMailboxStateMap,
- buildMailbox,
-} from '../../src/devices/mailbox/mailbox.js';
import { bundleOpts } from '../util.js';
test.before(async t => {
diff --git a/packages/SwingSet/test/device-plugin/bootstrap.js b/packages/SwingSet/test/device-plugin/bootstrap.js
index 8c7f4c59fb2..9816feba37b 100644
--- a/packages/SwingSet/test/device-plugin/bootstrap.js
+++ b/packages/SwingSet/test/device-plugin/bootstrap.js
@@ -1,5 +1,6 @@
-import { Far, E } from '@endo/far';
import { Fail } from '@endo/errors';
+import { E, Far } from '@endo/far';
+
import { makePluginManager } from '../../src/vats/plugin-manager.js';
export function buildRootObject(vatPowers, vatParameters) {
diff --git a/packages/SwingSet/test/device-plugin/device.test.js b/packages/SwingSet/test/device-plugin/device.test.js
index fd043e3733b..c1909e8b579 100644
--- a/packages/SwingSet/test/device-plugin/device.test.js
+++ b/packages/SwingSet/test/device-plugin/device.test.js
@@ -1,16 +1,16 @@
// @ts-nocheck
+
import { test } from '../../tools/prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { initSwingStore } from '@agoric/swing-store';
+import { buildBridge } from '../../src/devices/bridge/bridge.js';
+import { buildPlugin } from '../../src/devices/plugin/plugin.js';
import {
- swingsetIsInitialized,
initializeSwingset,
makeSwingsetController,
+ swingsetIsInitialized,
} from '../../src/index.js';
-import { buildBridge } from '../../src/devices/bridge/bridge.js';
-import { buildPlugin } from '../../src/devices/plugin/plugin.js';
test.before('initialize storage', t => {
t.context.kernelStorage = initSwingStore().kernelStorage;
diff --git a/packages/SwingSet/test/device-plugin/vat-bridge.js b/packages/SwingSet/test/device-plugin/vat-bridge.js
index 4c434b7be79..1a46bd34710 100644
--- a/packages/SwingSet/test/device-plugin/vat-bridge.js
+++ b/packages/SwingSet/test/device-plugin/vat-bridge.js
@@ -1,5 +1,5 @@
-import { Far, E } from '@endo/far';
import { Fail } from '@endo/errors';
+import { E, Far } from '@endo/far';
export function buildRootObject(vatPowers, _vatParameters) {
const log = vatPowers.testLog;
diff --git a/packages/SwingSet/test/devices/bootstrap-1.js b/packages/SwingSet/test/devices/bootstrap-1.js
index 664b9196e93..d3a51ad622b 100644
--- a/packages/SwingSet/test/devices/bootstrap-1.js
+++ b/packages/SwingSet/test/devices/bootstrap-1.js
@@ -1,5 +1,6 @@
+import { krefOf, kser, kunser } from '@agoric/kmarshal';
import { Fail } from '@endo/errors';
-import { kser, kunser, krefOf } from '@agoric/kmarshal';
+
import { extractMessage } from '../vat-util.js';
export default function setup(syscall, state, _helpers, vatPowers) {
diff --git a/packages/SwingSet/test/devices/bootstrap-2.js b/packages/SwingSet/test/devices/bootstrap-2.js
index 719361d1d5d..4e031256ddc 100644
--- a/packages/SwingSet/test/devices/bootstrap-2.js
+++ b/packages/SwingSet/test/devices/bootstrap-2.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject(vatPowers) {
const { D, testLog: log } = vatPowers;
diff --git a/packages/SwingSet/test/devices/bootstrap-4.js b/packages/SwingSet/test/devices/bootstrap-4.js
index 26111b60431..db76ee7c67b 100644
--- a/packages/SwingSet/test/devices/bootstrap-4.js
+++ b/packages/SwingSet/test/devices/bootstrap-4.js
@@ -1,4 +1,5 @@
-import { kunser, kser, kslot, krefOf } from '@agoric/kmarshal';
+import { krefOf, kser, kslot, kunser } from '@agoric/kmarshal';
+
import { insistVatType } from '../../src/lib/parseVatSlots.js';
import { extractMessage } from '../vat-util.js';
diff --git a/packages/SwingSet/test/devices/device-raw-0.js b/packages/SwingSet/test/devices/device-raw-0.js
index b1ca08adfa8..b696e8e7733 100644
--- a/packages/SwingSet/test/devices/device-raw-0.js
+++ b/packages/SwingSet/test/devices/device-raw-0.js
@@ -1,4 +1,5 @@
import { assert } from '@endo/errors';
+
import { buildSerializationTools } from '../../src/devices/lib/deviceTools.js';
export function buildDevice(tools, endowments) {
diff --git a/packages/SwingSet/test/devices/devices.test.js b/packages/SwingSet/test/devices/devices.test.js
index 7aa66d590db..920ca2e277f 100644
--- a/packages/SwingSet/test/devices/devices.test.js
+++ b/packages/SwingSet/test/devices/devices.test.js
@@ -1,18 +1,18 @@
// @ts-nocheck
-// eslint-disable-next-line import/order
+
import { test } from '../../tools/prepare-test-env-ava.js';
-import bundleSource from '@endo/bundle-source';
-import { parse } from '@endo/marshal';
import { kser, kslot } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
+import bundleSource from '@endo/bundle-source';
+import { parse } from '@endo/marshal';
+import buildCommand from '../../src/devices/command/command.js';
import {
+ buildKernelBundles,
initializeSwingset,
makeSwingsetController,
- buildKernelBundles,
} from '../../src/index.js';
-import buildCommand from '../../src/devices/command/command.js';
import { bundleOpts, vstr } from '../util.js';
function dfile(name) {
diff --git a/packages/SwingSet/test/devices/raw-device.test.js b/packages/SwingSet/test/devices/raw-device.test.js
index ead4abcf5de..7c8484fbf3e 100644
--- a/packages/SwingSet/test/devices/raw-device.test.js
+++ b/packages/SwingSet/test/devices/raw-device.test.js
@@ -1,15 +1,15 @@
// @ts-nocheck
-// eslint-disable-next-line import/order
+
import { test } from '../../tools/prepare-test-env-ava.js';
-import bundleSource from '@endo/bundle-source';
-import { initSwingStore } from '@agoric/swing-store';
import { kunser } from '@agoric/kmarshal';
+import { initSwingStore } from '@agoric/swing-store';
+import bundleSource from '@endo/bundle-source';
import {
+ buildKernelBundles,
initializeSwingset,
makeSwingsetController,
- buildKernelBundles,
} from '../../src/index.js';
import { bundleOpts } from '../util.js';
diff --git a/packages/SwingSet/test/exomessages.test.js b/packages/SwingSet/test/exomessages.test.js
index 594a63d8305..3487f798d92 100644
--- a/packages/SwingSet/test/exomessages.test.js
+++ b/packages/SwingSet/test/exomessages.test.js
@@ -1,7 +1,7 @@
import { test } from '../tools/prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
-import { kunser, kslot, krefOf } from '@agoric/kmarshal';
+import { krefOf, kslot, kunser } from '@agoric/kmarshal';
+
import { buildVatController } from '../src/index.js';
async function beginning(t, mode) {
diff --git a/packages/SwingSet/test/external-termination/bootstrap-external-termination.js b/packages/SwingSet/test/external-termination/bootstrap-external-termination.js
index 70e24801a4d..a95d1b72c5f 100644
--- a/packages/SwingSet/test/external-termination/bootstrap-external-termination.js
+++ b/packages/SwingSet/test/external-termination/bootstrap-external-termination.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject() {
let vatAdmin;
diff --git a/packages/SwingSet/test/external-termination/external-termination.test.js b/packages/SwingSet/test/external-termination/external-termination.test.js
index 6fa0a1ef807..626420bca21 100644
--- a/packages/SwingSet/test/external-termination/external-termination.test.js
+++ b/packages/SwingSet/test/external-termination/external-termination.test.js
@@ -1,8 +1,8 @@
-// eslint-disable-next-line import/order
import { test } from '../../tools/prepare-test-env-ava.js';
-import { initSwingStore } from '@agoric/swing-store';
import { kser, kunser } from '@agoric/kmarshal';
+import { initSwingStore } from '@agoric/swing-store';
+
import { initializeSwingset, makeSwingsetController } from '../../src/index.js';
const bfile = name => new URL(name, import.meta.url).pathname;
diff --git a/packages/SwingSet/test/files-vattp/bootstrap-test-vattp.js b/packages/SwingSet/test/files-vattp/bootstrap-test-vattp.js
index 5325d28a0e1..1bf35edf84b 100644
--- a/packages/SwingSet/test/files-vattp/bootstrap-test-vattp.js
+++ b/packages/SwingSet/test/files-vattp/bootstrap-test-vattp.js
@@ -1,5 +1,5 @@
-import { Far, E } from '@endo/far';
import { Fail } from '@endo/errors';
+import { E, Far } from '@endo/far';
export function buildRootObject(vatPowers, vatParameters) {
const { D, testLog: log } = vatPowers;
diff --git a/packages/SwingSet/test/gc-and-finalize.test.js b/packages/SwingSet/test/gc-and-finalize.test.js
index 123e24163df..598b5cb2bff 100644
--- a/packages/SwingSet/test/gc-and-finalize.test.js
+++ b/packages/SwingSet/test/gc-and-finalize.test.js
@@ -1,15 +1,15 @@
// @ts-nocheck
/* global FinalizationRegistry WeakRef */
-// eslint-disable-next-line import/order
+
import { test } from '../tools/prepare-test-env-ava.js';
+import engineGC from '@agoric/internal/src/lib-nodejs/engine-gc.js';
+import { makeGcAndFinalize } from '@agoric/internal/src/lib-nodejs/gc-and-finalize.js';
+import { xsnap } from '@agoric/xsnap';
import * as childProcess from 'child_process';
import fs from 'fs';
import * as os from 'os';
import { tmpName } from 'tmp';
-import { xsnap } from '@agoric/xsnap';
-import engineGC from '@agoric/internal/src/lib-nodejs/engine-gc.js';
-import { makeGcAndFinalize } from '@agoric/internal/src/lib-nodejs/gc-and-finalize.js';
function makeVictim() {
const victim = { doomed: 'oh no' };
diff --git a/packages/SwingSet/test/gc-dead-vat/bootstrap.js b/packages/SwingSet/test/gc-dead-vat/bootstrap.js
index 7bf0c47039b..97c64605fe4 100644
--- a/packages/SwingSet/test/gc-dead-vat/bootstrap.js
+++ b/packages/SwingSet/test/gc-dead-vat/bootstrap.js
@@ -1,6 +1,6 @@
-import { Far, E } from '@endo/far';
-import { makePromiseKit } from '@endo/promise-kit';
import { makeScalarBigWeakSetStore } from '@agoric/vat-data';
+import { E, Far } from '@endo/far';
+import { makePromiseKit } from '@endo/promise-kit';
async function sendExport(doomedRoot) {
const exportToDoomed = Far('exportToDoomed', {});
diff --git a/packages/SwingSet/test/gc-dead-vat/vat-doomed.js b/packages/SwingSet/test/gc-dead-vat/vat-doomed.js
index 19acca8758b..7089c5740db 100644
--- a/packages/SwingSet/test/gc-dead-vat/vat-doomed.js
+++ b/packages/SwingSet/test/gc-dead-vat/vat-doomed.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject(vatPowers) {
const pin = [];
diff --git a/packages/SwingSet/test/gc-device-transfer/bootstrap-gc.js b/packages/SwingSet/test/gc-device-transfer/bootstrap-gc.js
index cafb0741d35..7f549d84119 100644
--- a/packages/SwingSet/test/gc-device-transfer/bootstrap-gc.js
+++ b/packages/SwingSet/test/gc-device-transfer/bootstrap-gc.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
async function sendAmy(D, dev, testLog, left) {
const amy = Far('amy', {
diff --git a/packages/SwingSet/test/gc-device-transfer/vat-right-gc.js b/packages/SwingSet/test/gc-device-transfer/vat-right-gc.js
index 9deb4b96ce2..0fb9c86b8c2 100644
--- a/packages/SwingSet/test/gc-device-transfer/vat-right-gc.js
+++ b/packages/SwingSet/test/gc-device-transfer/vat-right-gc.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject(vatPowers) {
const { D, testLog } = vatPowers;
diff --git a/packages/SwingSet/test/gc-kernel-orphan.test.js b/packages/SwingSet/test/gc-kernel-orphan.test.js
index d6b30126493..17114b6a54f 100644
--- a/packages/SwingSet/test/gc-kernel-orphan.test.js
+++ b/packages/SwingSet/test/gc-kernel-orphan.test.js
@@ -1,16 +1,16 @@
// @ts-nocheck
/* global WeakRef, FinalizationRegistry */
-import anylogger from 'anylogger';
-// eslint-disable-next-line import/order
import { test } from '../tools/prepare-test-env-ava.js';
-import { assert } from '@endo/errors';
-import { kser, kunser, kslot } from '@agoric/kmarshal';
-import { initSwingStore } from '@agoric/swing-store';
import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
-import buildKernel from '../src/kernel/index.js';
+import { kser, kslot, kunser } from '@agoric/kmarshal';
+import { initSwingStore } from '@agoric/swing-store';
+import { assert } from '@endo/errors';
+import anylogger from 'anylogger';
+
import { initializeKernel } from '../src/controller/initializeKernel.js';
+import buildKernel from '../src/kernel/index.js';
function makeConsole(tag) {
const log = anylogger(tag);
diff --git a/packages/SwingSet/test/gc-kernel.test.js b/packages/SwingSet/test/gc-kernel.test.js
index ea6fa54b929..0fbc0d97446 100644
--- a/packages/SwingSet/test/gc-kernel.test.js
+++ b/packages/SwingSet/test/gc-kernel.test.js
@@ -1,26 +1,26 @@
// @ts-nocheck
/* global WeakRef, FinalizationRegistry */
-import anylogger from 'anylogger';
-// eslint-disable-next-line import/order
import { test } from '../tools/prepare-test-env-ava.js';
-import { assert } from '@endo/errors';
-import { kser, kunser, kslot } from '@agoric/kmarshal';
-import { initSwingStore } from '@agoric/swing-store';
import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
-import { parseVatSlot } from '../src/lib/parseVatSlots.js';
-import buildKernel from '../src/kernel/index.js';
+import { kser, kslot, kunser } from '@agoric/kmarshal';
+import { initSwingStore } from '@agoric/swing-store';
+import { assert } from '@endo/errors';
+import anylogger from 'anylogger';
+
import { initializeKernel } from '../src/controller/initializeKernel.js';
import {
buildVatController,
initializeSwingset,
makeSwingsetController,
} from '../src/index.js';
+import buildKernel from '../src/kernel/index.js';
+import { parseVatSlot } from '../src/lib/parseVatSlots.js';
import {
+ makeDropExports,
makeMessage,
makeResolutions,
- makeDropExports,
makeRetireExports,
makeRetireImports,
} from './util.js';
diff --git a/packages/SwingSet/test/gc/bootstrap.js b/packages/SwingSet/test/gc/bootstrap.js
index 8cdf7ce4dfe..7d7ed36d522 100644
--- a/packages/SwingSet/test/gc/bootstrap.js
+++ b/packages/SwingSet/test/gc/bootstrap.js
@@ -1,5 +1,5 @@
// @ts-nocheck
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject() {
let A = Far('A', { hello() {} });
diff --git a/packages/SwingSet/test/gc/gc-vat.test.js b/packages/SwingSet/test/gc/gc-vat.test.js
index 617e4b07a7e..ec5a5d0935e 100644
--- a/packages/SwingSet/test/gc/gc-vat.test.js
+++ b/packages/SwingSet/test/gc/gc-vat.test.js
@@ -1,7 +1,7 @@
import { test } from '../../tools/prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { initSwingStore } from '@agoric/swing-store';
+
import { initializeSwingset, makeSwingsetController } from '../../src/index.js';
import { extractMethod } from '../../src/lib/kdebug.js';
diff --git a/packages/SwingSet/test/gc/vat-target.js b/packages/SwingSet/test/gc/vat-target.js
index 53900b66055..4ac53f7e8f4 100644
--- a/packages/SwingSet/test/gc/vat-target.js
+++ b/packages/SwingSet/test/gc/vat-target.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject(_vatPowers, _vatParameters, baggage) {
/** @type { WeakSet | undefined } */
diff --git a/packages/SwingSet/test/kdebug.test.js b/packages/SwingSet/test/kdebug.test.js
index 9a6af853097..41ddd055ed5 100644
--- a/packages/SwingSet/test/kdebug.test.js
+++ b/packages/SwingSet/test/kdebug.test.js
@@ -1,10 +1,10 @@
import { test } from '../tools/prepare-test-env-ava.js';
import {
- legibilizeValue,
- legibilizeMethod,
extractMethod,
legibilizeMessageArgs,
+ legibilizeMethod,
+ legibilizeValue,
} from '../src/lib/kdebug.js';
function testLegibilizeValue(t, body, slots, out) {
diff --git a/packages/SwingSet/test/kernel.test.js b/packages/SwingSet/test/kernel.test.js
index f18a0720ff3..183ac5232a1 100644
--- a/packages/SwingSet/test/kernel.test.js
+++ b/packages/SwingSet/test/kernel.test.js
@@ -1,11 +1,12 @@
// @ts-nocheck
-// eslint-disable-next-line import/order
+
import { test } from '../tools/prepare-test-env-ava.js';
+import { kser, kslot, kunser } from '@agoric/kmarshal';
import { Fail } from '@endo/errors';
-import { kser, kunser, kslot } from '@agoric/kmarshal';
-import buildKernel from '../src/kernel/index.js';
+
import { initializeKernel } from '../src/controller/initializeKernel.js';
+import buildKernel from '../src/kernel/index.js';
import { makeVatSlot } from '../src/lib/parseVatSlots.js';
import { checkKT, extractMessage, makeKernelEndowments } from './util.js';
diff --git a/packages/SwingSet/test/manual-timer.test.js b/packages/SwingSet/test/manual-timer.test.js
index 72205d78607..300463f4029 100644
--- a/packages/SwingSet/test/manual-timer.test.js
+++ b/packages/SwingSet/test/manual-timer.test.js
@@ -1,6 +1,7 @@
import { test } from '../tools/prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
+
import { TimeMath } from '@agoric/time';
+
import { buildManualTimer } from '../tools/manual-timer.js';
test('buildManualTimer', async t => {
diff --git a/packages/SwingSet/test/marshal.test.js b/packages/SwingSet/test/marshal.test.js
index 6e1a8d673ca..264d1add26f 100644
--- a/packages/SwingSet/test/marshal.test.js
+++ b/packages/SwingSet/test/marshal.test.js
@@ -1,11 +1,11 @@
/* global WeakRef, FinalizationRegistry */
-// eslint-disable-next-line import/order
+
import { test } from '../tools/prepare-test-env-ava.js';
-import { Far } from '@endo/far';
-import { makePromiseKit } from '@endo/promise-kit';
import { kser, makeError } from '@agoric/kmarshal';
import { makeMarshaller } from '@agoric/swingset-liveslots';
+import { Far } from '@endo/far';
+import { makePromiseKit } from '@endo/promise-kit';
import { makeDummyMeterControl } from '../src/kernel/dummyMeterControl.js';
diff --git a/packages/SwingSet/test/message-patterns-comms.test.js b/packages/SwingSet/test/message-patterns-comms.test.js
index 6b1d071c97c..1605b076ba6 100644
--- a/packages/SwingSet/test/message-patterns-comms.test.js
+++ b/packages/SwingSet/test/message-patterns-comms.test.js
@@ -3,20 +3,20 @@
/* eslint dot-notation: "off" */
/* eslint object-shorthand: "off" */
-// eslint-disable-next-line import/order -- has side-effects AND exports
import { test } from '../tools/prepare-test-env-ava.js';
-import path from 'path';
-import bundleSource from '@endo/bundle-source';
import { initSwingStore } from '@agoric/swing-store';
+import bundleSource from '@endo/bundle-source';
+import path from 'path';
+
+import { buildLoopbox } from '../src/devices/loopbox/loopbox.js';
import {
+ buildKernelBundles,
initializeSwingset,
makeSwingsetController,
- buildKernelBundles,
} from '../src/index.js';
-import { bundleOpts } from './util.js';
-import { buildLoopbox } from '../src/devices/loopbox/loopbox.js';
import { buildPatterns } from './message-patterns.js';
+import { bundleOpts } from './util.js';
// This exercises all the patterns in 'message-patterns.js' twice with
// comms vats in the path (a different file runs them all with a
diff --git a/packages/SwingSet/test/message-patterns-local.test.js b/packages/SwingSet/test/message-patterns-local.test.js
index dd6474e9003..09fbe818291 100644
--- a/packages/SwingSet/test/message-patterns-local.test.js
+++ b/packages/SwingSet/test/message-patterns-local.test.js
@@ -3,19 +3,19 @@
/* eslint dot-notation: "off" */
/* eslint object-shorthand: "off" */
-// eslint-disable-next-line import/order -- has side-effects AND exports
import { test } from '../tools/prepare-test-env-ava.js';
-import path from 'path';
-import bundleSource from '@endo/bundle-source';
import { initSwingStore } from '@agoric/swing-store';
+import bundleSource from '@endo/bundle-source';
+import path from 'path';
+
import {
+ buildKernelBundles,
initializeSwingset,
makeSwingsetController,
- buildKernelBundles,
} from '../src/index.js';
-import { bundleOpts } from './util.js';
import { buildPatterns } from './message-patterns.js';
+import { bundleOpts } from './util.js';
// This exercises all the patterns in 'message-patterns.js' with
// vatA/vatB connected directly through the kernel (a different file
diff --git a/packages/SwingSet/test/message-patterns.js b/packages/SwingSet/test/message-patterns.js
index 9ab90a912f7..353a0f0f878 100644
--- a/packages/SwingSet/test/message-patterns.js
+++ b/packages/SwingSet/test/message-patterns.js
@@ -2,9 +2,10 @@
// I turned off dot-notation so eslint won't rewrite the grep-preserving
// test.stuff patterns.
-import { makePromiseKit } from '@endo/promise-kit';
import { q } from '@endo/errors';
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
+import { makePromiseKit } from '@endo/promise-kit';
+
import { ignore } from './vat-util.js';
// Exercise a set of increasingly complex object-capability message patterns,
diff --git a/packages/SwingSet/test/metering/dynamic-vat-metered.test.js b/packages/SwingSet/test/metering/dynamic-vat-metered.test.js
index e3157b3f19b..fb0d4f77172 100644
--- a/packages/SwingSet/test/metering/dynamic-vat-metered.test.js
+++ b/packages/SwingSet/test/metering/dynamic-vat-metered.test.js
@@ -1,13 +1,14 @@
// @ts-nocheck
-// eslint-disable-next-line import/order
+
import { test } from '../../tools/prepare-test-env-ava.js';
-import bundleSource from '@endo/bundle-source';
-import { kunser, krefOf } from '@agoric/kmarshal';
+import { krefOf, kunser } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
+import bundleSource from '@endo/bundle-source';
+
import { buildKernelBundles, buildVatController } from '../../src/index.js';
-import { restartVatAdminVat } from '../util.js';
import { enumeratePrefixedKeys } from '../../src/kernel/state/storageHelper.js';
+import { restartVatAdminVat } from '../util.js';
async function prepare() {
const kernelBundles = await buildKernelBundles();
diff --git a/packages/SwingSet/test/metering/dynamic-vat-unmetered.test.js b/packages/SwingSet/test/metering/dynamic-vat-unmetered.test.js
index d4b759ee385..c40751b7a84 100644
--- a/packages/SwingSet/test/metering/dynamic-vat-unmetered.test.js
+++ b/packages/SwingSet/test/metering/dynamic-vat-unmetered.test.js
@@ -1,7 +1,7 @@
import { test } from '../../tools/prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { kunser } from '@agoric/kmarshal';
+
import { buildVatController } from '../../src/index.js';
// Dynamic vats are created without metering by default
diff --git a/packages/SwingSet/test/metering/metered-dynamic-vat.js b/packages/SwingSet/test/metering/metered-dynamic-vat.js
index 11f5bb5aaae..d80ab2d1b59 100644
--- a/packages/SwingSet/test/metering/metered-dynamic-vat.js
+++ b/packages/SwingSet/test/metering/metered-dynamic-vat.js
@@ -1,5 +1,6 @@
-import { makePromiseKit } from '@endo/promise-kit';
import { Far } from '@endo/far';
+import { makePromiseKit } from '@endo/promise-kit';
+
import { meterMe } from './metered-code.js';
export function buildRootObject(_dynamicVatPowers) {
diff --git a/packages/SwingSet/test/metering/vat-load-dynamic.js b/packages/SwingSet/test/metering/vat-load-dynamic.js
index cec0c2648f3..ab8805ec5d9 100644
--- a/packages/SwingSet/test/metering/vat-load-dynamic.js
+++ b/packages/SwingSet/test/metering/vat-load-dynamic.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject(vatPowers) {
const { testLog: log } = vatPowers;
diff --git a/packages/SwingSet/test/promise-watcher/bootstrap-promise-watcher.js b/packages/SwingSet/test/promise-watcher/bootstrap-promise-watcher.js
index 8eaee9241cd..2f9943bba86 100644
--- a/packages/SwingSet/test/promise-watcher/bootstrap-promise-watcher.js
+++ b/packages/SwingSet/test/promise-watcher/bootstrap-promise-watcher.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
import { makePromiseKit } from '@endo/promise-kit';
export function buildRootObject() {
diff --git a/packages/SwingSet/test/promise-watcher/promise-watcher.test.js b/packages/SwingSet/test/promise-watcher/promise-watcher.test.js
index 7c607a4d355..bca7013c2c1 100644
--- a/packages/SwingSet/test/promise-watcher/promise-watcher.test.js
+++ b/packages/SwingSet/test/promise-watcher/promise-watcher.test.js
@@ -1,14 +1,11 @@
-import process from 'process';
-
-import { handleUnhandledRejections } from './unhandledRejectionDetector.js';
-
import { test } from '../../tools/prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
-import { assert } from '@endo/errors';
-// eslint-disable-next-line import/order
import { initSwingStore } from '@agoric/swing-store';
+import { assert } from '@endo/errors';
+import process from 'process';
+
import { initializeSwingset, makeSwingsetController } from '../../src/index.js';
+import { handleUnhandledRejections } from './unhandledRejectionDetector.js';
function bfile(name) {
return new URL(name, import.meta.url).pathname;
diff --git a/packages/SwingSet/test/promise-watcher/vat-upton.js b/packages/SwingSet/test/promise-watcher/vat-upton.js
index 2f3d894dd05..3995bf9e0df 100644
--- a/packages/SwingSet/test/promise-watcher/vat-upton.js
+++ b/packages/SwingSet/test/promise-watcher/vat-upton.js
@@ -1,13 +1,13 @@
// @ts-nocheck
-import { Far, E } from '@endo/far';
import { initEmpty } from '@agoric/store';
-import { makePromiseKit } from '@endo/promise-kit';
import {
+ defineDurableKindMulti,
provideKindHandle,
providePromiseWatcher,
- defineDurableKindMulti,
watchPromise,
} from '@agoric/vat-data';
+import { E, Far } from '@endo/far';
+import { makePromiseKit } from '@endo/promise-kit';
export function buildRootObject(vatPowers, vatParameters, baggage) {
const log = vatPowers.testLog;
diff --git a/packages/SwingSet/test/promises.test.js b/packages/SwingSet/test/promises.test.js
index eb994ce9e32..a207f94397d 100644
--- a/packages/SwingSet/test/promises.test.js
+++ b/packages/SwingSet/test/promises.test.js
@@ -1,12 +1,13 @@
// @ts-nocheck
+
import { test } from '../tools/prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { kser, kslot, kunser } from '@agoric/kmarshal';
+
import {
+ buildKernelBundles,
buildVatController,
loadBasedir,
- buildKernelBundles,
} from '../src/index.js';
const bfile = name => new URL(name, import.meta.url).pathname;
diff --git a/packages/SwingSet/test/reap-all/bootstrap-reap-all.js b/packages/SwingSet/test/reap-all/bootstrap-reap-all.js
index 615e7c46f45..8090a9e9694 100644
--- a/packages/SwingSet/test/reap-all/bootstrap-reap-all.js
+++ b/packages/SwingSet/test/reap-all/bootstrap-reap-all.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject() {
let vatAdmin;
diff --git a/packages/SwingSet/test/reap-all/reap-all.test.js b/packages/SwingSet/test/reap-all/reap-all.test.js
index 3e7ed85a70f..f59c9e307bb 100644
--- a/packages/SwingSet/test/reap-all/reap-all.test.js
+++ b/packages/SwingSet/test/reap-all/reap-all.test.js
@@ -1,8 +1,7 @@
-// eslint-disable-next-line import/order
import { test } from '../../tools/prepare-test-env-ava.js';
-import { initSwingStore } from '@agoric/swing-store';
import { kunser } from '@agoric/kmarshal';
+import { initSwingStore } from '@agoric/swing-store';
import { initializeSwingset, makeSwingsetController } from '../../src/index.js';
diff --git a/packages/SwingSet/test/run-policy/run-policy.test.js b/packages/SwingSet/test/run-policy/run-policy.test.js
index a76d17785b2..84aa5137437 100644
--- a/packages/SwingSet/test/run-policy/run-policy.test.js
+++ b/packages/SwingSet/test/run-policy/run-policy.test.js
@@ -1,13 +1,14 @@
// @ts-nocheck
-// eslint-disable-next-line import/order
+
import { test } from '../../tools/prepare-test-env-ava.js';
-import { kslot, kser } from '@agoric/kmarshal';
+import { kser, kslot } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
+
import { initializeSwingset, makeSwingsetController } from '../../src/index.js';
import {
- crankCounter,
computronCounter,
+ crankCounter,
wallClockWaiter,
} from '../../src/lib/runPolicies.js';
diff --git a/packages/SwingSet/test/run-policy/vat-policy-left.js b/packages/SwingSet/test/run-policy/vat-policy-left.js
index 7eea4d1ed85..fdd00268428 100644
--- a/packages/SwingSet/test/run-policy/vat-policy-left.js
+++ b/packages/SwingSet/test/run-policy/vat-policy-left.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
import { makePromiseKit } from '@endo/promise-kit';
export function buildRootObject() {
diff --git a/packages/SwingSet/test/run-policy/vat-policy-right.js b/packages/SwingSet/test/run-policy/vat-policy-right.js
index 9630c4bb4bf..791d90e3bf2 100644
--- a/packages/SwingSet/test/run-policy/vat-policy-right.js
+++ b/packages/SwingSet/test/run-policy/vat-policy-right.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
import { makePromiseKit } from '@endo/promise-kit';
// this takes about 5.7M computrons
diff --git a/packages/SwingSet/test/state.test.js b/packages/SwingSet/test/state.test.js
index c60a01aa79c..b06419771f5 100644
--- a/packages/SwingSet/test/state.test.js
+++ b/packages/SwingSet/test/state.test.js
@@ -1,21 +1,22 @@
// @ts-nocheck
/* eslint-disable no-useless-concat */
-// eslint-disable-next-line import/order
+
import { test } from '../tools/prepare-test-env-ava.js';
-import { createHash } from 'crypto';
import { kser, kslot } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
+import { createHash } from 'crypto';
+
+import { upgradeSwingset } from '../src/controller/upgradeSwingset.js';
+import { KERNEL_STATS_METRICS } from '../src/kernel/metrics.js';
import makeKernelKeeper, {
CURRENT_SCHEMA_VERSION,
} from '../src/kernel/state/kernelKeeper.js';
-import { upgradeSwingset } from '../src/controller/upgradeSwingset.js';
import { makeKernelStats } from '../src/kernel/state/stats.js';
-import { KERNEL_STATS_METRICS } from '../src/kernel/metrics.js';
import {
+ deletePrefixedKeys,
enumeratePrefixedKeys,
getPrefixedValues,
- deletePrefixedKeys,
} from '../src/kernel/state/storageHelper.js';
const ignoredStateKeys = ['activityhash', 'kernelStats', 'local.kernelStats'];
diff --git a/packages/SwingSet/test/stripPrefix.test.js b/packages/SwingSet/test/stripPrefix.test.js
index a34e8ac3cd6..58d38c05636 100644
--- a/packages/SwingSet/test/stripPrefix.test.js
+++ b/packages/SwingSet/test/stripPrefix.test.js
@@ -1,4 +1,5 @@
import { test } from '../tools/prepare-test-env-ava.js';
+
import { stripPrefix } from '../src/kernel/state/kernelKeeper.js';
test('stripPrefix', t => {
diff --git a/packages/SwingSet/test/syscall-failure.test.js b/packages/SwingSet/test/syscall-failure.test.js
index 4e1a0f798e0..19f6da59542 100644
--- a/packages/SwingSet/test/syscall-failure.test.js
+++ b/packages/SwingSet/test/syscall-failure.test.js
@@ -1,8 +1,9 @@
// @ts-nocheck
+
import { test } from '../tools/prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { initSwingStore } from '@agoric/swing-store';
+
import { buildVatController } from '../src/index.js';
import { enumeratePrefixedKeys } from '../src/kernel/state/storageHelper.js';
diff --git a/packages/SwingSet/test/timer-device.test.js b/packages/SwingSet/test/timer-device.test.js
index b4ae7a07011..058e65b5584 100644
--- a/packages/SwingSet/test/timer-device.test.js
+++ b/packages/SwingSet/test/timer-device.test.js
@@ -1,11 +1,12 @@
// @ts-nocheck
+
import { test } from '../tools/prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { Far } from '@endo/far';
+
import {
- makeTimerMap,
curryPollFn,
+ makeTimerMap,
} from '../src/devices/timer/device-timer.js';
test('multiMap multi store', t => {
diff --git a/packages/SwingSet/test/timer-device/bootstrap.js b/packages/SwingSet/test/timer-device/bootstrap.js
index 80d69515710..1f05fad5fca 100644
--- a/packages/SwingSet/test/timer-device/bootstrap.js
+++ b/packages/SwingSet/test/timer-device/bootstrap.js
@@ -1,6 +1,6 @@
import { Fail } from '@endo/errors';
-import { Nat } from '@endo/nat';
import { Far } from '@endo/far';
+import { Nat } from '@endo/nat';
export function buildRootObject(vatPowers, vatParameters) {
const { D } = vatPowers;
diff --git a/packages/SwingSet/test/timer-device/device.test.js b/packages/SwingSet/test/timer-device/device.test.js
index 4ba2623aca0..1a0cd8c15bc 100644
--- a/packages/SwingSet/test/timer-device/device.test.js
+++ b/packages/SwingSet/test/timer-device/device.test.js
@@ -1,10 +1,9 @@
import { test } from '../../tools/prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { initSwingStore } from '@agoric/swing-store';
-import { initializeSwingset, makeSwingsetController } from '../../src/index.js';
import { buildTimer } from '../../src/devices/timer/timer.js';
+import { initializeSwingset, makeSwingsetController } from '../../src/index.js';
const TimerSrc = new URL(
'../../src/devices/timer/device-timer.js',
diff --git a/packages/SwingSet/test/timer/bootstrap-timer.js b/packages/SwingSet/test/timer/bootstrap-timer.js
index e16b78eeff4..816dc32c447 100644
--- a/packages/SwingSet/test/timer/bootstrap-timer.js
+++ b/packages/SwingSet/test/timer/bootstrap-timer.js
@@ -1,5 +1,5 @@
-import { Far, E } from '@endo/far';
import { TimeMath } from '@agoric/time';
+import { E, Far } from '@endo/far';
export function buildRootObject() {
let ts;
diff --git a/packages/SwingSet/test/timer/timer.test.js b/packages/SwingSet/test/timer/timer.test.js
index 2df4742240a..da79ed79747 100644
--- a/packages/SwingSet/test/timer/timer.test.js
+++ b/packages/SwingSet/test/timer/timer.test.js
@@ -1,10 +1,10 @@
-// eslint-disable-next-line import/order
import { test } from '../../tools/prepare-test-env-ava.js';
import { kunser } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
-import { initializeSwingset, makeSwingsetController } from '../../src/index.js';
+
import { buildTimer } from '../../src/devices/timer/timer.js';
+import { initializeSwingset, makeSwingsetController } from '../../src/index.js';
const bfile = name => new URL(name, import.meta.url).pathname;
diff --git a/packages/SwingSet/test/transcript-light.test.js b/packages/SwingSet/test/transcript-light.test.js
index 9049eb57845..c11ea50d7c5 100644
--- a/packages/SwingSet/test/transcript-light.test.js
+++ b/packages/SwingSet/test/transcript-light.test.js
@@ -1,8 +1,9 @@
// @ts-nocheck
import { test } from '../tools/prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
+
import { initSwingStore } from '@agoric/swing-store';
+
import { buildVatController, loadBasedir } from '../src/index.js';
// this test wants to compare the swing-store state from one run to
diff --git a/packages/SwingSet/test/transcript.test.js b/packages/SwingSet/test/transcript.test.js
index f2470ff864c..8fa77d49f6b 100644
--- a/packages/SwingSet/test/transcript.test.js
+++ b/packages/SwingSet/test/transcript.test.js
@@ -1,5 +1,5 @@
import { test } from '../tools/prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
+
import { initSwingStore } from '@agoric/swing-store';
// import fs from 'fs';
diff --git a/packages/SwingSet/test/transcript/state-sync-reload.test.js b/packages/SwingSet/test/transcript/state-sync-reload.test.js
index 41432628aec..9becb53a15f 100644
--- a/packages/SwingSet/test/transcript/state-sync-reload.test.js
+++ b/packages/SwingSet/test/transcript/state-sync-reload.test.js
@@ -1,16 +1,16 @@
// @ts-nocheck
-import test from 'ava';
-
-import tmp from 'tmp';
import { kunser } from '@agoric/kmarshal';
import {
+ importSwingStore,
initSwingStore,
- openSwingStore,
makeSwingStoreExporter,
- importSwingStore,
+ openSwingStore,
} from '@agoric/swing-store';
-import { initializeSwingset, makeSwingsetController } from '../../src/index.js';
+import test from 'ava';
+import tmp from 'tmp';
+
import { buildKernelBundle } from '../../src/controller/initializeSwingset.js';
+import { initializeSwingset, makeSwingsetController } from '../../src/index.js';
/**
* @param {string} [prefix]
diff --git a/packages/SwingSet/test/transcript/transcript-entries.test.js b/packages/SwingSet/test/transcript/transcript-entries.test.js
index 3c1c332908b..829b51b66d3 100644
--- a/packages/SwingSet/test/transcript/transcript-entries.test.js
+++ b/packages/SwingSet/test/transcript/transcript-entries.test.js
@@ -1,10 +1,10 @@
// @ts-nocheck
-import test from 'ava';
-
import { kunser } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
-import { initializeSwingset, makeSwingsetController } from '../../src/index.js';
+import test from 'ava';
+
import { buildKernelBundle } from '../../src/controller/initializeSwingset.js';
+import { initializeSwingset, makeSwingsetController } from '../../src/index.js';
const bfile = name => new URL(name, import.meta.url).pathname;
diff --git a/packages/SwingSet/test/transcriptlessness.test.js b/packages/SwingSet/test/transcriptlessness.test.js
index 766a6d1a4a3..82b5aea5c95 100644
--- a/packages/SwingSet/test/transcriptlessness.test.js
+++ b/packages/SwingSet/test/transcriptlessness.test.js
@@ -1,7 +1,7 @@
import { test } from '../tools/prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { initSwingStore } from '@agoric/swing-store';
+
import { buildVatController } from '../src/index.js';
async function testTranscriptlessness(t, useTranscript) {
diff --git a/packages/SwingSet/test/upgrade-swingset.test.js b/packages/SwingSet/test/upgrade-swingset.test.js
index a18b2699dd8..2bff4a3e76e 100644
--- a/packages/SwingSet/test/upgrade-swingset.test.js
+++ b/packages/SwingSet/test/upgrade-swingset.test.js
@@ -1,14 +1,15 @@
/* eslint-disable no-underscore-dangle */
// @ts-nocheck
-import { initSwingStore } from '@agoric/swing-store';
import { test } from '../tools/prepare-test-env-ava.js';
+import { initSwingStore } from '@agoric/swing-store';
+
import {
+ buildKernelBundles,
initializeSwingset,
makeSwingsetController,
upgradeSwingset,
- buildKernelBundles,
} from '../src/index.js';
test.before(async t => {
diff --git a/packages/SwingSet/test/upgrade/bootstrap-scripted-upgrade.js b/packages/SwingSet/test/upgrade/bootstrap-scripted-upgrade.js
index c93cfa6b568..c163f4b80bb 100644
--- a/packages/SwingSet/test/upgrade/bootstrap-scripted-upgrade.js
+++ b/packages/SwingSet/test/upgrade/bootstrap-scripted-upgrade.js
@@ -1,5 +1,5 @@
-import { Far, E } from '@endo/far';
import { assert } from '@endo/errors';
+import { E, Far } from '@endo/far';
import { makePromiseKit } from '@endo/promise-kit';
const NUM_SENSORS = 39;
diff --git a/packages/SwingSet/test/upgrade/bootstrap-upgrade-replay.js b/packages/SwingSet/test/upgrade/bootstrap-upgrade-replay.js
index 607e9c9e584..7982735e376 100644
--- a/packages/SwingSet/test/upgrade/bootstrap-upgrade-replay.js
+++ b/packages/SwingSet/test/upgrade/bootstrap-upgrade-replay.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject() {
let vatAdmin;
diff --git a/packages/SwingSet/test/upgrade/upgrade-replay.test.js b/packages/SwingSet/test/upgrade/upgrade-replay.test.js
index 1cd95fc32d2..ede43a80439 100644
--- a/packages/SwingSet/test/upgrade/upgrade-replay.test.js
+++ b/packages/SwingSet/test/upgrade/upgrade-replay.test.js
@@ -1,10 +1,11 @@
// @ts-nocheck
-// eslint-disable-next-line import/order
+
import { test } from '../../tools/prepare-test-env-ava.js';
-import { assert } from '@endo/errors';
import { kser } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
+import { assert } from '@endo/errors';
+
import {
buildKernelBundles,
initializeSwingset,
diff --git a/packages/SwingSet/test/upgrade/upgrade.test.js b/packages/SwingSet/test/upgrade/upgrade.test.js
index aca1efbbd89..0830190faa7 100644
--- a/packages/SwingSet/test/upgrade/upgrade.test.js
+++ b/packages/SwingSet/test/upgrade/upgrade.test.js
@@ -1,19 +1,20 @@
// @ts-nocheck
-// eslint-disable-next-line import/order
+
import { test } from '../../tools/prepare-test-env-ava.js';
-import { assert } from '@endo/errors';
-import bundleSource from '@endo/bundle-source';
import { objectMap } from '@agoric/internal';
-import { kser, kunser, krefOf } from '@agoric/kmarshal';
+import { krefOf, kser, kunser } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
-import { parseReachableAndVatSlot } from '../../src/kernel/state/reachable.js';
-import { parseVatSlot } from '../../src/lib/parseVatSlots.js';
+import bundleSource from '@endo/bundle-source';
+import { assert } from '@endo/errors';
+
import {
buildKernelBundles,
initializeSwingset,
makeSwingsetController,
} from '../../src/index.js';
+import { parseReachableAndVatSlot } from '../../src/kernel/state/reachable.js';
+import { parseVatSlot } from '../../src/lib/parseVatSlots.js';
import { bundleOpts, restartVatAdminVat } from '../util.js';
const bfile = name => new URL(name, import.meta.url).pathname;
diff --git a/packages/SwingSet/test/upgrade/vat-ulrik-1.js b/packages/SwingSet/test/upgrade/vat-ulrik-1.js
index 89c08c286df..ccb72f5f769 100644
--- a/packages/SwingSet/test/upgrade/vat-ulrik-1.js
+++ b/packages/SwingSet/test/upgrade/vat-ulrik-1.js
@@ -1,14 +1,14 @@
-import { Far, E } from '@endo/far';
-import { makePromiseKit } from '@endo/promise-kit';
import { initEmpty } from '@agoric/store';
import {
- makeKindHandle,
defineDurableKind,
defineDurableKindMulti,
defineKind,
+ makeKindHandle,
makeScalarBigMapStore,
makeScalarBigWeakMapStore,
} from '@agoric/vat-data';
+import { E, Far } from '@endo/far';
+import { makePromiseKit } from '@endo/promise-kit';
// we set up a lot of ephemeral, merely-virtual, and durable objects
// holding references to imported objects
diff --git a/packages/SwingSet/test/upgrade/vat-ulrik-2.js b/packages/SwingSet/test/upgrade/vat-ulrik-2.js
index e843e2154e3..55c183c0706 100644
--- a/packages/SwingSet/test/upgrade/vat-ulrik-2.js
+++ b/packages/SwingSet/test/upgrade/vat-ulrik-2.js
@@ -1,7 +1,7 @@
-import { Far, E } from '@endo/far';
-import { assert } from '@endo/errors';
import { initEmpty } from '@agoric/store';
import { defineDurableKind, defineDurableKindMulti } from '@agoric/vat-data';
+import { assert } from '@endo/errors';
+import { E, Far } from '@endo/far';
const initialize = (name, imp, value) => {
return harden({ name, imp, value });
diff --git a/packages/SwingSet/test/util.js b/packages/SwingSet/test/util.js
index aedaab707b8..a11334a8534 100644
--- a/packages/SwingSet/test/util.js
+++ b/packages/SwingSet/test/util.js
@@ -1,11 +1,10 @@
/* global WeakRef, FinalizationRegistry */
-import anylogger from 'anylogger';
-
-import bundleSource from '@endo/bundle-source';
-
+import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
import { kser } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
-import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
+import bundleSource from '@endo/bundle-source';
+import anylogger from 'anylogger';
+
import { extractMessage, ignore, vstr } from './vat-util.js';
export { extractMessage, ignore, vstr };
diff --git a/packages/SwingSet/test/vat-activityhash-comms.js b/packages/SwingSet/test/vat-activityhash-comms.js
index d7455679cfa..d2bc9588df5 100644
--- a/packages/SwingSet/test/vat-activityhash-comms.js
+++ b/packages/SwingSet/test/vat-activityhash-comms.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject() {
let comms;
diff --git a/packages/SwingSet/test/vat-admin/bootstrap.js b/packages/SwingSet/test/vat-admin/bootstrap.js
index 74bf050d9ac..4ebf5ad2c34 100644
--- a/packages/SwingSet/test/vat-admin/bootstrap.js
+++ b/packages/SwingSet/test/vat-admin/bootstrap.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject() {
let admin;
diff --git a/packages/SwingSet/test/vat-admin/create-vat.test.js b/packages/SwingSet/test/vat-admin/create-vat.test.js
index 40b3325cc58..821cf7eb5d3 100644
--- a/packages/SwingSet/test/vat-admin/create-vat.test.js
+++ b/packages/SwingSet/test/vat-admin/create-vat.test.js
@@ -1,18 +1,19 @@
// @ts-nocheck
-// eslint-disable-next-line import/order
+
import { test } from '../../tools/prepare-test-env-ava.js';
-import bundleSource from '@endo/bundle-source';
-import { kunser, krefOf } from '@agoric/kmarshal';
+import { krefOf, kunser } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
+import bundleSource from '@endo/bundle-source';
+
import {
buildKernelBundles,
initializeSwingset,
- makeSwingsetController,
loadBasedir,
+ makeSwingsetController,
} from '../../src/index.js';
-import { bundleOpts, restartVatAdminVat } from '../util.js';
import { extractMethod } from '../../src/lib/kdebug.js';
+import { bundleOpts, restartVatAdminVat } from '../util.js';
function nonBundleFunction(_E) {
return {};
diff --git a/packages/SwingSet/test/vat-admin/durable-root-vat.js b/packages/SwingSet/test/vat-admin/durable-root-vat.js
index 3a0f7938cf8..c3a341c079c 100644
--- a/packages/SwingSet/test/vat-admin/durable-root-vat.js
+++ b/packages/SwingSet/test/vat-admin/durable-root-vat.js
@@ -1,4 +1,4 @@
-import { makeKindHandle, defineDurableKind } from '@agoric/vat-data';
+import { defineDurableKind, makeKindHandle } from '@agoric/vat-data';
// root objects must be ephemeral, not virtual/durable
diff --git a/packages/SwingSet/test/vat-admin/new-vat-13.js b/packages/SwingSet/test/vat-admin/new-vat-13.js
index 6d32acce6fe..471596a43ee 100644
--- a/packages/SwingSet/test/vat-admin/new-vat-13.js
+++ b/packages/SwingSet/test/vat-admin/new-vat-13.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject(_vatPowers, vatParameters) {
const { adder } = vatParameters;
diff --git a/packages/SwingSet/test/vat-admin/new-vat-44.js b/packages/SwingSet/test/vat-admin/new-vat-44.js
index f8e718b458f..b13085b19c4 100644
--- a/packages/SwingSet/test/vat-admin/new-vat-44.js
+++ b/packages/SwingSet/test/vat-admin/new-vat-44.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject(_vatPowers, vatParameters) {
const { adder } = vatParameters;
diff --git a/packages/SwingSet/test/vat-admin/replay-bootstrap.js b/packages/SwingSet/test/vat-admin/replay-bootstrap.js
index 74eb82e3b13..fe10bb0dcd1 100644
--- a/packages/SwingSet/test/vat-admin/replay-bootstrap.js
+++ b/packages/SwingSet/test/vat-admin/replay-bootstrap.js
@@ -1,5 +1,5 @@
+import { E, Far } from '@endo/far';
import { makePromiseKit } from '@endo/promise-kit';
-import { Far, E } from '@endo/far';
export function buildRootObject() {
const { promise: vatAdminSvc, resolve: gotVatAdminSvc } = makePromiseKit();
diff --git a/packages/SwingSet/test/vat-admin/replay.test.js b/packages/SwingSet/test/vat-admin/replay.test.js
index 24cb2dfd24f..0316df10585 100644
--- a/packages/SwingSet/test/vat-admin/replay.test.js
+++ b/packages/SwingSet/test/vat-admin/replay.test.js
@@ -1,9 +1,10 @@
// @ts-nocheck
-// eslint-disable-next-line import/order
+
import { test } from '../../tools/prepare-test-env-ava.js';
import { kser } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
+
import { buildKernelBundles, buildVatController } from '../../src/index.js';
function copy(data) {
diff --git a/packages/SwingSet/test/vat-admin/slow-termination/bootstrap-slow-terminate.js b/packages/SwingSet/test/vat-admin/slow-termination/bootstrap-slow-terminate.js
index 135124209ef..5f58d593ac1 100644
--- a/packages/SwingSet/test/vat-admin/slow-termination/bootstrap-slow-terminate.js
+++ b/packages/SwingSet/test/vat-admin/slow-termination/bootstrap-slow-terminate.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject(_vatPowers) {
let root;
diff --git a/packages/SwingSet/test/vat-admin/slow-termination/slow-termination.test.js b/packages/SwingSet/test/vat-admin/slow-termination/slow-termination.test.js
index 336176024c6..02431e5c01c 100644
--- a/packages/SwingSet/test/vat-admin/slow-termination/slow-termination.test.js
+++ b/packages/SwingSet/test/vat-admin/slow-termination/slow-termination.test.js
@@ -1,15 +1,14 @@
// @ts-nocheck
-// eslint-disable-next-line import/order
-import { test } from '../../../tools/prepare-test-env-ava.js';
-import tmp from 'tmp';
-import sqlite3 from 'better-sqlite3';
-import path from 'path';
+import { test } from '../../../tools/prepare-test-env-ava.js';
import { kser } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
+import sqlite3 from 'better-sqlite3';
+import path from 'path';
+import tmp from 'tmp';
-import { buildVatController, buildKernelBundles } from '../../../src/index.js';
+import { buildKernelBundles, buildVatController } from '../../../src/index.js';
import { enumeratePrefixedKeys } from '../../../src/kernel/state/storageHelper.js';
/**
diff --git a/packages/SwingSet/test/vat-admin/terminate/bootstrap-badVatKey.js b/packages/SwingSet/test/vat-admin/terminate/bootstrap-badVatKey.js
index 728d6f3cbb8..0b64cc8b6af 100644
--- a/packages/SwingSet/test/vat-admin/terminate/bootstrap-badVatKey.js
+++ b/packages/SwingSet/test/vat-admin/terminate/bootstrap-badVatKey.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject() {
return Far('root', {
diff --git a/packages/SwingSet/test/vat-admin/terminate/bootstrap-die-cleanly.js b/packages/SwingSet/test/vat-admin/terminate/bootstrap-die-cleanly.js
index 8b67c11b9a1..0caaffc0329 100644
--- a/packages/SwingSet/test/vat-admin/terminate/bootstrap-die-cleanly.js
+++ b/packages/SwingSet/test/vat-admin/terminate/bootstrap-die-cleanly.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject() {
let dude;
diff --git a/packages/SwingSet/test/vat-admin/terminate/bootstrap-die-with-presence.js b/packages/SwingSet/test/vat-admin/terminate/bootstrap-die-with-presence.js
index 5428150a2a8..b8006e498de 100644
--- a/packages/SwingSet/test/vat-admin/terminate/bootstrap-die-with-presence.js
+++ b/packages/SwingSet/test/vat-admin/terminate/bootstrap-die-with-presence.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject(vatPowers) {
const { testLog } = vatPowers;
diff --git a/packages/SwingSet/test/vat-admin/terminate/bootstrap-no-zombies.js b/packages/SwingSet/test/vat-admin/terminate/bootstrap-no-zombies.js
index 3ecdd90937d..f61642fdf4e 100644
--- a/packages/SwingSet/test/vat-admin/terminate/bootstrap-no-zombies.js
+++ b/packages/SwingSet/test/vat-admin/terminate/bootstrap-no-zombies.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject() {
const self = Far('root', {
diff --git a/packages/SwingSet/test/vat-admin/terminate/bootstrap-speak-to-dead.js b/packages/SwingSet/test/vat-admin/terminate/bootstrap-speak-to-dead.js
index ee255796b80..079a9656995 100644
--- a/packages/SwingSet/test/vat-admin/terminate/bootstrap-speak-to-dead.js
+++ b/packages/SwingSet/test/vat-admin/terminate/bootstrap-speak-to-dead.js
@@ -1,5 +1,5 @@
+import { E, Far } from '@endo/far';
import { makePromiseKit } from '@endo/promise-kit';
-import { Far, E } from '@endo/far';
export function buildRootObject(vatPowers) {
const { testLog } = vatPowers;
diff --git a/packages/SwingSet/test/vat-admin/terminate/bootstrap-terminate-with-presence.js b/packages/SwingSet/test/vat-admin/terminate/bootstrap-terminate-with-presence.js
index 07a538bac65..3e8657137b6 100644
--- a/packages/SwingSet/test/vat-admin/terminate/bootstrap-terminate-with-presence.js
+++ b/packages/SwingSet/test/vat-admin/terminate/bootstrap-terminate-with-presence.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject(vatPowers) {
const { testLog } = vatPowers;
diff --git a/packages/SwingSet/test/vat-admin/terminate/bootstrap-terminate.js b/packages/SwingSet/test/vat-admin/terminate/bootstrap-terminate.js
index 851d811ff88..004595a6db4 100644
--- a/packages/SwingSet/test/vat-admin/terminate/bootstrap-terminate.js
+++ b/packages/SwingSet/test/vat-admin/terminate/bootstrap-terminate.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject(vatPowers) {
const { testLog } = vatPowers;
diff --git a/packages/SwingSet/test/vat-admin/terminate/terminate-replay.test.js b/packages/SwingSet/test/vat-admin/terminate/terminate-replay.test.js
index aaa555ed2d5..9ab9b6ceaaa 100644
--- a/packages/SwingSet/test/vat-admin/terminate/terminate-replay.test.js
+++ b/packages/SwingSet/test/vat-admin/terminate/terminate-replay.test.js
@@ -1,14 +1,14 @@
// @ts-nocheck
-// eslint-disable-next-line import/order
+
import { test } from '../../../tools/prepare-test-env-ava.js';
import { kser } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
import {
+ buildKernelBundles,
buildVatController,
loadSwingsetConfigFile,
- buildKernelBundles,
} from '../../../src/index.js';
test.before(async t => {
diff --git a/packages/SwingSet/test/vat-admin/terminate/terminate.test.js b/packages/SwingSet/test/vat-admin/terminate/terminate.test.js
index a4759943e47..a017d1931ad 100644
--- a/packages/SwingSet/test/vat-admin/terminate/terminate.test.js
+++ b/packages/SwingSet/test/vat-admin/terminate/terminate.test.js
@@ -1,14 +1,14 @@
// @ts-nocheck
-// eslint-disable-next-line import/order
+
import { test } from '../../../tools/prepare-test-env-ava.js';
import { kser, kunser } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
import {
+ buildKernelBundles,
buildVatController,
loadSwingsetConfigFile,
- buildKernelBundles,
} from '../../../src/index.js';
import { enumeratePrefixedKeys } from '../../../src/kernel/state/storageHelper.js';
import { restartVatAdminVat } from '../../util.js';
diff --git a/packages/SwingSet/test/vat-admin/terminate/vat-dude-terminate.js b/packages/SwingSet/test/vat-admin/terminate/vat-dude-terminate.js
index 42da13a3cfb..f8fdc95e821 100644
--- a/packages/SwingSet/test/vat-admin/terminate/vat-dude-terminate.js
+++ b/packages/SwingSet/test/vat-admin/terminate/vat-dude-terminate.js
@@ -1,5 +1,5 @@
+import { E, Far } from '@endo/far';
import { makePromiseKit } from '@endo/promise-kit';
-import { Far, E } from '@endo/far';
export function buildRootObject(vatPowers) {
// we use testLog to attempt to deliver messages even after we're supposed
diff --git a/packages/SwingSet/test/vat-admin/terminate/vat-medium-terminate.js b/packages/SwingSet/test/vat-admin/terminate/vat-medium-terminate.js
index 5f48dd4bc63..1366b42240e 100644
--- a/packages/SwingSet/test/vat-admin/terminate/vat-medium-terminate.js
+++ b/packages/SwingSet/test/vat-admin/terminate/vat-medium-terminate.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject(vatPowers) {
const { testLog } = vatPowers;
diff --git a/packages/SwingSet/test/vat-admin/terminate/vat-weatherwax-terminate.js b/packages/SwingSet/test/vat-admin/terminate/vat-weatherwax-terminate.js
index 1dbcf3b1c52..fa2aed10175 100644
--- a/packages/SwingSet/test/vat-admin/terminate/vat-weatherwax-terminate.js
+++ b/packages/SwingSet/test/vat-admin/terminate/vat-weatherwax-terminate.js
@@ -1,5 +1,5 @@
-import { makePromiseKit } from '@endo/promise-kit';
import { Far } from '@endo/far';
+import { makePromiseKit } from '@endo/promise-kit';
export function buildRootObject(vatPowers) {
// we use testLog to attempt to deliver messages even after we're supposed
diff --git a/packages/SwingSet/test/vat-direct.js b/packages/SwingSet/test/vat-direct.js
index a9121801b92..89c0c79329d 100644
--- a/packages/SwingSet/test/vat-direct.js
+++ b/packages/SwingSet/test/vat-direct.js
@@ -1,5 +1,6 @@
// @ts-nocheck
import { krefOf, kser, kslot, kunser } from '@agoric/kmarshal';
+
import { extractMessage } from './vat-util.js';
/**
diff --git a/packages/SwingSet/test/vat-durable-promise-watcher.js b/packages/SwingSet/test/vat-durable-promise-watcher.js
index ef4287b2699..d214e96b850 100644
--- a/packages/SwingSet/test/vat-durable-promise-watcher.js
+++ b/packages/SwingSet/test/vat-durable-promise-watcher.js
@@ -1,12 +1,12 @@
// @ts-nocheck
-import { Far } from '@endo/far';
import { getCopyMapEntries, M } from '@agoric/store';
-import { makePromiseKit } from '@endo/promise-kit';
import {
prepareExo,
provideDurableMapStore,
watchPromise,
} from '@agoric/vat-data';
+import { Far } from '@endo/far';
+import { makePromiseKit } from '@endo/promise-kit';
export function buildRootObject(_vatPowers, vatParameters, baggage) {
const settlements = provideDurableMapStore(baggage, 'settlements');
diff --git a/packages/SwingSet/test/vat-env.test.js b/packages/SwingSet/test/vat-env.test.js
index aed60fadfdd..82aa998b281 100644
--- a/packages/SwingSet/test/vat-env.test.js
+++ b/packages/SwingSet/test/vat-env.test.js
@@ -1,9 +1,10 @@
// @ts-nocheck
-// eslint-disable-next-line import/order
+
import { test, VatData } from '../tools/prepare-test-env-ava.js';
-import bundleSource from '@endo/bundle-source';
import { initSwingStore } from '@agoric/swing-store';
+import bundleSource from '@endo/bundle-source';
+
import { buildVatController } from '../src/index.js';
test('harden from SES is in the test environment', t => {
diff --git a/packages/SwingSet/test/vat-envtest.js b/packages/SwingSet/test/vat-envtest.js
index 0e750cde6f6..7fafc16f7d6 100644
--- a/packages/SwingSet/test/vat-envtest.js
+++ b/packages/SwingSet/test/vat-envtest.js
@@ -1,9 +1,9 @@
// @ts-nocheck
/* global VatData globalThis */
import { Far } from '@endo/far';
+import { importBundle } from '@endo/import-bundle';
import { passStyleOf } from '@endo/pass-style';
import { PassStyleOfEndowmentSymbol } from '@endo/pass-style/endow.js';
-import { importBundle } from '@endo/import-bundle';
export function meta() {
return { globalThis, passStyleOf };
diff --git a/packages/SwingSet/test/vat-exporter.js b/packages/SwingSet/test/vat-exporter.js
index fe9cabb227e..0611c33f3e1 100644
--- a/packages/SwingSet/test/vat-exporter.js
+++ b/packages/SwingSet/test/vat-exporter.js
@@ -1,10 +1,10 @@
-import { Far } from '@endo/far';
-import { M, defineExoClass } from '@agoric/store';
+import { defineExoClass, M } from '@agoric/store';
import {
defineVirtualExoClass,
prepareExoClass,
provide,
} from '@agoric/vat-data';
+import { Far } from '@endo/far';
export const buildRootObject = (_vatPowers, vatParameters, baggage) => {
const { version } = vatParameters || {};
diff --git a/packages/SwingSet/test/vat-syscall-failure.js b/packages/SwingSet/test/vat-syscall-failure.js
index 4c1af219fda..2f9861ce977 100644
--- a/packages/SwingSet/test/vat-syscall-failure.js
+++ b/packages/SwingSet/test/vat-syscall-failure.js
@@ -1,4 +1,5 @@
import { kser } from '@agoric/kmarshal';
+
import { extractMessage } from './vat-util.js';
export default function setup(syscall, _state, _helpers, vatPowers) {
diff --git a/packages/SwingSet/test/vat-timer-upgrade/bootstrap-vat-timer-upgrade.js b/packages/SwingSet/test/vat-timer-upgrade/bootstrap-vat-timer-upgrade.js
index 0c913887a14..d6fe5f7b295 100644
--- a/packages/SwingSet/test/vat-timer-upgrade/bootstrap-vat-timer-upgrade.js
+++ b/packages/SwingSet/test/vat-timer-upgrade/bootstrap-vat-timer-upgrade.js
@@ -1,5 +1,5 @@
-import { Far, E } from '@endo/far';
import { TimeMath } from '@agoric/time';
+import { E, Far } from '@endo/far';
export function buildRootObject() {
let ts;
diff --git a/packages/SwingSet/test/vat-timer-upgrade/vat-timer-upgrade.test.js b/packages/SwingSet/test/vat-timer-upgrade/vat-timer-upgrade.test.js
index 138a203c161..edf88613523 100644
--- a/packages/SwingSet/test/vat-timer-upgrade/vat-timer-upgrade.test.js
+++ b/packages/SwingSet/test/vat-timer-upgrade/vat-timer-upgrade.test.js
@@ -1,11 +1,11 @@
-// eslint-disable-next-line import/order
import { test } from '../../tools/prepare-test-env-ava.js';
-import bundleSource from '@endo/bundle-source';
import { kunser } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
-import { initializeSwingset, makeSwingsetController } from '../../src/index.js';
+import bundleSource from '@endo/bundle-source';
+
import { buildTimer } from '../../src/devices/timer/timer.js';
+import { initializeSwingset, makeSwingsetController } from '../../src/index.js';
const bfile = name => new URL(name, import.meta.url).pathname;
diff --git a/packages/SwingSet/test/vat-timer.test.js b/packages/SwingSet/test/vat-timer.test.js
index 6db6343c11a..04b6194d316 100644
--- a/packages/SwingSet/test/vat-timer.test.js
+++ b/packages/SwingSet/test/vat-timer.test.js
@@ -1,12 +1,13 @@
// @ts-nocheck
-// eslint-disable-next-line import/order
+
import { test } from '../tools/prepare-test-env-ava.js';
-import { Far, E } from '@endo/far';
-import { makePromiseKit } from '@endo/promise-kit';
+import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
import { makeScalarMapStore } from '@agoric/store';
import { TimeMath } from '@agoric/time';
-import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
+import { E, Far } from '@endo/far';
+import { makePromiseKit } from '@endo/promise-kit';
+
import { buildRootObject, debugTools } from '../src/vats/timer/vat-timer.js';
test('schedule', t => {
diff --git a/packages/SwingSet/test/vat-util.js b/packages/SwingSet/test/vat-util.js
index 8d2c4be5a13..962ff692643 100644
--- a/packages/SwingSet/test/vat-util.js
+++ b/packages/SwingSet/test/vat-util.js
@@ -1,8 +1,8 @@
// this file is imported by some test vats, so don't import any non-pure
// modules
-import { assert } from '@endo/errors';
import { kser, kunser } from '@agoric/kmarshal';
+import { assert } from '@endo/errors';
export function extractMessage(vatDeliverObject) {
const [type, ...vdoargs] = vatDeliverObject;
diff --git a/packages/SwingSet/test/vat-warehouse/preload.test.js b/packages/SwingSet/test/vat-warehouse/preload.test.js
index 275f8e1ef14..9e10f02c9f1 100644
--- a/packages/SwingSet/test/vat-warehouse/preload.test.js
+++ b/packages/SwingSet/test/vat-warehouse/preload.test.js
@@ -1,14 +1,15 @@
// @ts-nocheck
-// eslint-disable-next-line import/order
+
import { test } from '../../tools/prepare-test-env-ava.js';
-// import * as proc from 'child_process';
-import sqlite3 from 'better-sqlite3';
import {
initSwingStore,
makeSnapStore,
makeSnapStoreIO,
} from '@agoric/swing-store';
+// import * as proc from 'child_process';
+import sqlite3 from 'better-sqlite3';
+
import { initializeSwingset, makeSwingsetController } from '../../src/index.js';
test('only preload maxVatsOnline vats', async t => {
diff --git a/packages/SwingSet/test/vat-warehouse/reload-snapshot.test.js b/packages/SwingSet/test/vat-warehouse/reload-snapshot.test.js
index e83f016549f..5c98553600e 100644
--- a/packages/SwingSet/test/vat-warehouse/reload-snapshot.test.js
+++ b/packages/SwingSet/test/vat-warehouse/reload-snapshot.test.js
@@ -1,13 +1,14 @@
// @ts-nocheck
-// eslint-disable-next-line import/order
+
import { test } from '../../tools/prepare-test-env-ava.js';
-import sqlite3 from 'better-sqlite3';
import {
initSwingStore,
makeSnapStore,
makeSnapStoreIO,
} from '@agoric/swing-store';
+import sqlite3 from 'better-sqlite3';
+
import { initializeSwingset, makeSwingsetController } from '../../src/index.js';
const vatReloadFromSnapshot = async (t, restartWorkerOnSnapshot) => {
diff --git a/packages/SwingSet/test/vat-warehouse/vat-preload-bootstrap.js b/packages/SwingSet/test/vat-warehouse/vat-preload-bootstrap.js
index f4c0d81c83c..464198641c5 100644
--- a/packages/SwingSet/test/vat-warehouse/vat-preload-bootstrap.js
+++ b/packages/SwingSet/test/vat-warehouse/vat-preload-bootstrap.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject() {
const extras = new Map(); // count -> root
diff --git a/packages/SwingSet/test/vattp.test.js b/packages/SwingSet/test/vattp.test.js
index aeadb19c044..7ed5025ca36 100644
--- a/packages/SwingSet/test/vattp.test.js
+++ b/packages/SwingSet/test/vattp.test.js
@@ -1,13 +1,13 @@
-// eslint-disable-next-line import/order
import { test } from '../tools/prepare-test-env-ava.js';
-import bundleSource from '@endo/bundle-source';
import { initSwingStore } from '@agoric/swing-store';
-import { initializeSwingset, makeSwingsetController } from '../src/index.js';
+import bundleSource from '@endo/bundle-source';
+
import {
- buildMailboxStateMap,
buildMailbox,
+ buildMailboxStateMap,
} from '../src/devices/mailbox/mailbox.js';
+import { initializeSwingset, makeSwingsetController } from '../src/index.js';
async function restartVatTP(controller) {
const vaBundle = await bundleSource(
diff --git a/packages/SwingSet/test/virtualObjects/collection-slots/bootstrap-collection-slots.js b/packages/SwingSet/test/virtualObjects/collection-slots/bootstrap-collection-slots.js
index 47650caf0c6..28aa3389209 100644
--- a/packages/SwingSet/test/virtualObjects/collection-slots/bootstrap-collection-slots.js
+++ b/packages/SwingSet/test/virtualObjects/collection-slots/bootstrap-collection-slots.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject() {
// build the import sensor
diff --git a/packages/SwingSet/test/virtualObjects/collection-slots/collection-slots.test.js b/packages/SwingSet/test/virtualObjects/collection-slots/collection-slots.test.js
index 2c77a2e65c7..fc174ed08eb 100644
--- a/packages/SwingSet/test/virtualObjects/collection-slots/collection-slots.test.js
+++ b/packages/SwingSet/test/virtualObjects/collection-slots/collection-slots.test.js
@@ -1,15 +1,16 @@
// @ts-nocheck
-// eslint-disable-next-line import/order
+
import { test } from '../../../tools/prepare-test-env-ava.js';
-import { assert } from '@endo/errors';
-import { kunser, krefOf } from '@agoric/kmarshal';
+import { krefOf, kunser } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
-import { parseReachableAndVatSlot } from '../../../src/kernel/state/reachable.js';
+import { assert } from '@endo/errors';
+
import {
initializeSwingset,
makeSwingsetController,
} from '../../../src/index.js';
+import { parseReachableAndVatSlot } from '../../../src/kernel/state/reachable.js';
function bfile(name) {
return new URL(name, import.meta.url).pathname;
diff --git a/packages/SwingSet/test/virtualObjects/delete-stored-vo/bootstrap-delete-stored-vo.js b/packages/SwingSet/test/virtualObjects/delete-stored-vo/bootstrap-delete-stored-vo.js
index 9a0cb9a7ae8..e88e2ded506 100644
--- a/packages/SwingSet/test/virtualObjects/delete-stored-vo/bootstrap-delete-stored-vo.js
+++ b/packages/SwingSet/test/virtualObjects/delete-stored-vo/bootstrap-delete-stored-vo.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject() {
// build the import sensor
diff --git a/packages/SwingSet/test/virtualObjects/delete-stored-vo/delete-stored-vo.test.js b/packages/SwingSet/test/virtualObjects/delete-stored-vo/delete-stored-vo.test.js
index 443a79fd3a8..42f8a0d95bc 100644
--- a/packages/SwingSet/test/virtualObjects/delete-stored-vo/delete-stored-vo.test.js
+++ b/packages/SwingSet/test/virtualObjects/delete-stored-vo/delete-stored-vo.test.js
@@ -1,15 +1,16 @@
// @ts-nocheck
-// eslint-disable-next-line import/order
+
import { test } from '../../../tools/prepare-test-env-ava.js';
-import { assert } from '@endo/errors';
-import { kunser, krefOf } from '@agoric/kmarshal';
+import { krefOf, kunser } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
-import { parseReachableAndVatSlot } from '../../../src/kernel/state/reachable.js';
+import { assert } from '@endo/errors';
+
import {
initializeSwingset,
makeSwingsetController,
} from '../../../src/index.js';
+import { parseReachableAndVatSlot } from '../../../src/kernel/state/reachable.js';
function bfile(name) {
return new URL(name, import.meta.url).pathname;
diff --git a/packages/SwingSet/test/virtualObjects/double-retire-import/bootstrap-dri.js b/packages/SwingSet/test/virtualObjects/double-retire-import/bootstrap-dri.js
index 496e4dd9bb2..9835e303ecb 100644
--- a/packages/SwingSet/test/virtualObjects/double-retire-import/bootstrap-dri.js
+++ b/packages/SwingSet/test/virtualObjects/double-retire-import/bootstrap-dri.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject() {
let vatAdmin;
diff --git a/packages/SwingSet/test/virtualObjects/double-retire-import/double-retire-import.test.js b/packages/SwingSet/test/virtualObjects/double-retire-import/double-retire-import.test.js
index c2ef83e7934..06136774f31 100644
--- a/packages/SwingSet/test/virtualObjects/double-retire-import/double-retire-import.test.js
+++ b/packages/SwingSet/test/virtualObjects/double-retire-import/double-retire-import.test.js
@@ -1,7 +1,7 @@
import { test } from '../../../tools/prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { initSwingStore } from '@agoric/swing-store';
+
import {
initializeSwingset,
makeSwingsetController,
diff --git a/packages/SwingSet/test/virtualObjects/facet-retention.test.js b/packages/SwingSet/test/virtualObjects/facet-retention.test.js
index 389fb6f12bd..42884614bbf 100644
--- a/packages/SwingSet/test/virtualObjects/facet-retention.test.js
+++ b/packages/SwingSet/test/virtualObjects/facet-retention.test.js
@@ -1,8 +1,8 @@
// @ts-nocheck
-import test from 'ava';
-
import { kunser } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
+import test from 'ava';
+
import { buildVatController } from '../../src/index.js';
// Check that facets which don't reference their state still keep their cohort alive
diff --git a/packages/SwingSet/test/virtualObjects/representatives.test.js b/packages/SwingSet/test/virtualObjects/representatives.test.js
index 0a9a8b812c9..308a3a03e52 100644
--- a/packages/SwingSet/test/virtualObjects/representatives.test.js
+++ b/packages/SwingSet/test/virtualObjects/representatives.test.js
@@ -1,18 +1,18 @@
// @ts-nocheck
-// eslint-disable-next-line import/order
+
import { test } from '../../tools/prepare-test-env-ava.js';
import { kser, kslot } from '@agoric/kmarshal';
import { M } from '@agoric/store';
import { initSwingStore } from '@agoric/swing-store';
+
import {
buildVatController,
initializeSwingset,
makeSwingsetController,
} from '../../src/index.js';
-import makeNextLog from '../make-nextlog.js';
-
import { enumeratePrefixedKeys } from '../../src/kernel/state/storageHelper.js';
+import makeNextLog from '../make-nextlog.js';
import { vstr } from '../util.js';
test.serial('exercise cache', async t => {
diff --git a/packages/SwingSet/test/virtualObjects/vat-orphan-bob.js b/packages/SwingSet/test/virtualObjects/vat-orphan-bob.js
index c943755bcec..6dacc50dff1 100644
--- a/packages/SwingSet/test/virtualObjects/vat-orphan-bob.js
+++ b/packages/SwingSet/test/virtualObjects/vat-orphan-bob.js
@@ -1,6 +1,6 @@
-import { Far } from '@endo/far';
import { initEmpty } from '@agoric/store';
import { defineKind, defineKindMulti } from '@agoric/vat-data';
+import { Far } from '@endo/far';
const { getPrototypeOf } = Object;
diff --git a/packages/SwingSet/test/virtualObjects/vat-orphan-bootstrap.js b/packages/SwingSet/test/virtualObjects/vat-orphan-bootstrap.js
index c76d8d06860..68e18b70bbe 100644
--- a/packages/SwingSet/test/virtualObjects/vat-orphan-bootstrap.js
+++ b/packages/SwingSet/test/virtualObjects/vat-orphan-bootstrap.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject() {
let bob;
diff --git a/packages/SwingSet/test/virtualObjects/vat-representatives.js b/packages/SwingSet/test/virtualObjects/vat-representatives.js
index be307428199..98d131bbc2d 100644
--- a/packages/SwingSet/test/virtualObjects/vat-representatives.js
+++ b/packages/SwingSet/test/virtualObjects/vat-representatives.js
@@ -1,5 +1,5 @@
-import { Far } from '@endo/far';
import { defineKind } from '@agoric/vat-data';
+import { Far } from '@endo/far';
const makeThing = defineKind(
'thing',
diff --git a/packages/SwingSet/test/virtualObjects/vat-vom-gc-bob.js b/packages/SwingSet/test/virtualObjects/vat-vom-gc-bob.js
index f75ff9faa88..ff7810973ef 100644
--- a/packages/SwingSet/test/virtualObjects/vat-vom-gc-bob.js
+++ b/packages/SwingSet/test/virtualObjects/vat-vom-gc-bob.js
@@ -1,5 +1,5 @@
-import { Far, E } from '@endo/far';
import { defineKind } from '@agoric/vat-data';
+import { E, Far } from '@endo/far';
const things = [];
diff --git a/packages/SwingSet/test/virtualObjects/vat-vom-gc-bootstrap.js b/packages/SwingSet/test/virtualObjects/vat-vom-gc-bootstrap.js
index 935fab077cd..ce4b15f141d 100644
--- a/packages/SwingSet/test/virtualObjects/vat-vom-gc-bootstrap.js
+++ b/packages/SwingSet/test/virtualObjects/vat-vom-gc-bootstrap.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject() {
// eslint thinks 'other' is unused, but eslint is wrong.
diff --git a/packages/SwingSet/test/virtualObjects/vat-weakcollections-alice.js b/packages/SwingSet/test/virtualObjects/vat-weakcollections-alice.js
index 0dd2ca39333..c58812d51bb 100644
--- a/packages/SwingSet/test/virtualObjects/vat-weakcollections-alice.js
+++ b/packages/SwingSet/test/virtualObjects/vat-weakcollections-alice.js
@@ -1,5 +1,5 @@
-import { Far } from '@endo/far';
import { defineKind } from '@agoric/vat-data';
+import { Far } from '@endo/far';
const makeHolder = defineKind('holder-vo', value => ({ value }), {
getValue: ({ state }) => state.value,
diff --git a/packages/SwingSet/test/virtualObjects/vat-weakcollections-bootstrap.js b/packages/SwingSet/test/virtualObjects/vat-weakcollections-bootstrap.js
index 2542a23fa32..e7b9f1c2d24 100644
--- a/packages/SwingSet/test/virtualObjects/vat-weakcollections-bootstrap.js
+++ b/packages/SwingSet/test/virtualObjects/vat-weakcollections-bootstrap.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export function buildRootObject(vatPowers) {
const { testLog } = vatPowers;
diff --git a/packages/SwingSet/test/virtualObjects/vdata-promises/bootstrap-vdata-promises.js b/packages/SwingSet/test/virtualObjects/vdata-promises/bootstrap-vdata-promises.js
index 2e351b5f27b..8c24b623d60 100644
--- a/packages/SwingSet/test/virtualObjects/vdata-promises/bootstrap-vdata-promises.js
+++ b/packages/SwingSet/test/virtualObjects/vdata-promises/bootstrap-vdata-promises.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
import { makePromiseKit } from '@endo/promise-kit';
export function buildRootObject() {
diff --git a/packages/SwingSet/test/virtualObjects/vdata-promises/vat-vdata-promises.js b/packages/SwingSet/test/virtualObjects/vdata-promises/vat-vdata-promises.js
index e1610f263a8..b21616cd1d9 100644
--- a/packages/SwingSet/test/virtualObjects/vdata-promises/vat-vdata-promises.js
+++ b/packages/SwingSet/test/virtualObjects/vdata-promises/vat-vdata-promises.js
@@ -1,5 +1,5 @@
/* global VatData */
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
import { makePromiseKit } from '@endo/promise-kit';
// import { makeScalarBigMapStore } from '@agoric/vat-data';
diff --git a/packages/SwingSet/test/virtualObjects/vdata-promises/vdata-promises.test.js b/packages/SwingSet/test/virtualObjects/vdata-promises/vdata-promises.test.js
index 6d7bf9aa666..9252c309b48 100644
--- a/packages/SwingSet/test/virtualObjects/vdata-promises/vdata-promises.test.js
+++ b/packages/SwingSet/test/virtualObjects/vdata-promises/vdata-promises.test.js
@@ -1,13 +1,13 @@
-// eslint-disable-next-line import/order
import { test } from '../../../tools/prepare-test-env-ava.js';
import { kunser } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
-import { parseReachableAndVatSlot } from '../../../src/kernel/state/reachable.js';
+
import {
initializeSwingset,
makeSwingsetController,
} from '../../../src/index.js';
+import { parseReachableAndVatSlot } from '../../../src/kernel/state/reachable.js';
function bfile(name) {
return new URL(name, import.meta.url).pathname;
diff --git a/packages/SwingSet/test/virtualObjects/weakcollections.test.js b/packages/SwingSet/test/virtualObjects/weakcollections.test.js
index d6a401ff927..3d413352444 100644
--- a/packages/SwingSet/test/virtualObjects/weakcollections.test.js
+++ b/packages/SwingSet/test/virtualObjects/weakcollections.test.js
@@ -1,9 +1,9 @@
-// eslint-disable-next-line import/order
import { test } from '../../tools/prepare-test-env-ava.js';
+import engineGC from '@agoric/internal/src/lib-nodejs/engine-gc.js';
import { kser } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
-import engineGC from '@agoric/internal/src/lib-nodejs/engine-gc.js';
+
import { initializeSwingset, makeSwingsetController } from '../../src/index.js';
import makeNextLog from '../make-nextlog.js';
diff --git a/packages/SwingSet/test/vo-test-harness/dvo-test-harness.test.js b/packages/SwingSet/test/vo-test-harness/dvo-test-harness.test.js
index 00c04aa92d5..3ca21b00ff0 100644
--- a/packages/SwingSet/test/vo-test-harness/dvo-test-harness.test.js
+++ b/packages/SwingSet/test/vo-test-harness/dvo-test-harness.test.js
@@ -1,4 +1,4 @@
-import { test, runDVOTest } from '../../tools/dvo-test-harness.js';
+import { runDVOTest, test } from '../../tools/dvo-test-harness.js';
function bfile(name) {
return new URL(name, import.meta.url).pathname;
diff --git a/packages/SwingSet/test/vo-test-harness/vat-dvo-test-test.js b/packages/SwingSet/test/vo-test-harness/vat-dvo-test-test.js
index 350ac4639ed..403574df7e5 100644
--- a/packages/SwingSet/test/vo-test-harness/vat-dvo-test-test.js
+++ b/packages/SwingSet/test/vo-test-harness/vat-dvo-test-test.js
@@ -1,9 +1,9 @@
-import { Far, E } from '@endo/far';
import {
+ defineDurableKind,
provide,
provideKindHandle,
- defineDurableKind,
} from '@agoric/vat-data';
+import { E, Far } from '@endo/far';
export function buildRootObject(_vatPowers, vatParameters, baggage) {
let other;
diff --git a/packages/SwingSet/test/vpid-kernel.test.js b/packages/SwingSet/test/vpid-kernel.test.js
index a34fcc8281e..440adbd7cac 100644
--- a/packages/SwingSet/test/vpid-kernel.test.js
+++ b/packages/SwingSet/test/vpid-kernel.test.js
@@ -1,17 +1,16 @@
// @ts-nocheck
/* global WeakRef, FinalizationRegistry */
-// eslint-disable-next-line import/order
+
import { test } from '../tools/prepare-test-env-ava.js';
-import anylogger from 'anylogger';
-import { Fail } from '@endo/errors';
+import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
import { kser, kslot } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
-import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
+import { Fail } from '@endo/errors';
+import anylogger from 'anylogger';
-import buildKernel from '../src/kernel/index.js';
import { initializeKernel } from '../src/controller/initializeKernel.js';
-
+import buildKernel from '../src/kernel/index.js';
import { buildDispatch } from './util.js';
function oneResolution(promiseID, rejected, data) {
diff --git a/packages/SwingSet/test/worker-protocol.test.js b/packages/SwingSet/test/worker-protocol.test.js
index c5c9bd49b1c..ca608a36e5e 100644
--- a/packages/SwingSet/test/worker-protocol.test.js
+++ b/packages/SwingSet/test/worker-protocol.test.js
@@ -1,15 +1,15 @@
/* global Buffer */
-// eslint-disable-next-line import/order
+
import { test } from '../tools/prepare-test-env-ava.js';
import {
- arrayEncoderStream,
arrayDecoderStream,
+ arrayEncoderStream,
} from '@agoric/internal/src/lib-nodejs/worker-protocol.js';
import {
encode,
- netstringEncoderStream,
netstringDecoderStream,
+ netstringEncoderStream,
} from '@agoric/internal/src/netstring.js';
test('arrayEncoderStream', async t => {
diff --git a/packages/SwingSet/test/workers/bootstrap.js b/packages/SwingSet/test/workers/bootstrap.js
index bcbad1a1478..d93e15452f3 100644
--- a/packages/SwingSet/test/workers/bootstrap.js
+++ b/packages/SwingSet/test/workers/bootstrap.js
@@ -1,5 +1,5 @@
+import { E, Far } from '@endo/far';
import { makePromiseKit } from '@endo/promise-kit';
-import { Far, E } from '@endo/far';
export function buildRootObject() {
const callbackObj = Far('callback', {
diff --git a/packages/SwingSet/test/workers/vat-target.js b/packages/SwingSet/test/workers/vat-target.js
index 9a24a0d4f5d..0efd372ed94 100644
--- a/packages/SwingSet/test/workers/vat-target.js
+++ b/packages/SwingSet/test/workers/vat-target.js
@@ -1,5 +1,5 @@
+import { E, Far } from '@endo/far';
import { makePromiseKit } from '@endo/promise-kit';
-import { Far, E } from '@endo/far';
function ignore(p) {
p.then(
diff --git a/packages/SwingSet/test/workers/worker.test.js b/packages/SwingSet/test/workers/worker.test.js
index ec49a67e0ff..6b4f7e1c65c 100644
--- a/packages/SwingSet/test/workers/worker.test.js
+++ b/packages/SwingSet/test/workers/worker.test.js
@@ -1,8 +1,8 @@
import { test } from '../../tools/prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { kunser } from '@agoric/kmarshal';
-import { loadBasedir, buildVatController } from '../../src/index.js';
+
+import { buildVatController, loadBasedir } from '../../src/index.js';
const expected = [
['B good', 'C good', 'F good', 'three good', 'exit good', 'exitWF good'],
diff --git a/packages/SwingSet/test/xsnap-errors.test.js b/packages/SwingSet/test/xsnap-errors.test.js
index 4eb6e3f404b..a781791f3d0 100644
--- a/packages/SwingSet/test/xsnap-errors.test.js
+++ b/packages/SwingSet/test/xsnap-errors.test.js
@@ -1,20 +1,21 @@
/* global setTimeout */
// @ts-nocheck
-// eslint-disable-next-line import/order
+
import { test } from '../tools/prepare-test-env-ava.js';
+
+import { kser } from '@agoric/kmarshal';
+import { initSwingStore } from '@agoric/swing-store';
+import bundleSource from '@endo/bundle-source';
import { spawn } from 'child_process';
import fs from 'fs';
import { tmpName } from 'tmp';
-import bundleSource from '@endo/bundle-source';
-import { kser } from '@agoric/kmarshal';
-import { initSwingStore } from '@agoric/swing-store';
-import { makeXsSubprocessFactory } from '../src/kernel/vat-loader/manager-subprocess-xsnap.js';
import {
makeWorkerBundleHandler,
makeXsnapBundleData,
} from '../src/controller/bundle-handler.js';
import { makeStartXSnap } from '../src/controller/startXSnap.js';
+import { makeXsSubprocessFactory } from '../src/kernel/vat-loader/manager-subprocess-xsnap.js';
test('child termination distinguished from meter exhaustion', async t => {
/** @type { ReturnType } */
diff --git a/packages/SwingSet/test/xsnap-metering.test.js b/packages/SwingSet/test/xsnap-metering.test.js
index 5dad4d627c4..e1959201204 100644
--- a/packages/SwingSet/test/xsnap-metering.test.js
+++ b/packages/SwingSet/test/xsnap-metering.test.js
@@ -1,13 +1,13 @@
// @ts-nocheck
-// eslint-disable-next-line import/order
+
import { test } from '../tools/prepare-test-env-ava.js';
+import { makeSnapStore, makeSnapStoreIO } from '@agoric/swing-store';
+import { makePromiseKit } from '@endo/promise-kit';
+import sqlite3 from 'better-sqlite3';
import { spawn } from 'child_process';
import fs from 'fs';
import { tmpName } from 'tmp';
-import sqlite3 from 'better-sqlite3';
-import { makePromiseKit } from '@endo/promise-kit';
-import { makeSnapStore, makeSnapStoreIO } from '@agoric/swing-store';
import { makeStartXSnap } from '../src/controller/startXSnap.js';
diff --git a/packages/SwingSet/test/xsnap-stable-bundles/stable-bundles.test.js b/packages/SwingSet/test/xsnap-stable-bundles/stable-bundles.test.js
index 35698f23ad1..90be2ca19f3 100644
--- a/packages/SwingSet/test/xsnap-stable-bundles/stable-bundles.test.js
+++ b/packages/SwingSet/test/xsnap-stable-bundles/stable-bundles.test.js
@@ -1,20 +1,20 @@
// @ts-nocheck
-import test from 'ava';
-import { createHash } from 'crypto';
-
import { initSwingStore } from '@agoric/swing-store';
import {
- getLockdownBundleSHA256,
- getLockdownBundle,
-} from '@agoric/xsnap-lockdown';
-import {
- getSupervisorBundleSHA256,
getSupervisorBundle,
+ getSupervisorBundleSHA256,
} from '@agoric/swingset-xsnap-supervisor';
import {
+ getLockdownBundle,
+ getLockdownBundleSHA256,
+} from '@agoric/xsnap-lockdown';
+import test from 'ava';
+import { createHash } from 'crypto';
+
+import {
+ buildKernelBundles,
initializeSwingset,
makeSwingsetController,
- buildKernelBundles,
} from '../../src/index.js';
function sha256(s) {
diff --git a/packages/SwingSet/test/xsnap-store.test.js b/packages/SwingSet/test/xsnap-store.test.js
index 0ef655b91e0..779bfb8a5cf 100644
--- a/packages/SwingSet/test/xsnap-store.test.js
+++ b/packages/SwingSet/test/xsnap-store.test.js
@@ -1,16 +1,16 @@
// @ts-nocheck
/* global globalThis */
-import { spawn } from 'child_process';
-import fs from 'fs';
-import { tmpName } from 'tmp';
-import { type as osType } from 'os';
-import sqlite3 from 'better-sqlite3';
-import test from 'ava';
import { makeMeasureSeconds } from '@agoric/internal';
+import { makeSnapStore, makeSnapStoreIO } from '@agoric/swing-store';
import { xsnap } from '@agoric/xsnap';
import { getLockdownBundle } from '@agoric/xsnap-lockdown';
-import { makeSnapStore, makeSnapStoreIO } from '@agoric/swing-store';
+import test from 'ava';
+import sqlite3 from 'better-sqlite3';
+import { spawn } from 'child_process';
+import fs from 'fs';
+import { type as osType } from 'os';
+import { tmpName } from 'tmp';
const makeMockSnapStoreIO = () => ({
...makeSnapStoreIO(),
diff --git a/packages/SwingSet/test/zcf-ish-upgrade/bootstrap-zcf-ish-upgrade.js b/packages/SwingSet/test/zcf-ish-upgrade/bootstrap-zcf-ish-upgrade.js
index b39f8999a53..64e04ff61c0 100644
--- a/packages/SwingSet/test/zcf-ish-upgrade/bootstrap-zcf-ish-upgrade.js
+++ b/packages/SwingSet/test/zcf-ish-upgrade/bootstrap-zcf-ish-upgrade.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
export const buildRootObject = () => {
let vatAdmin;
diff --git a/packages/SwingSet/test/zcf-ish-upgrade/pseudo-contract-v1.js b/packages/SwingSet/test/zcf-ish-upgrade/pseudo-contract-v1.js
index 252a8ed3ec0..d51dc1bcfb6 100644
--- a/packages/SwingSet/test/zcf-ish-upgrade/pseudo-contract-v1.js
+++ b/packages/SwingSet/test/zcf-ish-upgrade/pseudo-contract-v1.js
@@ -1,7 +1,8 @@
// @ts-nocheck
/* eslint-disable no-unused-vars */
import { defineDurableKind, defineDurableKindMulti } from '@agoric/vat-data';
-import { provideHandle, provideBaggageSubset } from './util.js';
+
+import { provideBaggageSubset, provideHandle } from './util.js';
export const setupInstallation = async installationBaggage => {
const installationHandle1 = provideHandle(
diff --git a/packages/SwingSet/test/zcf-ish-upgrade/pseudo-contract-v2.js b/packages/SwingSet/test/zcf-ish-upgrade/pseudo-contract-v2.js
index 7029dbc9bbb..a78a48cb0fc 100644
--- a/packages/SwingSet/test/zcf-ish-upgrade/pseudo-contract-v2.js
+++ b/packages/SwingSet/test/zcf-ish-upgrade/pseudo-contract-v2.js
@@ -1,7 +1,8 @@
// @ts-nocheck
/* eslint-disable no-unused-vars */
import { defineDurableKind, defineDurableKindMulti } from '@agoric/vat-data';
-import { provideHandle, provideBaggageSubset } from './util.js';
+
+import { provideBaggageSubset, provideHandle } from './util.js';
export const setupInstallation = async installationBaggage => {
const installationHandle1 = provideHandle(
diff --git a/packages/SwingSet/test/zcf-ish-upgrade/pseudo-zcf.js b/packages/SwingSet/test/zcf-ish-upgrade/pseudo-zcf.js
index 62b69fb4123..a951f2c3397 100644
--- a/packages/SwingSet/test/zcf-ish-upgrade/pseudo-zcf.js
+++ b/packages/SwingSet/test/zcf-ish-upgrade/pseudo-zcf.js
@@ -2,12 +2,13 @@
/* global globalThis, VatData */
/* eslint-disable no-unused-vars */
+import { defineDurableKind } from '@agoric/vat-data';
import { Far } from '@endo/far';
import { importBundle } from '@endo/import-bundle';
-import { defineDurableKind } from '@agoric/vat-data';
+
import {
- provideHandle,
provideBaggageSubset as provideBaggageSubTree,
+ provideHandle,
} from './util.js';
export const buildRootObject = async (vatPowers, vatParameters, baggage) => {
diff --git a/packages/SwingSet/test/zcf-ish-upgrade/zcf-ish-upgrade.test.js b/packages/SwingSet/test/zcf-ish-upgrade/zcf-ish-upgrade.test.js
index d88e5c2db77..d72b1214a6e 100644
--- a/packages/SwingSet/test/zcf-ish-upgrade/zcf-ish-upgrade.test.js
+++ b/packages/SwingSet/test/zcf-ish-upgrade/zcf-ish-upgrade.test.js
@@ -1,8 +1,8 @@
-// eslint-disable-next-line import/order
import { test } from '../../tools/prepare-test-env-ava.js';
-import { assert } from '@endo/errors';
import { initSwingStore } from '@agoric/swing-store';
+import { assert } from '@endo/errors';
+
import { initializeSwingset, makeSwingsetController } from '../../src/index.js';
const bfile = name => new URL(name, import.meta.url).pathname;
diff --git a/packages/SwingSet/tools/baggage-check.js b/packages/SwingSet/tools/baggage-check.js
index 6455952d10e..28ec4f322f6 100644
--- a/packages/SwingSet/tools/baggage-check.js
+++ b/packages/SwingSet/tools/baggage-check.js
@@ -1,5 +1,5 @@
-import { makeMarshal } from '@endo/marshal';
import { Far } from '@endo/far';
+import { makeMarshal } from '@endo/marshal';
/* eslint-disable no-use-before-define */
diff --git a/packages/SwingSet/tools/bootstrap-dvo-test.js b/packages/SwingSet/tools/bootstrap-dvo-test.js
index 337e4d95abe..a8ff34864c7 100644
--- a/packages/SwingSet/tools/bootstrap-dvo-test.js
+++ b/packages/SwingSet/tools/bootstrap-dvo-test.js
@@ -1,4 +1,4 @@
-import { Far, E } from '@endo/far';
+import { E, Far } from '@endo/far';
import { makePromiseKit } from '@endo/promise-kit';
export function buildRootObject() {
diff --git a/packages/SwingSet/tools/bootstrap-relay.js b/packages/SwingSet/tools/bootstrap-relay.js
index 730a7aa6593..27342b4c084 100644
--- a/packages/SwingSet/tools/bootstrap-relay.js
+++ b/packages/SwingSet/tools/bootstrap-relay.js
@@ -1,7 +1,8 @@
-import { Fail, q } from '@endo/errors';
import { objectMap } from '@agoric/internal';
-import { Far, E } from '@endo/far';
+import { Fail, q } from '@endo/errors';
+import { E, Far } from '@endo/far';
import { makePromiseKit } from '@endo/promise-kit';
+
import { buildManualTimer } from './manual-timer.js';
export const buildRootObject = () => {
diff --git a/packages/SwingSet/tools/dvo-test-harness.js b/packages/SwingSet/tools/dvo-test-harness.js
index d921c37de55..33244c0f88b 100644
--- a/packages/SwingSet/tools/dvo-test-harness.js
+++ b/packages/SwingSet/tools/dvo-test-harness.js
@@ -1,9 +1,9 @@
-// eslint-disable-next-line import/order
import { test } from './prepare-test-env-ava.js';
+import { initSwingStore } from '@agoric/swing-store';
import { assert } from '@endo/errors';
import { makeMarshal } from '@endo/marshal';
-import { initSwingStore } from '@agoric/swing-store';
+
import { initializeSwingset, makeSwingsetController } from '../src/index.js';
export { test };
diff --git a/packages/SwingSet/tools/manual-timer.js b/packages/SwingSet/tools/manual-timer.js
index 6eb7a62bad1..2db84cfba15 100644
--- a/packages/SwingSet/tools/manual-timer.js
+++ b/packages/SwingSet/tools/manual-timer.js
@@ -1,8 +1,9 @@
-import { Fail } from '@endo/errors';
-import { Far } from '@endo/far';
-import { makeScalarMapStore } from '@agoric/store';
import { bindAllMethods } from '@agoric/internal';
+import { makeScalarMapStore } from '@agoric/store';
import { TimeMath } from '@agoric/time';
+import { Fail } from '@endo/errors';
+import { Far } from '@endo/far';
+
import { buildRootObject } from '../src/vats/timer/vat-timer.js';
/**
diff --git a/packages/SwingSet/tools/prepare-test-env-ava.js b/packages/SwingSet/tools/prepare-test-env-ava.js
index f626c586ebf..dbf623c1559 100644
--- a/packages/SwingSet/tools/prepare-test-env-ava.js
+++ b/packages/SwingSet/tools/prepare-test-env-ava.js
@@ -5,7 +5,6 @@
*/
import '@endo/init/pre-bundle-source.js';
-
import '@agoric/swingset-liveslots/tools/prepare-test-env.js';
import { wrapTest } from '@endo/ses-ava';
diff --git a/packages/SwingSet/tools/run-utils.js b/packages/SwingSet/tools/run-utils.js
index 5c1ed2e4b39..14f50f9608a 100644
--- a/packages/SwingSet/tools/run-utils.js
+++ b/packages/SwingSet/tools/run-utils.js
@@ -1,5 +1,5 @@
-import { Fail, q } from '@endo/errors';
import { kunser } from '@agoric/kmarshal';
+import { Fail, q } from '@endo/errors';
import { makeQueue } from '@endo/stream';
/** @import { ERef } from '@endo/far' */
diff --git a/packages/SwingSet/tools/vat.js b/packages/SwingSet/tools/vat.js
index 68b44baf13e..6fd1a723102 100755
--- a/packages/SwingSet/tools/vat.js
+++ b/packages/SwingSet/tools/vat.js
@@ -2,11 +2,13 @@
import '@endo/init/pre-bundle-source.js';
import '@endo/init';
+
import process from 'process';
import repl from 'repl';
import util from 'util';
-import { loadBasedir, buildVatController } from '../src/index.js';
+
import { buildLoopbox } from '../src/devices/loopbox/loopbox.js';
+import { buildVatController, loadBasedir } from '../src/index.js';
function deepLog(item) {
console.log(util.inspect(item, false, null, true));
diff --git a/packages/access-token/src/access-token.js b/packages/access-token/src/access-token.js
index 812b2ee7d04..b8b7f435f4b 100644
--- a/packages/access-token/src/access-token.js
+++ b/packages/access-token/src/access-token.js
@@ -1,5 +1,5 @@
-import fs from 'fs';
import crypto from 'crypto';
+import fs from 'fs';
import os from 'os';
import path from 'path';
diff --git a/packages/access-token/src/json-store.js b/packages/access-token/src/json-store.js
index a4ea82ab69a..c7f7a3def10 100644
--- a/packages/access-token/src/json-store.js
+++ b/packages/access-token/src/json-store.js
@@ -1,9 +1,9 @@
// @ts-check
import fs from 'fs';
+import Readlines from 'n-readlines';
import path from 'path';
import process from 'process';
import lockfile from 'proper-lockfile';
-import Readlines from 'n-readlines';
// TODO: Update this when we make a breaking change.
// const DATA_FILE = 'data.jsonlines';
diff --git a/packages/access-token/test/state.test.js b/packages/access-token/test/state.test.js
index 475e367ad68..0db2196f6a5 100644
--- a/packages/access-token/test/state.test.js
+++ b/packages/access-token/test/state.test.js
@@ -1,11 +1,12 @@
import test from 'ava';
-import { tmpDir } from './tmp.js';
+
import {
- initJSONStore,
- openJSONStore,
getAllState,
+ initJSONStore,
isJSONStore,
+ openJSONStore,
} from '../src/json-store.js';
+import { tmpDir } from './tmp.js';
function testStorage(t, storage) {
t.falsy(storage.has('missing'));
diff --git a/packages/access-token/test/token.test.js b/packages/access-token/test/token.test.js
index dd087f15ffc..8088c2112bb 100644
--- a/packages/access-token/test/token.test.js
+++ b/packages/access-token/test/token.test.js
@@ -1,7 +1,7 @@
import test from 'ava';
-import { tmpDir } from './tmp.js';
import { getAccessToken } from '../src/access-token.js';
+import { tmpDir } from './tmp.js';
test('access tokens', async t => {
const [sharedStateDir, removeCallback] = await tmpDir('access-token-test');
diff --git a/packages/agoric-cli/scripts/stat-bundle.js b/packages/agoric-cli/scripts/stat-bundle.js
index 43de05222f7..4d2631cb227 100755
--- a/packages/agoric-cli/scripts/stat-bundle.js
+++ b/packages/agoric-cli/scripts/stat-bundle.js
@@ -1,6 +1,7 @@
#!/usr/bin/env node
import assert from 'node:assert';
import process from 'node:process';
+
import { statBundle } from '../src/lib/bundles.js';
const filename = process.argv[2];
diff --git a/packages/agoric-cli/scripts/stat-plans.js b/packages/agoric-cli/scripts/stat-plans.js
index 34382985fba..09d5466898e 100755
--- a/packages/agoric-cli/scripts/stat-plans.js
+++ b/packages/agoric-cli/scripts/stat-plans.js
@@ -1,5 +1,6 @@
#!/usr/bin/env node
import process from 'node:process';
+
import { statPlans } from '../src/lib/bundles.js';
await statPlans(process.cwd());
diff --git a/packages/agoric-cli/src/bin-agops.js b/packages/agoric-cli/src/bin-agops.js
index 445589a8cb1..0b233f8e03b 100755
--- a/packages/agoric-cli/src/bin-agops.js
+++ b/packages/agoric-cli/src/bin-agops.js
@@ -5,25 +5,24 @@
/* global fetch, setTimeout */
import '@endo/init/pre.js';
-
import '@endo/init';
import { E } from '@endo/far';
-
+import anylogger from 'anylogger';
import { execFileSync } from 'child_process';
+import { Command, CommanderError, createCommand } from 'commander';
import path from 'path';
import process from 'process';
-import anylogger from 'anylogger';
-import { Command, CommanderError, createCommand } from 'commander';
-import { makeOracleCommand } from './commands/oracle.js';
+
+import { makeAuctionCommand } from './commands/auction.js';
import { makeGovCommand } from './commands/gov.js';
+import { makeInterCommand } from './commands/inter.js';
+import { makeOracleCommand } from './commands/oracle.js';
+import { makePerfCommand } from './commands/perf.js';
import { makePsmCommand } from './commands/psm.js';
import { makeReserveCommand } from './commands/reserve.js';
-import { makeVaultsCommand } from './commands/vaults.js';
-import { makePerfCommand } from './commands/perf.js';
-import { makeInterCommand } from './commands/inter.js';
-import { makeAuctionCommand } from './commands/auction.js';
import { makeTestCommand } from './commands/test-upgrade.js';
+import { makeVaultsCommand } from './commands/vaults.js';
const logger = anylogger('agops');
const progname = path.basename(process.argv[1]);
diff --git a/packages/agoric-cli/src/chain-config.js b/packages/agoric-cli/src/chain-config.js
index e9bc39f7376..1054a0f9b25 100644
--- a/packages/agoric-cli/src/chain-config.js
+++ b/packages/agoric-cli/src/chain-config.js
@@ -1,6 +1,6 @@
-import djson from 'deterministic-json';
-import TOML from '@iarna/toml';
import * as Tokens from '@agoric/internal/src/tokens.js';
+import TOML from '@iarna/toml';
+import djson from 'deterministic-json';
export const STAKING_MAX_VALIDATORS = 150;
// Required for IBC connections not to time out.
diff --git a/packages/agoric-cli/src/commands/auction.js b/packages/agoric-cli/src/commands/auction.js
index 99ffd43355c..d44a6fe9e4f 100644
--- a/packages/agoric-cli/src/commands/auction.js
+++ b/packages/agoric-cli/src/commands/auction.js
@@ -1,7 +1,8 @@
// @ts-check
-import { InvalidArgumentError } from 'commander';
import { Fail } from '@endo/errors';
+import { InvalidArgumentError } from 'commander';
+
import { makeRpcUtils } from '../lib/rpc.js';
import { outputActionAndHint } from '../lib/wallet.js';
diff --git a/packages/agoric-cli/src/commands/gov.js b/packages/agoric-cli/src/commands/gov.js
index 8a4b46d49e5..e9fbb783d55 100644
--- a/packages/agoric-cli/src/commands/gov.js
+++ b/packages/agoric-cli/src/commands/gov.js
@@ -3,6 +3,7 @@
/* global globalThis, process, setTimeout */
import { execFileSync as execFileSyncAmbient } from 'child_process';
import { Command, CommanderError } from 'commander';
+
import { normalizeAddressWithOptions, pollBlocks } from '../lib/chain.js';
import { getNetworkConfig, makeRpcUtils } from '../lib/rpc.js';
import {
diff --git a/packages/agoric-cli/src/commands/inter.js b/packages/agoric-cli/src/commands/inter.js
index 702b2ae0f48..6e1044b7754 100644
--- a/packages/agoric-cli/src/commands/inter.js
+++ b/packages/agoric-cli/src/commands/inter.js
@@ -4,12 +4,12 @@
*/
// @ts-check
-import { CommanderError, InvalidArgumentError } from 'commander';
// TODO: should get M from endo https://github.com/Agoric/agoric-sdk/issues/7090
import { makeOfferSpecShape } from '@agoric/inter-protocol/src/auction/auctionBook.js';
import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
import { objectMap } from '@agoric/internal';
import { M, matches } from '@agoric/store';
+import { CommanderError, InvalidArgumentError } from 'commander';
import { normalizeAddressWithOptions, pollBlocks } from '../lib/chain.js';
import {
diff --git a/packages/agoric-cli/src/commands/oracle.js b/packages/agoric-cli/src/commands/oracle.js
index d8f44b2159b..fd3851edd97 100644
--- a/packages/agoric-cli/src/commands/oracle.js
+++ b/packages/agoric-cli/src/commands/oracle.js
@@ -1,14 +1,16 @@
// @ts-check
/* eslint-disable func-names */
/* global fetch, setTimeout, process */
+import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
+import { oracleBrandFeedName } from '@agoric/inter-protocol/src/proposals/utils.js';
import { Fail } from '@endo/errors';
import { Nat } from '@endo/nat';
-import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
-import { Command } from 'commander';
import * as cp from 'child_process';
+import { Command } from 'commander';
import { inspect } from 'util';
-import { oracleBrandFeedName } from '@agoric/inter-protocol/src/proposals/utils.js';
+
import { normalizeAddressWithOptions } from '../lib/chain.js';
+import { bigintReplacer } from '../lib/format.js';
import { getNetworkConfig, makeRpcUtils, storageHelper } from '../lib/rpc.js';
import {
getCurrent,
@@ -17,7 +19,6 @@ import {
sendAction,
sendHint,
} from '../lib/wallet.js';
-import { bigintReplacer } from '../lib/format.js';
/** @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js'; */
diff --git a/packages/agoric-cli/src/commands/perf.js b/packages/agoric-cli/src/commands/perf.js
index 01e40b30b1a..528d1e30d9f 100644
--- a/packages/agoric-cli/src/commands/perf.js
+++ b/packages/agoric-cli/src/commands/perf.js
@@ -7,11 +7,12 @@ import {
makeFollower,
makeLeaderFromRpcAddresses,
} from '@agoric/casting';
+import { slotToRemotable } from '@agoric/internal/src/storage-test-utils.js';
+import { boardSlottingMarshaller } from '@agoric/vats/tools/board-utils.js';
import { Command } from 'commander';
import fs from 'fs';
import { exit } from 'process';
-import { slotToRemotable } from '@agoric/internal/src/storage-test-utils.js';
-import { boardSlottingMarshaller } from '@agoric/vats/tools/board-utils.js';
+
import { makeLeaderOptions } from '../lib/casting.js';
import {
execSwingsetTransaction,
diff --git a/packages/agoric-cli/src/commands/psm.js b/packages/agoric-cli/src/commands/psm.js
index 1daaa99f503..9cc688660cd 100644
--- a/packages/agoric-cli/src/commands/psm.js
+++ b/packages/agoric-cli/src/commands/psm.js
@@ -1,8 +1,9 @@
// @ts-check
/* eslint-disable func-names */
/* global fetch, process */
-import { Command } from 'commander';
import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
+import { Command } from 'commander';
+
import { asPercent } from '../lib/format.js';
import { makeRpcUtils, storageHelper } from '../lib/rpc.js';
import { outputExecuteOfferAction } from '../lib/wallet.js';
diff --git a/packages/agoric-cli/src/commands/reserve.js b/packages/agoric-cli/src/commands/reserve.js
index c064ec497f4..a2b9267c98b 100644
--- a/packages/agoric-cli/src/commands/reserve.js
+++ b/packages/agoric-cli/src/commands/reserve.js
@@ -3,6 +3,7 @@
/* global fetch, process */
import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
import { Command } from 'commander';
+
import { makeRpcUtils } from '../lib/rpc.js';
import { outputActionAndHint } from '../lib/wallet.js';
diff --git a/packages/agoric-cli/src/commands/test-upgrade.js b/packages/agoric-cli/src/commands/test-upgrade.js
index 20223ee7bc5..6ce56c25d82 100644
--- a/packages/agoric-cli/src/commands/test-upgrade.js
+++ b/packages/agoric-cli/src/commands/test-upgrade.js
@@ -2,6 +2,7 @@
/* global process */
import { Fail } from '@endo/errors';
import { CommanderError } from 'commander';
+
import { normalizeAddressWithOptions } from '../lib/chain.js';
import { bigintReplacer } from '../lib/format.js';
import { getNetworkConfig } from '../lib/rpc.js';
diff --git a/packages/agoric-cli/src/commands/vaults.js b/packages/agoric-cli/src/commands/vaults.js
index b45c55ff9de..411dab9d1a3 100644
--- a/packages/agoric-cli/src/commands/vaults.js
+++ b/packages/agoric-cli/src/commands/vaults.js
@@ -1,11 +1,12 @@
// @ts-check
/* eslint-disable func-names */
/* global fetch, process */
-import { Command } from 'commander';
import {
lookupOfferIdForVault,
Offers,
} from '@agoric/inter-protocol/src/clientSupport.js';
+import { Command } from 'commander';
+
import { normalizeAddressWithOptions } from '../lib/chain.js';
import { makeRpcUtils } from '../lib/rpc.js';
import { getCurrent, outputExecuteOfferAction } from '../lib/wallet.js';
diff --git a/packages/agoric-cli/src/commands/wallet.js b/packages/agoric-cli/src/commands/wallet.js
index 8fc3405fbf6..754a70be039 100644
--- a/packages/agoric-cli/src/commands/wallet.js
+++ b/packages/agoric-cli/src/commands/wallet.js
@@ -8,11 +8,9 @@ import {
makeLeader,
makeLeaderFromRpcAddresses,
} from '@agoric/casting';
+import { execFileSync } from 'child_process';
import fs from 'fs';
import util from 'util';
-import { execFileSync } from 'child_process';
-import { fmtRecordOfLines, summarize } from '../lib/format.js';
-import { makeRpcUtils, networkConfig } from '../lib/rpc.js';
import { makeLeaderOptions } from '../lib/casting.js';
import {
@@ -20,6 +18,8 @@ import {
fetchSwingsetParams,
normalizeAddressWithOptions,
} from '../lib/chain.js';
+import { fmtRecordOfLines, summarize } from '../lib/format.js';
+import { makeRpcUtils, networkConfig } from '../lib/rpc.js';
import { coalesceWalletState, getCurrent } from '../lib/wallet.js';
const SLEEP_SECONDS = 3;
diff --git a/packages/agoric-cli/src/cosmos.js b/packages/agoric-cli/src/cosmos.js
index 147cda627d0..28af5ec28e3 100644
--- a/packages/agoric-cli/src/cosmos.js
+++ b/packages/agoric-cli/src/cosmos.js
@@ -1,6 +1,7 @@
import chalk from 'chalk';
import path from 'path';
-import { makePspawn, getSDKBinaries } from './helpers.js';
+
+import { getSDKBinaries, makePspawn } from './helpers.js';
const filename = new URL(import.meta.url).pathname;
diff --git a/packages/agoric-cli/src/deploy.js b/packages/agoric-cli/src/deploy.js
index 68e2a94e6f1..3d79c2ee5ce 100644
--- a/packages/agoric-cli/src/deploy.js
+++ b/packages/agoric-cli/src/deploy.js
@@ -1,24 +1,23 @@
// @ts-check
/* global process setTimeout setInterval clearInterval */
+import { getAccessToken } from '@agoric/access-token';
+import { makeLeaderFromRpcAddresses } from '@agoric/casting';
+import { whileTrue } from '@agoric/internal';
+import { SigningStargateClient } from '@cosmjs/stargate';
+import { E, makeCapTP } from '@endo/captp';
import { X } from '@endo/errors';
import { makePromiseKit } from '@endo/promise-kit';
-import { E, makeCapTP } from '@endo/captp';
-import { makeLeaderFromRpcAddresses } from '@agoric/casting';
-import path from 'path';
import http from 'http';
import inquirer from 'inquirer';
-import { SigningStargateClient } from '@cosmjs/stargate';
-import { whileTrue } from '@agoric/internal';
-
-import { getAccessToken } from '@agoric/access-token';
+import path from 'path';
+import { makeJsonHttpClient } from './json-http-client-node.js';
import {
makeBundlePublisher,
makeCosmosBundlePublisher,
makeHttpBundlePublisher,
} from './publish.js';
-import { makeJsonHttpClient } from './json-http-client-node.js';
import { makeScriptLoader } from './scripts.js';
// note: CapTP has its own HandledPromise instantiation, and the contract
diff --git a/packages/agoric-cli/src/entrypoint.js b/packages/agoric-cli/src/entrypoint.js
index f921a2340ac..b81ab9e3feb 100755
--- a/packages/agoric-cli/src/entrypoint.js
+++ b/packages/agoric-cli/src/entrypoint.js
@@ -6,16 +6,15 @@
import '@endo/init/pre.js';
import 'esm';
import '@endo/init/legacy.js';
+// Configure logs.
+import './anylogger-agoric.js';
-import path from 'path';
-import WebSocket from 'ws';
+import anylogger from 'anylogger';
import { spawn } from 'child_process';
import rawFs from 'fs';
import os from 'os';
-
-// Configure logs.
-import './anylogger-agoric.js';
-import anylogger from 'anylogger';
+import path from 'path';
+import WebSocket from 'ws';
import main from './main.js';
diff --git a/packages/agoric-cli/src/follow.js b/packages/agoric-cli/src/follow.js
index 745afc5830f..f286d02c238 100644
--- a/packages/agoric-cli/src/follow.js
+++ b/packages/agoric-cli/src/follow.js
@@ -1,19 +1,19 @@
// @ts-check
-import process from 'process';
-import {
- Far,
- getInterfaceOf,
- decodeToJustin,
- makeMarshal,
-} from '@endo/marshal';
-
import {
+ iterateEach,
iterateLatest,
makeCastingSpec,
- iterateEach,
makeFollower,
makeLeader,
} from '@agoric/casting';
+import {
+ decodeToJustin,
+ Far,
+ getInterfaceOf,
+ makeMarshal,
+} from '@endo/marshal';
+import process from 'process';
+
import { makeLeaderOptions } from './lib/casting.js';
const makeCapDataToQclass = () => {
diff --git a/packages/agoric-cli/src/init.js b/packages/agoric-cli/src/init.js
index 251ef5c230e..a51d55daac2 100644
--- a/packages/agoric-cli/src/init.js
+++ b/packages/agoric-cli/src/init.js
@@ -1,4 +1,5 @@
import chalk from 'chalk';
+
import { makePspawn } from './helpers.js';
// Use either an absolute template URL, or find it relative to DAPP_URL_BASE.
diff --git a/packages/agoric-cli/src/install.js b/packages/agoric-cli/src/install.js
index 78c785cbf21..7d707c6d9cb 100644
--- a/packages/agoric-cli/src/install.js
+++ b/packages/agoric-cli/src/install.js
@@ -1,6 +1,7 @@
/* global process Buffer */
-import path from 'path';
import chalk from 'chalk';
+import path from 'path';
+
import { makePspawn } from './helpers.js';
import DEFAULT_SDK_PACKAGE_NAMES from './sdk-package-names.js';
diff --git a/packages/agoric-cli/src/lib/format.js b/packages/agoric-cli/src/lib/format.js
index 78227bcd615..83678e68a11 100644
--- a/packages/agoric-cli/src/lib/format.js
+++ b/packages/agoric-cli/src/lib/format.js
@@ -1,7 +1,7 @@
// @ts-check
-import { Fail, q } from '@endo/errors';
import { makeBoardRemote } from '@agoric/vats/tools/board-utils.js';
+import { Fail, q } from '@endo/errors';
/** @import {BoardRemote} from '@agoric/vats/tools/board-utils.js' */
/** @import {VBankAssetDetail} from '@agoric/vats/tools/board-utils.js'; */
diff --git a/packages/agoric-cli/src/lib/wallet.js b/packages/agoric-cli/src/lib/wallet.js
index c8d3dc71e35..8acfeae6dfd 100644
--- a/packages/agoric-cli/src/lib/wallet.js
+++ b/packages/agoric-cli/src/lib/wallet.js
@@ -1,9 +1,10 @@
// @ts-check
/* global process */
-import { Fail } from '@endo/errors';
import { iterateReverse } from '@agoric/casting';
import { makeWalletStateCoalescer } from '@agoric/smart-wallet/src/utils.js';
+import { Fail } from '@endo/errors';
+
import { execSwingsetTransaction, pollBlocks, pollTx } from './chain.js';
import { boardSlottingMarshaller, makeRpcUtils } from './rpc.js';
diff --git a/packages/agoric-cli/src/main-publish.js b/packages/agoric-cli/src/main-publish.js
index 431e3e81c3a..0a8e25d62e7 100644
--- a/packages/agoric-cli/src/main-publish.js
+++ b/packages/agoric-cli/src/main-publish.js
@@ -1,12 +1,10 @@
/* global process */
// @ts-check
-import path from 'path';
-
import { SigningStargateClient } from '@cosmjs/stargate';
+import path from 'path';
import { parseLocatedJson } from './json.js';
-
import { makeBundlePublisher, makeCosmosBundlePublisher } from './publish.js';
const publishMain = async (progname, rawArgs, powers, opts) => {
diff --git a/packages/agoric-cli/src/main.js b/packages/agoric-cli/src/main.js
index 453401f2e72..2236288adac 100644
--- a/packages/agoric-cli/src/main.js
+++ b/packages/agoric-cli/src/main.js
@@ -1,12 +1,13 @@
/* global process */
-import { Command } from 'commander';
-import path from 'path';
-import url from 'url';
-import { assert, X } from '@endo/errors';
import {
- DEFAULT_KEEP_POLLING_SECONDS,
DEFAULT_JITTER_SECONDS,
+ DEFAULT_KEEP_POLLING_SECONDS,
} from '@agoric/casting';
+import { assert, X } from '@endo/errors';
+import { Command } from 'commander';
+import path from 'path';
+import url from 'url';
+
import { makeWalletCommand } from './commands/wallet.js';
import cosmosMain from './cosmos.js';
import deployMain from './deploy.js';
diff --git a/packages/agoric-cli/src/open.js b/packages/agoric-cli/src/open.js
index 3251a49bc72..29f590c9ae7 100644
--- a/packages/agoric-cli/src/open.js
+++ b/packages/agoric-cli/src/open.js
@@ -1,7 +1,7 @@
/* global process setInterval clearInterval */
-import opener from 'opener';
-import { assert, X } from '@endo/errors';
import { getAccessToken } from '@agoric/access-token';
+import { assert, X } from '@endo/errors';
+import opener from 'opener';
export default async function walletMain(_progname, _rawArgs, powers, opts) {
const { anylogger } = powers;
diff --git a/packages/agoric-cli/src/publish.js b/packages/agoric-cli/src/publish.js
index 2d21068e940..55ca0b28b45 100644
--- a/packages/agoric-cli/src/publish.js
+++ b/packages/agoric-cli/src/publish.js
@@ -1,21 +1,20 @@
// @ts-check
///
-import { X, q, Fail } from '@endo/errors';
-import { E } from '@endo/far';
-
import {
iterateEach,
+ makeCastingSpec,
makeFollower,
makeLeaderFromRpcAddresses,
- makeCastingSpec,
} from '@agoric/casting';
-import { DirectSecp256k1HdWallet, Registry } from '@cosmjs/proto-signing';
-import { defaultRegistryTypes } from '@cosmjs/stargate';
+import { MsgInstallBundle } from '@agoric/cosmic-proto/swingset/msgs.js';
import { stringToPath } from '@cosmjs/crypto';
-import { Decimal } from '@cosmjs/math';
import { fromBech32 } from '@cosmjs/encoding';
-import { MsgInstallBundle } from '@agoric/cosmic-proto/swingset/msgs.js';
+import { Decimal } from '@cosmjs/math';
+import { DirectSecp256k1HdWallet, Registry } from '@cosmjs/proto-signing';
+import { defaultRegistryTypes } from '@cosmjs/stargate';
+import { Fail, q, X } from '@endo/errors';
+import { E } from '@endo/far';
// https://github.com/Agoric/agoric-sdk/blob/master/golang/cosmos/daemon/main.go
const Agoric = {
diff --git a/packages/agoric-cli/src/run.js b/packages/agoric-cli/src/run.js
index 4cdc54179be..82cc7b7b5f2 100644
--- a/packages/agoric-cli/src/run.js
+++ b/packages/agoric-cli/src/run.js
@@ -1,4 +1,5 @@
import makeScratchPad from '@agoric/internal/src/scratch.js';
+
import { makeScriptLoader } from './scripts.js';
export default async function runMain(progname, rawArgs, powers, opts) {
diff --git a/packages/agoric-cli/src/scripts.js b/packages/agoric-cli/src/scripts.js
index c1781eacc12..a2fc19caf26 100644
--- a/packages/agoric-cli/src/scripts.js
+++ b/packages/agoric-cli/src/scripts.js
@@ -3,7 +3,6 @@
import bundleSource from '@endo/bundle-source';
import { E } from '@endo/captp';
import { search as readContainingPackageDescriptor } from '@endo/compartment-mapper';
-
import createEsmRequire from 'esm';
import { createRequire } from 'module';
import path from 'path';
diff --git a/packages/agoric-cli/src/set-defaults.js b/packages/agoric-cli/src/set-defaults.js
index c0fbd80e3cf..8611201a49c 100644
--- a/packages/agoric-cli/src/set-defaults.js
+++ b/packages/agoric-cli/src/set-defaults.js
@@ -1,9 +1,10 @@
-import { basename } from 'path';
import { Fail } from '@endo/errors';
+import { basename } from 'path';
+
import {
finishCosmosApp,
- finishTendermintConfig,
finishCosmosGenesis,
+ finishTendermintConfig,
} from './chain-config.js';
export default async function setDefaultsMain(progname, rawArgs, powers, opts) {
diff --git a/packages/agoric-cli/src/start.js b/packages/agoric-cli/src/start.js
index 18fc9de2627..5508b601361 100644
--- a/packages/agoric-cli/src/start.js
+++ b/packages/agoric-cli/src/start.js
@@ -1,21 +1,19 @@
/* global process setTimeout */
+import { untilTrue } from '@agoric/internal';
+import { isNat, Nat } from '@endo/nat';
import chalk from 'chalk';
import { createHash } from 'crypto';
-import path from 'path';
import { createRequire } from 'module';
-
-import { Nat, isNat } from '@endo/nat';
-import { untilTrue } from '@agoric/internal';
+import path from 'path';
import {
CENTRAL_DENOM,
- STAKING_DENOM,
- finishTendermintConfig,
- finishCosmosGenesis,
finishCosmosApp,
+ finishCosmosGenesis,
+ finishTendermintConfig,
+ STAKING_DENOM,
} from './chain-config.js';
-
-import { makePspawn, getSDKBinaries } from './helpers.js';
+import { getSDKBinaries, makePspawn } from './helpers.js';
const require = createRequire(import.meta.url);
diff --git a/packages/agoric-cli/test/bundles-regExp.test.js b/packages/agoric-cli/test/bundles-regExp.test.js
index 87b6f040b14..60594c3e771 100644
--- a/packages/agoric-cli/test/bundles-regExp.test.js
+++ b/packages/agoric-cli/test/bundles-regExp.test.js
@@ -1,4 +1,5 @@
import test from 'ava';
+
import { PACKAGE_NAME_RE } from '../src/lib/bundles.js';
const goodPatterns = [
diff --git a/packages/agoric-cli/test/inter-cli.test.js b/packages/agoric-cli/test/inter-cli.test.js
index 5d7bb758626..24f38b9eb60 100644
--- a/packages/agoric-cli/test/inter-cli.test.js
+++ b/packages/agoric-cli/test/inter-cli.test.js
@@ -1,14 +1,14 @@
// @ts-check
/* global Buffer */
import '@endo/init';
-import test from 'ava';
-import { createCommand, CommanderError } from 'commander';
-import { Far } from '@endo/far';
import { makeParseAmount } from '@agoric/inter-protocol/src/clientSupport.js';
-import { boardSlottingMarshaller, makeFromBoard } from '../src/lib/rpc.js';
+import { Far } from '@endo/far';
+import test from 'ava';
+import { CommanderError, createCommand } from 'commander';
import { fmtBid, makeInterCommand } from '../src/commands/inter.js';
+import { boardSlottingMarshaller, makeFromBoard } from '../src/lib/rpc.js';
const { entries } = Object;
diff --git a/packages/agoric-cli/test/main.test.js b/packages/agoric-cli/test/main.test.js
index d2b17a170a5..38d1515ef58 100644
--- a/packages/agoric-cli/test/main.test.js
+++ b/packages/agoric-cli/test/main.test.js
@@ -2,9 +2,10 @@
import '@endo/init/pre.js';
import 'esm';
import '@endo/init/debug.js';
+
+import anylogger from 'anylogger';
import test from 'ava';
import fs from 'fs';
-import anylogger from 'anylogger';
import main from '../src/main.js';
diff --git a/packages/agoric-cli/test/publish-bundle.test.js b/packages/agoric-cli/test/publish-bundle.test.js
index 0cfbda50059..070c786a255 100644
--- a/packages/agoric-cli/test/publish-bundle.test.js
+++ b/packages/agoric-cli/test/publish-bundle.test.js
@@ -3,8 +3,8 @@
import '@endo/init/debug.js';
-import * as http from 'http';
import test from 'ava';
+import * as http from 'http';
import { makeJsonHttpClient } from '../src/json-http-client-node.js';
import {
diff --git a/packages/agoric-cli/tools/getting-started.js b/packages/agoric-cli/tools/getting-started.js
index 3dbbdf7a5a7..f4de313fa67 100644
--- a/packages/agoric-cli/tools/getting-started.js
+++ b/packages/agoric-cli/tools/getting-started.js
@@ -1,13 +1,12 @@
// @ts-check
/* global process setTimeout setInterval clearInterval Buffer */
+import { makePromiseKit } from '@endo/promise-kit';
+import { spawn } from 'child_process';
import fs from 'fs';
+import { request } from 'http';
import path from 'path';
import tmp from 'tmp';
-import { makePromiseKit } from '@endo/promise-kit';
-import { request } from 'http';
-
-import { spawn } from 'child_process';
import { makePspawn } from '../src/helpers.js';
diff --git a/packages/agoric-cli/tools/resm-plugin/src/plugin.js b/packages/agoric-cli/tools/resm-plugin/src/plugin.js
index 83bb1e2662d..f50857dc4bb 100644
--- a/packages/agoric-cli/tools/resm-plugin/src/plugin.js
+++ b/packages/agoric-cli/tools/resm-plugin/src/plugin.js
@@ -1,6 +1,7 @@
// @jessie-check
import { Far } from '@endo/marshal';
+
import { start } from './output.js';
export const bootPlugin = () => {
diff --git a/packages/async-flow/src/async-flow.js b/packages/async-flow/src/async-flow.js
index 654c12d209f..33616bf38f3 100644
--- a/packages/async-flow/src/async-flow.js
+++ b/packages/async-flow/src/async-flow.js
@@ -1,14 +1,15 @@
+import { PromiseWatcherI } from '@agoric/base-zone';
+import { makeScalarWeakMapStore } from '@agoric/store';
+import { prepareVowTools, toPassableCap, VowShape } from '@agoric/vow';
import { annotateError, Fail, makeError, q, X } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { M } from '@endo/patterns';
-import { makeScalarWeakMapStore } from '@agoric/store';
-import { PromiseWatcherI } from '@agoric/base-zone';
-import { prepareVowTools, toPassableCap, VowShape } from '@agoric/vow';
-import { makeReplayMembrane } from './replay-membrane.js';
-import { prepareLogStore } from './log-store.js';
+
import { prepareBijection } from './bijection.js';
import { prepareEndowmentTools } from './endowments.js';
-import { LogEntryShape, FlowStateShape } from './type-guards.js';
+import { prepareLogStore } from './log-store.js';
+import { makeReplayMembrane } from './replay-membrane.js';
+import { FlowStateShape, LogEntryShape } from './type-guards.js';
/**
* @import {WeakMapStore} from '@agoric/store'
diff --git a/packages/async-flow/src/bijection.js b/packages/async-flow/src/bijection.js
index 334e5c24ff6..b9123352868 100644
--- a/packages/async-flow/src/bijection.js
+++ b/packages/async-flow/src/bijection.js
@@ -1,7 +1,8 @@
+import { toPassableCap } from '@agoric/vow';
import { b, Fail } from '@endo/errors';
-import { M } from '@endo/patterns';
import { Far, isPassable } from '@endo/pass-style';
-import { toPassableCap } from '@agoric/vow';
+import { M } from '@endo/patterns';
+
import { makeEphemera } from './ephemera.js';
/**
diff --git a/packages/async-flow/src/convert.js b/packages/async-flow/src/convert.js
index 51ed928ec2e..2fb2eb497b0 100644
--- a/packages/async-flow/src/convert.js
+++ b/packages/async-flow/src/convert.js
@@ -1,6 +1,7 @@
-import { Fail, X, annotateError, makeError, q } from '@endo/errors';
-import { throwLabeled } from '@endo/common/throw-labeled.js';
+import { isVow } from '@agoric/vow/src/vow-utils.js';
import { objectMap } from '@endo/common/object-map.js';
+import { throwLabeled } from '@endo/common/throw-labeled.js';
+import { annotateError, Fail, makeError, q, X } from '@endo/errors';
import {
getErrorConstructor,
getTag,
@@ -8,7 +9,6 @@ import {
makeTagged,
passStyleOf,
} from '@endo/pass-style';
-import { isVow } from '@agoric/vow/src/vow-utils.js';
/**
* @import {Passable} from '@endo/pass-style'
diff --git a/packages/async-flow/src/endowments.js b/packages/async-flow/src/endowments.js
index 1aba97efaaf..adf782ce658 100644
--- a/packages/async-flow/src/endowments.js
+++ b/packages/async-flow/src/endowments.js
@@ -1,11 +1,12 @@
+import { isUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
+import { prepareVowTools, toPassableCap } from '@agoric/vow';
+import { isVow } from '@agoric/vow/src/vow-utils.js';
import { Fail } from '@endo/errors';
import { E } from '@endo/eventual-send';
-import { isPromise } from '@endo/promise-kit';
-import { isRemotable, isPassable, GET_METHOD_NAMES } from '@endo/pass-style';
+import { GET_METHOD_NAMES, isPassable, isRemotable } from '@endo/pass-style';
import { M, objectMap } from '@endo/patterns';
-import { prepareVowTools, toPassableCap } from '@agoric/vow';
-import { isVow } from '@agoric/vow/src/vow-utils.js';
-import { isUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
+import { isPromise } from '@endo/promise-kit';
+
import { PropertyKeyShape } from './type-guards.js';
/**
diff --git a/packages/async-flow/src/equate.js b/packages/async-flow/src/equate.js
index f11df50e911..cde75f0e181 100644
--- a/packages/async-flow/src/equate.js
+++ b/packages/async-flow/src/equate.js
@@ -1,8 +1,8 @@
-import { Fail, X, annotateError, q } from '@endo/errors';
+import { isVow } from '@agoric/vow/src/vow-utils.js';
import { throwLabeled } from '@endo/common/throw-labeled.js';
-import { getTag, isObject, passStyleOf } from '@endo/pass-style';
+import { annotateError, Fail, q, X } from '@endo/errors';
import { recordNames } from '@endo/marshal';
-import { isVow } from '@agoric/vow/src/vow-utils.js';
+import { getTag, isObject, passStyleOf } from '@endo/pass-style';
const { is } = Object;
diff --git a/packages/async-flow/src/log-store.js b/packages/async-flow/src/log-store.js
index 002209783c0..f933f166190 100644
--- a/packages/async-flow/src/log-store.js
+++ b/packages/async-flow/src/log-store.js
@@ -1,8 +1,9 @@
import { Fail, q } from '@endo/errors';
-import { makePromiseKit } from '@endo/promise-kit';
import { M } from '@endo/patterns';
-import { LogEntryShape } from './type-guards.js';
+import { makePromiseKit } from '@endo/promise-kit';
+
import { makeEphemera } from './ephemera.js';
+import { LogEntryShape } from './type-guards.js';
/**
* @import {PromiseKit} from '@endo/promise-kit'
diff --git a/packages/async-flow/src/replay-membrane.js b/packages/async-flow/src/replay-membrane.js
index 16e19f6a749..ff7d9ce07d6 100644
--- a/packages/async-flow/src/replay-membrane.js
+++ b/packages/async-flow/src/replay-membrane.js
@@ -2,10 +2,11 @@
import { isVow } from '@agoric/vow/src/vow-utils.js';
import { heapVowE } from '@agoric/vow/vat.js';
import { throwLabeled } from '@endo/common/throw-labeled.js';
-import { Fail, X, b, makeError, q } from '@endo/errors';
+import { b, Fail, makeError, q, X } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { getMethodNames } from '@endo/eventual-send/utils.js';
-import { Far, Remotable, getInterfaceOf } from '@endo/pass-style';
+import { Far, getInterfaceOf, Remotable } from '@endo/pass-style';
+
import { makeConvertKit } from './convert.js';
import { makeEquate } from './equate.js';
diff --git a/packages/async-flow/src/type-guards.js b/packages/async-flow/src/type-guards.js
index 8c3b641235d..a6be1ca92fb 100644
--- a/packages/async-flow/src/type-guards.js
+++ b/packages/async-flow/src/type-guards.js
@@ -1,5 +1,5 @@
-import { M } from '@endo/patterns';
import { VowShape } from '@agoric/vow';
+import { M } from '@endo/patterns';
export const FlowStateShape = M.or(
'Running',
diff --git a/packages/async-flow/src/types.d.ts b/packages/async-flow/src/types.d.ts
index 5541611961c..d43a17d3603 100644
--- a/packages/async-flow/src/types.d.ts
+++ b/packages/async-flow/src/types.d.ts
@@ -1,8 +1,9 @@
-import type { Passable } from '@endo/pass-style';
import type { Vow, VowTools } from '@agoric/vow';
-import type { LogStore } from './log-store.js';
+import type { Passable } from '@endo/pass-style';
+
import type { Bijection } from './bijection.js';
import type { EndowmentTools } from './endowments.js';
+import type { LogStore } from './log-store.js';
export type FlowState =
| 'Running'
diff --git a/packages/async-flow/test/async-flow-crank.test.js b/packages/async-flow/test/async-flow-crank.test.js
index db245205747..00b2ed75e97 100644
--- a/packages/async-flow/test/async-flow-crank.test.js
+++ b/packages/async-flow/test/async-flow-crank.test.js
@@ -2,12 +2,11 @@
// https://github.com/Agoric/agoric-sdk/issues/9377
// as the `test.serial.failing` test at the end.
-// eslint-disable-next-line import/order
import {
- test,
- getBaggage,
annihilate,
+ getBaggage,
nextLife,
+ test,
} from './prepare-test-env-ava.js';
import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
diff --git a/packages/async-flow/test/async-flow-early-completion.test.js b/packages/async-flow/test/async-flow-early-completion.test.js
index a68af387178..eee826fe470 100644
--- a/packages/async-flow/test/async-flow-early-completion.test.js
+++ b/packages/async-flow/test/async-flow-early-completion.test.js
@@ -1,19 +1,18 @@
-// eslint-disable-next-line import/order
import {
- test,
- getBaggage,
annihilate,
+ getBaggage,
nextLife,
+ test,
} from './prepare-test-env-ava.js';
+import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
+import { prepareVowTools } from '@agoric/vow';
+import { isVow } from '@agoric/vow/src/vow-utils.js';
+import { makeDurableZone } from '@agoric/zone/durable.js';
import { Fail } from '@endo/errors';
import { passStyleOf } from '@endo/pass-style';
import { makeCopyMap } from '@endo/patterns';
import { makePromiseKit } from '@endo/promise-kit';
-import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
-import { isVow } from '@agoric/vow/src/vow-utils.js';
-import { prepareVowTools } from '@agoric/vow';
-import { makeDurableZone } from '@agoric/zone/durable.js';
import { prepareAsyncFlowTools } from '../src/async-flow.js';
diff --git a/packages/async-flow/test/async-flow-no-this.js b/packages/async-flow/test/async-flow-no-this.js
index 12e2e0ba83e..77271f5b365 100644
--- a/packages/async-flow/test/async-flow-no-this.js
+++ b/packages/async-flow/test/async-flow-no-this.js
@@ -1,11 +1,10 @@
-// eslint-disable-next-line import/order
-import { test, getBaggage, annihilate } from './prepare-test-env-ava.js';
+import { annihilate, getBaggage, test } from './prepare-test-env-ava.js';
import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
import { prepareVowTools } from '@agoric/vow';
+import { makeDurableZone } from '@agoric/zone/durable.js';
import { makeHeapZone } from '@agoric/zone/heap.js';
import { makeVirtualZone } from '@agoric/zone/virtual.js';
-import { makeDurableZone } from '@agoric/zone/durable.js';
import { prepareAsyncFlowTools } from '../src/async-flow.js';
diff --git a/packages/async-flow/test/async-flow.test.js b/packages/async-flow/test/async-flow.test.js
index ed281cc9bf5..f518194197d 100644
--- a/packages/async-flow/test/async-flow.test.js
+++ b/packages/async-flow/test/async-flow.test.js
@@ -1,21 +1,20 @@
-// eslint-disable-next-line import/order
import {
- test,
- getBaggage,
annihilate,
+ getBaggage,
nextLife,
+ test,
} from './prepare-test-env-ava.js';
-import { Fail } from '@endo/errors';
-import { passStyleOf } from '@endo/pass-style';
-import { makeCopyMap } from '@endo/patterns';
-import { makePromiseKit } from '@endo/promise-kit';
import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
-import { isVow } from '@agoric/vow/src/vow-utils.js';
import { prepareVowTools } from '@agoric/vow';
+import { isVow } from '@agoric/vow/src/vow-utils.js';
+import { makeDurableZone } from '@agoric/zone/durable.js';
import { makeHeapZone } from '@agoric/zone/heap.js';
import { makeVirtualZone } from '@agoric/zone/virtual.js';
-import { makeDurableZone } from '@agoric/zone/durable.js';
+import { Fail } from '@endo/errors';
+import { passStyleOf } from '@endo/pass-style';
+import { makeCopyMap } from '@endo/patterns';
+import { makePromiseKit } from '@endo/promise-kit';
import { prepareAsyncFlowTools } from '../src/async-flow.js';
diff --git a/packages/async-flow/test/bad-host.test.js b/packages/async-flow/test/bad-host.test.js
index a7d3bb8893c..f3ba5cb7553 100644
--- a/packages/async-flow/test/bad-host.test.js
+++ b/packages/async-flow/test/bad-host.test.js
@@ -1,19 +1,18 @@
-// eslint-disable-next-line import/order
import {
- test,
- getBaggage,
annihilate,
+ getBaggage,
nextLife,
+ test,
} from './prepare-test-env-ava.js';
-import { Fail } from '@endo/errors';
-import { M } from '@endo/patterns';
-import { makePromiseKit } from '@endo/promise-kit';
import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
import { prepareVowTools } from '@agoric/vow';
+import { makeDurableZone } from '@agoric/zone/durable.js';
import { makeHeapZone } from '@agoric/zone/heap.js';
import { makeVirtualZone } from '@agoric/zone/virtual.js';
-import { makeDurableZone } from '@agoric/zone/durable.js';
+import { Fail } from '@endo/errors';
+import { M } from '@endo/patterns';
+import { makePromiseKit } from '@endo/promise-kit';
import { prepareAsyncFlowTools } from '../src/async-flow.js';
diff --git a/packages/async-flow/test/bijection.test.js b/packages/async-flow/test/bijection.test.js
index 79c8871055d..5cb22cd39fd 100644
--- a/packages/async-flow/test/bijection.test.js
+++ b/packages/async-flow/test/bijection.test.js
@@ -1,17 +1,16 @@
-// eslint-disable-next-line import/order
import {
- test,
- getBaggage,
annihilate,
+ getBaggage,
nextLife,
+ test,
} from './prepare-test-env-ava.js';
-import { Far } from '@endo/pass-style';
import { prepareVowTools } from '@agoric/vow';
import { isVow, toPassableCap } from '@agoric/vow/src/vow-utils.js';
+import { makeDurableZone } from '@agoric/zone/durable.js';
import { makeHeapZone } from '@agoric/zone/heap.js';
import { makeVirtualZone } from '@agoric/zone/virtual.js';
-import { makeDurableZone } from '@agoric/zone/durable.js';
+import { Far } from '@endo/pass-style';
import { prepareBijection } from '../src/bijection.js';
diff --git a/packages/async-flow/test/convert.test.js b/packages/async-flow/test/convert.test.js
index aa4288b3a34..23c255aafb7 100644
--- a/packages/async-flow/test/convert.test.js
+++ b/packages/async-flow/test/convert.test.js
@@ -1,22 +1,21 @@
-// eslint-disable-next-line import/order
import {
- test,
- getBaggage,
annihilate,
- nextLife,
asyncFlowVerbose,
+ getBaggage,
+ nextLife,
+ test,
} from './prepare-test-env-ava.js';
-import { X, makeError, q } from '@endo/errors';
-import { Far, getInterfaceOf, makeTagged, passStyleOf } from '@endo/pass-style';
import { prepareVowTools } from '@agoric/vow';
import { isVow } from '@agoric/vow/src/vow-utils.js';
+import { makeDurableZone } from '@agoric/zone/durable.js';
import { makeHeapZone } from '@agoric/zone/heap.js';
import { makeVirtualZone } from '@agoric/zone/virtual.js';
-import { makeDurableZone } from '@agoric/zone/durable.js';
+import { makeError, q, X } from '@endo/errors';
+import { Far, getInterfaceOf, makeTagged, passStyleOf } from '@endo/pass-style';
-import { makeConvertKit } from '../src/convert.js';
import { prepareBijection } from '../src/bijection.js';
+import { makeConvertKit } from '../src/convert.js';
/**
* @import {PromiseKit} from '@endo/promise-kit'
diff --git a/packages/async-flow/test/endowments.test.js b/packages/async-flow/test/endowments.test.js
index 45aa83f7caf..6a4874c8ec1 100644
--- a/packages/async-flow/test/endowments.test.js
+++ b/packages/async-flow/test/endowments.test.js
@@ -1,21 +1,20 @@
-// eslint-disable-next-line import/order
import {
- test,
- getBaggage,
annihilate,
+ getBaggage,
nextLife,
+ test,
} from './prepare-test-env-ava.js';
-import { Far, getInterfaceOf, isPassable, passStyleOf } from '@endo/pass-style';
import { prepareVowTools } from '@agoric/vow';
import { isVow } from '@agoric/vow/src/vow-utils.js';
+import { makeDurableZone } from '@agoric/zone/durable.js';
import { makeHeapZone } from '@agoric/zone/heap.js';
import { makeVirtualZone } from '@agoric/zone/virtual.js';
-import { makeDurableZone } from '@agoric/zone/durable.js';
+import { Far, getInterfaceOf, isPassable, passStyleOf } from '@endo/pass-style';
-import { forwardingMethods, prepareEndowmentTools } from '../src/endowments.js';
-import { makeConvertKit } from '../src/convert.js';
import { prepareBijection } from '../src/bijection.js';
+import { makeConvertKit } from '../src/convert.js';
+import { forwardingMethods, prepareEndowmentTools } from '../src/endowments.js';
const { ownKeys } = Reflect;
diff --git a/packages/async-flow/test/equate.test.js b/packages/async-flow/test/equate.test.js
index 5be4100794e..cb4ae3839e4 100644
--- a/packages/async-flow/test/equate.test.js
+++ b/packages/async-flow/test/equate.test.js
@@ -1,19 +1,18 @@
-// eslint-disable-next-line import/order
import {
- test,
- getBaggage,
annihilate,
- nextLife,
asyncFlowVerbose,
+ getBaggage,
+ nextLife,
+ test,
} from './prepare-test-env-ava.js';
-import { X, makeError } from '@endo/errors';
-import { Far } from '@endo/pass-style';
import { prepareVowTools } from '@agoric/vow';
import { isVow } from '@agoric/vow/src/vow-utils.js';
+import { makeDurableZone } from '@agoric/zone/durable.js';
import { makeHeapZone } from '@agoric/zone/heap.js';
import { makeVirtualZone } from '@agoric/zone/virtual.js';
-import { makeDurableZone } from '@agoric/zone/durable.js';
+import { makeError, X } from '@endo/errors';
+import { Far } from '@endo/pass-style';
import { prepareBijection } from '../src/bijection.js';
import { makeEquate } from '../src/equate.js';
diff --git a/packages/async-flow/test/log-store.test.js b/packages/async-flow/test/log-store.test.js
index 9b9db649fb8..6065b0aee19 100644
--- a/packages/async-flow/test/log-store.test.js
+++ b/packages/async-flow/test/log-store.test.js
@@ -1,16 +1,15 @@
-// eslint-disable-next-line import/order
import {
- test,
- getBaggage,
annihilate,
+ getBaggage,
nextLife,
+ test,
} from './prepare-test-env-ava.js';
-import { Fail } from '@endo/errors';
import { prepareVowTools, toPassableCap } from '@agoric/vow';
+import { makeDurableZone } from '@agoric/zone/durable.js';
import { makeHeapZone } from '@agoric/zone/heap.js';
import { makeVirtualZone } from '@agoric/zone/virtual.js';
-import { makeDurableZone } from '@agoric/zone/durable.js';
+import { Fail } from '@endo/errors';
import { prepareLogStore } from '../src/log-store.js';
diff --git a/packages/async-flow/test/prepare-test-env-ava.js b/packages/async-flow/test/prepare-test-env-ava.js
index fd00b0531ba..11dfecc7912 100644
--- a/packages/async-flow/test/prepare-test-env-ava.js
+++ b/packages/async-flow/test/prepare-test-env-ava.js
@@ -1,9 +1,9 @@
import '@agoric/swingset-liveslots/tools/prepare-test-env.js';
-import { wrapTest } from '@endo/ses-ava';
-import rawTest from 'ava';
-import { environmentOptionsListHas } from '@endo/env-options';
import { reincarnate } from '@agoric/swingset-liveslots/tools/setup-vat-data.js';
+import { environmentOptionsListHas } from '@endo/env-options';
+import { wrapTest } from '@endo/ses-ava';
+import rawTest from 'ava';
export const test = wrapTest(rawTest);
diff --git a/packages/async-flow/test/replay-membrane-eventual.test.js b/packages/async-flow/test/replay-membrane-eventual.test.js
index 460b8964348..fa9deec5c4b 100644
--- a/packages/async-flow/test/replay-membrane-eventual.test.js
+++ b/packages/async-flow/test/replay-membrane-eventual.test.js
@@ -1,22 +1,21 @@
-// eslint-disable-next-line import/order
import {
- test,
- getBaggage,
annihilate,
+ getBaggage,
nextLife,
+ test,
} from './prepare-test-env-ava.js';
-import { Fail } from '@endo/errors';
import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
import { prepareVowTools } from '@agoric/vow';
-import { E } from '@endo/eventual-send';
+import { makeDurableZone } from '@agoric/zone/durable.js';
// import E from '@agoric/vow/src/E.js';
import { makeHeapZone } from '@agoric/zone/heap.js';
import { makeVirtualZone } from '@agoric/zone/virtual.js';
-import { makeDurableZone } from '@agoric/zone/durable.js';
+import { Fail } from '@endo/errors';
+import { E } from '@endo/eventual-send';
-import { prepareLogStore } from '../src/log-store.js';
import { prepareBijection } from '../src/bijection.js';
+import { prepareLogStore } from '../src/log-store.js';
import { makeReplayMembrane } from '../src/replay-membrane.js';
/**
diff --git a/packages/async-flow/test/replay-membrane-settlement.test.js b/packages/async-flow/test/replay-membrane-settlement.test.js
index 78e94325ac9..7a1bbf27b99 100644
--- a/packages/async-flow/test/replay-membrane-settlement.test.js
+++ b/packages/async-flow/test/replay-membrane-settlement.test.js
@@ -1,20 +1,19 @@
-// eslint-disable-next-line import/order
import {
- test,
- getBaggage,
annihilate,
+ getBaggage,
nextLife,
+ test,
} from './prepare-test-env-ava.js';
-import { Fail } from '@endo/errors';
import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
import { prepareVowTools } from '@agoric/vow';
+import { makeDurableZone } from '@agoric/zone/durable.js';
import { makeHeapZone } from '@agoric/zone/heap.js';
import { makeVirtualZone } from '@agoric/zone/virtual.js';
-import { makeDurableZone } from '@agoric/zone/durable.js';
+import { Fail } from '@endo/errors';
-import { prepareLogStore } from '../src/log-store.js';
import { prepareBijection } from '../src/bijection.js';
+import { prepareLogStore } from '../src/log-store.js';
import { makeReplayMembrane } from '../src/replay-membrane.js';
/**
diff --git a/packages/async-flow/test/replay-membrane-zombie.test.js b/packages/async-flow/test/replay-membrane-zombie.test.js
index a07aa0cc636..601c37b41b8 100644
--- a/packages/async-flow/test/replay-membrane-zombie.test.js
+++ b/packages/async-flow/test/replay-membrane-zombie.test.js
@@ -1,20 +1,19 @@
-// eslint-disable-next-line import/order
import {
- test,
- getBaggage,
annihilate,
+ getBaggage,
nextLife,
+ test,
} from './prepare-test-env-ava.js';
-import { Fail } from '@endo/errors';
import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
import { prepareVowTools } from '@agoric/vow';
+import { makeDurableZone } from '@agoric/zone/durable.js';
import { makeHeapZone } from '@agoric/zone/heap.js';
import { makeVirtualZone } from '@agoric/zone/virtual.js';
-import { makeDurableZone } from '@agoric/zone/durable.js';
+import { Fail } from '@endo/errors';
-import { prepareLogStore } from '../src/log-store.js';
import { prepareBijection } from '../src/bijection.js';
+import { prepareLogStore } from '../src/log-store.js';
import { makeReplayMembrane } from '../src/replay-membrane.js';
/**
diff --git a/packages/async-flow/test/replay-membrane.test.js b/packages/async-flow/test/replay-membrane.test.js
index 8cacfd4a139..897049c6961 100644
--- a/packages/async-flow/test/replay-membrane.test.js
+++ b/packages/async-flow/test/replay-membrane.test.js
@@ -1,21 +1,20 @@
-// eslint-disable-next-line import/order
import {
- test,
- getBaggage,
annihilate,
- nextLife,
asyncFlowVerbose,
+ getBaggage,
+ nextLife,
+ test,
} from './prepare-test-env-ava.js';
-import { Fail } from '@endo/errors';
-import { isPromise } from '@endo/promise-kit';
import { prepareVowTools } from '@agoric/vow';
+import { makeDurableZone } from '@agoric/zone/durable.js';
import { makeHeapZone } from '@agoric/zone/heap.js';
import { makeVirtualZone } from '@agoric/zone/virtual.js';
-import { makeDurableZone } from '@agoric/zone/durable.js';
+import { Fail } from '@endo/errors';
+import { isPromise } from '@endo/promise-kit';
-import { prepareLogStore } from '../src/log-store.js';
import { prepareBijection } from '../src/bijection.js';
+import { prepareLogStore } from '../src/log-store.js';
import { makeReplayMembrane } from '../src/replay-membrane.js';
/**
diff --git a/packages/async-flow/test/types.test-d.ts b/packages/async-flow/test/types.test-d.ts
index 399a766743d..979952ac7d6 100644
--- a/packages/async-flow/test/types.test-d.ts
+++ b/packages/async-flow/test/types.test-d.ts
@@ -1,10 +1,11 @@
-import { expectType } from 'tsd';
import type { Vow, VowTools } from '@agoric/vow';
+import { expectType } from 'tsd';
+
import type {
- HostOf,
+ GuestInterface,
GuestOf,
HostInterface,
- GuestInterface,
+ HostOf,
} from '../src/types.js';
const castable: unknown = null;
diff --git a/packages/base-zone/src/heap.js b/packages/base-zone/src/heap.js
index fe6a6a72918..33fb2c42fa9 100644
--- a/packages/base-zone/src/heap.js
+++ b/packages/base-zone/src/heap.js
@@ -1,17 +1,17 @@
// @ts-check
// @jessie-check
-import { Far, isPassable } from '@endo/pass-style';
-import { makeExo, defineExoClass, defineExoClassKit } from '@endo/exo';
import {
makeScalarMapStore,
makeScalarSetStore,
makeScalarWeakMapStore,
makeScalarWeakSetStore,
} from '@agoric/store';
+import { defineExoClass, defineExoClassKit, makeExo } from '@endo/exo';
+import { Far, isPassable } from '@endo/pass-style';
-import { makeOnceKit } from './make-once.js';
import { agoricVatDataKeys as keys } from './keys.js';
+import { makeOnceKit } from './make-once.js';
import { watchPromise } from './watch-promise.js';
/**
diff --git a/packages/base-zone/src/prepare-revocable.js b/packages/base-zone/src/prepare-revocable.js
index 0368b61c42c..2ef5c412360 100644
--- a/packages/base-zone/src/prepare-revocable.js
+++ b/packages/base-zone/src/prepare-revocable.js
@@ -1,5 +1,5 @@
-import { Fail, q } from '@endo/errors';
import { fromUniqueEntries } from '@endo/common/from-unique-entries.js';
+import { Fail, q } from '@endo/errors';
import { M } from '@endo/patterns';
/** @import {Amplify} from '@endo/exo'; */
diff --git a/packages/base-zone/src/types.js b/packages/base-zone/src/types.js
index 26ddc574df4..305c0fb9d49 100644
--- a/packages/base-zone/src/types.js
+++ b/packages/base-zone/src/types.js
@@ -1,5 +1,6 @@
// eslint-disable-next-line no-unused-vars
-import { makeExo, defineExoClass, defineExoClassKit } from '@endo/exo';
+import { defineExoClass, defineExoClassKit, makeExo } from '@endo/exo';
+
// eslint-disable-next-line no-unused-vars
import { watchPromise } from './watch-promise.js';
diff --git a/packages/base-zone/src/watch-promise.js b/packages/base-zone/src/watch-promise.js
index 7e8fae9cc9d..86913b15830 100644
--- a/packages/base-zone/src/watch-promise.js
+++ b/packages/base-zone/src/watch-promise.js
@@ -1,7 +1,7 @@
// @ts-check
import { Fail } from '@endo/errors';
-import { M } from '@endo/patterns';
import { E } from '@endo/far';
+import { M } from '@endo/patterns';
const { apply } = Reflect;
diff --git a/packages/base-zone/test/prepare-revocable.test.js b/packages/base-zone/test/prepare-revocable.test.js
index 15327b9b1a9..aaef6369fdd 100644
--- a/packages/base-zone/test/prepare-revocable.test.js
+++ b/packages/base-zone/test/prepare-revocable.test.js
@@ -2,8 +2,8 @@
import { test } from './prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { M } from '@endo/patterns';
+
import { makeHeapZone } from '../src/heap.js';
import { prepareRevocableMakerKit } from '../src/prepare-revocable.js';
diff --git a/packages/base-zone/tools/greeter.js b/packages/base-zone/tools/greeter.js
index 7379ecb8e69..6d4002f6865 100644
--- a/packages/base-zone/tools/greeter.js
+++ b/packages/base-zone/tools/greeter.js
@@ -1,4 +1,4 @@
-import { M, getInterfaceGuardPayload } from '@endo/patterns';
+import { getInterfaceGuardPayload, M } from '@endo/patterns';
/**
* @template {{}} T
diff --git a/packages/benchmark/benchmark/benchmark-liquidation.js b/packages/benchmark/benchmark/benchmark-liquidation.js
index 7cef5032417..7ddf56704bc 100644
--- a/packages/benchmark/benchmark/benchmark-liquidation.js
+++ b/packages/benchmark/benchmark/benchmark-liquidation.js
@@ -1,8 +1,7 @@
-// eslint-disable-next-line import/order
-import { bench } from '../src/benchmarkerator.js';
-
-import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
import { scale6 } from '@agoric/boot/tools/liquidation.js';
+import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
+
+import { bench } from '../src/benchmarkerator.js';
const setupData = {
vaults: [
diff --git a/packages/benchmark/benchmark/benchmark-vault-adjust.js b/packages/benchmark/benchmark/benchmark-vault-adjust.js
index f22be8047bd..ed21b37c4f7 100644
--- a/packages/benchmark/benchmark/benchmark-vault-adjust.js
+++ b/packages/benchmark/benchmark/benchmark-vault-adjust.js
@@ -1,8 +1,7 @@
-import { bench } from '../src/benchmarkerator.js';
-
-// eslint-disable-next-line import/order
import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
+import { bench } from '../src/benchmarkerator.js';
+
const collateralBrandKey = 'ATOM';
const adjustOpenOfferId = 'adjust-open';
diff --git a/packages/benchmark/benchmark/benchmark-vault-open.js b/packages/benchmark/benchmark/benchmark-vault-open.js
index df4a9b7bc0e..a70acd23086 100644
--- a/packages/benchmark/benchmark/benchmark-vault-open.js
+++ b/packages/benchmark/benchmark/benchmark-vault-open.js
@@ -1,8 +1,7 @@
-import { bench } from '../src/benchmarkerator.js';
-
-// eslint-disable-next-line import/order
import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
+import { bench } from '../src/benchmarkerator.js';
+
const collateralBrandKey = 'ATOM';
bench.addBenchmark('open vault', {
diff --git a/packages/benchmark/src/benchmarkerator.js b/packages/benchmark/src/benchmarkerator.js
index 623fb0cc7c6..68883bbaede 100644
--- a/packages/benchmark/src/benchmarkerator.js
+++ b/packages/benchmark/src/benchmarkerator.js
@@ -1,20 +1,19 @@
-import process from 'node:process';
-import fs from 'node:fs';
-
import '@endo/init/pre-bundle-source.js';
import '@endo/init';
-
import '@agoric/cosmic-swingset/src/launch-chain.js';
-import { Fail } from '@endo/errors';
-import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
-import { makeAgoricNamesRemotesFromFakeStorage } from '@agoric/vats/tools/board-utils.js';
-import { makeSwingsetTestKit } from '@agoric/boot/tools/supports.js';
+import fs from 'node:fs';
+import process from 'node:process';
+
import {
- makeWalletFactoryDriver,
makeGovernanceDriver,
+ makeWalletFactoryDriver,
} from '@agoric/boot/tools/drivers.js';
import { makeLiquidationTestKit } from '@agoric/boot/tools/liquidation.js';
+import { makeSwingsetTestKit } from '@agoric/boot/tools/supports.js';
+import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
+import { makeAgoricNamesRemotesFromFakeStorage } from '@agoric/vats/tools/board-utils.js';
+import { Fail } from '@endo/errors';
// When I was a child my family took a lot of roadtrips around California to go
// camping and backpacking and so on. It was not uncommon in those days (nor is
diff --git a/packages/boot/test/bootstrapTests/addAssets.test.ts b/packages/boot/test/bootstrapTests/addAssets.test.ts
index 90190890b22..eebee606a7b 100644
--- a/packages/boot/test/bootstrapTests/addAssets.test.ts
+++ b/packages/boot/test/bootstrapTests/addAssets.test.ts
@@ -4,9 +4,9 @@
*/
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
+import { TimeMath } from '@agoric/time';
import type { TestFn } from 'ava';
-import { TimeMath } from '@agoric/time';
import {
LiquidationTestContext,
makeLiquidationTestContext,
diff --git a/packages/boot/test/bootstrapTests/demo-config.test.ts b/packages/boot/test/bootstrapTests/demo-config.test.ts
index af87839e678..c4f9a0619ae 100644
--- a/packages/boot/test/bootstrapTests/demo-config.test.ts
+++ b/packages/boot/test/bootstrapTests/demo-config.test.ts
@@ -1,7 +1,6 @@
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { PowerFlags } from '@agoric/vats/src/walletFlags.js';
-
import type { TestFn } from 'ava';
import { keyArrayEqual, makeSwingsetTestKit } from '../../tools/supports.js';
diff --git a/packages/boot/test/bootstrapTests/ibcClientMock.js b/packages/boot/test/bootstrapTests/ibcClientMock.js
index d25e0d2017a..8f19b432894 100644
--- a/packages/boot/test/bootstrapTests/ibcClientMock.js
+++ b/packages/boot/test/bootstrapTests/ibcClientMock.js
@@ -1,7 +1,7 @@
/** @file Mock IBC Server */
// @ts-check
-import { Far } from '@endo/far';
import { heapVowE as E } from '@agoric/vow/vat.js';
+import { Far } from '@endo/far';
/**
* @import {Connection, PortAllocator} from '@agoric/network';
diff --git a/packages/boot/test/bootstrapTests/ibcServerMock.js b/packages/boot/test/bootstrapTests/ibcServerMock.js
index f2e97bdd817..49a4274c095 100644
--- a/packages/boot/test/bootstrapTests/ibcServerMock.js
+++ b/packages/boot/test/bootstrapTests/ibcServerMock.js
@@ -1,9 +1,9 @@
/** @file Mock IBC Server */
// @ts-check
-import { q, Fail } from '@endo/errors';
+import { heapVowE as E } from '@agoric/vow/vat.js';
+import { Fail, q } from '@endo/errors';
import { Far } from '@endo/far';
import { makePromiseKit } from '@endo/promise-kit';
-import { heapVowE as E } from '@agoric/vow/vat.js';
const { log } = console;
diff --git a/packages/boot/test/bootstrapTests/lca.test.ts b/packages/boot/test/bootstrapTests/lca.test.ts
index 7603cced8ea..e855bba82b1 100644
--- a/packages/boot/test/bootstrapTests/lca.test.ts
+++ b/packages/boot/test/bootstrapTests/lca.test.ts
@@ -1,11 +1,11 @@
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import type { TestFn } from 'ava';
-
-import { Fail } from '@endo/errors';
import type { start as stakeBldStart } from '@agoric/orchestration/src/examples/stakeBld.contract.js';
-import type { Instance } from '@agoric/zoe/src/zoeService/utils.js';
import { SIMULATED_ERRORS } from '@agoric/vats/tools/fake-bridge.js';
+import type { Instance } from '@agoric/zoe/src/zoeService/utils.js';
+import { Fail } from '@endo/errors';
+import type { TestFn } from 'ava';
+
import {
makeWalletFactoryContext,
type WalletFactoryTestContext,
diff --git a/packages/boot/test/bootstrapTests/liquidation-1.test.ts b/packages/boot/test/bootstrapTests/liquidation-1.test.ts
index d25f8e871b8..bb67ca855aa 100644
--- a/packages/boot/test/bootstrapTests/liquidation-1.test.ts
+++ b/packages/boot/test/bootstrapTests/liquidation-1.test.ts
@@ -1,17 +1,18 @@
/** @file Bootstrap test of liquidation across multiple collaterals */
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
+import type { ScheduleNotification } from '@agoric/inter-protocol/src/auction/scheduler.js';
import { NonNullish } from '@agoric/internal';
-import process from 'process';
import type { ExecutionContext, TestFn } from 'ava';
-import type { ScheduleNotification } from '@agoric/inter-protocol/src/auction/scheduler.js';
+import process from 'process';
+
import {
ensureVaultCollateral,
- LiquidationTestContext,
likePayouts,
+ LiquidationSetup,
+ LiquidationTestContext,
makeLiquidationTestContext,
scale6,
- LiquidationSetup,
} from '../../tools/liquidation.js';
const test = anyTest as TestFn;
diff --git a/packages/boot/test/bootstrapTests/liquidation-2b.test.ts b/packages/boot/test/bootstrapTests/liquidation-2b.test.ts
index 3a9d48e555c..fb21a9269c3 100644
--- a/packages/boot/test/bootstrapTests/liquidation-2b.test.ts
+++ b/packages/boot/test/bootstrapTests/liquidation-2b.test.ts
@@ -8,10 +8,11 @@
*/
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { NonNullish } from '@agoric/internal';
+import { ScheduleNotification } from '@agoric/inter-protocol/src/auction/scheduler.js';
import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
+import { NonNullish } from '@agoric/internal';
import type { TestFn } from 'ava';
-import { ScheduleNotification } from '@agoric/inter-protocol/src/auction/scheduler.js';
+
import {
LiquidationSetup,
LiquidationTestContext,
diff --git a/packages/boot/test/bootstrapTests/liquidation-concurrent-1.test.ts b/packages/boot/test/bootstrapTests/liquidation-concurrent-1.test.ts
index 514d0df9323..51df286b156 100644
--- a/packages/boot/test/bootstrapTests/liquidation-concurrent-1.test.ts
+++ b/packages/boot/test/bootstrapTests/liquidation-concurrent-1.test.ts
@@ -3,13 +3,14 @@
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { NonNullish } from '@agoric/internal';
-import process from 'process';
import { TestFn } from 'ava';
+import process from 'process';
+
import {
- LiquidationSetup,
- LiquidationTestContext,
ensureVaultCollateral,
likePayouts,
+ LiquidationSetup,
+ LiquidationTestContext,
makeLiquidationTestContext,
scale6,
} from '../../tools/liquidation.js';
diff --git a/packages/boot/test/bootstrapTests/liquidation-concurrent-2b.test.ts b/packages/boot/test/bootstrapTests/liquidation-concurrent-2b.test.ts
index 4798cf96ae2..dcb863debf7 100644
--- a/packages/boot/test/bootstrapTests/liquidation-concurrent-2b.test.ts
+++ b/packages/boot/test/bootstrapTests/liquidation-concurrent-2b.test.ts
@@ -10,9 +10,10 @@ import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { NonNullish } from '@agoric/internal';
import { ExecutionContext, TestFn } from 'ava';
+
import {
- LiquidationTestContext,
ensureVaultCollateral,
+ LiquidationTestContext,
makeLiquidationTestContext,
scale6,
} from '../../tools/liquidation.js';
diff --git a/packages/boot/test/bootstrapTests/net-ibc-upgrade.test.ts b/packages/boot/test/bootstrapTests/net-ibc-upgrade.test.ts
index 53a1a1ebc98..ddd85ced3d1 100644
--- a/packages/boot/test/bootstrapTests/net-ibc-upgrade.test.ts
+++ b/packages/boot/test/bootstrapTests/net-ibc-upgrade.test.ts
@@ -1,12 +1,13 @@
/** @file upgrade network / IBC vat at many points in state machine */
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { makeNodeBundleCache } from '@endo/bundle-source/cache.js';
-import type { TestFn } from 'ava';
-import { createRequire } from 'module';
import type { Baggage } from '@agoric/swingset-liveslots';
import { M, makeScalarBigMapStore } from '@agoric/vat-data';
import { makeDurableZone } from '@agoric/zone/durable.js';
+import { makeNodeBundleCache } from '@endo/bundle-source/cache.js';
+import type { TestFn } from 'ava';
+import { createRequire } from 'module';
+
import { makeSwingsetTestKit } from '../../tools/supports.js';
const { entries, assign } = Object;
diff --git a/packages/boot/test/bootstrapTests/orchestration.test.ts b/packages/boot/test/bootstrapTests/orchestration.test.ts
index b022278b3b9..0efb74958f2 100644
--- a/packages/boot/test/bootstrapTests/orchestration.test.ts
+++ b/packages/boot/test/bootstrapTests/orchestration.test.ts
@@ -1,12 +1,13 @@
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { Fail } from '@endo/errors';
import { documentStorageSchema } from '@agoric/internal/src/storage-test-utils.js';
import type { CosmosValidatorAddress } from '@agoric/orchestration';
import type { start as startStakeIca } from '@agoric/orchestration/src/examples/stakeIca.contract.js';
+import { SIMULATED_ERRORS } from '@agoric/vats/tools/fake-bridge.js';
import type { Instance } from '@agoric/zoe/src/zoeService/utils.js';
+import { Fail } from '@endo/errors';
import type { TestFn } from 'ava';
-import { SIMULATED_ERRORS } from '@agoric/vats/tools/fake-bridge.js';
+
import {
makeWalletFactoryContext,
type WalletFactoryTestContext,
diff --git a/packages/boot/test/bootstrapTests/vat-orchestration.test.ts b/packages/boot/test/bootstrapTests/vat-orchestration.test.ts
index 7757344b6bc..a062d22c129 100644
--- a/packages/boot/test/bootstrapTests/vat-orchestration.test.ts
+++ b/packages/boot/test/bootstrapTests/vat-orchestration.test.ts
@@ -1,19 +1,20 @@
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import type { TestFn } from 'ava';
import { toRequestQueryJson } from '@agoric/cosmic-proto';
import {
QueryBalanceRequest,
QueryBalanceResponse,
} from '@agoric/cosmic-proto/cosmos/bank/v1beta1/query.js';
-import { Any } from '@agoric/cosmic-proto/google/protobuf/any.js';
import {
MsgDelegate,
MsgDelegateResponse,
} from '@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js';
+import { Any } from '@agoric/cosmic-proto/google/protobuf/any.js';
import type { CosmosInterchainService } from '@agoric/orchestration';
import { decodeBase64 } from '@endo/base64';
import { M, matches } from '@endo/patterns';
+import type { TestFn } from 'ava';
+
import {
makeWalletFactoryContext,
type WalletFactoryTestContext,
diff --git a/packages/boot/test/bootstrapTests/vats-restart.test.ts b/packages/boot/test/bootstrapTests/vats-restart.test.ts
index 0d33fb55a9f..6b2351d9955 100644
--- a/packages/boot/test/bootstrapTests/vats-restart.test.ts
+++ b/packages/boot/test/bootstrapTests/vats-restart.test.ts
@@ -1,14 +1,15 @@
/** @file Bootstrap test of restarting (almost) all vats */
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { TestFn } from 'ava';
-import { Fail } from '@endo/errors';
-import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
-import { makeAgoricNamesRemotesFromFakeStorage } from '@agoric/vats/tools/board-utils.js';
+import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
import { BridgeHandler, ScopedBridgeManager } from '@agoric/vats';
-import { makeSwingsetTestKit } from '../../tools/supports.js';
+import { makeAgoricNamesRemotesFromFakeStorage } from '@agoric/vats/tools/board-utils.js';
+import { Fail } from '@endo/errors';
+import { TestFn } from 'ava';
+
import { makeWalletFactoryDriver } from '../../tools/drivers.js';
+import { makeSwingsetTestKit } from '../../tools/supports.js';
// main/production config doesn't have initialPrice, upon which 'open vaults' depends
const PLATFORM_CONFIG = '@agoric/vm-config/decentral-itest-vaults-config.json';
diff --git a/packages/boot/test/bootstrapTests/vaults-integration.test.ts b/packages/boot/test/bootstrapTests/vaults-integration.test.ts
index 94aa48c3cc2..d9d44f9ad29 100644
--- a/packages/boot/test/bootstrapTests/vaults-integration.test.ts
+++ b/packages/boot/test/bootstrapTests/vaults-integration.test.ts
@@ -1,21 +1,21 @@
/** @file Bootstrap test integration vaults with smart-wallet */
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { Fail } from '@endo/errors';
import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
+import { ParamChangesOfferArgs } from '@agoric/inter-protocol/src/econCommitteeCharter.js';
import { SECONDS_PER_DAY } from '@agoric/inter-protocol/src/proposals/econ-behaviors.js';
import { unmarshalFromVstorage } from '@agoric/internal/src/marshal.js';
import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
-import { makeMarshal } from '@endo/marshal';
import {
makeAgoricNamesRemotesFromFakeStorage,
slotToBoardRemote,
} from '@agoric/vats/tools/board-utils.js';
+import { Fail } from '@endo/errors';
+import { makeMarshal } from '@endo/marshal';
import type { TestFn } from 'ava';
-import { ParamChangesOfferArgs } from '@agoric/inter-protocol/src/econCommitteeCharter.js';
-import { makeSwingsetTestKit } from '../../tools/supports.js';
import { makeWalletFactoryDriver } from '../../tools/drivers.js';
+import { makeSwingsetTestKit } from '../../tools/supports.js';
// presently all these tests use one collateral manager
const collateralBrandKey = 'ATOM';
diff --git a/packages/boot/test/bootstrapTests/vaults-upgrade.test.ts b/packages/boot/test/bootstrapTests/vaults-upgrade.test.ts
index 4af94865058..a3cab305281 100644
--- a/packages/boot/test/bootstrapTests/vaults-upgrade.test.ts
+++ b/packages/boot/test/bootstrapTests/vaults-upgrade.test.ts
@@ -7,16 +7,17 @@
*/
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { Fail } from '@endo/errors';
-import { NonNullish } from '@agoric/internal';
import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
-import { Far, makeMarshal } from '@endo/marshal';
import { SECONDS_PER_YEAR } from '@agoric/inter-protocol/src/interest.js';
+import { NonNullish } from '@agoric/internal';
+import { FakeStorageKit } from '@agoric/internal/src/storage-test-utils.js';
import { makeAgoricNamesRemotesFromFakeStorage } from '@agoric/vats/tools/board-utils.js';
+import { Fail } from '@endo/errors';
+import { Far, makeMarshal } from '@endo/marshal';
import { ExecutionContext, TestFn } from 'ava';
-import { FakeStorageKit } from '@agoric/internal/src/storage-test-utils.js';
-import { makeSwingsetTestKit } from '../../tools/supports.js';
+
import { makeWalletFactoryDriver } from '../../tools/drivers.js';
+import { makeSwingsetTestKit } from '../../tools/supports.js';
// presently all these tests use one collateral manager
const collateralBrandKey = 'ATOM';
diff --git a/packages/boot/test/bootstrapTests/vow-offer-results.test.ts b/packages/boot/test/bootstrapTests/vow-offer-results.test.ts
index 27a448f7d89..778de347161 100644
--- a/packages/boot/test/bootstrapTests/vow-offer-results.test.ts
+++ b/packages/boot/test/bootstrapTests/vow-offer-results.test.ts
@@ -1,7 +1,8 @@
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import type { TestFn } from 'ava';
import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
+import type { TestFn } from 'ava';
+
import {
makeWalletFactoryContext,
type WalletFactoryTestContext,
diff --git a/packages/boot/test/bootstrapTests/vtransfer.test.ts b/packages/boot/test/bootstrapTests/vtransfer.test.ts
index fd0bec558ac..bb824ac27bb 100644
--- a/packages/boot/test/bootstrapTests/vtransfer.test.ts
+++ b/packages/boot/test/bootstrapTests/vtransfer.test.ts
@@ -1,13 +1,13 @@
/* eslint-disable @jessie.js/safe-await-separator -- confused by casting 'as' */
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import type { TestFn } from 'ava';
-
+import { BridgeId } from '@agoric/internal';
+import { VTRANSFER_IBC_EVENT } from '@agoric/internal/src/action-types.js';
import type { ScopedBridgeManager } from '@agoric/vats';
import type { TransferMiddleware } from '@agoric/vats/src/transfer.js';
import type { TransferVat } from '@agoric/vats/src/vat-transfer.js';
-import { BridgeId } from '@agoric/internal';
-import { VTRANSFER_IBC_EVENT } from '@agoric/internal/src/action-types.js';
+import type { TestFn } from 'ava';
+
import { makeSwingsetTestKit } from '../../tools/supports.js';
const makeDefaultTestContext = async t => {
diff --git a/packages/boot/test/bootstrapTests/walletFactory.ts b/packages/boot/test/bootstrapTests/walletFactory.ts
index e00e5a6adc5..234a882d7fa 100644
--- a/packages/boot/test/bootstrapTests/walletFactory.ts
+++ b/packages/boot/test/bootstrapTests/walletFactory.ts
@@ -1,10 +1,11 @@
-import { Fail } from '@endo/errors';
import {
AgoricNamesRemotes,
makeAgoricNamesRemotesFromFakeStorage,
} from '@agoric/vats/tools/board-utils.js';
-import { makeSwingsetTestKit } from '../../tools/supports.js';
+import { Fail } from '@endo/errors';
+
import { makeWalletFactoryDriver } from '../../tools/drivers.js';
+import { makeSwingsetTestKit } from '../../tools/supports.js';
export const makeWalletFactoryContext = async (
t,
diff --git a/packages/boot/test/bootstrapTests/walletSurvivesZoeRestart.test.ts b/packages/boot/test/bootstrapTests/walletSurvivesZoeRestart.test.ts
index 43eda7d55a2..b66c83794f7 100644
--- a/packages/boot/test/bootstrapTests/walletSurvivesZoeRestart.test.ts
+++ b/packages/boot/test/bootstrapTests/walletSurvivesZoeRestart.test.ts
@@ -1,15 +1,15 @@
/** @file Bootstrap test of liquidation across multiple collaterals */
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import process from 'process';
+import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
+import { BridgeHandler } from '@agoric/vats';
import type { TestFn } from 'ava';
+import process from 'process';
-import { BridgeHandler } from '@agoric/vats';
-import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
import {
+ LiquidationSetup,
LiquidationTestContext,
makeLiquidationTestContext,
- LiquidationSetup,
} from '../../tools/liquidation.js';
const test = anyTest as TestFn;
diff --git a/packages/boot/test/bootstrapTests/zcf-upgrade.test.ts b/packages/boot/test/bootstrapTests/zcf-upgrade.test.ts
index 0e1ed083e13..8e66b4797f0 100644
--- a/packages/boot/test/bootstrapTests/zcf-upgrade.test.ts
+++ b/packages/boot/test/bootstrapTests/zcf-upgrade.test.ts
@@ -1,13 +1,13 @@
-import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import bundleSource from '@endo/bundle-source';
-
-import path from 'path';
+import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
import { makeAgoricNamesRemotesFromFakeStorage } from '@agoric/vats/tools/board-utils.js';
+import bundleSource from '@endo/bundle-source';
import { TestFn } from 'ava';
-import { matchAmount, makeSwingsetTestKit } from '../../tools/supports.js';
+import path from 'path';
+
import { makeZoeDriver } from '../../tools/drivers.js';
+import { makeSwingsetTestKit, matchAmount } from '../../tools/supports.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/boot/test/bootstrapTests/zcfProbe.contract.js b/packages/boot/test/bootstrapTests/zcfProbe.contract.js
index 326cb73ef5f..b651c6a2623 100644
--- a/packages/boot/test/bootstrapTests/zcfProbe.contract.js
+++ b/packages/boot/test/bootstrapTests/zcfProbe.contract.js
@@ -1,11 +1,11 @@
+import { AmountMath } from '@agoric/ertp';
import { makeTracer } from '@agoric/internal';
-import { E } from '@endo/far';
+import { M, prepareExoClass, provide } from '@agoric/vat-data';
import {
atomicRearrange,
provideAll,
} from '@agoric/zoe/src/contractSupport/index.js';
-import { M, prepareExoClass, provide } from '@agoric/vat-data';
-import { AmountMath } from '@agoric/ertp';
+import { E } from '@endo/far';
const trace = makeTracer('ZCF Probe');
diff --git a/packages/boot/test/configs.test.js b/packages/boot/test/configs.test.js
index 1c324abe770..12b3ed02124 100644
--- a/packages/boot/test/configs.test.js
+++ b/packages/boot/test/configs.test.js
@@ -1,17 +1,16 @@
// @ts-check
import '@agoric/swingset-liveslots/tools/prepare-test-env.js';
+import { extractCoreProposalBundles } from '@agoric/deploy-script-support/src/extract-proposal.js';
+import { mustMatch } from '@agoric/store';
+import { loadSwingsetConfigFile, shape as ssShape } from '@agoric/swingset-vat';
+import { provideBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js';
import anyTest from 'ava';
import { spawn as ambientSpawn } from 'child_process';
import { promises as fsPromises } from 'fs';
import { resolve as importMetaResolve } from 'import-meta-resolve';
import path from 'path';
-import { extractCoreProposalBundles } from '@agoric/deploy-script-support/src/extract-proposal.js';
-import { mustMatch } from '@agoric/store';
-import { loadSwingsetConfigFile, shape as ssShape } from '@agoric/swingset-vat';
-import { provideBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js';
-
const importConfig = configName =>
importMetaResolve(`@agoric/vm-config/${configName}`, import.meta.url).then(
u => new URL(u).pathname,
diff --git a/packages/boot/test/orchestration/restart-contracts.test.ts b/packages/boot/test/orchestration/restart-contracts.test.ts
index 25e7d881268..06950153adb 100644
--- a/packages/boot/test/orchestration/restart-contracts.test.ts
+++ b/packages/boot/test/orchestration/restart-contracts.test.ts
@@ -1,9 +1,10 @@
/** @file Bootstrap test of restarting contracts using orchestration */
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { TestFn } from 'ava';
import type { CosmosValidatorAddress } from '@agoric/orchestration';
import type { UpdateRecord } from '@agoric/smart-wallet/src/smartWallet.js';
+import { TestFn } from 'ava';
+
import {
makeWalletFactoryContext,
type WalletFactoryTestContext,
diff --git a/packages/boot/test/tools/ibc/mocks.test.ts b/packages/boot/test/tools/ibc/mocks.test.ts
index d2de9c5d501..0aaa6631f18 100644
--- a/packages/boot/test/tools/ibc/mocks.test.ts
+++ b/packages/boot/test/tools/ibc/mocks.test.ts
@@ -1,6 +1,7 @@
// @ts-check
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
+
import { addParamsIfJsonVersion } from '../../../tools/ibc/mocks.js';
test('addParamsToVersion', t => {
diff --git a/packages/boot/test/upgrading/bootstrap.js b/packages/boot/test/upgrading/bootstrap.js
index c009b02ddea..ec34efc22e6 100644
--- a/packages/boot/test/upgrading/bootstrap.js
+++ b/packages/boot/test/upgrading/bootstrap.js
@@ -1,6 +1,6 @@
+import { feeIssuerConfig } from '@agoric/vats/src/core/utils.js';
import { E, Far } from '@endo/far';
import { makePromiseKit } from '@endo/promise-kit';
-import { feeIssuerConfig } from '@agoric/vats/src/core/utils.js';
const bundles = {
mintHolder: 'mintHolder',
diff --git a/packages/boot/test/upgrading/upgrade-contracts.test.js b/packages/boot/test/upgrading/upgrade-contracts.test.js
index fdb5edba1d2..4630d368b5f 100644
--- a/packages/boot/test/upgrading/upgrade-contracts.test.js
+++ b/packages/boot/test/upgrading/upgrade-contracts.test.js
@@ -2,9 +2,10 @@
* @file cribbed from
* packages/zoe/test/swingsetTests/upgradeCoveredCall/test-coveredCall-service-upgrade.js
*/
-import { resolve as importMetaResolve } from 'import-meta-resolve';
import { test as anyTest } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+
import { buildVatController } from '@agoric/swingset-vat';
+import { resolve as importMetaResolve } from 'import-meta-resolve';
/**
* @type {import('ava').TestFn<{}>}
diff --git a/packages/boot/test/upgrading/upgrade-vats.test.ts b/packages/boot/test/upgrading/upgrade-vats.test.ts
index ed1647e1303..5c43a1e6d89 100644
--- a/packages/boot/test/upgrading/upgrade-vats.test.ts
+++ b/packages/boot/test/upgrading/upgrade-vats.test.ts
@@ -1,15 +1,15 @@
/* eslint-disable @jessie.js/safe-await-separator -- test */
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+import type { IssuerKit } from '@agoric/ertp/src/types.js';
import { BridgeId } from '@agoric/internal';
import { buildVatController } from '@agoric/swingset-vat';
import { makeRunUtils } from '@agoric/swingset-vat/tools/run-utils.js';
import { Fail } from '@endo/errors';
import { makeTagged } from '@endo/marshal';
import { resolve as importMetaResolve } from 'import-meta-resolve';
-import type { IssuerKit } from '@agoric/ertp/src/types.js';
-import { matchAmount, matchIter, matchRef } from '../../tools/supports.js';
+import { matchAmount, matchIter, matchRef } from '../../tools/supports.js';
import type { buildRootObject as buildTestMintVat } from './vat-mint.js';
const bfile = name => new URL(name, import.meta.url).pathname;
diff --git a/packages/boot/tools/authorityViz.js b/packages/boot/tools/authorityViz.js
index 86d080255eb..83c1b50df7e 100755
--- a/packages/boot/tools/authorityViz.js
+++ b/packages/boot/tools/authorityViz.js
@@ -1,9 +1,9 @@
#!/usr/bin/env node
// @ts-check
import '@endo/init';
-import process from 'process';
import { Fail, q } from '@endo/errors';
+import process from 'process';
const { entries, keys, values } = Object;
diff --git a/packages/boot/tools/drivers.ts b/packages/boot/tools/drivers.ts
index 6f36e56aeb7..2fcd244c966 100644
--- a/packages/boot/tools/drivers.ts
+++ b/packages/boot/tools/drivers.ts
@@ -1,29 +1,29 @@
/* eslint-disable jsdoc/require-param */
-import { Fail } from '@endo/errors';
-import { NonNullish } from '@agoric/internal';
import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
import { SECONDS_PER_MINUTE } from '@agoric/inter-protocol/src/proposals/econ-behaviors.js';
+import { oracleBrandFeedName } from '@agoric/inter-protocol/src/proposals/utils.js';
+import { NonNullish } from '@agoric/internal';
import { unmarshalFromVstorage } from '@agoric/internal/src/marshal.js';
import {
FakeStorageKit,
slotToRemotable,
} from '@agoric/internal/src/storage-test-utils.js';
-import { oracleBrandFeedName } from '@agoric/inter-protocol/src/proposals/utils.js';
-
-import {
- AgoricNamesRemotes,
- boardSlottingMarshaller,
-} from '@agoric/vats/tools/board-utils.js';
+import type { OfferSpec } from '@agoric/smart-wallet/src/offers.js';
import type {
CurrentWalletRecord,
SmartWallet,
UpdateRecord,
} from '@agoric/smart-wallet/src/smartWallet.js';
-import type { WalletFactoryStartResult } from '@agoric/vats/src/core/startWalletFactory.js';
-import type { OfferSpec } from '@agoric/smart-wallet/src/offers.js';
-import type { TimerService } from '@agoric/time';
import type { OfferMaker } from '@agoric/smart-wallet/src/types.js';
import type { RunUtils } from '@agoric/swingset-vat/tools/run-utils.js';
+import type { TimerService } from '@agoric/time';
+import type { WalletFactoryStartResult } from '@agoric/vats/src/core/startWalletFactory.js';
+import {
+ AgoricNamesRemotes,
+ boardSlottingMarshaller,
+} from '@agoric/vats/tools/board-utils.js';
+import { Fail } from '@endo/errors';
+
import type { SwingsetTestKit } from './supports.js';
export const makeWalletFactoryDriver = async (
diff --git a/packages/boot/tools/liquidation.ts b/packages/boot/tools/liquidation.ts
index 221f98e7260..ee559e07baa 100644
--- a/packages/boot/tools/liquidation.ts
+++ b/packages/boot/tools/liquidation.ts
@@ -1,4 +1,4 @@
-import { Fail } from '@endo/errors';
+import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
import {
SECONDS_PER_HOUR,
SECONDS_PER_MINUTE,
@@ -7,17 +7,18 @@ import {
AgoricNamesRemotes,
makeAgoricNamesRemotesFromFakeStorage,
} from '@agoric/vats/tools/board-utils.js';
-import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
+import { Fail } from '@endo/errors';
import type { ExecutionContext } from 'ava';
-import { type SwingsetTestKit, makeSwingsetTestKit } from './supports.js';
+
import {
type GovernanceDriver,
- type PriceFeedDriver,
- type WalletFactoryDriver,
makeGovernanceDriver,
makePriceFeedDriver,
makeWalletFactoryDriver,
+ type PriceFeedDriver,
+ type WalletFactoryDriver,
} from './drivers.js';
+import { makeSwingsetTestKit, type SwingsetTestKit } from './supports.js';
export type LiquidationSetup = {
vaults: {
diff --git a/packages/boot/tools/supports.ts b/packages/boot/tools/supports.ts
index 36af57d01cc..099c6d3593b 100644
--- a/packages/boot/tools/supports.ts
+++ b/packages/boot/tools/supports.ts
@@ -1,51 +1,48 @@
/* eslint-disable jsdoc/require-param, @jessie.js/safe-await-separator */
/* global process */
-import childProcessAmbient from 'child_process';
-import { promises as fsAmbientPromises } from 'fs';
-import { resolve as importMetaResolve } from 'import-meta-resolve';
-import { basename, join } from 'path';
-import { inspect } from 'util';
-
+import type { CoreEvalSDKType } from '@agoric/cosmic-proto/swingset/swingset.js';
import { buildSwingset } from '@agoric/cosmic-swingset/src/launch-chain.js';
+import type { EconomyBootstrapPowers } from '@agoric/inter-protocol/src/proposals/econ-behaviors.js';
import {
BridgeId,
- NonNullish,
- VBankAccount,
- makeTracer,
type BridgeIdValue,
+ makeTracer,
+ NonNullish,
type Remote,
+ VBankAccount,
} from '@agoric/internal';
import { unmarshalFromVstorage } from '@agoric/internal/src/marshal.js';
import { makeFakeStorageKit } from '@agoric/internal/src/storage-test-utils.js';
import { krefOf } from '@agoric/kmarshal';
import { initSwingStore } from '@agoric/swing-store';
import { loadSwingsetConfigFile } from '@agoric/swingset-vat';
-import { makeSlogSender } from '@agoric/telemetry';
-import { TimeMath, Timestamp } from '@agoric/time';
-import { Fail } from '@endo/errors';
-import {
- fakeLocalChainBridgeTxMsgHandler,
- LOCALCHAIN_DEFAULT_ADDRESS,
-} from '@agoric/vats/tools/fake-bridge.js';
-
+import type { SwingsetController } from '@agoric/swingset-vat/src/controller/controller.js';
import {
makeRunUtils,
type RunUtils,
} from '@agoric/swingset-vat/tools/run-utils.js';
+import { makeSlogSender } from '@agoric/telemetry';
+import { TimeMath, Timestamp } from '@agoric/time';
+import type { BridgeHandler, IBCMethod, IBCPacket } from '@agoric/vats';
+import type { BootstrapRootObject } from '@agoric/vats/src/core/lib-boot.js';
import {
boardSlottingMarshaller,
slotToBoardRemote,
} from '@agoric/vats/tools/board-utils.js';
-
+import {
+ fakeLocalChainBridgeTxMsgHandler,
+ LOCALCHAIN_DEFAULT_ADDRESS,
+} from '@agoric/vats/tools/fake-bridge.js';
+import { Fail } from '@endo/errors';
+import type { EProxy } from '@endo/eventual-send';
import type { ExecutionContext as AvaT } from 'ava';
+import childProcessAmbient from 'child_process';
+import { promises as fsAmbientPromises } from 'fs';
+import { resolve as importMetaResolve } from 'import-meta-resolve';
+import { basename, join } from 'path';
+import { inspect } from 'util';
-import type { CoreEvalSDKType } from '@agoric/cosmic-proto/swingset/swingset.js';
-import type { EconomyBootstrapPowers } from '@agoric/inter-protocol/src/proposals/econ-behaviors.js';
-import type { SwingsetController } from '@agoric/swingset-vat/src/controller/controller.js';
-import type { BridgeHandler, IBCMethod, IBCPacket } from '@agoric/vats';
-import type { BootstrapRootObject } from '@agoric/vats/src/core/lib-boot.js';
-import type { EProxy } from '@endo/eventual-send';
import { icaMocks, protoMsgMockMap, protoMsgMocks } from './ibc/mocks.js';
const trace = makeTracer('BSTSupport', false);
diff --git a/packages/builders/scripts/inter-protocol/add-STARS.js b/packages/builders/scripts/inter-protocol/add-STARS.js
index 50d2e6dbe9f..30b6c02c25b 100644
--- a/packages/builders/scripts/inter-protocol/add-STARS.js
+++ b/packages/builders/scripts/inter-protocol/add-STARS.js
@@ -1,4 +1,5 @@
import { makeHelpers } from '@agoric/deploy-script-support';
+
import { defaultProposalBuilder as vaultProposalBuilder } from './add-collateral-core.js';
import { defaultProposalBuilder as oraclesProposalBuilder } from './price-feed-core.js';
diff --git a/packages/builders/scripts/inter-protocol/add-collateral-core.js b/packages/builders/scripts/inter-protocol/add-collateral-core.js
index 12aac0786c8..25045225cce 100644
--- a/packages/builders/scripts/inter-protocol/add-collateral-core.js
+++ b/packages/builders/scripts/inter-protocol/add-collateral-core.js
@@ -1,6 +1,5 @@
/* global process */
import { makeHelpers } from '@agoric/deploy-script-support';
-
import { getManifestForAddAssetToVault } from '@agoric/inter-protocol/src/proposals/addAssetToVault.js';
import { getManifestForPsm } from '@agoric/inter-protocol/src/proposals/startPSM.js';
import { makeInstallCache } from '@agoric/inter-protocol/src/proposals/utils.js';
diff --git a/packages/builders/scripts/inter-protocol/deploy-contracts.js b/packages/builders/scripts/inter-protocol/deploy-contracts.js
index 335b947295d..5ffd8f35dd3 100644
--- a/packages/builders/scripts/inter-protocol/deploy-contracts.js
+++ b/packages/builders/scripts/inter-protocol/deploy-contracts.js
@@ -1,8 +1,8 @@
#!/usr/bin/env node
-import url from 'url';
import { makeHelpers } from '@agoric/deploy-script-support';
-import { E } from '@endo/eventual-send';
import { getCopyMapEntries, makeCopyMap } from '@agoric/store';
+import { E } from '@endo/eventual-send';
+import url from 'url';
/** @import {CopyMap} from '@endo/patterns' */
// TODO: CLI options to choose contracts
diff --git a/packages/builders/scripts/inter-protocol/init-core.js b/packages/builders/scripts/inter-protocol/init-core.js
index d4825239bed..cbe0c87f3a1 100644
--- a/packages/builders/scripts/inter-protocol/init-core.js
+++ b/packages/builders/scripts/inter-protocol/init-core.js
@@ -5,14 +5,13 @@
* governance votes (n/a on sim-chain).
*/
import { makeHelpers } from '@agoric/deploy-script-support';
-import { objectMap } from '@agoric/internal';
-
import {
- getManifestForInterProtocol,
getManifestForEconCommittee,
+ getManifestForInterProtocol,
getManifestForMain,
} from '@agoric/inter-protocol/src/proposals/core-proposal.js';
import { makeInstallCache } from '@agoric/inter-protocol/src/proposals/utils.js';
+import { objectMap } from '@agoric/internal';
// TODO end inter-package filesystem references https://github.com/Agoric/agoric-sdk/issues/8178
diff --git a/packages/builders/scripts/inter-protocol/invite-committee-core.js b/packages/builders/scripts/inter-protocol/invite-committee-core.js
index 03daa4d0990..f527c7fb04c 100644
--- a/packages/builders/scripts/inter-protocol/invite-committee-core.js
+++ b/packages/builders/scripts/inter-protocol/invite-committee-core.js
@@ -1,6 +1,5 @@
/* global process */
import { makeHelpers } from '@agoric/deploy-script-support';
-
import { getManifestForInviteCommittee } from '@agoric/inter-protocol/src/proposals/committee-proposal.js';
// Build proposal for sim-chain etc.
diff --git a/packages/builders/scripts/inter-protocol/manual-price-feed.js b/packages/builders/scripts/inter-protocol/manual-price-feed.js
index b8e5ff8237f..687f7276551 100644
--- a/packages/builders/scripts/inter-protocol/manual-price-feed.js
+++ b/packages/builders/scripts/inter-protocol/manual-price-feed.js
@@ -1,7 +1,6 @@
+import { makeNotifierFromAsyncIterable } from '@agoric/notifier';
import { E } from '@endo/far';
import { deeplyFulfilled } from '@endo/marshal';
-import { makeNotifierFromAsyncIterable } from '@agoric/notifier';
-
import process from 'process';
/**
diff --git a/packages/builders/scripts/testing/add-LEMONS.js b/packages/builders/scripts/testing/add-LEMONS.js
index a17827f3684..acf3198aecc 100644
--- a/packages/builders/scripts/testing/add-LEMONS.js
+++ b/packages/builders/scripts/testing/add-LEMONS.js
@@ -1,4 +1,5 @@
import { makeHelpers } from '@agoric/deploy-script-support';
+
import { defaultProposalBuilder as vaultProposalBuilder } from '../inter-protocol/add-collateral-core.js';
/** @file This is for use in tests in a3p-integration */
diff --git a/packages/builders/scripts/testing/add-OLIVES.js b/packages/builders/scripts/testing/add-OLIVES.js
index 011d70e3e3b..d1b71fe99d5 100644
--- a/packages/builders/scripts/testing/add-OLIVES.js
+++ b/packages/builders/scripts/testing/add-OLIVES.js
@@ -1,4 +1,5 @@
import { makeHelpers } from '@agoric/deploy-script-support';
+
import { defaultProposalBuilder as vaultProposalBuilder } from '../inter-protocol/add-collateral-core.js';
/** @file This is for use in tests in a3p-integration */
diff --git a/packages/builders/scripts/vats/set-core-proposal-env.js b/packages/builders/scripts/vats/set-core-proposal-env.js
index ef705bc6baa..5b4d34d4ad0 100755
--- a/packages/builders/scripts/vats/set-core-proposal-env.js
+++ b/packages/builders/scripts/vats/set-core-proposal-env.js
@@ -1,7 +1,7 @@
#! /usr/bin/env node
import fs from 'fs';
-import process from 'process';
import { createRequire } from 'module';
+import process from 'process';
const require = createRequire(import.meta.url);
const spec = process.argv[2];
diff --git a/packages/builders/scripts/vats/updateAtomPriceFeed.js b/packages/builders/scripts/vats/updateAtomPriceFeed.js
index 8651462510f..1e405aa8420 100644
--- a/packages/builders/scripts/vats/updateAtomPriceFeed.js
+++ b/packages/builders/scripts/vats/updateAtomPriceFeed.js
@@ -1,4 +1,5 @@
import { makeHelpers } from '@agoric/deploy-script-support';
+
import { priceFeedProposalBuilder } from './priceFeedSupport.js';
const OPTIONS = {
diff --git a/packages/builders/scripts/vats/updateStAtomPriceFeed.js b/packages/builders/scripts/vats/updateStAtomPriceFeed.js
index 456c1b73fff..d6ba32b8613 100644
--- a/packages/builders/scripts/vats/updateStAtomPriceFeed.js
+++ b/packages/builders/scripts/vats/updateStAtomPriceFeed.js
@@ -1,4 +1,5 @@
import { makeHelpers } from '@agoric/deploy-script-support';
+
import { priceFeedProposalBuilder } from './priceFeedSupport.js';
const OPTIONS = {
diff --git a/packages/builders/scripts/vats/updateStOsmoPriceFeed.js b/packages/builders/scripts/vats/updateStOsmoPriceFeed.js
index da8e272c5fb..174e624d4d8 100644
--- a/packages/builders/scripts/vats/updateStOsmoPriceFeed.js
+++ b/packages/builders/scripts/vats/updateStOsmoPriceFeed.js
@@ -1,4 +1,5 @@
import { makeHelpers } from '@agoric/deploy-script-support';
+
import { priceFeedProposalBuilder } from './priceFeedSupport.js';
const OPTIONS = {
diff --git a/packages/builders/scripts/vats/updateStTiaPriceFeed.js b/packages/builders/scripts/vats/updateStTiaPriceFeed.js
index d004c65bea0..223ea5f1e7c 100644
--- a/packages/builders/scripts/vats/updateStTiaPriceFeed.js
+++ b/packages/builders/scripts/vats/updateStTiaPriceFeed.js
@@ -1,4 +1,5 @@
import { makeHelpers } from '@agoric/deploy-script-support';
+
import { priceFeedProposalBuilder } from './priceFeedSupport.js';
const OPTIONS = {
diff --git a/packages/builders/scripts/vats/updateStkAtomPriceFeed.js b/packages/builders/scripts/vats/updateStkAtomPriceFeed.js
index 1226b7e201f..4236149cd8b 100644
--- a/packages/builders/scripts/vats/updateStkAtomPriceFeed.js
+++ b/packages/builders/scripts/vats/updateStkAtomPriceFeed.js
@@ -1,4 +1,5 @@
import { makeHelpers } from '@agoric/deploy-script-support';
+
import { priceFeedProposalBuilder } from './priceFeedSupport.js';
const OPTIONS = {
diff --git a/packages/builders/test/inter-proposals.test.js b/packages/builders/test/inter-proposals.test.js
index 322d31e6195..1536a265470 100644
--- a/packages/builders/test/inter-proposals.test.js
+++ b/packages/builders/test/inter-proposals.test.js
@@ -1,5 +1,6 @@
// @ts-check
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
+
import * as ambientFs from 'fs';
import { resolve as importMetaResolve } from 'import-meta-resolve';
diff --git a/packages/cache/src/store.js b/packages/cache/src/store.js
index b3700a284e9..d3da9e30b85 100644
--- a/packages/cache/src/store.js
+++ b/packages/cache/src/store.js
@@ -1,9 +1,10 @@
+import { untilTrue } from '@agoric/internal';
+import { makeScalarMapStore, matches } from '@agoric/store';
+import { makeScalarBigMapStore } from '@agoric/vat-data';
import { E, Far } from '@endo/far';
import { deeplyFulfilled, makeMarshal } from '@endo/marshal';
-import { matches, makeScalarMapStore } from '@agoric/store';
-import { makeScalarBigMapStore } from '@agoric/vat-data';
-import { untilTrue } from '@agoric/internal';
-import { withGroundState, makeState } from './state.js';
+
+import { makeState, withGroundState } from './state.js';
/** @import {Passable} from '@endo/pass-style' */
/**
diff --git a/packages/cache/test/mvp.test.js b/packages/cache/test/mvp.test.js
index f32bcc5d8e9..60454c09d32 100644
--- a/packages/cache/test/mvp.test.js
+++ b/packages/cache/test/mvp.test.js
@@ -1,5 +1,6 @@
// Must be first to set up globals
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
+
import { M } from '@agoric/store';
import { makeScalarBigMapStore } from '@agoric/vat-data';
diff --git a/packages/cache/test/storage.test.js b/packages/cache/test/storage.test.js
index af41dabf3ae..2617dcc090a 100644
--- a/packages/cache/test/storage.test.js
+++ b/packages/cache/test/storage.test.js
@@ -1,11 +1,11 @@
// Must be first to set up globals
import '@agoric/zoe/tools/prepare-test-env.js';
-import test from 'ava';
import { makeChainStorageRoot } from '@agoric/internal/src/lib-chainStorage.js';
-
-import { Far, makeMarshal } from '@endo/marshal';
import { M } from '@agoric/store';
+import { Far, makeMarshal } from '@endo/marshal';
+import test from 'ava';
+
import { makeCache } from '../src/cache.js';
import { makeChainStorageCoordinator } from '../src/store.js';
diff --git a/packages/casting/src/change-follower.js b/packages/casting/src/change-follower.js
index e5d8cf38ef0..8a1e6dc7e51 100644
--- a/packages/casting/src/change-follower.js
+++ b/packages/casting/src/change-follower.js
@@ -1,4 +1,5 @@
import { E, Far } from '@endo/far';
+
import { DEFAULT_KEEP_POLLING } from './defaults.js';
/**
diff --git a/packages/casting/src/follower-cosmjs.js b/packages/casting/src/follower-cosmjs.js
index e04572d649c..47eb7a03f13 100644
--- a/packages/casting/src/follower-cosmjs.js
+++ b/packages/casting/src/follower-cosmjs.js
@@ -1,13 +1,13 @@
///
-import { X, q, Fail, makeError } from '@endo/errors';
-import { E, Far } from '@endo/far';
-import * as tendermint34 from '@cosmjs/tendermint-rpc';
+import { isStreamCell } from '@agoric/internal/src/lib-chainStorage.js';
import * as stargateStar from '@cosmjs/stargate';
+import * as tendermint34 from '@cosmjs/tendermint-rpc';
+import { Fail, makeError, q, X } from '@endo/errors';
+import { E, Far } from '@endo/far';
-import { isStreamCell } from '@agoric/internal/src/lib-chainStorage.js';
-import { MAKE_DEFAULT_DECODER, MAKE_DEFAULT_UNSERIALIZER } from './defaults.js';
import { makeCastingSpec } from './casting-spec.js';
+import { MAKE_DEFAULT_DECODER, MAKE_DEFAULT_UNSERIALIZER } from './defaults.js';
import { makeLeader as defaultMakeLeader } from './leader-netconfig.js';
// A lot of cosmjs classes end up hardened through instances shared by this
diff --git a/packages/casting/src/follower.js b/packages/casting/src/follower.js
index bc49801acab..268d1ac10b7 100644
--- a/packages/casting/src/follower.js
+++ b/packages/casting/src/follower.js
@@ -1,13 +1,14 @@
// @jessie-check
import { Far } from '@endo/far';
+
+import { makeCastingSpec } from './casting-spec.js';
+import { makeCosmjsFollower } from './follower-cosmjs.js';
import {
mapAsyncIterable,
subscribeEach,
subscribeLatest,
} from './iterable.js';
-import { makeCosmjsFollower } from './follower-cosmjs.js';
-import { makeCastingSpec } from './casting-spec.js';
/**
* @template T
diff --git a/packages/casting/src/leader-netconfig.js b/packages/casting/src/leader-netconfig.js
index dd3a41f6fdf..41a8bec38c6 100644
--- a/packages/casting/src/leader-netconfig.js
+++ b/packages/casting/src/leader-netconfig.js
@@ -1,11 +1,12 @@
/* global fetch */
import { Fail } from '@endo/errors';
-import { makeRoundRobinLeader } from './leader.js';
+
import {
DEFAULT_BOOTSTRAP,
DEFAULT_JITTER,
DEFAULT_RETRY_CALLBACK,
} from './defaults.js';
+import { makeRoundRobinLeader } from './leader.js';
import { assertNetworkConfig } from './netconfig.js';
/**
diff --git a/packages/casting/src/leader.js b/packages/casting/src/leader.js
index 793551326ba..c0b3c426e2e 100644
--- a/packages/casting/src/leader.js
+++ b/packages/casting/src/leader.js
@@ -1,7 +1,8 @@
import { E, Far } from '@endo/far';
-import { DEFAULT_RETRY_CALLBACK, DEFAULT_JITTER } from './defaults.js';
-import { shuffle } from './shuffle.js';
+
import { makePollingChangeFollower } from './change-follower.js';
+import { DEFAULT_JITTER, DEFAULT_RETRY_CALLBACK } from './defaults.js';
+import { shuffle } from './shuffle.js';
/**
* Create a chain leader that rotates through a list of endpoints.
diff --git a/packages/casting/src/netconfig.js b/packages/casting/src/netconfig.js
index cc2ff7ece48..aec7b19f697 100644
--- a/packages/casting/src/netconfig.js
+++ b/packages/casting/src/netconfig.js
@@ -1,6 +1,6 @@
// @jessie-check
-import { mustMatch, M } from '@agoric/store';
+import { M, mustMatch } from '@agoric/store';
// NB: keep type and shape in sync manually until https://github.com/Agoric/agoric-sdk/issues/6160
/**
diff --git a/packages/casting/test/deploy.js b/packages/casting/test/deploy.js
index e8f3b77ec5d..f64d11bb333 100644
--- a/packages/casting/test/deploy.js
+++ b/packages/casting/test/deploy.js
@@ -1,4 +1,5 @@
import { E } from '@endo/far';
+
import { iterateLatest, makeFollower } from '../src/main.js';
const COLLATERAL = 'ATOM';
diff --git a/packages/casting/test/fake-rpc-server.js b/packages/casting/test/fake-rpc-server.js
index 0762904a0e8..01137e01daa 100644
--- a/packages/casting/test/fake-rpc-server.js
+++ b/packages/casting/test/fake-rpc-server.js
@@ -1,12 +1,10 @@
-import { Buffer } from 'buffer';
import './lockdown.js';
-import { makeMarshal } from '@endo/marshal';
-
-import express from 'express';
// import morgan from 'morgan';
-
import { toAscii, toBase64 } from '@cosmjs/encoding';
+import { makeMarshal } from '@endo/marshal';
+import { Buffer } from 'buffer';
+import express from 'express';
const chainName = 'fakeChain';
diff --git a/packages/casting/test/interpose-net-access.test.js b/packages/casting/test/interpose-net-access.test.js
index f0a0110d32d..0d562f4a6d1 100644
--- a/packages/casting/test/interpose-net-access.test.js
+++ b/packages/casting/test/interpose-net-access.test.js
@@ -1,16 +1,16 @@
// @ts-check
/* global globalThis */
-import anyTest from 'ava';
+import {
+ QueryChildrenRequest,
+ QueryChildrenResponse,
+} from '@agoric/cosmic-proto/vstorage/query.js';
import {
createProtobufRpcClient,
QueryClient,
setupBankExtension,
} from '@cosmjs/stargate';
import { Tendermint34Client } from '@cosmjs/tendermint-rpc';
-import {
- QueryChildrenRequest,
- QueryChildrenResponse,
-} from '@agoric/cosmic-proto/vstorage/query.js';
+import anyTest from 'ava';
import { makeHttpClient } from '../src/makeHttpClient.js';
import { captureIO, replayIO, web1, web2 } from './net-access-fixture.js';
diff --git a/packages/casting/test/mvp.test.js b/packages/casting/test/mvp.test.js
index 3a05b6abb73..435bd630e20 100644
--- a/packages/casting/test/mvp.test.js
+++ b/packages/casting/test/mvp.test.js
@@ -1,19 +1,18 @@
// @ts-nocheck
import './lockdown.js';
+import { test } from './prepare-test-env-ava.js';
import { makeMarshal } from '@endo/marshal';
-import { test } from './prepare-test-env-ava.js';
+import { delay } from '../src/defaults.js';
import {
- iterateLatest,
iterateEach,
+ iterateLatest,
+ makeCastingSpec,
makeFollower,
makeLeader,
- makeCastingSpec,
} from '../src/main.js';
-
-import { delay } from '../src/defaults.js';
import { startFakeServer } from './fake-rpc-server.js';
// TODO: Replace with test.macro({title, exec}).
diff --git a/packages/casting/test/netconfig.test.js b/packages/casting/test/netconfig.test.js
index 98dadc6d604..9d37642f7ca 100644
--- a/packages/casting/test/netconfig.test.js
+++ b/packages/casting/test/netconfig.test.js
@@ -1,4 +1,5 @@
import { test } from './prepare-test-env-ava.js';
+
import { assertNetworkConfig } from '../src/netconfig.js';
test('https://main.agoric.net/network-config 2022-10-27', t => {
diff --git a/packages/casting/test/prepare-test-env-ava.js b/packages/casting/test/prepare-test-env-ava.js
index 164f82d07a2..4617615480c 100644
--- a/packages/casting/test/prepare-test-env-ava.js
+++ b/packages/casting/test/prepare-test-env-ava.js
@@ -1,4 +1,5 @@
import './lockdown.js';
+
import { wrapTest } from '@endo/ses-ava';
import rawTest from 'ava';
diff --git a/packages/cosmic-swingset/calc-gci.js b/packages/cosmic-swingset/calc-gci.js
index 13c3ed24fec..6d07d0a9700 100755
--- a/packages/cosmic-swingset/calc-gci.js
+++ b/packages/cosmic-swingset/calc-gci.js
@@ -1,8 +1,8 @@
#!/usr/bin/env node
-import fs from 'fs';
-import djson from 'deterministic-json';
import { createHash } from 'crypto';
+import djson from 'deterministic-json';
+import fs from 'fs';
import process from 'process';
const g = fs.readFileSync(process.argv[2]).toString();
diff --git a/packages/cosmic-swingset/calc-rpcport.js b/packages/cosmic-swingset/calc-rpcport.js
index be0f24a98a9..89f289af898 100755
--- a/packages/cosmic-swingset/calc-rpcport.js
+++ b/packages/cosmic-swingset/calc-rpcport.js
@@ -3,9 +3,9 @@
// NOTE: Runs outside SES
-import process from 'process';
-import fs from 'fs';
import toml from '@iarna/toml';
+import fs from 'fs';
+import process from 'process';
// point this at ~/.ag-cosmos-chain/config/config.toml
diff --git a/packages/cosmic-swingset/scripts/clean-core-eval.js b/packages/cosmic-swingset/scripts/clean-core-eval.js
index b182992b3a3..9963b07f0c3 100755
--- a/packages/cosmic-swingset/scripts/clean-core-eval.js
+++ b/packages/cosmic-swingset/scripts/clean-core-eval.js
@@ -2,7 +2,9 @@
/* global globalThis */
import '@endo/init/debug.js';
+
import * as farExports from '@endo/far';
+
import { isEntrypoint } from '../src/helpers/is-entrypoint.js';
export const compartmentEvaluate = code => {
diff --git a/packages/cosmic-swingset/src/anylogger-agoric.js b/packages/cosmic-swingset/src/anylogger-agoric.js
index 8199ddcea77..016b621de47 100644
--- a/packages/cosmic-swingset/src/anylogger-agoric.js
+++ b/packages/cosmic-swingset/src/anylogger-agoric.js
@@ -1,6 +1,6 @@
import {
- getEnvironmentOptionsList,
getEnvironmentOption,
+ getEnvironmentOptionsList,
} from '@endo/env-options';
import anylogger from 'anylogger';
diff --git a/packages/cosmic-swingset/src/chain-main.js b/packages/cosmic-swingset/src/chain-main.js
index 83f38f2aa6a..3b169d1ab35 100644
--- a/packages/cosmic-swingset/src/chain-main.js
+++ b/packages/cosmic-swingset/src/chain-main.js
@@ -1,58 +1,56 @@
// @ts-check
-import path from 'node:path';
-import v8 from 'node:v8';
-import process from 'node:process';
+import { fork } from 'node:child_process';
import fs from 'node:fs';
import fsPromises from 'node:fs/promises';
+import path from 'node:path';
import { performance } from 'node:perf_hooks';
-import { fork } from 'node:child_process';
-import { resolve as importMetaResolve } from 'import-meta-resolve';
-import tmp from 'tmp';
-
-import { Fail, q } from '@endo/errors';
-import { E } from '@endo/far';
-import { makeMarshal } from '@endo/marshal';
-import { isNat } from '@endo/nat';
-import { M, mustMatch } from '@endo/patterns';
-import engineGC from '@agoric/internal/src/lib-nodejs/engine-gc.js';
-import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
-import {
- importMailbox,
- exportMailbox,
-} from '@agoric/swingset-vat/src/devices/mailbox/mailbox.js';
-
-import { makeSlogSender, tryFlushSlogSender } from '@agoric/telemetry';
+import process from 'node:process';
+import v8 from 'node:v8';
+import { BridgeId, CosmosInitKeyToBridgeId } from '@agoric/internal';
+import * as ActionType from '@agoric/internal/src/action-types.js';
+import * as STORAGE_PATH from '@agoric/internal/src/chain-storage-paths.js';
import {
makeChainStorageRoot,
makeSerializeToStorage,
} from '@agoric/internal/src/lib-chainStorage.js';
+import engineGC from '@agoric/internal/src/lib-nodejs/engine-gc.js';
+import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
import { makeShutdown } from '@agoric/internal/src/node/shutdown.js';
-
-import * as STORAGE_PATH from '@agoric/internal/src/chain-storage-paths.js';
-import * as ActionType from '@agoric/internal/src/action-types.js';
-import { BridgeId, CosmosInitKeyToBridgeId } from '@agoric/internal';
import {
makeArchiveSnapshot,
makeArchiveTranscript,
} from '@agoric/swing-store';
+import {
+ exportMailbox,
+ importMailbox,
+} from '@agoric/swingset-vat/src/devices/mailbox/mailbox.js';
+import { makeSlogSender, tryFlushSlogSender } from '@agoric/telemetry';
+import { Fail, q } from '@endo/errors';
+import { E } from '@endo/far';
+import { makeMarshal } from '@endo/marshal';
+import { isNat } from '@endo/nat';
+import { M, mustMatch } from '@endo/patterns';
+import { resolve as importMetaResolve } from 'import-meta-resolve';
+import tmp from 'tmp';
+
+import {
+ spawnSwingStoreExport,
+ validateExporterOptions,
+} from './export-kernel-db.js';
import {
makeBufferedStorage,
makeReadCachingStorage,
} from './helpers/bufferedStorage.js';
import stringify from './helpers/json-stable-stringify.js';
-import { launch } from './launch-chain.js';
-import { getTelemetryProviders } from './kernel-stats.js';
import { makeProcessValue } from './helpers/process-value.js';
-import {
- spawnSwingStoreExport,
- validateExporterOptions,
-} from './export-kernel-db.js';
import {
performStateSyncImport,
validateImporterOptions,
} from './import-kernel-db.js';
+import { getTelemetryProviders } from './kernel-stats.js';
+import { launch } from './launch-chain.js';
const ignore = () => {};
diff --git a/packages/cosmic-swingset/src/entrypoint.js b/packages/cosmic-swingset/src/entrypoint.js
index 7e1b2de18b2..b506c23cdaa 100755
--- a/packages/cosmic-swingset/src/entrypoint.js
+++ b/packages/cosmic-swingset/src/entrypoint.js
@@ -2,17 +2,15 @@
// @jessie-check
import '@endo/init/pre.js';
-
-import agcc from '@agoric/cosmos';
-
import '@endo/init/unsafe-fast.js';
+import './anylogger-agoric.js';
+import agcc from '@agoric/cosmos';
+import anylogger from 'anylogger';
import os from 'os';
import path from 'path';
import process from 'process';
-import './anylogger-agoric.js';
-import anylogger from 'anylogger';
import main from './chain-main.js';
const log = anylogger('ag-chain-cosmos');
diff --git a/packages/cosmic-swingset/src/export-kernel-db.js b/packages/cosmic-swingset/src/export-kernel-db.js
index cc90e945b29..3e461d9719e 100755
--- a/packages/cosmic-swingset/src/export-kernel-db.js
+++ b/packages/cosmic-swingset/src/export-kernel-db.js
@@ -4,18 +4,17 @@
import '@endo/init/unsafe-fast.js';
-import os from 'os';
-import process from 'process';
+import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
+import { makeShutdown } from '@agoric/internal/src/node/shutdown.js';
+import { makeSwingStoreExporter } from '@agoric/swing-store';
+import { Fail, q } from '@endo/errors';
+import { makePromiseKit } from '@endo/promise-kit';
import fsPower from 'fs/promises';
+import os from 'os';
import pathPower from 'path';
+import process from 'process';
import { fileURLToPath } from 'url';
-import { Fail, q } from '@endo/errors';
-import { makePromiseKit } from '@endo/promise-kit';
-import { makeShutdown } from '@agoric/internal/src/node/shutdown.js';
-import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
-import { makeSwingStoreExporter } from '@agoric/swing-store';
-
import { isEntrypoint } from './helpers/is-entrypoint.js';
import { makeProcessValue } from './helpers/process-value.js';
diff --git a/packages/cosmic-swingset/src/export-storage.js b/packages/cosmic-swingset/src/export-storage.js
index a96f91ccc84..7ab69f37c5c 100644
--- a/packages/cosmic-swingset/src/export-storage.js
+++ b/packages/cosmic-swingset/src/export-storage.js
@@ -1,5 +1,4 @@
import * as STORAGE_PATH from '@agoric/internal/src/chain-storage-paths.js';
-
import { Fail, q } from '@endo/errors';
/**
diff --git a/packages/cosmic-swingset/src/helpers/is-entrypoint.js b/packages/cosmic-swingset/src/helpers/is-entrypoint.js
index ba7a2750445..e0dcfd55ea4 100644
--- a/packages/cosmic-swingset/src/helpers/is-entrypoint.js
+++ b/packages/cosmic-swingset/src/helpers/is-entrypoint.js
@@ -1,8 +1,8 @@
// @jessie-check
// Detect if this is run as a script.
-import url from 'url';
import process from 'process';
+import url from 'url';
// FIXME: Should maybe be exported by '@endo/something'?
export const isEntrypoint = href =>
diff --git a/packages/cosmic-swingset/src/import-kernel-db.js b/packages/cosmic-swingset/src/import-kernel-db.js
index 9db89a6da33..efa7fe45513 100755
--- a/packages/cosmic-swingset/src/import-kernel-db.js
+++ b/packages/cosmic-swingset/src/import-kernel-db.js
@@ -4,24 +4,23 @@
import '@endo/init/unsafe-fast.js';
-import os from 'os';
-import process from 'process';
-import { Transform } from 'stream';
+import BufferLineTransform from '@agoric/internal/src/node/buffer-line-transform.js';
+import { importSwingStore, openSwingStore } from '@agoric/swing-store';
+import { Fail, q } from '@endo/errors';
import fsPower from 'fs';
import fsPromisesPower from 'fs/promises';
+import os from 'os';
import pathPower from 'path';
+import process from 'process';
+import { Transform } from 'stream';
-import { Fail, q } from '@endo/errors';
-import BufferLineTransform from '@agoric/internal/src/node/buffer-line-transform.js';
-import { importSwingStore, openSwingStore } from '@agoric/swing-store';
-
-import { isEntrypoint } from './helpers/is-entrypoint.js';
-import { makeProcessValue } from './helpers/process-value.js';
import {
- ExportManifestFileName,
- checkExportDataMode,
checkArtifactMode,
+ checkExportDataMode,
+ ExportManifestFileName,
} from './export-kernel-db.js';
+import { isEntrypoint } from './helpers/is-entrypoint.js';
+import { makeProcessValue } from './helpers/process-value.js';
/**
* @typedef {object} StateSyncImporterOptions
diff --git a/packages/cosmic-swingset/src/kernel-stats.js b/packages/cosmic-swingset/src/kernel-stats.js
index 3f9e9438628..efccec4ee5f 100644
--- a/packages/cosmic-swingset/src/kernel-stats.js
+++ b/packages/cosmic-swingset/src/kernel-stats.js
@@ -1,28 +1,22 @@
// @ts-check
-import {
- ExplicitBucketHistogramAggregation,
- MeterProvider,
- View,
-} from '@opentelemetry/sdk-metrics';
+import process from 'node:process';
+import v8 from 'node:v8';
import { makeLegacyMap } from '@agoric/store';
-
import {
KERNEL_STATS_SUM_METRICS,
KERNEL_STATS_UPDOWN_METRICS,
} from '@agoric/swingset-vat/src/kernel/metrics.js';
-
// import { diag, DiagConsoleLogger, DiagLogLevel } from '@opentelemetry/api';
-
// diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.VERBOSE);
-
/** @import {MetricAttributes as Attributes} from '@opentelemetry/api' */
/** @import {Histogram} from '@opentelemetry/api' */
-
import { getTelemetryProviders as getTelemetryProvidersOriginal } from '@agoric/telemetry';
-
-import v8 from 'node:v8';
-import process from 'node:process';
+import {
+ ExplicitBucketHistogramAggregation,
+ MeterProvider,
+ View,
+} from '@opentelemetry/sdk-metrics';
/**
* TODO Would be nice somehow to label the vats individually, but it's too
diff --git a/packages/cosmic-swingset/src/launch-chain.js b/packages/cosmic-swingset/src/launch-chain.js
index ac4ce65dd7d..81c3ba2294a 100644
--- a/packages/cosmic-swingset/src/launch-chain.js
+++ b/packages/cosmic-swingset/src/launch-chain.js
@@ -5,52 +5,48 @@
// so let the JS tooling know about it by importing it here.
import '@agoric/builders';
-import anylogger from 'anylogger';
-
-import { assert, Fail } from '@endo/errors';
-import { E } from '@endo/far';
-import bundleSource from '@endo/bundle-source';
-
import {
+ extractCoreProposalBundles,
+ mergeCoreProposals,
+} from '@agoric/deploy-script-support/src/extract-proposal.js';
+import { BridgeId as BRIDGE_ID } from '@agoric/internal';
+import * as ActionType from '@agoric/internal/src/action-types.js';
+import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
+import { makeWithQueue } from '@agoric/internal/src/queue.js';
+import { openSwingStore } from '@agoric/swing-store';
+import {
+ buildBridge,
buildMailbox,
buildMailboxStateMap,
buildTimer,
- buildBridge,
- swingsetIsInitialized,
initializeSwingset,
- makeSwingsetController,
loadBasedir,
loadSwingsetConfigFile,
+ makeSwingsetController,
+ swingsetIsInitialized,
upgradeSwingset,
} from '@agoric/swingset-vat';
-import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
-import { openSwingStore } from '@agoric/swing-store';
-import { BridgeId as BRIDGE_ID } from '@agoric/internal';
-import { makeWithQueue } from '@agoric/internal/src/queue.js';
-import * as ActionType from '@agoric/internal/src/action-types.js';
-
-import {
- extractCoreProposalBundles,
- mergeCoreProposals,
-} from '@agoric/deploy-script-support/src/extract-proposal.js';
+import bundleSource from '@endo/bundle-source';
+import { assert, Fail } from '@endo/errors';
+import { E } from '@endo/far';
+import anylogger from 'anylogger';
import { fileURLToPath } from 'url';
+import { exportStorage } from './export-storage.js';
+import { parseLocatedJson } from './helpers/json.js';
+import { makeQueue, makeQueueStorageMock } from './helpers/make-queue.js';
import {
+ exportKernelStats,
makeDefaultMeterProvider,
makeInboundQueueMetrics,
- exportKernelStats,
makeSlogCallbacks,
} from './kernel-stats.js';
-
+import { parseParams } from './params.js';
import {
BeansPerBlockComputeLimit,
BeansPerVatCreation,
BeansPerXsnapComputron,
} from './sim-params.js';
-import { parseParams } from './params.js';
-import { makeQueue, makeQueueStorageMock } from './helpers/make-queue.js';
-import { exportStorage } from './export-storage.js';
-import { parseLocatedJson } from './helpers/json.js';
/** @import {RunPolicy} from '@agoric/swingset-vat' */
diff --git a/packages/cosmic-swingset/src/params.js b/packages/cosmic-swingset/src/params.js
index f3a57b03749..267bc9b0f13 100644
--- a/packages/cosmic-swingset/src/params.js
+++ b/packages/cosmic-swingset/src/params.js
@@ -2,7 +2,7 @@
// @jessie-check
import { Fail } from '@endo/errors';
-import { Nat, isNat } from '@endo/nat';
+import { isNat, Nat } from '@endo/nat';
export const stringToNat = s => {
typeof s === 'string' || Fail`${s} must be a string`;
diff --git a/packages/cosmic-swingset/src/sim-chain.js b/packages/cosmic-swingset/src/sim-chain.js
index ba1847d6cfc..98800c41891 100644
--- a/packages/cosmic-swingset/src/sim-chain.js
+++ b/packages/cosmic-swingset/src/sim-chain.js
@@ -1,25 +1,23 @@
/* global process setTimeout clearTimeout */
-import path from 'path';
-import fs from 'fs';
-import { Fail } from '@endo/errors';
+import { makeBatchedDeliver } from '@agoric/internal/src/batched-deliver.js';
+import { makeWithQueue } from '@agoric/internal/src/queue.js';
import {
- importMailbox,
exportMailbox,
+ importMailbox,
} from '@agoric/swingset-vat/src/devices/mailbox/mailbox.js';
-
-import anylogger from 'anylogger';
-
import { makeSlogSender } from '@agoric/telemetry';
-
+import { Fail } from '@endo/errors';
+import anylogger from 'anylogger';
+import fs from 'fs';
import { resolve as importMetaResolve } from 'import-meta-resolve';
-import { makeWithQueue } from '@agoric/internal/src/queue.js';
-import { makeBatchedDeliver } from '@agoric/internal/src/batched-deliver.js';
+import path from 'path';
+
import stringify from './helpers/json-stable-stringify.js';
-import { launch } from './launch-chain.js';
+import { makeQueue, makeQueueStorageMock } from './helpers/make-queue.js';
import { getTelemetryProviders } from './kernel-stats.js';
-import { DEFAULT_SIM_SWINGSET_PARAMS, QueueInbound } from './sim-params.js';
+import { launch } from './launch-chain.js';
import { parseQueueSizes } from './params.js';
-import { makeQueue, makeQueueStorageMock } from './helpers/make-queue.js';
+import { DEFAULT_SIM_SWINGSET_PARAMS, QueueInbound } from './sim-params.js';
const console = anylogger('fake-chain');
diff --git a/packages/cosmic-swingset/test/clean-core-eval.test.js b/packages/cosmic-swingset/test/clean-core-eval.test.js
index 9c0a9717f76..2850245b4ec 100644
--- a/packages/cosmic-swingset/test/clean-core-eval.test.js
+++ b/packages/cosmic-swingset/test/clean-core-eval.test.js
@@ -1,7 +1,8 @@
import test from 'ava';
+
import {
- defangEvaluableCode,
compartmentEvaluate,
+ defangEvaluableCode,
} from '../scripts/clean-core-eval.js';
test('defangEvaluableCode is working', t => {
diff --git a/packages/cosmic-swingset/test/export-storage.test.js b/packages/cosmic-swingset/test/export-storage.test.js
index 73ad823187f..48a950d47a0 100644
--- a/packages/cosmic-swingset/test/export-storage.test.js
+++ b/packages/cosmic-swingset/test/export-storage.test.js
@@ -1,5 +1,6 @@
// @ts-check
import test from 'ava';
+
import { exportStorage } from '../src/export-storage.js';
const makeBatchChainStorage = published => {
diff --git a/packages/cosmic-swingset/test/make.test.js b/packages/cosmic-swingset/test/make.test.js
index 2f5cca6f7bf..ddc3888960e 100644
--- a/packages/cosmic-swingset/test/make.test.js
+++ b/packages/cosmic-swingset/test/make.test.js
@@ -1,6 +1,5 @@
// @ts-check
import anyTest from 'ava';
-
// Use ambient authority only in test.before()
import { spawn as ambientSpawn } from 'child_process';
import * as ambientPath from 'path';
diff --git a/packages/cosmic-swingset/test/provision-smartwallet.test.js b/packages/cosmic-swingset/test/provision-smartwallet.test.js
index 2162550fe82..1ff09dc51b6 100644
--- a/packages/cosmic-swingset/test/provision-smartwallet.test.js
+++ b/packages/cosmic-swingset/test/provision-smartwallet.test.js
@@ -1,12 +1,11 @@
/* global setTimeout */
+import { VBankAccount } from '@agoric/internal';
import test from 'ava';
-
// Use ambient authority only in test.before()
import { spawn as ambientSpawn } from 'child_process';
-import * as ambientPath from 'path';
import * as ambientFs from 'fs';
+import * as ambientPath from 'path';
-import { VBankAccount } from '@agoric/internal';
import { makeScenario2, makeWalletTool, pspawn } from './scenario2.js';
// module account address for 'vbank/provision'; aka "megz"
diff --git a/packages/deploy-script-support/src/code-gen.js b/packages/deploy-script-support/src/code-gen.js
index 7e2310199f9..1cb96e915a4 100644
--- a/packages/deploy-script-support/src/code-gen.js
+++ b/packages/deploy-script-support/src/code-gen.js
@@ -1,5 +1,5 @@
// @ts-check
-import { makeMarshal, decodeToJustin } from '@endo/marshal';
+import { decodeToJustin, makeMarshal } from '@endo/marshal';
const { keys, values, fromEntries } = Object;
diff --git a/packages/deploy-script-support/src/endo-pieces-contract.js b/packages/deploy-script-support/src/endo-pieces-contract.js
index acd46770eba..57cfdcbbdf9 100644
--- a/packages/deploy-script-support/src/endo-pieces-contract.js
+++ b/packages/deploy-script-support/src/endo-pieces-contract.js
@@ -1,7 +1,7 @@
// @ts-check
+import { decodeBase64, encodeBase64 } from '@endo/base64';
import { Fail, q } from '@endo/errors';
import { E, Far } from '@endo/far';
-import { encodeBase64, decodeBase64 } from '@endo/base64';
import { ZipWriter } from '@endo/zip';
export const start = () => {
diff --git a/packages/deploy-script-support/src/extract-proposal.js b/packages/deploy-script-support/src/extract-proposal.js
index f0b258b4bb7..3666ccd0119 100644
--- a/packages/deploy-script-support/src/extract-proposal.js
+++ b/packages/deploy-script-support/src/extract-proposal.js
@@ -1,6 +1,6 @@
// @ts-check
-import { Fail } from '@endo/errors';
import { deeplyFulfilledObject } from '@agoric/internal';
+import { Fail } from '@endo/errors';
import fs from 'fs';
import { createRequire } from 'module';
import path from 'path';
diff --git a/packages/deploy-script-support/src/helpers.js b/packages/deploy-script-support/src/helpers.js
index 0ae7f62750f..5bba486ad4a 100644
--- a/packages/deploy-script-support/src/helpers.js
+++ b/packages/deploy-script-support/src/helpers.js
@@ -2,21 +2,20 @@
///
-import { E } from '@endo/far';
import bundleSource from '@endo/bundle-source';
-
+import { E } from '@endo/far';
import fs from 'fs/promises';
import os from 'os';
-import { makeInstall } from './install.js';
-import { makeOfferAndFindInvitationAmount } from './offer.js';
-import { makeStartInstance } from './startInstance.js';
+import { assertOfferResult } from './assertOfferResult.js';
import { makeCacheAndGetBundleSpec } from './cachedBundleSpec.js';
import { makeDepositInvitation } from './depositInvitation.js';
-import { makeSaveIssuer } from './saveIssuer.js';
import { makeGetBundlerMaker } from './getBundlerMaker.js';
-import { assertOfferResult } from './assertOfferResult.js';
+import { makeInstall } from './install.js';
import { installInPieces } from './installInPieces.js';
+import { makeOfferAndFindInvitationAmount } from './offer.js';
+import { makeSaveIssuer } from './saveIssuer.js';
+import { makeStartInstance } from './startInstance.js';
import { makeWriteCoreEval } from './writeCoreEvalParts.js';
export * from '@agoric/internal/src/node/createBundles.js';
diff --git a/packages/deploy-script-support/src/installInPieces.js b/packages/deploy-script-support/src/installInPieces.js
index 2df78d42b52..95507bec513 100644
--- a/packages/deploy-script-support/src/installInPieces.js
+++ b/packages/deploy-script-support/src/installInPieces.js
@@ -1,7 +1,7 @@
// @ts-check
+import { decodeBase64, encodeBase64 } from '@endo/base64';
import { E } from '@endo/far';
import { ZipReader } from '@endo/zip';
-import { encodeBase64, decodeBase64 } from '@endo/base64';
import crypto from 'crypto';
const computeSha512 = bytes => {
diff --git a/packages/deploy-script-support/src/offer.js b/packages/deploy-script-support/src/offer.js
index 2307988735d..cfd578c4f4b 100644
--- a/packages/deploy-script-support/src/offer.js
+++ b/packages/deploy-script-support/src/offer.js
@@ -1,8 +1,8 @@
// @ts-check
-import { assert } from '@endo/errors';
-import { E } from '@endo/far';
// Avoid pulling in too many dependencies like notifiers
import { AmountMath } from '@agoric/ertp/src/amountMath.js';
+import { assert } from '@endo/errors';
+import { E } from '@endo/far';
/** @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js' */
diff --git a/packages/deploy-script-support/src/writeCoreEvalParts.js b/packages/deploy-script-support/src/writeCoreEvalParts.js
index 505f07008b6..2242fd31964 100644
--- a/packages/deploy-script-support/src/writeCoreEvalParts.js
+++ b/packages/deploy-script-support/src/writeCoreEvalParts.js
@@ -1,9 +1,9 @@
// @ts-check
-import fs from 'fs';
+import { createBundles } from '@agoric/internal/src/node/createBundles.js';
import { E } from '@endo/far';
import { deeplyFulfilled } from '@endo/marshal';
+import fs from 'fs';
-import { createBundles } from '@agoric/internal/src/node/createBundles.js';
import { defangAndTrim, mergePermits, stringify } from './code-gen.js';
import {
makeCoreProposalBehavior,
diff --git a/packages/deploy-script-support/test/unitTests/coreProposalBehavior.test.js b/packages/deploy-script-support/test/unitTests/coreProposalBehavior.test.js
index 9faea35cbca..6c3e01b4237 100644
--- a/packages/deploy-script-support/test/unitTests/coreProposalBehavior.test.js
+++ b/packages/deploy-script-support/test/unitTests/coreProposalBehavior.test.js
@@ -1,11 +1,12 @@
// @ts-check
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { E } from '@endo/far';
import {
makeAgoricNamesAccess,
runModuleBehaviors,
} from '@agoric/vats/src/core/utils.js';
+import { E } from '@endo/far';
+
import { makeCoreProposalBehavior } from '../../src/coreProposalBehavior.js';
// TODO: we need to rewrite writeCoreEvalParts.js to produce BundleIDs,
diff --git a/packages/deploy-script-support/test/unitTests/depositInvitation.test.js b/packages/deploy-script-support/test/unitTests/depositInvitation.test.js
index 91e9a9561e5..41b995738bc 100644
--- a/packages/deploy-script-support/test/unitTests/depositInvitation.test.js
+++ b/packages/deploy-script-support/test/unitTests/depositInvitation.test.js
@@ -1,7 +1,7 @@
// @ts-check
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { makeIssuerKit, AssetKind, AmountMath } from '@agoric/ertp';
+import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
import { makeDepositInvitation } from '../../src/depositInvitation.js';
diff --git a/packages/deploy-script-support/test/unitTests/findInvitationAmount.test.js b/packages/deploy-script-support/test/unitTests/findInvitationAmount.test.js
index bb2e7f9e982..0b52dbabc43 100644
--- a/packages/deploy-script-support/test/unitTests/findInvitationAmount.test.js
+++ b/packages/deploy-script-support/test/unitTests/findInvitationAmount.test.js
@@ -1,7 +1,7 @@
// @ts-nocheck
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { makeIssuerKit, AssetKind, AmountMath } from '@agoric/ertp';
+import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
import { makeOfferAndFindInvitationAmount } from '../../src/offer.js';
diff --git a/packages/deploy-script-support/test/unitTests/install.test.js b/packages/deploy-script-support/test/unitTests/install.test.js
index 6265b93fb13..6fbc360daab 100644
--- a/packages/deploy-script-support/test/unitTests/install.test.js
+++ b/packages/deploy-script-support/test/unitTests/install.test.js
@@ -1,8 +1,8 @@
// @ts-check
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { makeZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
import { makeFakeBoard } from '@agoric/vats/tools/board-utils.js';
+import { makeZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
import bundleSource from '@endo/bundle-source';
import { resolve as importMetaResolve } from 'import-meta-resolve';
diff --git a/packages/deploy-script-support/test/unitTests/installInPieces.test.js b/packages/deploy-script-support/test/unitTests/installInPieces.test.js
index 08181ce0689..b3944a7d241 100644
--- a/packages/deploy-script-support/test/unitTests/installInPieces.test.js
+++ b/packages/deploy-script-support/test/unitTests/installInPieces.test.js
@@ -3,7 +3,6 @@ import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import bundleSource from '@endo/bundle-source';
import { E } from '@endo/far';
-
import url from 'url';
import { start } from '../../src/endo-pieces-contract.js';
diff --git a/packages/deploy-script-support/test/unitTests/offer.test.js b/packages/deploy-script-support/test/unitTests/offer.test.js
index f75c106bff6..caae789a338 100644
--- a/packages/deploy-script-support/test/unitTests/offer.test.js
+++ b/packages/deploy-script-support/test/unitTests/offer.test.js
@@ -1,11 +1,11 @@
// @ts-check
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
+import { AmountMath, makeIssuerKit } from '@agoric/ertp';
import { makeZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
import bundleSource from '@endo/bundle-source';
-import { makeIssuerKit, AmountMath } from '@agoric/ertp';
-import { resolve as importMetaResolve } from 'import-meta-resolve';
import { E } from '@endo/far';
+import { resolve as importMetaResolve } from 'import-meta-resolve';
import { makeOfferAndFindInvitationAmount } from '../../src/offer.js';
diff --git a/packages/deploy-script-support/test/unitTests/startInstance.test.js b/packages/deploy-script-support/test/unitTests/startInstance.test.js
index 65bf659445b..1e14c037d99 100644
--- a/packages/deploy-script-support/test/unitTests/startInstance.test.js
+++ b/packages/deploy-script-support/test/unitTests/startInstance.test.js
@@ -1,11 +1,11 @@
// @ts-check
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
+import { makeIssuerKit } from '@agoric/ertp';
import { makeZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
import bundleSource from '@endo/bundle-source';
-import { makeIssuerKit } from '@agoric/ertp';
-import { resolve as importMetaResolve } from 'import-meta-resolve';
import { E } from '@endo/far';
+import { resolve as importMetaResolve } from 'import-meta-resolve';
import { makeStartInstance } from '../../src/startInstance.js';
diff --git a/packages/deployment/src/entrypoint.js b/packages/deployment/src/entrypoint.js
index c5ab08dfd4d..4e95da2d403 100755
--- a/packages/deployment/src/entrypoint.js
+++ b/packages/deployment/src/entrypoint.js
@@ -3,17 +3,17 @@
import '@endo/init';
+import { exec, spawn } from 'child_process';
import fs from 'fs';
+import inquirer from 'inquirer';
import path from 'path';
-import temp from 'temp';
import process from 'process';
-import { exec, spawn } from 'child_process';
-import inquirer from 'inquirer';
+import temp from 'temp';
-import { running } from './run.js';
-import { setup } from './setup.js';
import * as files from './files.js';
import deploy from './main.js';
+import { running } from './run.js';
+import { setup } from './setup.js';
process.on('SIGINT', () => process.exit(-1));
deploy(process.argv[1], process.argv.splice(2), {
diff --git a/packages/deployment/src/files.js b/packages/deployment/src/files.js
index e7d8cf0bc1c..3bfa01f00ad 100644
--- a/packages/deployment/src/files.js
+++ b/packages/deployment/src/files.js
@@ -1,8 +1,7 @@
-import { promisify } from 'util';
-import { Readable } from 'stream';
-import chalk from 'chalk';
-
import { Fail } from '@endo/errors';
+import chalk from 'chalk';
+import { Readable } from 'stream';
+import { promisify } from 'util';
const { freeze } = Object;
diff --git a/packages/deployment/src/init.js b/packages/deployment/src/init.js
index df9fcd7c316..b74173d4a75 100644
--- a/packages/deployment/src/init.js
+++ b/packages/deployment/src/init.js
@@ -2,8 +2,9 @@
import { Fail } from '@endo/errors';
import { isObject } from '@endo/marshal';
-import { PLAYBOOK_WRAPPER, SSH_TYPE } from './setup.js';
+
import { shellEscape } from './run.js';
+import { PLAYBOOK_WRAPPER, SSH_TYPE } from './setup.js';
export const AVAILABLE_ROLES = ['validator', 'peer', 'seed'];
diff --git a/packages/deployment/src/main.js b/packages/deployment/src/main.js
index f550e9a37d7..25712aec5cb 100644
--- a/packages/deployment/src/main.js
+++ b/packages/deployment/src/main.js
@@ -1,13 +1,14 @@
/* eslint-disable @jessie.js/safe-await-separator */
-import djson from 'deterministic-json';
-import { createHash } from 'crypto';
+import { Fail } from '@endo/errors';
import chalk from 'chalk';
+import { createHash } from 'crypto';
+import djson from 'deterministic-json';
import parseArgs from 'minimist';
-import { Fail } from '@endo/errors';
-import { doInit } from './init.js';
-import { shellMetaRegexp, shellEscape } from './run.js';
+
import { streamFromString } from './files.js';
-import { SSH_TYPE, DEFAULT_BOOT_TOKENS } from './setup.js';
+import { doInit } from './init.js';
+import { shellEscape, shellMetaRegexp } from './run.js';
+import { DEFAULT_BOOT_TOKENS, SSH_TYPE } from './setup.js';
const PROVISION_DIR = 'provision';
const COSMOS_DIR = 'ag-chain-cosmos';
diff --git a/packages/deployment/src/run.js b/packages/deployment/src/run.js
index f511d0bc095..718048d0c19 100644
--- a/packages/deployment/src/run.js
+++ b/packages/deployment/src/run.js
@@ -1,6 +1,5 @@
-import { Writable } from 'stream';
-
import { Fail } from '@endo/errors';
+import { Writable } from 'stream';
const { freeze } = Object;
diff --git a/packages/governance/scripts/build-bundles.js b/packages/governance/scripts/build-bundles.js
index 9f71f8357c0..38ba853c082 100644
--- a/packages/governance/scripts/build-bundles.js
+++ b/packages/governance/scripts/build-bundles.js
@@ -1,5 +1,6 @@
#! /usr/bin/env node
import '@endo/init';
+
import { createBundles } from '@agoric/internal/src/node/createBundles.js';
import url from 'url';
diff --git a/packages/governance/src/binaryVoteCounter.js b/packages/governance/src/binaryVoteCounter.js
index d502507e737..32a58d59270 100644
--- a/packages/governance/src/binaryVoteCounter.js
+++ b/packages/governance/src/binaryVoteCounter.js
@@ -1,21 +1,21 @@
+import { keyEQ, makeExo, makeScalarMapStore } from '@agoric/store';
import { Fail } from '@endo/errors';
-import { makePromiseKit } from '@endo/promise-kit';
import { E } from '@endo/eventual-send';
-import { makeExo, keyEQ, makeScalarMapStore } from '@agoric/store';
+import { makePromiseKit } from '@endo/promise-kit';
+import { scheduleClose } from './closingRule.js';
import {
buildQuestion,
ChoiceMethod,
coerceQuestionSpec,
positionIncluded,
} from './question.js';
-import { scheduleClose } from './closingRule.js';
+import { makeQuorumCounter } from './quorumCounter.js';
import {
BinaryVoteCounterAdminI,
BinaryVoteCounterCloseI,
BinaryVoteCounterPublicI,
} from './typeGuards.js';
-import { makeQuorumCounter } from './quorumCounter.js';
/**
* @import {BuildVoteCounter, OutcomeRecord, Position, QuestionSpec, VoteStatistics} from './types.js';
diff --git a/packages/governance/src/committee.js b/packages/governance/src/committee.js
index 8eb967d75fb..1dc0ae5b03d 100644
--- a/packages/governance/src/committee.js
+++ b/packages/governance/src/committee.js
@@ -1,11 +1,11 @@
+import { StorageNodeShape } from '@agoric/internal';
import { makeStoredPublishKit } from '@agoric/notifier';
import { M } from '@agoric/store';
+import { prepareExo, provideDurableMapStore } from '@agoric/vat-data';
import { natSafeMath } from '@agoric/zoe/src/contractSupport/index.js';
+import { EmptyProposalShape } from '@agoric/zoe/src/typeGuards.js';
import { E } from '@endo/eventual-send';
-import { StorageNodeShape } from '@agoric/internal';
-import { prepareExo, provideDurableMapStore } from '@agoric/vat-data';
-import { EmptyProposalShape } from '@agoric/zoe/src/typeGuards.js';
import {
getOpenQuestions,
getPoserInvitation,
diff --git a/packages/governance/src/contractGovernance/assertions.js b/packages/governance/src/contractGovernance/assertions.js
index 09a3bb57930..7ad1be7e5fa 100644
--- a/packages/governance/src/contractGovernance/assertions.js
+++ b/packages/governance/src/contractGovernance/assertions.js
@@ -1,8 +1,8 @@
-import { Fail } from '@endo/errors';
-import { isRemotable } from '@endo/marshal';
-import { assertIsRatio } from '@agoric/zoe/src/contractSupport/ratio.js';
import { mustMatch } from '@agoric/store';
import { RelativeTimeRecordShape, TimestampRecordShape } from '@agoric/time';
+import { assertIsRatio } from '@agoric/zoe/src/contractSupport/ratio.js';
+import { Fail } from '@endo/errors';
+import { isRemotable } from '@endo/marshal';
const makeLooksLikeBrand = name => {
/** @param {Brand} brand */
diff --git a/packages/governance/src/contractGovernance/governApi.js b/packages/governance/src/contractGovernance/governApi.js
index f700e6de740..f3c1d3496b2 100644
--- a/packages/governance/src/contractGovernance/governApi.js
+++ b/packages/governance/src/contractGovernance/governApi.js
@@ -1,13 +1,13 @@
+import { keyEQ } from '@agoric/store';
import { Fail, q } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { keyEQ } from '@agoric/store';
import {
ChoiceMethod,
- QuorumRule,
- ElectionType,
coerceQuestionSpec,
+ ElectionType,
+ QuorumRule,
} from '../question.js';
/**
diff --git a/packages/governance/src/contractGovernance/governFilter.js b/packages/governance/src/contractGovernance/governFilter.js
index 293f6dc65e9..6ba8efefe7a 100644
--- a/packages/governance/src/contractGovernance/governFilter.js
+++ b/packages/governance/src/contractGovernance/governFilter.js
@@ -1,13 +1,13 @@
+import { keyEQ, mustMatch } from '@agoric/store';
+import { M } from '@agoric/vat-data';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { mustMatch, keyEQ } from '@agoric/store';
-import { M } from '@agoric/vat-data';
import {
ChoiceMethod,
- QuorumRule,
- ElectionType,
coerceQuestionSpec,
+ ElectionType,
+ QuorumRule,
} from '../question.js';
/**
diff --git a/packages/governance/src/contractGovernance/governParam.js b/packages/governance/src/contractGovernance/governParam.js
index 8ca1b9b7859..ba1c9fdeb10 100644
--- a/packages/governance/src/contractGovernance/governParam.js
+++ b/packages/governance/src/contractGovernance/governParam.js
@@ -1,7 +1,7 @@
+import { keyEQ, mustMatch } from '@agoric/store';
import { Fail } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { deeplyFulfilled, Far } from '@endo/marshal';
-import { mustMatch, keyEQ } from '@agoric/store';
import {
ChoiceMethod,
diff --git a/packages/governance/src/contractGovernance/paramManager.js b/packages/governance/src/contractGovernance/paramManager.js
index ccafa4fc6b7..0d8e1a205d7 100644
--- a/packages/governance/src/contractGovernance/paramManager.js
+++ b/packages/governance/src/contractGovernance/paramManager.js
@@ -1,16 +1,16 @@
-import { Fail, q } from '@endo/errors';
-import { Far, passStyleOf } from '@endo/marshal';
import { AmountMath } from '@agoric/ertp';
-import { assertKeywordName } from '@agoric/zoe/src/cleanProposal.js';
-import { Nat } from '@endo/nat';
+import { assertAllDefined } from '@agoric/internal';
import { keyEQ, makeScalarMapStore } from '@agoric/store';
+import { assertKeywordName } from '@agoric/zoe/src/cleanProposal.js';
+import { Fail, q } from '@endo/errors';
import { E } from '@endo/eventual-send';
-import { assertAllDefined } from '@agoric/internal';
-import { ParamTypes } from '../constants.js';
+import { Far, passStyleOf } from '@endo/marshal';
+import { Nat } from '@endo/nat';
+import { ParamTypes } from '../constants.js';
import {
- assertTimestamp,
assertRelativeTime,
+ assertTimestamp,
makeAssertBrandedRatio,
makeAssertInstallation,
makeAssertInstance,
diff --git a/packages/governance/src/contractGovernance/typedParamManager.js b/packages/governance/src/contractGovernance/typedParamManager.js
index ecd80d844f4..2c715fc186b 100644
--- a/packages/governance/src/contractGovernance/typedParamManager.js
+++ b/packages/governance/src/contractGovernance/typedParamManager.js
@@ -1,5 +1,6 @@
-import { E } from '@endo/eventual-send';
import { Fail, q } from '@endo/errors';
+import { E } from '@endo/eventual-send';
+
import { ParamTypes } from '../constants.js';
import { CONTRACT_ELECTORATE } from './governParam.js';
import { makeParamManagerBuilder } from './paramManager.js';
diff --git a/packages/governance/src/contractGovernor.js b/packages/governance/src/contractGovernor.js
index 594d17aa28a..7359c69759f 100644
--- a/packages/governance/src/contractGovernor.js
+++ b/packages/governance/src/contractGovernor.js
@@ -1,9 +1,9 @@
+import { makeTracer } from '@agoric/internal';
+import { mustMatch } from '@agoric/store';
+import { provideSingleton } from '@agoric/zoe/src/contractSupport/durability.js';
import { Fail } from '@endo/errors';
import { E } from '@endo/eventual-send';
-import { mustMatch } from '@agoric/store';
-import { makeTracer } from '@agoric/internal';
-import { provideSingleton } from '@agoric/zoe/src/contractSupport/durability.js';
import { CONTRACT_ELECTORATE } from './contractGovernance/governParam.js';
import { prepareContractGovernorKit } from './contractGovernorKit.js';
import { ParamChangesQuestionDetailsShape } from './typeGuards.js';
diff --git a/packages/governance/src/contractGovernorKit.js b/packages/governance/src/contractGovernorKit.js
index 02016b36607..43d4e5c52f0 100644
--- a/packages/governance/src/contractGovernorKit.js
+++ b/packages/governance/src/contractGovernorKit.js
@@ -1,13 +1,14 @@
-import { Fail } from '@endo/errors';
-import { UnguardedHelperI, makeTracer } from '@agoric/internal';
+import { makeTracer, UnguardedHelperI } from '@agoric/internal';
+import { TimestampShape } from '@agoric/time';
import { M, prepareExoClassKit } from '@agoric/vat-data';
-import { E } from '@endo/eventual-send';
import {
- InvitationShape,
- InstanceHandleShape,
InstallationShape,
+ InstanceHandleShape,
+ InvitationShape,
} from '@agoric/zoe/src/typeGuards.js';
-import { TimestampShape } from '@agoric/time';
+import { Fail } from '@endo/errors';
+import { E } from '@endo/eventual-send';
+
import { setupApiGovernance } from './contractGovernance/governApi.js';
import { setupFilterGovernance } from './contractGovernance/governFilter.js';
import {
diff --git a/packages/governance/src/contractHelper.js b/packages/governance/src/contractHelper.js
index c3a0896ea1d..c3408d688d5 100644
--- a/packages/governance/src/contractHelper.js
+++ b/packages/governance/src/contractHelper.js
@@ -1,15 +1,16 @@
-import { Fail } from '@endo/errors';
-import { Far } from '@endo/marshal';
-import { makeStoredPublisherKit } from '@agoric/notifier';
+import { AmountShape, BrandShape } from '@agoric/ertp';
import { getMethodNames, objectMap } from '@agoric/internal';
-import { ignoreContext, prepareExo } from '@agoric/vat-data';
+import { makeStoredPublisherKit } from '@agoric/notifier';
import { M } from '@agoric/store';
-import { AmountShape, BrandShape } from '@agoric/ertp';
import { RelativeTimeRecordShape, TimestampRecordShape } from '@agoric/time';
+import { ignoreContext, prepareExo } from '@agoric/vat-data';
+import { Fail } from '@endo/errors';
import { E } from '@endo/eventual-send';
+import { Far } from '@endo/marshal';
+
+import { CONTRACT_ELECTORATE } from './contractGovernance/governParam.js';
import { makeParamManagerFromTerms } from './contractGovernance/typedParamManager.js';
import { GovernorFacetShape } from './typeGuards.js';
-import { CONTRACT_ELECTORATE } from './contractGovernance/governParam.js';
/**
* @import {VoteCounterCreatorFacet, VoteCounterPublicFacet, QuestionSpec, OutcomeRecord, AddQuestion, AddQuestionReturn, GovernanceSubscriptionState, GovernanceTerms, GovernedApis, GovernedCreatorFacet, GovernedPublicFacet} from './types.js';
diff --git a/packages/governance/src/multiCandidateVoteCounter.js b/packages/governance/src/multiCandidateVoteCounter.js
index ff236aa911d..05e0f2b6360 100644
--- a/packages/governance/src/multiCandidateVoteCounter.js
+++ b/packages/governance/src/multiCandidateVoteCounter.js
@@ -1,7 +1,10 @@
+import { keyEQ, makeExo, makeScalarMapStore } from '@agoric/store';
import { Fail } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { makePromiseKit } from '@endo/promise-kit';
-import { keyEQ, makeExo, makeScalarMapStore } from '@agoric/store';
+
+import { breakTie } from './breakTie.js';
+import { scheduleClose } from './closingRule.js';
import {
buildQuestion,
ChoiceMethod,
@@ -9,14 +12,12 @@ import {
ElectionType,
positionIncluded,
} from './question.js';
-import { scheduleClose } from './closingRule.js';
+import { makeQuorumCounter } from './quorumCounter.js';
import {
VoteCounterAdminI,
VoteCounterCloseI,
VoteCounterPublicI,
} from './typeGuards.js';
-import { makeQuorumCounter } from './quorumCounter.js';
-import { breakTie } from './breakTie.js';
/**
* @import {QuestionSpec, BuildMultiVoteCounter, MultiOutcomeRecord, Position, VoteStatistics} from './types.js';
diff --git a/packages/governance/src/noActionElectorate.js b/packages/governance/src/noActionElectorate.js
index cfde5182e46..6307d0b922e 100644
--- a/packages/governance/src/noActionElectorate.js
+++ b/packages/governance/src/noActionElectorate.js
@@ -1,9 +1,9 @@
import { makePublishKit } from '@agoric/notifier';
-import { makePromiseKit } from '@endo/promise-kit';
import { makeExo } from '@agoric/store';
import { EmptyProposalShape } from '@agoric/zoe/src/typeGuards.js';
+import { makePromiseKit } from '@endo/promise-kit';
-import { ElectoratePublicI, ElectorateCreatorI } from './typeGuards.js';
+import { ElectorateCreatorI, ElectoratePublicI } from './typeGuards.js';
/**
* @import {ElectoratePublic, ElectorateCreatorFacet} from './types.js';
diff --git a/packages/governance/src/question.js b/packages/governance/src/question.js
index b3684597e1b..6b854bd127f 100644
--- a/packages/governance/src/question.js
+++ b/packages/governance/src/question.js
@@ -1,4 +1,4 @@
-import { makeExo, mustMatch, keyEQ, M } from '@agoric/store';
+import { keyEQ, M, makeExo, mustMatch } from '@agoric/store';
import { makeHandle } from '@agoric/zoe/src/makeHandle.js';
import { QuestionI, QuestionSpecShape } from './typeGuards.js';
diff --git a/packages/governance/src/typeGuards.js b/packages/governance/src/typeGuards.js
index 6e41726003d..9fa150adbab 100644
--- a/packages/governance/src/typeGuards.js
+++ b/packages/governance/src/typeGuards.js
@@ -1,11 +1,11 @@
+import { SubscriberShape } from '@agoric/notifier';
import { M } from '@agoric/store';
import { TimestampShape } from '@agoric/time';
import {
InstanceHandleShape,
- TimerShape,
makeHandleShape,
+ TimerShape,
} from '@agoric/zoe/src/typeGuards.js';
-import { SubscriberShape } from '@agoric/notifier';
export const ChoiceMethodShape = M.or('unranked', 'order', 'plurality');
export const QuorumRuleShape = M.or('majority', 'no_quorum', 'all');
diff --git a/packages/governance/src/voterKit.js b/packages/governance/src/voterKit.js
index 7dea9b257ba..0f0b1f65b8c 100644
--- a/packages/governance/src/voterKit.js
+++ b/packages/governance/src/voterKit.js
@@ -1,6 +1,7 @@
import { M, prepareExoClassKit } from '@agoric/vat-data';
import { defineDurableHandle } from '@agoric/zoe/src/makeHandle.js';
import { E } from '@endo/eventual-send';
+
import { PositionShape, QuestionHandleShape } from './typeGuards.js';
/**
diff --git a/packages/governance/test/swingsetTests/committeeBinary/bootstrap.js b/packages/governance/test/swingsetTests/committeeBinary/bootstrap.js
index b23a3fe2a1d..258db241aba 100644
--- a/packages/governance/test/swingsetTests/committeeBinary/bootstrap.js
+++ b/packages/governance/test/swingsetTests/committeeBinary/bootstrap.js
@@ -1,14 +1,14 @@
-import { q } from '@endo/errors';
import { makeMockChainStorageRoot } from '@agoric/internal/src/storage-test-utils.js';
import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
+import { q } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
import {
ChoiceMethod,
+ coerceQuestionSpec,
ElectionType,
QuorumRule,
- coerceQuestionSpec,
} from '../../../src/index.js';
import { remoteNullMarshaller } from '../utils.js';
diff --git a/packages/governance/test/swingsetTests/committeeBinary/committee.test.js b/packages/governance/test/swingsetTests/committeeBinary/committee.test.js
index 90b0302fbbd..87250e2ff2b 100644
--- a/packages/governance/test/swingsetTests/committeeBinary/committee.test.js
+++ b/packages/governance/test/swingsetTests/committeeBinary/committee.test.js
@@ -1,9 +1,9 @@
/* eslint-disable ava/assertion-arguments -- the standard diff is unreadable */
-import test from 'ava';
-import { buildVatController, buildKernelBundles } from '@agoric/swingset-vat';
-import bundleSource from '@endo/bundle-source';
+import { buildKernelBundles, buildVatController } from '@agoric/swingset-vat';
import zcfBundle from '@agoric/zoe/bundles/bundle-contractFacet.js';
+import bundleSource from '@endo/bundle-source';
+import test from 'ava';
import path from 'path';
const CONTRACT_FILES = ['committee', 'binaryVoteCounter'];
diff --git a/packages/governance/test/swingsetTests/committeeBinary/vat-voter.js b/packages/governance/test/swingsetTests/committeeBinary/vat-voter.js
index d817520ed99..8892288e081 100644
--- a/packages/governance/test/swingsetTests/committeeBinary/vat-voter.js
+++ b/packages/governance/test/swingsetTests/committeeBinary/vat-voter.js
@@ -1,10 +1,9 @@
+import { makeNotifierFromSubscriber, observeNotifier } from '@agoric/notifier';
+import { keyEQ } from '@agoric/store';
import { q } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { makeNotifierFromSubscriber, observeNotifier } from '@agoric/notifier';
-import { keyEQ } from '@agoric/store';
-
/**
* @import {CommitteeElectoratePublic, Issue} from '../../../src/types.js';
*/
diff --git a/packages/governance/test/swingsetTests/contractGovernor/bootstrap.js b/packages/governance/test/swingsetTests/contractGovernor/bootstrap.js
index 12dc64fe62b..0912b89956a 100644
--- a/packages/governance/test/swingsetTests/contractGovernor/bootstrap.js
+++ b/packages/governance/test/swingsetTests/contractGovernor/bootstrap.js
@@ -1,9 +1,9 @@
-import { q } from '@endo/errors';
-import { E } from '@endo/eventual-send';
-import { Far } from '@endo/marshal';
import { makeMockChainStorageRoot } from '@agoric/internal/src/storage-test-utils.js';
import { observeIteration, subscribeEach } from '@agoric/notifier';
import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
+import { q } from '@endo/errors';
+import { E } from '@endo/eventual-send';
+import { Far } from '@endo/marshal';
import {
assertContractElectorate,
diff --git a/packages/governance/test/swingsetTests/contractGovernor/governedContract.js b/packages/governance/test/swingsetTests/contractGovernor/governedContract.js
index b0231c0c78e..f1930765038 100644
--- a/packages/governance/test/swingsetTests/contractGovernor/governedContract.js
+++ b/packages/governance/test/swingsetTests/contractGovernor/governedContract.js
@@ -1,6 +1,6 @@
+import { CONTRACT_ELECTORATE } from '../../../src/contractGovernance/governParam.js';
import { handleParamGovernance } from '../../../src/contractHelper.js';
import { ParamTypes } from '../../../src/index.js';
-import { CONTRACT_ELECTORATE } from '../../../src/contractGovernance/governParam.js';
/**
* @import {GovernanceTerms} from '../../../src/types.js';
diff --git a/packages/governance/test/swingsetTests/contractGovernor/governor.test.js b/packages/governance/test/swingsetTests/contractGovernor/governor.test.js
index de24bb0268b..aaec058a6ba 100644
--- a/packages/governance/test/swingsetTests/contractGovernor/governor.test.js
+++ b/packages/governance/test/swingsetTests/contractGovernor/governor.test.js
@@ -1,9 +1,9 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-import { buildVatController, buildKernelBundles } from '@agoric/swingset-vat';
-import bundleSource from '@endo/bundle-source';
+import { buildKernelBundles, buildVatController } from '@agoric/swingset-vat';
import zcfBundle from '@agoric/zoe/bundles/bundle-contractFacet.js';
+import bundleSource from '@endo/bundle-source';
+import path from 'path';
const CONTRACT_FILES = [
'committee',
diff --git a/packages/governance/test/swingsetTests/contractGovernor/vat-voter.js b/packages/governance/test/swingsetTests/contractGovernor/vat-voter.js
index 4f8cb994f86..c6e85835b84 100644
--- a/packages/governance/test/swingsetTests/contractGovernor/vat-voter.js
+++ b/packages/governance/test/swingsetTests/contractGovernor/vat-voter.js
@@ -3,11 +3,11 @@ import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
import {
+ assertBallotConcernsParam,
assertContractElectorate,
assertContractGovernance,
- validateQuestionFromCounter,
validateQuestionDetails,
- assertBallotConcernsParam,
+ validateQuestionFromCounter,
} from '../../../src/index.js';
import { MALLEABLE_NUMBER } from './governedContract.js';
diff --git a/packages/governance/test/swingsetTests/utils.js b/packages/governance/test/swingsetTests/utils.js
index 7929ab8ff61..ff05b256455 100644
--- a/packages/governance/test/swingsetTests/utils.js
+++ b/packages/governance/test/swingsetTests/utils.js
@@ -1,5 +1,5 @@
-import { Far, makeMarshal } from '@endo/marshal';
import { makeExo } from '@agoric/store';
+import { Far, makeMarshal } from '@endo/marshal';
const nullMarshaller = makeMarshal(
_ => null,
diff --git a/packages/governance/test/unitTests/ballotBuilder.test.js b/packages/governance/test/unitTests/ballotBuilder.test.js
index 9c9208b3bd4..63461760eae 100644
--- a/packages/governance/test/unitTests/ballotBuilder.test.js
+++ b/packages/governance/test/unitTests/ballotBuilder.test.js
@@ -1,9 +1,10 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
+
import {
- coerceQuestionSpec,
ChoiceMethod,
+ coerceQuestionSpec,
ElectionType,
QuorumRule,
} from '../../src/index.js';
diff --git a/packages/governance/test/unitTests/binaryballotCount.test.js b/packages/governance/test/unitTests/binaryballotCount.test.js
index 9df95351c91..a44ba2f2ed1 100644
--- a/packages/governance/test/unitTests/binaryballotCount.test.js
+++ b/packages/governance/test/unitTests/binaryballotCount.test.js
@@ -1,24 +1,24 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { E } from '@endo/eventual-send';
-import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
-import { makeHandle } from '@agoric/zoe/src/makeHandle.js';
-import { Far } from '@endo/marshal';
+import { makeMockChainStorageRoot } from '@agoric/internal/src/storage-test-utils.js';
import { makeStoredPublishKit } from '@agoric/notifier';
import {
eventLoopIteration,
makeFakeMarshaller,
} from '@agoric/notifier/tools/testSupports.js';
+import { makeHandle } from '@agoric/zoe/src/makeHandle.js';
+import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
+import { E } from '@endo/eventual-send';
+import { Far } from '@endo/marshal';
-import { makeMockChainStorageRoot } from '@agoric/internal/src/storage-test-utils.js';
+import { makeBinaryVoteCounter } from '../../src/binaryVoteCounter.js';
import {
ChoiceMethod,
- ElectionType,
- QuorumRule,
coerceQuestionSpec,
+ ElectionType,
makeParamChangePositions,
+ QuorumRule,
} from '../../src/index.js';
-import { makeBinaryVoteCounter } from '../../src/binaryVoteCounter.js';
const SIMPLE_ISSUE = harden({ text: 'Fish or cut bait?' });
const FISH = harden({ text: 'Fish' });
diff --git a/packages/governance/test/unitTests/buildParamManager.test.js b/packages/governance/test/unitTests/buildParamManager.test.js
index 3585026d361..a60e237ba65 100644
--- a/packages/governance/test/unitTests/buildParamManager.test.js
+++ b/packages/governance/test/unitTests/buildParamManager.test.js
@@ -2,6 +2,7 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
+import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
import { makeStoredPublisherKit } from '@agoric/notifier';
import { keyEQ } from '@agoric/store';
import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
@@ -9,7 +10,7 @@ import { makeHandle } from '@agoric/zoe/src/makeHandle.js';
import { setupZCFTest } from '@agoric/zoe/test/unitTests/zcf/setupZcfTest.js';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
+
import { makeParamManagerBuilder, ParamTypes } from '../../src/index.js';
test('two parameters', t => {
diff --git a/packages/governance/test/unitTests/committee.test.js b/packages/governance/test/unitTests/committee.test.js
index 5e50c9d300e..eb04a1a0cf9 100644
--- a/packages/governance/test/unitTests/committee.test.js
+++ b/packages/governance/test/unitTests/committee.test.js
@@ -11,9 +11,9 @@ import path from 'path';
import {
ChoiceMethod,
+ coerceQuestionSpec,
ElectionType,
QuorumRule,
- coerceQuestionSpec,
} from '../../src/index.js';
import { documentStorageSchema } from '../../tools/storageDoc.js';
import { remoteNullMarshaller } from '../swingsetTests/utils.js';
diff --git a/packages/governance/test/unitTests/multiCandidateBallotCount.test.js b/packages/governance/test/unitTests/multiCandidateBallotCount.test.js
index 2f319530615..71cf43e1dad 100644
--- a/packages/governance/test/unitTests/multiCandidateBallotCount.test.js
+++ b/packages/governance/test/unitTests/multiCandidateBallotCount.test.js
@@ -1,13 +1,15 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
+
+import { makeMockChainStorageRoot } from '@agoric/internal/src/storage-test-utils.js';
import { makeStoredPublishKit } from '@agoric/notifier';
import {
eventLoopIteration,
makeFakeMarshaller,
} from '@agoric/notifier/tools/testSupports.js';
-import { makeMockChainStorageRoot } from '@agoric/internal/src/storage-test-utils.js';
import { makeHandle } from '@agoric/zoe/src/makeHandle.js';
import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
import { E } from '@endo/eventual-send';
+
import {
ChoiceMethod,
coerceQuestionSpec,
diff --git a/packages/governance/test/unitTests/paramChangePositions.test.js b/packages/governance/test/unitTests/paramChangePositions.test.js
index 5c166b4e3d4..3293676902b 100644
--- a/packages/governance/test/unitTests/paramChangePositions.test.js
+++ b/packages/governance/test/unitTests/paramChangePositions.test.js
@@ -2,8 +2,8 @@ import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
-
import { makeHandle } from '@agoric/zoe/src/makeHandle.js';
+
import { makeParamChangePositions } from '../../src/index.js';
const positive = (name, val) => {
diff --git a/packages/governance/test/unitTests/paramGovernance.test.js b/packages/governance/test/unitTests/paramGovernance.test.js
index 68d35fc032b..02baa86a31d 100644
--- a/packages/governance/test/unitTests/paramGovernance.test.js
+++ b/packages/governance/test/unitTests/paramGovernance.test.js
@@ -1,14 +1,14 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { makeMockChainStorageRoot } from '@agoric/internal/src/storage-test-utils.js';
+import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
import { makeNotifierFromAsyncIterable } from '@agoric/notifier';
import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
import { makeZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
import bundleSource from '@endo/bundle-source';
import { E } from '@endo/eventual-send';
-
-import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
import { resolve as importMetaResolve } from 'import-meta-resolve';
+
import { CONTRACT_ELECTORATE, ParamTypes } from '../../src/index.js';
import { MALLEABLE_NUMBER } from '../swingsetTests/contractGovernor/governedContract.js';
import { remoteNullMarshaller } from '../swingsetTests/utils.js';
diff --git a/packages/governance/test/unitTests/puppetContractGovernor.test.js b/packages/governance/test/unitTests/puppetContractGovernor.test.js
index 6243d5fda46..ead93136818 100644
--- a/packages/governance/test/unitTests/puppetContractGovernor.test.js
+++ b/packages/governance/test/unitTests/puppetContractGovernor.test.js
@@ -1,12 +1,12 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
+import { AssetKind, makeIssuerKit } from '@agoric/ertp';
import { makeNotifierFromAsyncIterable } from '@agoric/notifier';
-import { makeZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
+import { makeZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
import bundleSource from '@endo/bundle-source';
import { E } from '@endo/eventual-send';
import { resolve as importMetaResolve } from 'import-meta-resolve';
-import { AssetKind, makeIssuerKit } from '@agoric/ertp';
import { CONTRACT_ELECTORATE, ParamTypes } from '../../src/index.js';
import { setUpGovernedContract } from '../../tools/puppetGovernance.js';
diff --git a/packages/governance/test/unitTests/typedParamManager.test.js b/packages/governance/test/unitTests/typedParamManager.test.js
index fcc4255bdbb..ef32c8b864d 100644
--- a/packages/governance/test/unitTests/typedParamManager.test.js
+++ b/packages/governance/test/unitTests/typedParamManager.test.js
@@ -1,19 +1,20 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { makeIssuerKit, AmountMath } from '@agoric/ertp';
+
+import { AmountMath, makeIssuerKit } from '@agoric/ertp';
+import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
import { makeStoredPublisherKit } from '@agoric/notifier';
import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
+import { makeHandle } from '@agoric/zoe/src/makeHandle.js';
import { setupZCFTest } from '@agoric/zoe/test/unitTests/zcf/setupZcfTest.js';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { makeHandle } from '@agoric/zoe/src/makeHandle.js';
-import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
-import { ParamTypes } from '../../src/index.js';
import {
makeParamManager,
makeParamManagerFromTerms,
makeParamManagerSync,
} from '../../src/contractGovernance/typedParamManager.js';
+import { ParamTypes } from '../../src/index.js';
const drachmaKit = makeIssuerKit('drachma');
const drachmaBrand = drachmaKit.brand;
diff --git a/packages/governance/tools/puppetContractGovernor.js b/packages/governance/tools/puppetContractGovernor.js
index 0ad9aa3e07b..630d946e43f 100644
--- a/packages/governance/tools/puppetContractGovernor.js
+++ b/packages/governance/tools/puppetContractGovernor.js
@@ -2,9 +2,9 @@ import { Fail } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
+import { makeApiInvocationPositions } from '../src/contractGovernance/governApi.js';
// eslint-disable-next-line no-unused-vars -- used by typedef
import { CONTRACT_ELECTORATE } from '../src/contractGovernance/governParam.js';
-import { makeApiInvocationPositions } from '../src/contractGovernance/governApi.js';
/**
* @import {Passable, RemotableObject} from '@endo/pass-style';
diff --git a/packages/governance/tools/puppetGovernance.js b/packages/governance/tools/puppetGovernance.js
index 47089b3f62a..0f723a9f808 100644
--- a/packages/governance/tools/puppetGovernance.js
+++ b/packages/governance/tools/puppetGovernance.js
@@ -1,6 +1,7 @@
import bundleSource from '@endo/bundle-source';
import { E } from '@endo/eventual-send';
import { resolve as importMetaResolve } from 'import-meta-resolve';
+
import { CONTRACT_ELECTORATE, ParamTypes } from '../src/index.js';
/**
diff --git a/packages/import-manager/test/unitTests/goodImports.js b/packages/import-manager/test/unitTests/goodImports.js
index 13a789787f7..83e65c49ddd 100644
--- a/packages/import-manager/test/unitTests/goodImports.js
+++ b/packages/import-manager/test/unitTests/goodImports.js
@@ -1,7 +1,7 @@
// Copyright (C) 2019 Agoric, under Apache License 2.0
-import { numIsEmpty, listIsEmpty } from './valueOps.js';
import { importManager } from '../../src/importManager.js';
+import { listIsEmpty, numIsEmpty } from './valueOps.js';
// This file models the way a module could export functionality to be run
// locally within a vat, but with the behavior determined by remote objects.
diff --git a/packages/inter-protocol/src/auction/auctionBook.js b/packages/inter-protocol/src/auction/auctionBook.js
index d5536768e8a..9d4ba41c8d3 100644
--- a/packages/inter-protocol/src/auction/auctionBook.js
+++ b/packages/inter-protocol/src/auction/auctionBook.js
@@ -2,13 +2,11 @@
///
///
-import { Fail } from '@endo/errors';
-import { E } from '@endo/captp';
import { AmountMath, RatioShape } from '@agoric/ertp';
+import { assertAllDefined, makeTracer } from '@agoric/internal';
+import { observeNotifier } from '@agoric/notifier';
import { mustMatch } from '@agoric/store';
import { M, prepareExoClassKit } from '@agoric/vat-data';
-
-import { assertAllDefined, makeTracer } from '@agoric/internal';
import {
ceilMultiplyBy,
makeRatioFromAmounts,
@@ -16,7 +14,8 @@ import {
multiplyRatios,
ratioGTE,
} from '@agoric/zoe/src/contractSupport/index.js';
-import { observeNotifier } from '@agoric/notifier';
+import { E } from '@endo/captp';
+import { Fail } from '@endo/errors';
import { makeNatAmountShape } from '../contractSupport.js';
import { amountsToSettle } from './auctionMath.js';
diff --git a/packages/inter-protocol/src/auction/auctioneer.js b/packages/inter-protocol/src/auction/auctioneer.js
index 1eed4c9d48a..cb39a577a55 100644
--- a/packages/inter-protocol/src/auction/auctioneer.js
+++ b/packages/inter-protocol/src/auction/auctioneer.js
@@ -1,9 +1,6 @@
///
///
-import { Fail, q } from '@endo/errors';
-import { E } from '@endo/eventual-send';
-import { Far } from '@endo/marshal';
import { AmountMath, AmountShape, BrandShape } from '@agoric/ertp';
import { handleParamGovernance } from '@agoric/governance';
import { BASIS_POINTS, makeTracer } from '@agoric/internal';
@@ -22,11 +19,14 @@ import {
makeRatioFromAmounts,
makeRecorderTopic,
natSafeMath,
+ offerTo,
prepareRecorder,
provideEmptySeat,
- offerTo,
} from '@agoric/zoe/src/contractSupport/index.js';
import { FullProposalShape } from '@agoric/zoe/src/typeGuards.js';
+import { Fail, q } from '@endo/errors';
+import { E } from '@endo/eventual-send';
+import { Far } from '@endo/marshal';
import { makeNatAmountShape } from '../contractSupport.js';
import { makeOfferSpecShape, prepareAuctionBook } from './auctionBook.js';
diff --git a/packages/inter-protocol/src/auction/params.js b/packages/inter-protocol/src/auction/params.js
index c4bb7bf1328..deda038ce77 100644
--- a/packages/inter-protocol/src/auction/params.js
+++ b/packages/inter-protocol/src/auction/params.js
@@ -3,8 +3,8 @@ import {
makeParamManager,
ParamTypes,
} from '@agoric/governance';
-import { TimeMath, RelativeTimeRecordShape } from '@agoric/time';
import { M } from '@agoric/store';
+import { RelativeTimeRecordShape, TimeMath } from '@agoric/time';
/**
* @import {AsyncSpecTuple} from '@agoric/governance/src/contractGovernance/typedParamManager.js';
diff --git a/packages/inter-protocol/src/auction/scheduleMath.js b/packages/inter-protocol/src/auction/scheduleMath.js
index 73fe93e4cef..419971a1a6a 100644
--- a/packages/inter-protocol/src/auction/scheduleMath.js
+++ b/packages/inter-protocol/src/auction/scheduleMath.js
@@ -1,9 +1,9 @@
// @jessie-check
-import { Fail } from '@endo/errors';
+import { assertAllDefined, makeTracer } from '@agoric/internal';
import { TimeMath } from '@agoric/time';
import { natSafeMath } from '@agoric/zoe/src/contractSupport/index.js';
-import { assertAllDefined, makeTracer } from '@agoric/internal';
+import { Fail } from '@endo/errors';
/** @import {TimestampRecord} from '@agoric/time'; */
diff --git a/packages/inter-protocol/src/auction/scheduler.js b/packages/inter-protocol/src/auction/scheduler.js
index 716b84267b5..54153cd831d 100644
--- a/packages/inter-protocol/src/auction/scheduler.js
+++ b/packages/inter-protocol/src/auction/scheduler.js
@@ -1,16 +1,16 @@
-import { X, Fail, q, makeError } from '@endo/errors';
-import { E } from '@endo/eventual-send';
-import { Far } from '@endo/marshal';
-import { TimeMath } from '@agoric/time';
import { makeTracer } from '@agoric/internal';
import { observeIteration, subscribeEach } from '@agoric/notifier';
+import { TimeMath } from '@agoric/time';
+import { Fail, makeError, q, X } from '@endo/errors';
+import { E } from '@endo/eventual-send';
+import { Far } from '@endo/marshal';
-import { AuctionState, makeCancelTokenMaker } from './util.js';
import {
computeRoundTiming,
nextDescendingStepTime,
timeVsSchedule,
} from './scheduleMath.js';
+import { AuctionState, makeCancelTokenMaker } from './util.js';
const trace = makeTracer('SCHED', true);
diff --git a/packages/inter-protocol/src/auction/sortedOffers.js b/packages/inter-protocol/src/auction/sortedOffers.js
index fd58098815b..fb78984c10c 100644
--- a/packages/inter-protocol/src/auction/sortedOffers.js
+++ b/packages/inter-protocol/src/auction/sortedOffers.js
@@ -1,12 +1,12 @@
// @jessie-check
-import { Fail } from '@endo/errors';
+import { RatioShape } from '@agoric/ertp';
+import { M, mustMatch } from '@agoric/store';
import {
makeRatio,
ratioToNumber,
} from '@agoric/zoe/src/contractSupport/index.js';
-import { M, mustMatch } from '@agoric/store';
-import { RatioShape } from '@agoric/ertp';
+import { Fail } from '@endo/errors';
import { decodeData, encodeData } from '../vaultFactory/storeUtils.js';
diff --git a/packages/inter-protocol/src/clientSupport.js b/packages/inter-protocol/src/clientSupport.js
index 58c92353f80..3452d8ded00 100644
--- a/packages/inter-protocol/src/clientSupport.js
+++ b/packages/inter-protocol/src/clientSupport.js
@@ -1,9 +1,9 @@
// @ts-check
-import { Fail } from '@endo/errors';
import { AmountMath } from '@agoric/ertp';
import { assertAllDefined } from '@agoric/internal';
import { parseRatio } from '@agoric/zoe/src/contractSupport/ratio.js';
+import { Fail } from '@endo/errors';
// XXX support other decimal places
const COSMOS_UNIT = 1_000_000n;
diff --git a/packages/inter-protocol/src/contractSupport.js b/packages/inter-protocol/src/contractSupport.js
index 119f819fc89..c6a2a01dfcb 100644
--- a/packages/inter-protocol/src/contractSupport.js
+++ b/packages/inter-protocol/src/contractSupport.js
@@ -1,9 +1,9 @@
// @jessie-check
-import { Fail, q } from '@endo/errors';
import { AmountMath } from '@agoric/ertp';
import { M } from '@agoric/store';
import { makeRatioFromAmounts } from '@agoric/zoe/src/contractSupport/index.js';
+import { Fail, q } from '@endo/errors';
/** @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js'; */
diff --git a/packages/inter-protocol/src/feeDistributor.js b/packages/inter-protocol/src/feeDistributor.js
index 5871f9c50dd..8d30659aeb0 100644
--- a/packages/inter-protocol/src/feeDistributor.js
+++ b/packages/inter-protocol/src/feeDistributor.js
@@ -1,11 +1,11 @@
import { AmountMath } from '@agoric/ertp';
import { splitMany } from '@agoric/ertp/src/legacy-payment-helpers.js';
-import { E, Far } from '@endo/far';
-import { Nat } from '@endo/nat';
import { observeNotifier } from '@agoric/notifier';
-import { mustMatch, makeScalarSetStore, M } from '@agoric/store';
+import { M, makeScalarSetStore, mustMatch } from '@agoric/store';
import { RelativeTimeShape } from '@agoric/time';
import { KeywordShape } from '@agoric/zoe/src/typeGuards.js';
+import { E, Far } from '@endo/far';
+import { Nat } from '@endo/nat';
const KeywordSharesShape = M.recordOf(KeywordShape, M.nat());
diff --git a/packages/inter-protocol/src/interest-math.js b/packages/inter-protocol/src/interest-math.js
index 0322e813ecd..b8f6ae49bbf 100644
--- a/packages/inter-protocol/src/interest-math.js
+++ b/packages/inter-protocol/src/interest-math.js
@@ -2,8 +2,8 @@
import {
divideBy,
- multiplyBy,
invertRatio,
+ multiplyBy,
multiplyRatios,
ratiosSame,
} from '@agoric/zoe/src/contractSupport/ratio.js';
diff --git a/packages/inter-protocol/src/interest.js b/packages/inter-protocol/src/interest.js
index 7faf77615df..990a5048ff2 100644
--- a/packages/inter-protocol/src/interest.js
+++ b/packages/inter-protocol/src/interest.js
@@ -1,14 +1,14 @@
// @jessie-check
-import { Fail } from '@endo/errors';
import { AmountMath } from '@agoric/ertp';
+import { TimeMath } from '@agoric/time';
import { natSafeMath } from '@agoric/zoe/src/contractSupport/index.js';
import {
makeRatio,
multiplyRatios,
quantize,
} from '@agoric/zoe/src/contractSupport/ratio.js';
-import { TimeMath } from '@agoric/time';
+import { Fail } from '@endo/errors';
/**
* @import {Timestamp} from '@agoric/time'
diff --git a/packages/inter-protocol/src/price/fluxAggregatorContract.js b/packages/inter-protocol/src/price/fluxAggregatorContract.js
index 0eb968edd2b..c4b81d16fbb 100644
--- a/packages/inter-protocol/src/price/fluxAggregatorContract.js
+++ b/packages/inter-protocol/src/price/fluxAggregatorContract.js
@@ -8,6 +8,7 @@ import { M } from '@agoric/store';
import { provideAll } from '@agoric/zoe/src/contractSupport/durability.js';
import { prepareRecorder } from '@agoric/zoe/src/contractSupport/recorder.js';
import { E } from '@endo/eventual-send';
+
import { reserveThenDeposit } from '../proposals/utils.js';
import { prepareFluxAggregatorKit } from './fluxAggregatorKit.js';
diff --git a/packages/inter-protocol/src/price/fluxAggregatorKit.js b/packages/inter-protocol/src/price/fluxAggregatorKit.js
index e538b207dfc..420aa2df28b 100644
--- a/packages/inter-protocol/src/price/fluxAggregatorKit.js
+++ b/packages/inter-protocol/src/price/fluxAggregatorKit.js
@@ -15,6 +15,7 @@ import {
} from '@agoric/zoe/src/contractSupport/index.js';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
+
import { prepareOracleAdminKit } from './priceOracleKit.js';
import { prepareRoundsManagerKit } from './roundsManager.js';
diff --git a/packages/inter-protocol/src/price/priceOracleKit.js b/packages/inter-protocol/src/price/priceOracleKit.js
index 1f634d2544d..446628f819e 100644
--- a/packages/inter-protocol/src/price/priceOracleKit.js
+++ b/packages/inter-protocol/src/price/priceOracleKit.js
@@ -1,6 +1,6 @@
-import { Fail } from '@endo/errors';
import { makeTracer } from '@agoric/internal';
import { M, prepareExoClassKit } from '@agoric/vat-data';
+import { Fail } from '@endo/errors';
const trace = makeTracer('OrKit', true);
diff --git a/packages/inter-protocol/src/price/roundsManager.js b/packages/inter-protocol/src/price/roundsManager.js
index 0e47ce4cc38..449d28540a3 100644
--- a/packages/inter-protocol/src/price/roundsManager.js
+++ b/packages/inter-protocol/src/price/roundsManager.js
@@ -1,16 +1,16 @@
-import { Fail, q } from '@endo/errors';
import { AmountMath } from '@agoric/ertp';
import { makeTracer } from '@agoric/internal';
+import { UnguardedHelperI } from '@agoric/internal/src/typeGuards.js';
import { TimeMath, TimestampShape } from '@agoric/time';
import { M, makeScalarBigMapStore, prepareExoClassKit } from '@agoric/vat-data';
import {
calculateMedian,
natSafeMath,
} from '@agoric/zoe/src/contractSupport/index.js';
+import { Fail, q } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
import { isNat, Nat } from '@endo/nat';
-import { UnguardedHelperI } from '@agoric/internal/src/typeGuards.js';
const { add, subtract, multiply, floorDivide, ceilDivide, isGTE } = natSafeMath;
diff --git a/packages/inter-protocol/src/proposals/add-auction.js b/packages/inter-protocol/src/proposals/add-auction.js
index ca5bb004759..a870d74d078 100644
--- a/packages/inter-protocol/src/proposals/add-auction.js
+++ b/packages/inter-protocol/src/proposals/add-auction.js
@@ -1,7 +1,8 @@
import { deeplyFulfilledObject, makeTracer } from '@agoric/internal';
import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
-import { E } from '@endo/far';
import { Stable } from '@agoric/internal/src/tokens.js';
+import { E } from '@endo/far';
+
import { makeGovernedTerms as makeGovernedATerms } from '../auction/params.js';
const trace = makeTracer('NewAuction', true);
diff --git a/packages/inter-protocol/src/proposals/addAssetToVault.js b/packages/inter-protocol/src/proposals/addAssetToVault.js
index f1481e09099..c601d2c530b 100644
--- a/packages/inter-protocol/src/proposals/addAssetToVault.js
+++ b/packages/inter-protocol/src/proposals/addAssetToVault.js
@@ -1,16 +1,16 @@
// @jessie-check
// @ts-check
-import { q } from '@endo/errors';
-import { ToFarFunction } from '@endo/captp';
-import { Far } from '@endo/marshal';
import { AmountMath, AssetKind } from '@agoric/ertp';
import { deeplyFulfilledObject } from '@agoric/internal';
+import { Stable } from '@agoric/internal/src/tokens.js';
+import { TimeMath } from '@agoric/time/src/timeMath.js';
import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
import { parseRatio } from '@agoric/zoe/src/contractSupport/ratio.js';
+import { ToFarFunction } from '@endo/captp';
+import { q } from '@endo/errors';
import { E } from '@endo/far';
-import { Stable } from '@agoric/internal/src/tokens.js';
-import { TimeMath } from '@agoric/time/src/timeMath.js';
+import { Far } from '@endo/marshal';
import { makePromiseKit } from '@endo/promise-kit';
import {
diff --git a/packages/inter-protocol/src/proposals/committee-proposal.js b/packages/inter-protocol/src/proposals/committee-proposal.js
index 5f86fb31443..f450ce38f6e 100644
--- a/packages/inter-protocol/src/proposals/committee-proposal.js
+++ b/packages/inter-protocol/src/proposals/committee-proposal.js
@@ -1,5 +1,6 @@
import { deeplyFulfilledObject } from '@agoric/internal';
import { E } from '@endo/far';
+
import { reserveThenDeposit } from './utils.js';
const { values } = Object;
diff --git a/packages/inter-protocol/src/proposals/core-proposal.js b/packages/inter-protocol/src/proposals/core-proposal.js
index ba31357f616..cf9d57490e6 100644
--- a/packages/inter-protocol/src/proposals/core-proposal.js
+++ b/packages/inter-protocol/src/proposals/core-proposal.js
@@ -1,6 +1,7 @@
// @jessie-check
import { Stable } from '@agoric/internal/src/tokens.js';
+
import * as econBehaviors from './econ-behaviors.js';
import { ECON_COMMITTEE_MANIFEST } from './startEconCommittee.js';
diff --git a/packages/inter-protocol/src/proposals/econ-behaviors.js b/packages/inter-protocol/src/proposals/econ-behaviors.js
index 9b58897e6c9..17cf890815e 100644
--- a/packages/inter-protocol/src/proposals/econ-behaviors.js
+++ b/packages/inter-protocol/src/proposals/econ-behaviors.js
@@ -3,9 +3,10 @@
import { AmountMath } from '@agoric/ertp';
import { deeplyFulfilledObject, makeTracer } from '@agoric/internal';
import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
-import { E } from '@endo/far';
-import { makeScalarBigMapStore } from '@agoric/vat-data';
import { Stable } from '@agoric/internal/src/tokens.js';
+import { makeScalarBigMapStore } from '@agoric/vat-data';
+import { E } from '@endo/far';
+
import { makeGovernedTerms as makeGovernedATerms } from '../auction/params.js';
import { makeReserveTerms } from '../reserve/params.js';
import { makeGovernedTerms as makeGovernedVFTerms } from '../vaultFactory/params.js';
diff --git a/packages/inter-protocol/src/proposals/price-feed-proposal.js b/packages/inter-protocol/src/proposals/price-feed-proposal.js
index ef0808cea6e..096581ff6f5 100644
--- a/packages/inter-protocol/src/proposals/price-feed-proposal.js
+++ b/packages/inter-protocol/src/proposals/price-feed-proposal.js
@@ -4,9 +4,9 @@ import {
assertPathSegment,
makeStorageNodeChild,
} from '@agoric/internal/src/lib-chainStorage.js';
+import { unitAmount } from '@agoric/zoe/src/contractSupport/priceQuote.js';
import { E } from '@endo/far';
-import { unitAmount } from '@agoric/zoe/src/contractSupport/priceQuote.js';
import {
oracleBrandFeedName,
reserveThenDeposit,
diff --git a/packages/inter-protocol/src/proposals/startPSM.js b/packages/inter-protocol/src/proposals/startPSM.js
index 9c00cdcf9d9..d10e8fa0d85 100644
--- a/packages/inter-protocol/src/proposals/startPSM.js
+++ b/packages/inter-protocol/src/proposals/startPSM.js
@@ -1,28 +1,27 @@
// @jessie-check
-import { makeMap } from 'jessie.js';
-import { X } from '@endo/errors';
-import { E } from '@endo/far';
import { AmountMath, AssetKind } from '@agoric/ertp';
import { CONTRACT_ELECTORATE, ParamTypes } from '@agoric/governance';
+import { deeplyFulfilledObject } from '@agoric/internal';
import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
-import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
import {
- makeHistoryReviver,
makeBoardRemote,
+ makeHistoryReviver,
slotToBoardRemote,
} from '@agoric/internal/src/marshal.js';
-import { deeplyFulfilledObject } from '@agoric/internal';
-import { makeScalarBigMapStore } from '@agoric/vat-data';
import { Stable } from '@agoric/internal/src/tokens.js';
-
-import { reserveThenGetNamePaths } from './utils.js';
+import { makeScalarBigMapStore } from '@agoric/vat-data';
+import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
+import { X } from '@endo/errors';
+import { E } from '@endo/far';
+import { makeMap } from 'jessie.js';
import {
inviteCommitteeMembers,
- startEconCharter,
inviteToEconCharter,
+ startEconCharter,
} from './committee-proposal.js';
+import { reserveThenGetNamePaths } from './utils.js';
/** @import {BootstrapManifest} from '@agoric/vats/src/core/lib-boot.js' */
/** @import {MetricsNotification} from '../psm/psm.js' */
diff --git a/packages/inter-protocol/src/proposals/upgrade-vaults.js b/packages/inter-protocol/src/proposals/upgrade-vaults.js
index 2088aac9e67..f6092cc6143 100644
--- a/packages/inter-protocol/src/proposals/upgrade-vaults.js
+++ b/packages/inter-protocol/src/proposals/upgrade-vaults.js
@@ -1,9 +1,9 @@
-import { E } from '@endo/far';
-import { makeNotifierFromAsyncIterable } from '@agoric/notifier';
import { AmountMath } from '@agoric/ertp/src/index.js';
import { makeTracer } from '@agoric/internal/src/index.js';
-import { Fail } from '@endo/errors';
+import { makeNotifierFromAsyncIterable } from '@agoric/notifier';
import { TimeMath } from '@agoric/time';
+import { Fail } from '@endo/errors';
+import { E } from '@endo/far';
const trace = makeTracer('upgrade Vaults proposal');
diff --git a/packages/inter-protocol/src/proposals/utils.js b/packages/inter-protocol/src/proposals/utils.js
index f0c00e9e18e..40eacd17d42 100644
--- a/packages/inter-protocol/src/proposals/utils.js
+++ b/packages/inter-protocol/src/proposals/utils.js
@@ -1,7 +1,7 @@
-import { Fail } from '@endo/errors';
-import { E } from '@endo/far';
import { WalletName } from '@agoric/internal';
import { getCopyMapEntries, makeCopyMap } from '@agoric/store';
+import { Fail } from '@endo/errors';
+import { E } from '@endo/far';
/** @import {CopyMap} from '@endo/patterns'; */
diff --git a/packages/inter-protocol/src/provisionPool.js b/packages/inter-protocol/src/provisionPool.js
index 7eb37c61dd1..cc3c6b0ff42 100644
--- a/packages/inter-protocol/src/provisionPool.js
+++ b/packages/inter-protocol/src/provisionPool.js
@@ -12,6 +12,7 @@ import { prepareExo } from '@agoric/vat-data';
import { provideSingleton } from '@agoric/zoe/src/contractSupport/durability.js';
import { prepareRecorderKitMakers } from '@agoric/zoe/src/contractSupport/recorder.js';
import { TopicsRecordShape } from '@agoric/zoe/src/contractSupport/topics.js';
+
import { prepareProvisionPoolKit } from './provisionPoolKit.js';
/** @import {Marshal} from '@endo/marshal'; */
diff --git a/packages/inter-protocol/src/provisionPoolKit.js b/packages/inter-protocol/src/provisionPoolKit.js
index 4e1c71aa704..506d3170f11 100644
--- a/packages/inter-protocol/src/provisionPoolKit.js
+++ b/packages/inter-protocol/src/provisionPoolKit.js
@@ -1,11 +1,8 @@
// @ts-check
-import { X, q, Fail } from '@endo/errors';
-import { E } from '@endo/far';
-import { Far } from '@endo/marshal';
-
import { AmountMath, BrandShape } from '@agoric/ertp';
import { deeplyFulfilledObject, makeTracer } from '@agoric/internal';
import { UnguardedHelperI } from '@agoric/internal/src/typeGuards.js';
+import { isUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
import {
observeIteration,
observeNotifier,
@@ -19,11 +16,13 @@ import {
} from '@agoric/vat-data';
import { PowerFlags } from '@agoric/vats/src/walletFlags.js';
import {
- PublicTopicShape,
makeRecorderTopic,
+ PublicTopicShape,
} from '@agoric/zoe/src/contractSupport/topics.js';
import { InstanceHandleShape } from '@agoric/zoe/src/typeGuards.js';
-import { isUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
+import { Fail, q, X } from '@endo/errors';
+import { E } from '@endo/far';
+import { Far } from '@endo/marshal';
const trace = makeTracer('ProvPool');
diff --git a/packages/inter-protocol/src/psm/psm.js b/packages/inter-protocol/src/psm/psm.js
index 246d138979f..968e507e936 100644
--- a/packages/inter-protocol/src/psm/psm.js
+++ b/packages/inter-protocol/src/psm/psm.js
@@ -2,8 +2,6 @@
///
///
-import { Fail } from '@endo/errors';
-import { E } from '@endo/eventual-send';
import { AmountMath, AmountShape, BrandShape, RatioShape } from '@agoric/ertp';
import {
CONTRACT_ELECTORATE,
@@ -12,6 +10,7 @@ import {
publicMixinAPI,
} from '@agoric/governance';
import { StorageNodeShape } from '@agoric/internal';
+import { mustMatch } from '@agoric/store';
import { M, prepareExo, provide } from '@agoric/vat-data';
import {
atomicRearrange,
@@ -31,8 +30,9 @@ import {
InstanceHandleShape,
InvitationShape,
} from '@agoric/zoe/src/typeGuards.js';
+import { Fail } from '@endo/errors';
+import { E } from '@endo/eventual-send';
-import { mustMatch } from '@agoric/store';
import { makeCollectFeesInvitation } from '../collectFees.js';
import { makeNatAmountShape } from '../contractSupport.js';
diff --git a/packages/inter-protocol/src/reserve/assetReserve.js b/packages/inter-protocol/src/reserve/assetReserve.js
index 322172e0e0f..06918b76a9f 100644
--- a/packages/inter-protocol/src/reserve/assetReserve.js
+++ b/packages/inter-protocol/src/reserve/assetReserve.js
@@ -6,6 +6,7 @@ import {
prepareRecorderKitMakers,
provideAll,
} from '@agoric/zoe/src/contractSupport/index.js';
+
import { prepareAssetReserveKit } from './assetReserveKit.js';
const trace = makeTracer('AR', true);
diff --git a/packages/inter-protocol/src/reserve/assetReserveKit.js b/packages/inter-protocol/src/reserve/assetReserveKit.js
index d4e5971ccf0..19bba97840f 100644
--- a/packages/inter-protocol/src/reserve/assetReserveKit.js
+++ b/packages/inter-protocol/src/reserve/assetReserveKit.js
@@ -1,6 +1,6 @@
-import { Fail, q } from '@endo/errors';
import { AmountMath, AmountShape, IssuerShape } from '@agoric/ertp';
import { makeTracer } from '@agoric/internal';
+import { UnguardedHelperI } from '@agoric/internal/src/typeGuards.js';
import { M, makeScalarBigMapStore, prepareExoClassKit } from '@agoric/vat-data';
import { atomicTransfer } from '@agoric/zoe/src/contractSupport/atomicTransfer.js';
import {
@@ -8,8 +8,8 @@ import {
TopicsRecordShape,
} from '@agoric/zoe/src/contractSupport/topics.js';
import { AmountKeywordRecordShape } from '@agoric/zoe/src/typeGuards.js';
+import { Fail, q } from '@endo/errors';
import { E } from '@endo/eventual-send';
-import { UnguardedHelperI } from '@agoric/internal/src/typeGuards.js';
const trace = makeTracer('ReserveKit', true);
diff --git a/packages/inter-protocol/src/vaultFactory/math.js b/packages/inter-protocol/src/vaultFactory/math.js
index 9b42e0af247..b0c43535d58 100644
--- a/packages/inter-protocol/src/vaultFactory/math.js
+++ b/packages/inter-protocol/src/vaultFactory/math.js
@@ -13,6 +13,7 @@ import {
floorDivideBy,
ratioGTE,
} from '@agoric/zoe/src/contractSupport/ratio.js';
+
import { priceFrom } from '../auction/util.js';
import { addSubtract } from '../contractSupport.js';
diff --git a/packages/inter-protocol/src/vaultFactory/params.js b/packages/inter-protocol/src/vaultFactory/params.js
index b232f5cb1bf..cf21d7a0a1d 100644
--- a/packages/inter-protocol/src/vaultFactory/params.js
+++ b/packages/inter-protocol/src/vaultFactory/params.js
@@ -7,12 +7,13 @@ import {
makeParamManagerSync,
ParamTypes,
} from '@agoric/governance';
+import { makeTracer } from '@agoric/internal/src/index.js';
import { makeStoredPublisherKit } from '@agoric/notifier';
import { M, makeScalarMapStore } from '@agoric/store';
import { TimeMath } from '@agoric/time';
import { provideDurableMapStore } from '@agoric/vat-data';
import { subtractRatios } from '@agoric/zoe/src/contractSupport/ratio.js';
-import { makeTracer } from '@agoric/internal/src/index.js';
+
import { amountPattern, ratioPattern } from '../contractSupport.js';
/** @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js'; */
diff --git a/packages/inter-protocol/src/vaultFactory/prioritizedVaults.js b/packages/inter-protocol/src/vaultFactory/prioritizedVaults.js
index c0739fe8a58..8aae1228b58 100644
--- a/packages/inter-protocol/src/vaultFactory/prioritizedVaults.js
+++ b/packages/inter-protocol/src/vaultFactory/prioritizedVaults.js
@@ -1,16 +1,17 @@
// @jessie-check
+import { AmountMath } from '@agoric/ertp';
import { makeTracer } from '@agoric/internal';
+import { makeScalarMapStore } from '@agoric/store';
+import { M } from '@agoric/vat-data';
import { makeRatioFromAmounts } from '@agoric/zoe/src/contractSupport/index.js';
-import { AmountMath } from '@agoric/ertp';
import { Far } from '@endo/marshal';
-import { M } from '@agoric/vat-data';
-import { makeScalarMapStore } from '@agoric/store';
+
import { makeOrderedVaultStore } from './orderedVaultStore.js';
import {
- toVaultKey,
- normalizedCollRatioKey,
normalizedCollRatio,
+ normalizedCollRatioKey,
+ toVaultKey,
} from './storeUtils.js';
/** @import {Vault} from './vault.js' */
diff --git a/packages/inter-protocol/src/vaultFactory/proceeds.js b/packages/inter-protocol/src/vaultFactory/proceeds.js
index 70f9aa3b0d2..acc0269c1c1 100644
--- a/packages/inter-protocol/src/vaultFactory/proceeds.js
+++ b/packages/inter-protocol/src/vaultFactory/proceeds.js
@@ -6,6 +6,7 @@ import {
makeRatioFromAmounts,
multiplyRatios,
} from '@agoric/zoe/src/contractSupport/index.js';
+
import { quoteAsRatio, subtractToEmpty } from '../contractSupport.js';
import { liquidationResults } from './liquidation.js';
diff --git a/packages/inter-protocol/src/vaultFactory/storeUtils.js b/packages/inter-protocol/src/vaultFactory/storeUtils.js
index 55fea23f9c1..e2e59ed95cb 100644
--- a/packages/inter-protocol/src/vaultFactory/storeUtils.js
+++ b/packages/inter-protocol/src/vaultFactory/storeUtils.js
@@ -9,13 +9,13 @@
// XXX importing these that are declared to be used only for testing
// until @agoric/store supports composite keys
-import { makeDecodePassable, makeEncodePassable } from '@endo/marshal';
+import { makeTracer } from '@agoric/internal';
import {
getAmountIn,
getAmountOut,
natSafeMath,
} from '@agoric/zoe/src/contractSupport/index.js';
-import { makeTracer } from '@agoric/internal';
+import { makeDecodePassable, makeEncodePassable } from '@endo/marshal';
const { multiply } = natSafeMath;
diff --git a/packages/inter-protocol/src/vaultFactory/vault.js b/packages/inter-protocol/src/vaultFactory/vault.js
index 70fed25f3fa..c96595dd304 100644
--- a/packages/inter-protocol/src/vaultFactory/vault.js
+++ b/packages/inter-protocol/src/vaultFactory/vault.js
@@ -1,10 +1,11 @@
-import { q, Fail } from '@endo/errors';
import { AmountMath, AmountShape } from '@agoric/ertp';
-import { StorageNodeShape, makeTracer } from '@agoric/internal';
+import { makeTracer, StorageNodeShape } from '@agoric/internal';
import { UnguardedHelperI } from '@agoric/internal/src/typeGuards.js';
import { M, prepareExoClassKit } from '@agoric/vat-data';
import { atomicTransfer } from '@agoric/zoe/src/contractSupport/index.js';
import { SeatShape } from '@agoric/zoe/src/typeGuards.js';
+import { Fail, q } from '@endo/errors';
+
import {
addSubtract,
allEmpty,
diff --git a/packages/inter-protocol/src/vaultFactory/vaultDirector.js b/packages/inter-protocol/src/vaultFactory/vaultDirector.js
index fdfa8d2f9d9..4aeadc3ad0a 100644
--- a/packages/inter-protocol/src/vaultFactory/vaultDirector.js
+++ b/packages/inter-protocol/src/vaultFactory/vaultDirector.js
@@ -1,9 +1,6 @@
///
///
-import { Fail, q } from '@endo/errors';
-import { E } from '@endo/eventual-send';
-import { Far } from '@endo/marshal';
import { AmountMath, AmountShape, BrandShape, IssuerShape } from '@agoric/ertp';
import {
GovernorFacetShape,
@@ -24,6 +21,10 @@ import {
TopicsRecordShape,
unitAmount,
} from '@agoric/zoe/src/contractSupport/index.js';
+import { Fail, q } from '@endo/errors';
+import { E } from '@endo/eventual-send';
+import { Far } from '@endo/marshal';
+
import { makeCollectFeesInvitation } from '../collectFees.js';
import {
setWakeupsForNextAuction,
diff --git a/packages/inter-protocol/src/vaultFactory/vaultFactory.js b/packages/inter-protocol/src/vaultFactory/vaultFactory.js
index b2d27dca2f6..86687ffa3e9 100644
--- a/packages/inter-protocol/src/vaultFactory/vaultFactory.js
+++ b/packages/inter-protocol/src/vaultFactory/vaultFactory.js
@@ -23,8 +23,9 @@ import { makeStoredSubscription, makeSubscriptionKit } from '@agoric/notifier';
import { M } from '@agoric/store';
import { provideAll } from '@agoric/zoe/src/contractSupport/durability.js';
import { prepareRecorderKitMakers } from '@agoric/zoe/src/contractSupport/recorder.js';
-import { E } from '@endo/eventual-send';
import { FeeMintAccessShape } from '@agoric/zoe/src/typeGuards.js';
+import { E } from '@endo/eventual-send';
+
import { InvitationShape } from '../auction/params.js';
import { SHORTFALL_INVITATION_KEY, vaultDirectorParamTypes } from './params.js';
import { provideDirector } from './vaultDirector.js';
diff --git a/packages/inter-protocol/src/vaultFactory/vaultHolder.js b/packages/inter-protocol/src/vaultFactory/vaultHolder.js
index 567849ae3e0..e3c8698f18b 100644
--- a/packages/inter-protocol/src/vaultFactory/vaultHolder.js
+++ b/packages/inter-protocol/src/vaultFactory/vaultHolder.js
@@ -1,9 +1,9 @@
/** @file Use-object for the owner of a vault */
-import { Fail } from '@endo/errors';
import { AmountShape } from '@agoric/ertp';
+import { UnguardedHelperI } from '@agoric/internal/src/typeGuards.js';
import { M, prepareExoClassKit } from '@agoric/vat-data';
import { TopicsRecordShape } from '@agoric/zoe/src/contractSupport/index.js';
-import { UnguardedHelperI } from '@agoric/internal/src/typeGuards.js';
+import { Fail } from '@endo/errors';
/**
* @typedef {{
diff --git a/packages/inter-protocol/src/vaultFactory/vaultKit.js b/packages/inter-protocol/src/vaultFactory/vaultKit.js
index aef32038c6c..ce2f1eb534e 100644
--- a/packages/inter-protocol/src/vaultFactory/vaultKit.js
+++ b/packages/inter-protocol/src/vaultFactory/vaultKit.js
@@ -3,6 +3,7 @@
///
import { makeTracer } from '@agoric/internal';
+
import { prepareVaultHolder } from './vaultHolder.js';
const trace = makeTracer('VK', true);
diff --git a/packages/inter-protocol/src/vaultFactory/vaultManager.js b/packages/inter-protocol/src/vaultFactory/vaultManager.js
index 20ffb29ab71..f3585a348c2 100644
--- a/packages/inter-protocol/src/vaultFactory/vaultManager.js
+++ b/packages/inter-protocol/src/vaultFactory/vaultManager.js
@@ -18,8 +18,6 @@
*/
///
-import { X, Fail, q, makeError } from '@endo/errors';
-import { E } from '@endo/eventual-send';
import {
AmountMath,
AmountShape,
@@ -50,8 +48,12 @@ import {
SubscriberShape,
TopicsRecordShape,
} from '@agoric/zoe/src/contractSupport/index.js';
-import { PriceQuoteShape, SeatShape } from '@agoric/zoe/src/typeGuards.js';
import { multiplyBy } from '@agoric/zoe/src/contractSupport/ratio.js';
+import { PriceQuoteShape, SeatShape } from '@agoric/zoe/src/typeGuards.js';
+import { Fail, makeError, q, X } from '@endo/errors';
+import { E } from '@endo/eventual-send';
+
+import { AuctionPFShape } from '../auction/auctioneer.js';
import {
checkDebtLimit,
makeNatAmountShape,
@@ -61,9 +63,8 @@ import { chargeInterest } from '../interest.js';
import { getLiquidatableVaults } from './liquidation.js';
import { calculateMinimumCollateralization, minimumPrice } from './math.js';
import { makePrioritizedVaults } from './prioritizedVaults.js';
-import { Phase, prepareVault } from './vault.js';
import { calculateDistributionPlan } from './proceeds.js';
-import { AuctionPFShape } from '../auction/auctioneer.js';
+import { Phase, prepareVault } from './vault.js';
/**
* @import {Baggage} from '@agoric/vat-data';
diff --git a/packages/inter-protocol/test/auction/auctionBook.test.js b/packages/inter-protocol/test/auction/auctionBook.test.js
index 84670e77472..1413fc04501 100644
--- a/packages/inter-protocol/test/auction/auctionBook.test.js
+++ b/packages/inter-protocol/test/auction/auctionBook.test.js
@@ -14,9 +14,9 @@ import { makeOffer } from '@agoric/zoe/test/unitTests/makeOffer.js';
import { setup } from '@agoric/zoe/test/unitTests/setupBasicMints.js';
import { setupZCFTest } from '@agoric/zoe/test/unitTests/zcf/setupZcfTest.js';
import { makeManualPriceAuthority } from '@agoric/zoe/tools/manualPriceAuthority.js';
-import { makeMockChainStorageRoot } from '../supports.js';
import { prepareAuctionBook } from '../../src/auction/auctionBook.js';
+import { makeMockChainStorageRoot } from '../supports.js';
const buildManualPriceAuthority = initialPrice =>
makeManualPriceAuthority({
diff --git a/packages/inter-protocol/test/auction/auctionContract.test.js b/packages/inter-protocol/test/auction/auctionContract.test.js
index 95ff406c4e8..acc8b2d4cf9 100644
--- a/packages/inter-protocol/test/auction/auctionContract.test.js
+++ b/packages/inter-protocol/test/auction/auctionContract.test.js
@@ -7,18 +7,18 @@ import {
makeTracer,
NonNullish,
} from '@agoric/internal';
-import { subscribeEach } from '@agoric/notifier';
import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
+import { subscribeEach } from '@agoric/notifier';
import { buildManualTimer } from '@agoric/swingset-vat/tools/manual-timer.js';
import { TimeMath } from '@agoric/time';
import { makeScalarMapStore } from '@agoric/vat-data';
+import { providePriceAuthorityRegistry } from '@agoric/vats/src/priceAuthorityRegistry.js';
import {
makeRatio,
makeRatioFromAmounts,
} from '@agoric/zoe/src/contractSupport/index.js';
import { assertPayoutAmount } from '@agoric/zoe/test/zoeTestHelpers.js';
import { makeManualPriceAuthority } from '@agoric/zoe/tools/manualPriceAuthority.js';
-import { providePriceAuthorityRegistry } from '@agoric/vats/src/priceAuthorityRegistry.js';
import { E } from '@endo/eventual-send';
import {
diff --git a/packages/inter-protocol/test/auction/auctionMath.test.js b/packages/inter-protocol/test/auction/auctionMath.test.js
index 337c2d36dfe..56ed1e27f54 100644
--- a/packages/inter-protocol/test/auction/auctionMath.test.js
+++ b/packages/inter-protocol/test/auction/auctionMath.test.js
@@ -3,6 +3,7 @@ import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { AmountMath } from '@agoric/ertp';
import { makeRatioFromAmounts } from '@agoric/zoe/src/contractSupport/ratio.js';
import { Far } from '@endo/far';
+
import { amountsToSettle } from '../../src/auction/auctionMath.js';
/**
diff --git a/packages/inter-protocol/test/auction/proportionalDist.test.js b/packages/inter-protocol/test/auction/proportionalDist.test.js
index e9969f5958c..3120f9d1577 100644
--- a/packages/inter-protocol/test/auction/proportionalDist.test.js
+++ b/packages/inter-protocol/test/auction/proportionalDist.test.js
@@ -3,8 +3,8 @@ import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { makeIssuerKit } from '@agoric/ertp';
import { makeTracer } from '@agoric/internal';
-import { withAmountUtils } from '../supports.js';
import { distributeProportionalSharesWithLimits } from '../../src/auction/auctioneer.js';
+import { withAmountUtils } from '../supports.js';
/** @type {import('ava').TestFn>>} */
const test = anyTest;
diff --git a/packages/inter-protocol/test/auction/scheduleMath.test.js b/packages/inter-protocol/test/auction/scheduleMath.test.js
index 0b7e6cd3d3b..f7c305f54dc 100644
--- a/packages/inter-protocol/test/auction/scheduleMath.test.js
+++ b/packages/inter-protocol/test/auction/scheduleMath.test.js
@@ -1,9 +1,9 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
+import { NonNullish } from '@agoric/internal';
import { TimeMath } from '@agoric/time';
import { Far } from '@endo/marshal';
-import { NonNullish } from '@agoric/internal';
import {
computeRoundTiming,
nextDescendingStepTime,
diff --git a/packages/inter-protocol/test/auction/scheduler.test.js b/packages/inter-protocol/test/auction/scheduler.test.js
index 90e3e59e715..6cf84afb2e5 100644
--- a/packages/inter-protocol/test/auction/scheduler.test.js
+++ b/packages/inter-protocol/test/auction/scheduler.test.js
@@ -1,12 +1,12 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { subscribeEach, makePublishKit } from '@agoric/notifier';
+import { objectMap } from '@agoric/internal';
+import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
+import { makePublishKit, subscribeEach } from '@agoric/notifier';
import { buildManualTimer } from '@agoric/swingset-vat/tools/manual-timer.js';
import { TimeMath } from '@agoric/time';
import { prepareMockRecorderKitMakers } from '@agoric/zoe/src/contractSupport/recorder.js';
import { setupZCFTest } from '@agoric/zoe/test/unitTests/zcf/setupZcfTest.js';
-import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
-import { objectMap } from '@agoric/internal';
import {
makeAuctioneerParamManager,
diff --git a/packages/inter-protocol/test/auction/sortedOffers.test.js b/packages/inter-protocol/test/auction/sortedOffers.test.js
index 7dc908b617e..9343264298a 100644
--- a/packages/inter-protocol/test/auction/sortedOffers.test.js
+++ b/packages/inter-protocol/test/auction/sortedOffers.test.js
@@ -1,18 +1,19 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
+import { AmountMath } from '@agoric/ertp';
import {
- ratiosSame,
makeRatioFromAmounts,
quantize,
+ ratiosSame,
subtractRatios,
} from '@agoric/zoe/src/contractSupport/index.js';
import { setup } from '@agoric/zoe/test/unitTests/setupBasicMints.js';
-import { AmountMath } from '@agoric/ertp';
+
import {
fromPriceOfferKey,
+ fromScaledRateOfferKey,
toPriceOfferKey,
toScaledRateOfferKey,
- fromScaledRateOfferKey,
} from '../../src/auction/sortedOffers.js';
// these used to be timestamps, but now they're bigInts
diff --git a/packages/inter-protocol/test/auction/tools.js b/packages/inter-protocol/test/auction/tools.js
index 0c78bfe8c97..aee57094623 100644
--- a/packages/inter-protocol/test/auction/tools.js
+++ b/packages/inter-protocol/test/auction/tools.js
@@ -1,13 +1,12 @@
-import { Far } from '@endo/marshal';
-import { E } from '@endo/eventual-send';
-import { makeStoredPublisherKit } from '@agoric/notifier';
-import { objectMap, allValues } from '@agoric/internal';
+import contractGovernorBundle from '@agoric/governance/bundles/bundle-contractGovernor.js';
+import { GOVERNANCE_STORAGE_KEY } from '@agoric/governance/src/contractHelper.js';
+import { allValues, objectMap } from '@agoric/internal';
import { makeMockChainStorageRoot } from '@agoric/internal/src/storage-test-utils.js';
+import { makeStoredPublisherKit } from '@agoric/notifier';
import { makeFakeMarshaller } from '@agoric/notifier/tools/testSupports.js';
-import { GOVERNANCE_STORAGE_KEY } from '@agoric/governance/src/contractHelper.js';
-import contractGovernorBundle from '@agoric/governance/bundles/bundle-contractGovernor.js';
import { unsafeMakeBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js';
-
+import { E } from '@endo/eventual-send';
+import { Far } from '@endo/marshal';
import { resolve as importMetaResolve } from 'import-meta-resolve';
/**
diff --git a/packages/inter-protocol/test/clientSupport.test.js b/packages/inter-protocol/test/clientSupport.test.js
index 2c64d390012..559ef120c9d 100644
--- a/packages/inter-protocol/test/clientSupport.test.js
+++ b/packages/inter-protocol/test/clientSupport.test.js
@@ -2,6 +2,7 @@ import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { makeIssuerKit } from '@agoric/ertp';
import { makeRatio } from '@agoric/zoe/src/contractSupport/ratio.js';
+
import { Offers } from '../src/clientSupport.js';
import { withAmountUtils } from './supports.js';
diff --git a/packages/inter-protocol/test/contractSupport.test.js b/packages/inter-protocol/test/contractSupport.test.js
index cbea5608a91..9ad0bf8f58f 100644
--- a/packages/inter-protocol/test/contractSupport.test.js
+++ b/packages/inter-protocol/test/contractSupport.test.js
@@ -1,8 +1,9 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { makeIssuerKit } from '@agoric/ertp';
-import { withAmountUtils } from './supports.js';
+
import { checkDebtLimit } from '../src/contractSupport.js';
+import { withAmountUtils } from './supports.js';
const debt = withAmountUtils(makeIssuerKit('rupies'));
diff --git a/packages/inter-protocol/test/feeDistributor.test.js b/packages/inter-protocol/test/feeDistributor.test.js
index 9363491c205..6f6e50ffbbe 100644
--- a/packages/inter-protocol/test/feeDistributor.test.js
+++ b/packages/inter-protocol/test/feeDistributor.test.js
@@ -1,13 +1,13 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
import { AmountMath } from '@agoric/ertp';
-import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
+import { mustMatch } from '@agoric/store';
import { setup } from '@agoric/zoe/test/unitTests/setupBasicMints.js';
-
import { assertPayoutAmount } from '@agoric/zoe/test/zoeTestHelpers.js';
+import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
import { E, Far } from '@endo/far';
-import { mustMatch } from '@agoric/store';
+
import { makeFeeDistributor, meta } from '../src/feeDistributor.js';
/** @param {Issuer} feeIssuer */
diff --git a/packages/inter-protocol/test/interest-labeled.test.js b/packages/inter-protocol/test/interest-labeled.test.js
index c1ca9c7cac9..1b8a9669e0f 100644
--- a/packages/inter-protocol/test/interest-labeled.test.js
+++ b/packages/inter-protocol/test/interest-labeled.test.js
@@ -1,9 +1,9 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { makeIssuerKit } from '@agoric/ertp';
+import { TimeMath } from '@agoric/time';
import { makeRatio } from '@agoric/zoe/src/contractSupport/ratio.js';
import { Far } from '@endo/marshal';
-import { TimeMath } from '@agoric/time';
import { makeInterestCalculator, SECONDS_PER_YEAR } from '../src/interest.js';
diff --git a/packages/inter-protocol/test/interest-math.test.js b/packages/inter-protocol/test/interest-math.test.js
index b4656de60c4..a931c79253c 100644
--- a/packages/inter-protocol/test/interest-math.test.js
+++ b/packages/inter-protocol/test/interest-math.test.js
@@ -1,7 +1,8 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { makeIssuerKit, AmountMath } from '@agoric/ertp';
+import { AmountMath, makeIssuerKit } from '@agoric/ertp';
import { makeRatio } from '@agoric/zoe/src/contractSupport/ratio.js';
+
import { calculateCurrentDebt, reverseInterest } from '../src/interest-math.js';
const brand = makeIssuerKit('foo').brand;
diff --git a/packages/inter-protocol/test/interest.test.js b/packages/inter-protocol/test/interest.test.js
index 0fbc01ad525..6aeffd956e6 100644
--- a/packages/inter-protocol/test/interest.test.js
+++ b/packages/inter-protocol/test/interest.test.js
@@ -5,8 +5,9 @@ import {
ceilMultiplyBy,
makeRatio,
} from '@agoric/zoe/src/contractSupport/ratio.js';
-import { Far } from '@endo/marshal';
import { makeIssuerRecord } from '@agoric/zoe/src/issuerRecord.js';
+import { Far } from '@endo/marshal';
+
import {
calculateCompoundedInterest,
chargeInterest,
diff --git a/packages/inter-protocol/test/metrics.js b/packages/inter-protocol/test/metrics.js
index 9add8e2dea5..da7e379d130 100644
--- a/packages/inter-protocol/test/metrics.js
+++ b/packages/inter-protocol/test/metrics.js
@@ -1,3 +1,4 @@
+import { makeTracer } from '@agoric/internal';
import {
makeNotifierFromAsyncIterable,
makeNotifierFromSubscriber,
@@ -6,8 +7,6 @@ import {
import { E } from '@endo/eventual-send';
import { diff } from 'deep-object-diff';
-import { makeTracer } from '@agoric/internal';
-
// While t.log has the advantage of omitting by default when tests pass,
// when debugging it's most valuable to have the messages in sequence with app
// code logging which doesn't have access to t.log.
diff --git a/packages/inter-protocol/test/price/fluxAggregatorKit.test.js b/packages/inter-protocol/test/price/fluxAggregatorKit.test.js
index c25b5033647..811ea86361a 100644
--- a/packages/inter-protocol/test/price/fluxAggregatorKit.test.js
+++ b/packages/inter-protocol/test/price/fluxAggregatorKit.test.js
@@ -1,21 +1,21 @@
import { test as unknownTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { AssetKind, makeIssuerKit } from '@agoric/ertp';
-import { E } from '@endo/eventual-send';
-import { Far } from '@endo/far';
-
+import { documentStorageSchema } from '@agoric/governance/tools/storageDoc.js';
import { makeMockChainStorageRoot } from '@agoric/internal/src/storage-test-utils.js';
import { subscribeEach } from '@agoric/notifier';
import {
eventLoopIteration,
makeFakeMarshaller,
} from '@agoric/notifier/tools/testSupports.js';
+import { TimeMath } from '@agoric/time';
import { makeScalarBigMapStore } from '@agoric/vat-data';
+import { prepareRecorderKitMakers } from '@agoric/zoe/src/contractSupport/recorder.js';
import { setupZCFTest } from '@agoric/zoe/test/unitTests/zcf/setupZcfTest.js';
import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
-import { TimeMath } from '@agoric/time';
-import { prepareRecorderKitMakers } from '@agoric/zoe/src/contractSupport/recorder.js';
-import { documentStorageSchema } from '@agoric/governance/tools/storageDoc.js';
+import { E } from '@endo/eventual-send';
+import { Far } from '@endo/far';
+
import { prepareFluxAggregatorKit } from '../../src/price/fluxAggregatorKit.js';
import { topicPath } from '../supports.js';
diff --git a/packages/inter-protocol/test/provisionPool.test.js b/packages/inter-protocol/test/provisionPool.test.js
index 48ea08f7312..7cace2dd5b7 100644
--- a/packages/inter-protocol/test/provisionPool.test.js
+++ b/packages/inter-protocol/test/provisionPool.test.js
@@ -19,6 +19,7 @@ import { makeFakeBoard } from '@agoric/vats/tools/board-utils.js';
import { makeRatio } from '@agoric/zoe/src/contractSupport/ratio.js';
import { E, Far } from '@endo/far';
import path from 'path';
+
import { makeBridgeProvisionTool } from '../src/provisionPoolKit.js';
import {
makeMockChainStorageRoot,
diff --git a/packages/inter-protocol/test/psm/governedPsm.test.js b/packages/inter-protocol/test/psm/governedPsm.test.js
index def9e88a03d..988159fb2ce 100644
--- a/packages/inter-protocol/test/psm/governedPsm.test.js
+++ b/packages/inter-protocol/test/psm/governedPsm.test.js
@@ -7,6 +7,7 @@ import { unsafeMakeBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js'
import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
+
import { setupPsm } from './setupPsm.js';
test.before(async t => {
diff --git a/packages/inter-protocol/test/psm/psm.test.js b/packages/inter-protocol/test/psm/psm.test.js
index ccd533147f7..14415dfbe27 100644
--- a/packages/inter-protocol/test/psm/psm.test.js
+++ b/packages/inter-protocol/test/psm/psm.test.js
@@ -5,9 +5,18 @@ import { split } from '@agoric/ertp/src/legacy-payment-helpers.js';
import { CONTRACT_ELECTORATE, ParamTypes } from '@agoric/governance';
import committeeBundle from '@agoric/governance/bundles/bundle-committee.js';
import contractGovernorBundle from '@agoric/governance/bundles/bundle-contractGovernor.js';
+import { documentStorageSchema } from '@agoric/governance/tools/storageDoc.js';
+import { makeTracer, NonNullish } from '@agoric/internal';
+import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
+import { Stable } from '@agoric/internal/src/tokens.js';
import { unsafeMakeBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js';
+import { makeAgoricNamesAccess, makePromiseSpace } from '@agoric/vats';
import centralSupplyBundle from '@agoric/vats/bundles/bundle-centralSupply.js';
import mintHolderBundle from '@agoric/vats/bundles/bundle-mintHolder.js';
+import {
+ produceDiagnostics,
+ produceStartUpgradable,
+} from '@agoric/vats/src/core/basic-behaviors.js';
import { makeFakeBoard } from '@agoric/vats/tools/board-utils.js';
import {
floorDivideBy,
@@ -15,19 +24,10 @@ import {
makeRatio,
natSafeMath as NatMath,
} from '@agoric/zoe/src/contractSupport/index.js';
-
-import { NonNullish, makeTracer } from '@agoric/internal';
-import { documentStorageSchema } from '@agoric/governance/tools/storageDoc.js';
-import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
-import { makeAgoricNamesAccess, makePromiseSpace } from '@agoric/vats';
-import {
- produceDiagnostics,
- produceStartUpgradable,
-} from '@agoric/vats/src/core/basic-behaviors.js';
+import { makeHeapZone } from '@agoric/zone';
import { E, Far } from '@endo/far';
import path from 'path';
-import { makeHeapZone } from '@agoric/zone';
-import { Stable } from '@agoric/internal/src/tokens.js';
+
import { makeAnchorAsset, startPSM } from '../../src/proposals/startPSM.js';
import {
makeMockChainStorageRoot,
diff --git a/packages/inter-protocol/test/psm/reviver.test.js b/packages/inter-protocol/test/psm/reviver.test.js
index 1b9294168f7..46a575cdc09 100644
--- a/packages/inter-protocol/test/psm/reviver.test.js
+++ b/packages/inter-protocol/test/psm/reviver.test.js
@@ -2,6 +2,7 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
import { makeHistoryReviver } from '@agoric/vats/tools/board-utils.js';
+
import { chainStorageEntries } from './psm-storage-fixture.js';
test('restore PSM: revive metrics, governance with old board IDs', async t => {
diff --git a/packages/inter-protocol/test/psm/setupPsm.js b/packages/inter-protocol/test/psm/setupPsm.js
index f00a283c05b..4146df0d3d2 100644
--- a/packages/inter-protocol/test/psm/setupPsm.js
+++ b/packages/inter-protocol/test/psm/setupPsm.js
@@ -1,23 +1,22 @@
-import { Far } from '@endo/captp';
-import { E } from '@endo/eventual-send';
-
+import { makeIssuerKit } from '@agoric/ertp';
+import { allValues } from '@agoric/internal';
+import { makeMockChainStorageRoot } from '@agoric/internal/src/storage-test-utils.js';
+import { makeScalarMapStore } from '@agoric/vat-data';
import { makeAgoricNamesAccess, makePromiseSpace } from '@agoric/vats';
+import { produceDiagnostics } from '@agoric/vats/src/core/basic-behaviors.js';
import { makeFakeBoard } from '@agoric/vats/tools/board-utils.js';
-import { setUpZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
-import { makeScalarMapStore } from '@agoric/vat-data';
import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
-import { allValues } from '@agoric/internal';
-import { makeMockChainStorageRoot } from '@agoric/internal/src/storage-test-utils.js';
-import { makeIssuerKit } from '@agoric/ertp';
+import { setUpZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
+import { Far } from '@endo/captp';
+import { E } from '@endo/eventual-send';
-import { produceDiagnostics } from '@agoric/vats/src/core/basic-behaviors.js';
+import { startEconomicCommittee } from '../../src/proposals/startEconCommittee.js';
+import { startEconCharter, startPSM } from '../../src/proposals/startPSM.js';
import {
installGovernance,
provideBundle,
withAmountUtils,
} from '../supports.js';
-import { startEconomicCommittee } from '../../src/proposals/startEconCommittee.js';
-import { startPSM, startEconCharter } from '../../src/proposals/startPSM.js';
const psmRoot = './src/psm/psm.js'; // package relative
const charterRoot = './src/econCommitteeCharter.js'; // package relative
diff --git a/packages/inter-protocol/test/reserve/reserve.test.js b/packages/inter-protocol/test/reserve/reserve.test.js
index 97ff275fa1b..a4d80f3c653 100644
--- a/packages/inter-protocol/test/reserve/reserve.test.js
+++ b/packages/inter-protocol/test/reserve/reserve.test.js
@@ -1,11 +1,11 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { AmountMath, makeIssuerKit } from '@agoric/ertp';
+import { documentStorageSchema } from '@agoric/governance/tools/storageDoc.js';
import { unsafeMakeBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js';
import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
import { E } from '@endo/eventual-send';
-import { documentStorageSchema } from '@agoric/governance/tools/storageDoc.js';
import { reserveInitialState, subscriptionTracker } from '../metrics.js';
import { setupReserveServices } from './setup.js';
diff --git a/packages/inter-protocol/test/reserve/setup.js b/packages/inter-protocol/test/reserve/setup.js
index 138cb4aba2a..10cdb954f85 100644
--- a/packages/inter-protocol/test/reserve/setup.js
+++ b/packages/inter-protocol/test/reserve/setup.js
@@ -1,18 +1,18 @@
-import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
-import { E } from '@endo/eventual-send';
import { makeAgoricNamesAccess, makePromiseSpace } from '@agoric/vats';
-import { makeFakeBoard } from '@agoric/vats/tools/board-utils.js';
+import { produceDiagnostics } from '@agoric/vats/src/core/basic-behaviors.js';
import { feeIssuerConfig } from '@agoric/vats/src/core/utils.js';
+import { makeFakeBoard } from '@agoric/vats/tools/board-utils.js';
+import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
import { setUpZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
-import { produceDiagnostics } from '@agoric/vats/src/core/basic-behaviors.js';
-import { setupReserve } from '../../src/proposals/econ-behaviors.js';
+import { E } from '@endo/eventual-send';
+import { setupReserve } from '../../src/proposals/econ-behaviors.js';
+import { startEconomicCommittee } from '../../src/proposals/startEconCommittee.js';
import {
installPuppetGovernance,
makeMockChainStorageRoot,
provideBundle,
} from '../supports.js';
-import { startEconomicCommittee } from '../../src/proposals/startEconCommittee.js';
/** @import {ZoeManualTimer} from '@agoric/zoe/tools/manualTimer.js'; */
diff --git a/packages/inter-protocol/test/smartWallet/boot-psm.js b/packages/inter-protocol/test/smartWallet/boot-psm.js
index c50966ed4a9..919c8a93024 100644
--- a/packages/inter-protocol/test/smartWallet/boot-psm.js
+++ b/packages/inter-protocol/test/smartWallet/boot-psm.js
@@ -1,7 +1,7 @@
// @ts-check
/** @file Boot script for PSM-only (aka Pismo) chain */
import * as ERTPmod from '@agoric/ertp';
-import { E, Far } from '@endo/far';
+import { Stable, Stake } from '@agoric/internal/src/tokens.js';
// TODO: factor startEconomicCommittee out of econ-behaviors.js
import { M, makeScalarMapStore, mustMatch } from '@agoric/store';
import {
@@ -34,7 +34,13 @@ import {
} from '@agoric/vats/src/core/startWalletFactory.js';
import * as utils from '@agoric/vats/src/core/utils.js';
import { makeHeapZone } from '@agoric/zone';
-import { Stable, Stake } from '@agoric/internal/src/tokens.js';
+import { E, Far } from '@endo/far';
+
+import {
+ inviteCommitteeMembers,
+ inviteToEconCharter,
+ startEconCharter,
+} from '../../src/proposals/committee-proposal.js';
import {
ECON_COMMITTEE_MANIFEST,
startEconomicCommittee,
@@ -46,11 +52,6 @@ import {
PSM_MANIFEST,
startPSM,
} from '../../src/proposals/startPSM.js';
-import {
- inviteCommitteeMembers,
- inviteToEconCharter,
- startEconCharter,
-} from '../../src/proposals/committee-proposal.js';
/** @import {EconomyBootstrapSpace} from '@agoric/inter-protocol/src/proposals/econ-behaviors.js' */
diff --git a/packages/inter-protocol/test/smartWallet/boot-test-utils.js b/packages/inter-protocol/test/smartWallet/boot-test-utils.js
index ae1231d5781..d1ceec26bba 100644
--- a/packages/inter-protocol/test/smartWallet/boot-test-utils.js
+++ b/packages/inter-protocol/test/smartWallet/boot-test-utils.js
@@ -4,16 +4,17 @@
* integrates multiple bundles so should move to a bootstrap-style test.
*/
// @ts-check
-import { Fail } from '@endo/errors';
-import { E } from '@endo/eventual-send';
+import { makeScalarBigMapStore } from '@agoric/vat-data';
+import { vatRoots } from '@agoric/vats/tools/boot-test-utils.js';
import {
makeFakeVatAdmin,
zcfBundleCap,
} from '@agoric/zoe/tools/fakeVatAdmin.js';
import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
+import { Fail } from '@endo/errors';
+import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { makeScalarBigMapStore } from '@agoric/vat-data';
-import { vatRoots } from '@agoric/vats/tools/boot-test-utils.js';
+
import { bundles, devices } from './devices.js';
export const noop = () => {};
diff --git a/packages/inter-protocol/test/smartWallet/contexts.js b/packages/inter-protocol/test/smartWallet/contexts.js
index 7f6bca7ed05..2be154e0f1d 100644
--- a/packages/inter-protocol/test/smartWallet/contexts.js
+++ b/packages/inter-protocol/test/smartWallet/contexts.js
@@ -2,17 +2,18 @@ import { BridgeId, deeplyFulfilledObject } from '@agoric/internal';
import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
import { coalesceUpdates } from '@agoric/smart-wallet/src/utils.js';
import { unsafeMakeBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js';
+import { makeScopedBridge } from '@agoric/vats';
import {
- produceStartUpgradable,
- produceStartGovernedUpgradable,
produceDiagnostics,
+ produceStartGovernedUpgradable,
+ produceStartUpgradable,
} from '@agoric/vats/src/core/basic-behaviors.js';
import { makeHeapZone } from '@agoric/zone';
import { E } from '@endo/far';
import path from 'path';
-import { makeScopedBridge } from '@agoric/vats';
-import { oracleBrandFeedName } from '../../src/proposals/utils.js';
+
import { createPriceFeed } from '../../src/proposals/price-feed-proposal.js';
+import { oracleBrandFeedName } from '../../src/proposals/utils.js';
import { withAmountUtils } from '../supports.js';
// referenced by TS
diff --git a/packages/inter-protocol/test/smartWallet/devices.js b/packages/inter-protocol/test/smartWallet/devices.js
index 12a8cecfc9f..ff5804bda75 100644
--- a/packages/inter-protocol/test/smartWallet/devices.js
+++ b/packages/inter-protocol/test/smartWallet/devices.js
@@ -5,6 +5,7 @@ import walletFactory from '@agoric/smart-wallet/bundles/bundle-walletFactory.js'
import centralSupply from '@agoric/vats/bundles/bundle-centralSupply.js';
import mintHolder from '@agoric/vats/bundles/bundle-mintHolder.js';
import provisionPool from '@agoric/vats/bundles/bundle-provisionPool.js';
+
import econCommitteeCharter from '../../bundles/bundle-econCommitteeCharter.js';
import psm from '../../bundles/bundle-psm.js';
diff --git a/packages/inter-protocol/test/smartWallet/oracle-integration.test.js b/packages/inter-protocol/test/smartWallet/oracle-integration.test.js
index e896b16ff88..11828c01d1c 100644
--- a/packages/inter-protocol/test/smartWallet/oracle-integration.test.js
+++ b/packages/inter-protocol/test/smartWallet/oracle-integration.test.js
@@ -1,15 +1,16 @@
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { NonNullish, zip } from '@agoric/internal';
import { AssetKind, makeIssuerKit } from '@agoric/ertp';
+import { NonNullish, zip } from '@agoric/internal';
import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
import { coalesceUpdates } from '@agoric/smart-wallet/src/utils.js';
import { TimeMath } from '@agoric/time';
import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
import { E } from '@endo/far';
-import { oracleBrandFeedName } from '../../src/proposals/utils.js';
+
import { INVITATION_MAKERS_DESC as EC_INVITATION_MAKERS_DESC } from '../../src/econCommitteeCharter.js';
import { INVITATION_MAKERS_DESC as ORACLE_INVITATION_MAKERS_DESC } from '../../src/price/fluxAggregatorKit.js';
+import { oracleBrandFeedName } from '../../src/proposals/utils.js';
import { headValue } from '../supports.js';
import { buildRootObject } from './boot-psm.js';
import {
diff --git a/packages/inter-protocol/test/smartWallet/psm-integration.test.js b/packages/inter-protocol/test/smartWallet/psm-integration.test.js
index 2444cc34f43..eac50962fe5 100644
--- a/packages/inter-protocol/test/smartWallet/psm-integration.test.js
+++ b/packages/inter-protocol/test/smartWallet/psm-integration.test.js
@@ -1,14 +1,15 @@
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { AmountMath, makeIssuerKit } from '@agoric/ertp';
-import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
-import { E } from '@endo/far';
import { NonNullish } from '@agoric/internal';
+import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
+import { Stable } from '@agoric/internal/src/tokens.js';
+import { coalesceUpdates } from '@agoric/smart-wallet/src/utils.js';
import { keyEQ } from '@agoric/store';
+import { E } from '@endo/far';
-import { coalesceUpdates } from '@agoric/smart-wallet/src/utils.js';
-import { Stable } from '@agoric/internal/src/tokens.js';
import { INVITATION_MAKERS_DESC } from '../../src/econCommitteeCharter.js';
+import { headValue, sequenceCurrents, withAmountUtils } from '../supports.js';
import { buildRootObject as buildPSMRootObject } from './boot-psm.js';
import {
currentPurseBalance,
@@ -16,7 +17,6 @@ import {
makeDefaultTestContext,
voteForOpenQuestion,
} from './contexts.js';
-import { headValue, sequenceCurrents, withAmountUtils } from '../supports.js';
/**
* @type {import('ava').TestFn<
diff --git a/packages/inter-protocol/test/swingsetTests/fluxAggregator/bootstrap-fluxAggregator-service-upgrade.js b/packages/inter-protocol/test/swingsetTests/fluxAggregator/bootstrap-fluxAggregator-service-upgrade.js
index cdc1f520358..d293a99e745 100644
--- a/packages/inter-protocol/test/swingsetTests/fluxAggregator/bootstrap-fluxAggregator-service-upgrade.js
+++ b/packages/inter-protocol/test/swingsetTests/fluxAggregator/bootstrap-fluxAggregator-service-upgrade.js
@@ -1,6 +1,5 @@
// @ts-check
-import { Fail } from '@endo/errors';
import { AmountMath, makeIssuerKit } from '@agoric/ertp';
import { CONTRACT_ELECTORATE, ParamTypes } from '@agoric/governance';
import {
@@ -13,6 +12,7 @@ import { makeNotifierFromSubscriber } from '@agoric/notifier';
import { makeNameHubKit } from '@agoric/vats';
import { makeFakeBoard } from '@agoric/vats/tools/board-utils.js';
import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
+import { Fail } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
import { makePromiseKit } from '@endo/promise-kit';
diff --git a/packages/inter-protocol/test/swingsetTests/fluxAggregator/fluxAggregator-service-upgrade.test.js b/packages/inter-protocol/test/swingsetTests/fluxAggregator/fluxAggregator-service-upgrade.test.js
index a7aff689d51..1d2eb1bc2cd 100644
--- a/packages/inter-protocol/test/swingsetTests/fluxAggregator/fluxAggregator-service-upgrade.test.js
+++ b/packages/inter-protocol/test/swingsetTests/fluxAggregator/fluxAggregator-service-upgrade.test.js
@@ -1,9 +1,9 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+import { buildVatController } from '@agoric/swingset-vat';
import { assert } from '@endo/errors';
import { resolve as importMetaResolve } from 'import-meta-resolve';
-import { buildVatController } from '@agoric/swingset-vat';
import { faV1BundleName } from './bootstrap-fluxAggregator-service-upgrade.js';
// so paths can be expresssed relative to this file and made absolute
diff --git a/packages/inter-protocol/test/swingsetTests/psmUpgrade/bootstrap-psm-upgrade.js b/packages/inter-protocol/test/swingsetTests/psmUpgrade/bootstrap-psm-upgrade.js
index a0d47ea6942..8fcbbd80771 100644
--- a/packages/inter-protocol/test/swingsetTests/psmUpgrade/bootstrap-psm-upgrade.js
+++ b/packages/inter-protocol/test/swingsetTests/psmUpgrade/bootstrap-psm-upgrade.js
@@ -1,6 +1,5 @@
// @ts-check
-import { Fail } from '@endo/errors';
import { AmountMath, makeIssuerKit } from '@agoric/ertp';
import { CONTRACT_ELECTORATE, ParamTypes } from '@agoric/governance';
import {
@@ -14,9 +13,11 @@ import { makeFakeBoard } from '@agoric/vats/tools/board-utils.js';
import { makeRatio } from '@agoric/zoe/src/contractSupport/ratio.js';
import { PaymentPKeywordRecordShape } from '@agoric/zoe/src/typeGuards.js';
import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
+import { Fail } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
import { makePromiseKit } from '@endo/promise-kit';
+
import { scale6, withAmountUtils } from '../../supports.js';
const trace = makeTracer('BootPSMUpg');
diff --git a/packages/inter-protocol/test/swingsetTests/psmUpgrade/psm-upgrade.test.js b/packages/inter-protocol/test/swingsetTests/psmUpgrade/psm-upgrade.test.js
index f2356d6dc7b..2487c8aa6f1 100644
--- a/packages/inter-protocol/test/swingsetTests/psmUpgrade/psm-upgrade.test.js
+++ b/packages/inter-protocol/test/swingsetTests/psmUpgrade/psm-upgrade.test.js
@@ -1,9 +1,9 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+import { buildVatController } from '@agoric/swingset-vat';
import { assert } from '@endo/errors';
import { resolve as importMetaResolve } from 'import-meta-resolve';
-import { buildVatController } from '@agoric/swingset-vat';
import { psmV1BundleName } from './bootstrap-psm-upgrade.js';
// so paths can be expresssed relative to this file and made absolute
diff --git a/packages/inter-protocol/test/swingsetTests/reserve/assetReserve-upgrade.test.js b/packages/inter-protocol/test/swingsetTests/reserve/assetReserve-upgrade.test.js
index 37cd55ac94d..edd8880da14 100644
--- a/packages/inter-protocol/test/swingsetTests/reserve/assetReserve-upgrade.test.js
+++ b/packages/inter-protocol/test/swingsetTests/reserve/assetReserve-upgrade.test.js
@@ -1,9 +1,9 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+import { buildVatController } from '@agoric/swingset-vat';
import { assert } from '@endo/errors';
import { resolve as importMetaResolve } from 'import-meta-resolve';
-import { buildVatController } from '@agoric/swingset-vat';
import { arV1BundleName } from './bootstrap-assetReserve-upgrade.js';
// so paths can be expresssed relative to this file and made absolute
diff --git a/packages/inter-protocol/test/swingsetTests/reserve/bootstrap-assetReserve-upgrade.js b/packages/inter-protocol/test/swingsetTests/reserve/bootstrap-assetReserve-upgrade.js
index d6bb13d4d50..f6a25b3f5d3 100644
--- a/packages/inter-protocol/test/swingsetTests/reserve/bootstrap-assetReserve-upgrade.js
+++ b/packages/inter-protocol/test/swingsetTests/reserve/bootstrap-assetReserve-upgrade.js
@@ -1,6 +1,5 @@
// @ts-check
-import { Fail } from '@endo/errors';
import { makeIssuerKit } from '@agoric/ertp';
import { CONTRACT_ELECTORATE, ParamTypes } from '@agoric/governance';
import {
@@ -12,9 +11,11 @@ import { makeFakeStorageKit } from '@agoric/internal/src/storage-test-utils.js';
import { makeNameHubKit } from '@agoric/vats';
import { makeFakeBoard } from '@agoric/vats/tools/board-utils.js';
import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
+import { Fail } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
import { makePromiseKit } from '@endo/promise-kit';
+
import { withAmountUtils } from '../../supports.js';
const trace = makeTracer('BootFAUpg');
diff --git a/packages/inter-protocol/test/vaultFactory/auction.test.js b/packages/inter-protocol/test/vaultFactory/auction.test.js
index 1e8674a42a7..48f40e1b652 100644
--- a/packages/inter-protocol/test/vaultFactory/auction.test.js
+++ b/packages/inter-protocol/test/vaultFactory/auction.test.js
@@ -2,6 +2,7 @@ import { test as unknownTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { makeTracer } from '@agoric/internal';
import { TimeMath } from '@agoric/time';
+
import { SECONDS_PER_DAY } from '../../src/proposals/econ-behaviors.js';
import {
makeAuctioneerDriver,
diff --git a/packages/inter-protocol/test/vaultFactory/collatRatio.test.js b/packages/inter-protocol/test/vaultFactory/collatRatio.test.js
index d51e5e08883..61fdae85b4e 100644
--- a/packages/inter-protocol/test/vaultFactory/collatRatio.test.js
+++ b/packages/inter-protocol/test/vaultFactory/collatRatio.test.js
@@ -2,8 +2,8 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { makeIssuerKit } from '@agoric/ertp';
-import { Far } from '@endo/marshal';
import { makeRatioFromAmounts } from '@agoric/zoe/src/contractSupport/index.js';
+import { Far } from '@endo/marshal';
import { normalizedCollRatio } from '../../src/vaultFactory/storeUtils.js';
import { withAmountUtils } from '../supports.js';
diff --git a/packages/inter-protocol/test/vaultFactory/director-allMgrsDo.test.js b/packages/inter-protocol/test/vaultFactory/director-allMgrsDo.test.js
index 6720436e94b..3c3f5aaf735 100644
--- a/packages/inter-protocol/test/vaultFactory/director-allMgrsDo.test.js
+++ b/packages/inter-protocol/test/vaultFactory/director-allMgrsDo.test.js
@@ -1,7 +1,8 @@
-import { Far } from '@endo/marshal';
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { waitUntilQuiescent } from '@agoric/swingset-liveslots/test/waitUntilQuiescent.js';
+import { Far } from '@endo/marshal';
+
import { makeAllManagersDo } from '../../src/vaultFactory/vaultDirector.js';
const makeFakeVM = (name, thrower) => {
diff --git a/packages/inter-protocol/test/vaultFactory/driver.js b/packages/inter-protocol/test/vaultFactory/driver.js
index d203afcd8b1..71b37ea86cb 100644
--- a/packages/inter-protocol/test/vaultFactory/driver.js
+++ b/packages/inter-protocol/test/vaultFactory/driver.js
@@ -1,7 +1,10 @@
import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
-import { allValues, makeTracer, objectMap, NonNullish } from '@agoric/internal';
+import { allValues, makeTracer, NonNullish, objectMap } from '@agoric/internal';
import { makeNotifierFromSubscriber } from '@agoric/notifier';
+import { eventLoopIteration } from '@agoric/notifier/tools/testSupports.js';
import { unsafeMakeBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js';
+import { makeScalarBigMapStore } from '@agoric/vat-data/src/index.js';
+import { providePriceAuthorityRegistry } from '@agoric/vats/src/priceAuthorityRegistry.js';
import {
ceilMultiplyBy,
makeRatio,
@@ -12,10 +15,6 @@ import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
import { E } from '@endo/eventual-send';
import { deeplyFulfilled } from '@endo/marshal';
-import { eventLoopIteration } from '@agoric/notifier/tools/testSupports.js';
-import { providePriceAuthorityRegistry } from '@agoric/vats/src/priceAuthorityRegistry.js';
-import { makeScalarBigMapStore } from '@agoric/vat-data/src/index.js';
-
import {
setupReserve,
startAuctioneer,
diff --git a/packages/inter-protocol/test/vaultFactory/faucet.js b/packages/inter-protocol/test/vaultFactory/faucet.js
index 1edee2d1eaf..89097090ec5 100644
--- a/packages/inter-protocol/test/vaultFactory/faucet.js
+++ b/packages/inter-protocol/test/vaultFactory/faucet.js
@@ -1,5 +1,5 @@
-import { Far } from '@endo/marshal';
import { assertProposalShape } from '@agoric/zoe/src/contractSupport/index.js';
+import { Far } from '@endo/marshal';
/**
* A Faucet providing Minted so we can provide initial liquidity where it's
diff --git a/packages/inter-protocol/test/vaultFactory/interestSupport.js b/packages/inter-protocol/test/vaultFactory/interestSupport.js
index 56640d403a7..20b99bf2ae0 100644
--- a/packages/inter-protocol/test/vaultFactory/interestSupport.js
+++ b/packages/inter-protocol/test/vaultFactory/interestSupport.js
@@ -4,6 +4,7 @@ import {
makeRatio,
} from '@agoric/zoe/src/contractSupport/ratio.js';
import { Far } from '@endo/marshal';
+
import { reverseInterest } from '../../src/interest-math.js';
export const makeCompoundedInterestProvider = brand => {
diff --git a/packages/inter-protocol/test/vaultFactory/liquidation-plans.test.js b/packages/inter-protocol/test/vaultFactory/liquidation-plans.test.js
index 5abf6680b57..382951dd038 100644
--- a/packages/inter-protocol/test/vaultFactory/liquidation-plans.test.js
+++ b/packages/inter-protocol/test/vaultFactory/liquidation-plans.test.js
@@ -1,6 +1,7 @@
import { test as unknownTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { makeTracer } from '@agoric/internal';
+
import { SECONDS_PER_DAY } from '../../src/proposals/econ-behaviors.js';
import {
makeAuctioneerDriver,
diff --git a/packages/inter-protocol/test/vaultFactory/math.test.js b/packages/inter-protocol/test/vaultFactory/math.test.js
index cd987df2c99..c49ed287bcf 100644
--- a/packages/inter-protocol/test/vaultFactory/math.test.js
+++ b/packages/inter-protocol/test/vaultFactory/math.test.js
@@ -1,6 +1,7 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { makeIssuerKit } from '@agoric/ertp';
+
import {
calculateDebtCosts,
maxDebtForVault,
diff --git a/packages/inter-protocol/test/vaultFactory/orderedVaultStore.test.js b/packages/inter-protocol/test/vaultFactory/orderedVaultStore.test.js
index 49f7a8e6e7f..e90161a1835 100644
--- a/packages/inter-protocol/test/vaultFactory/orderedVaultStore.test.js
+++ b/packages/inter-protocol/test/vaultFactory/orderedVaultStore.test.js
@@ -4,6 +4,7 @@ import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { AmountMath } from '@agoric/ertp';
import { makeScalarBigMapStore } from '@agoric/vat-data';
import { Far } from '@endo/marshal';
+
import { makeOrderedVaultStore } from '../../src/vaultFactory/orderedVaultStore.js';
import { fromVaultKey } from '../../src/vaultFactory/storeUtils.js';
import { makeFakeVault } from './interestSupport.js';
diff --git a/packages/inter-protocol/test/vaultFactory/prioritizedVaults.test.js b/packages/inter-protocol/test/vaultFactory/prioritizedVaults.test.js
index 18dcfc0b53d..9db424f4d90 100644
--- a/packages/inter-protocol/test/vaultFactory/prioritizedVaults.test.js
+++ b/packages/inter-protocol/test/vaultFactory/prioritizedVaults.test.js
@@ -1,12 +1,12 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { AmountMath, makeIssuerKit } from '@agoric/ertp';
+import { makeScalarBigMapStore } from '@agoric/vat-data';
import {
makeRatio,
makeRatioFromAmounts,
} from '@agoric/zoe/src/contractSupport/ratio.js';
-import { makeScalarBigMapStore } from '@agoric/vat-data';
import {
currentDebtToCollateral,
makePrioritizedVaults,
diff --git a/packages/inter-protocol/test/vaultFactory/replacePriceAuthority.test.js b/packages/inter-protocol/test/vaultFactory/replacePriceAuthority.test.js
index a9b7aca8a1f..32aa22c5fab 100644
--- a/packages/inter-protocol/test/vaultFactory/replacePriceAuthority.test.js
+++ b/packages/inter-protocol/test/vaultFactory/replacePriceAuthority.test.js
@@ -7,17 +7,26 @@ import {
makeTracer,
objectMap,
} from '@agoric/internal';
-import { unsafeMakeBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js';
-import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
+import { makeNotifierFromAsyncIterable, subscribeEach } from '@agoric/notifier';
+import { unsafeMakeBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js';
import { buildManualTimer } from '@agoric/swingset-vat/tools/manual-timer.js';
-import { E } from '@endo/eventual-send';
import { TimeMath } from '@agoric/time';
-import { providePriceAuthorityRegistry } from '@agoric/vats/src/priceAuthorityRegistry.js';
import { makeScalarMapStore } from '@agoric/vat-data/src/index.js';
+import { providePriceAuthorityRegistry } from '@agoric/vats/src/priceAuthorityRegistry.js';
+import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
import { makeManualPriceAuthority } from '@agoric/zoe/tools/manualPriceAuthority.js';
-import { makeNotifierFromAsyncIterable, subscribeEach } from '@agoric/notifier';
+import { E } from '@endo/eventual-send';
+import {
+ SECONDS_PER_DAY as ONE_DAY,
+ SECONDS_PER_HOUR as ONE_HOUR,
+ SECONDS_PER_WEEK as ONE_WEEK,
+ setupReserve,
+ startAuctioneer,
+ startVaultFactory,
+} from '../../src/proposals/econ-behaviors.js';
+import { startEconomicCommittee } from '../../src/proposals/startEconCommittee.js';
import {
installPuppetGovernance,
produceInstallations,
@@ -25,16 +34,6 @@ import {
setUpZoeForTest,
withAmountUtils,
} from '../supports.js';
-import { startEconomicCommittee } from '../../src/proposals/startEconCommittee.js';
-import {
- setupReserve,
- startAuctioneer,
- SECONDS_PER_DAY as ONE_DAY,
- SECONDS_PER_HOUR as ONE_HOUR,
- SECONDS_PER_WEEK as ONE_WEEK,
- startVaultFactory,
-} from '../../src/proposals/econ-behaviors.js';
-
import { defaultParamValues } from './vaultFactoryUtils.js';
/**
diff --git a/packages/inter-protocol/test/vaultFactory/storage.test.js b/packages/inter-protocol/test/vaultFactory/storage.test.js
index 2758ad918f9..8b423a88841 100644
--- a/packages/inter-protocol/test/vaultFactory/storage.test.js
+++ b/packages/inter-protocol/test/vaultFactory/storage.test.js
@@ -3,6 +3,7 @@ import { test as unknownTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { makeTracer } from '@agoric/internal';
import { makeNotifierFromAsyncIterable } from '@agoric/notifier';
import { E } from '@endo/eventual-send';
+
import { assertTopicPathData, subscriptionKey } from '../supports.js';
import { makeDriverContext, makeManagerDriver } from './driver.js';
diff --git a/packages/inter-protocol/test/vaultFactory/storeUtils.test.js b/packages/inter-protocol/test/vaultFactory/storeUtils.test.js
index 16e7762340c..7cae8cefe8c 100644
--- a/packages/inter-protocol/test/vaultFactory/storeUtils.test.js
+++ b/packages/inter-protocol/test/vaultFactory/storeUtils.test.js
@@ -1,7 +1,7 @@
-import test from 'ava';
-
import { AmountMath } from '@agoric/ertp';
import { Far } from '@endo/marshal';
+import test from 'ava';
+
import * as StoreUtils from '../../src/vaultFactory/storeUtils.js';
/** @type {Brand<'nat'>} */
diff --git a/packages/inter-protocol/test/vaultFactory/vault-collateralization.test.js b/packages/inter-protocol/test/vaultFactory/vault-collateralization.test.js
index 5f3a912872f..7fb4ca19edd 100644
--- a/packages/inter-protocol/test/vaultFactory/vault-collateralization.test.js
+++ b/packages/inter-protocol/test/vaultFactory/vault-collateralization.test.js
@@ -1,8 +1,9 @@
import { test as unknownTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { makeTracer } from '@agoric/internal';
-import { E } from '@endo/eventual-send';
import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
+import { E } from '@endo/eventual-send';
+
import { AT_NEXT, makeDriverContext, makeManagerDriver } from './driver.js';
/** @typedef {import('./driver.js').DriverContext & {}} Context */
diff --git a/packages/inter-protocol/test/vaultFactory/vault-contract-wrapper.js b/packages/inter-protocol/test/vaultFactory/vault-contract-wrapper.js
index 3dd4d282f6e..84a8482bfa8 100644
--- a/packages/inter-protocol/test/vaultFactory/vault-contract-wrapper.js
+++ b/packages/inter-protocol/test/vaultFactory/vault-contract-wrapper.js
@@ -1,6 +1,5 @@
/** @file DEPRECATED use the vault test driver instead */
import { AmountMath, makeIssuerKit } from '@agoric/ertp';
-
import { makePublishKit, observeNotifier } from '@agoric/notifier';
import {
makeFakeMarshaller,
diff --git a/packages/inter-protocol/test/vaultFactory/vault-interest.test.js b/packages/inter-protocol/test/vaultFactory/vault-interest.test.js
index 72e4648fb88..baa77e217fd 100644
--- a/packages/inter-protocol/test/vaultFactory/vault-interest.test.js
+++ b/packages/inter-protocol/test/vaultFactory/vault-interest.test.js
@@ -1,15 +1,13 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { assert } from '@endo/errors';
-import { E } from '@endo/eventual-send';
+import { AmountMath } from '@agoric/ertp';
+import { makeTracer } from '@agoric/internal';
import { setUpZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
import bundleSource from '@endo/bundle-source';
+import { assert } from '@endo/errors';
+import { E } from '@endo/eventual-send';
import { resolve as importMetaResolve } from 'import-meta-resolve';
-import { AmountMath } from '@agoric/ertp';
-
-import { makeTracer } from '@agoric/internal';
-
const vaultRoot = './vault-contract-wrapper.js';
const trace = makeTracer('TestVaultInterest', false);
diff --git a/packages/inter-protocol/test/vaultFactory/vault-pause.test.js b/packages/inter-protocol/test/vaultFactory/vault-pause.test.js
index a64ee2723e3..e37c94dc5ce 100644
--- a/packages/inter-protocol/test/vaultFactory/vault-pause.test.js
+++ b/packages/inter-protocol/test/vaultFactory/vault-pause.test.js
@@ -1,6 +1,7 @@
import { test as unknownTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { makeTracer } from '@agoric/internal';
+
import { makeDriverContext, makeManagerDriver } from './driver.js';
/** @typedef {import('./driver.js').DriverContext & {}} Context */
diff --git a/packages/inter-protocol/test/vaultFactory/vault.test.js b/packages/inter-protocol/test/vaultFactory/vault.test.js
index c5712a70755..4c8cf38e279 100644
--- a/packages/inter-protocol/test/vaultFactory/vault.test.js
+++ b/packages/inter-protocol/test/vaultFactory/vault.test.js
@@ -1,15 +1,13 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { assert } from '@endo/errors';
+import { AmountMath, makeIssuerKit } from '@agoric/ertp';
+import { makeTracer } from '@agoric/internal';
import { setUpZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
import bundleSource from '@endo/bundle-source';
+import { assert } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { resolve as importMetaResolve } from 'import-meta-resolve';
-import { AmountMath, makeIssuerKit } from '@agoric/ertp';
-
-import { makeTracer } from '@agoric/internal';
-
const vaultRoot = './vault-contract-wrapper.js';
const trace = makeTracer('TestVault', false);
diff --git a/packages/inter-protocol/test/vaultFactory/vaultFactory.test.js b/packages/inter-protocol/test/vaultFactory/vaultFactory.test.js
index f285b00bd00..8d76e3baf7c 100644
--- a/packages/inter-protocol/test/vaultFactory/vaultFactory.test.js
+++ b/packages/inter-protocol/test/vaultFactory/vaultFactory.test.js
@@ -2,6 +2,7 @@ import { test as unknownTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
import { combine, split } from '@agoric/ertp/src/legacy-payment-helpers.js';
+import { documentStorageSchema } from '@agoric/governance/tools/storageDoc.js';
import {
allValues,
deeplyFulfilledObject,
@@ -21,12 +22,11 @@ import {
assertPayoutAmount,
} from '@agoric/zoe/test/zoeTestHelpers.js';
import { makeManualPriceAuthority } from '@agoric/zoe/tools/manualPriceAuthority.js';
-
-import { documentStorageSchema } from '@agoric/governance/tools/storageDoc.js';
import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
import { E } from '@endo/eventual-send';
-import { calculateCurrentDebt } from '../../src/interest-math.js';
+
import { SECONDS_PER_YEAR } from '../../src/interest.js';
+import { calculateCurrentDebt } from '../../src/interest-math.js';
import { startVaultFactory } from '../../src/proposals/econ-behaviors.js';
import {
metricsTracker,
diff --git a/packages/inter-protocol/test/vaultFactory/vaultFactoryUtils.js b/packages/inter-protocol/test/vaultFactory/vaultFactoryUtils.js
index 62f4e6e94cd..634a82c5749 100644
--- a/packages/inter-protocol/test/vaultFactory/vaultFactoryUtils.js
+++ b/packages/inter-protocol/test/vaultFactory/vaultFactoryUtils.js
@@ -1,23 +1,23 @@
import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
import { makeNotifierFromSubscriber } from '@agoric/notifier';
-import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
-import { makeManualPriceAuthority } from '@agoric/zoe/tools/manualPriceAuthority.js';
import { makeScalarBigMapStore } from '@agoric/vat-data/src/index.js';
import { providePriceAuthorityRegistry } from '@agoric/vats/src/priceAuthorityRegistry.js';
-
+import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
+import { makeManualPriceAuthority } from '@agoric/zoe/tools/manualPriceAuthority.js';
import { makeScriptedPriceAuthority } from '@agoric/zoe/tools/scriptedPriceAuthority.js';
import { E } from '@endo/eventual-send';
+
import {
SECONDS_PER_WEEK,
setupReserve,
startAuctioneer,
} from '../../src/proposals/econ-behaviors.js';
+import { startEconomicCommittee } from '../../src/proposals/startEconCommittee.js';
import {
installPuppetGovernance,
produceInstallations,
setupBootstrap,
} from '../supports.js';
-import { startEconomicCommittee } from '../../src/proposals/startEconCommittee.js';
export const BASIS_POINTS = 10000n;
diff --git a/packages/inter-protocol/test/vaultFactory/vaultLiquidation.test.js b/packages/inter-protocol/test/vaultFactory/vaultLiquidation.test.js
index 9f9cad0738c..11f1d51ab30 100644
--- a/packages/inter-protocol/test/vaultFactory/vaultLiquidation.test.js
+++ b/packages/inter-protocol/test/vaultFactory/vaultLiquidation.test.js
@@ -5,21 +5,21 @@ import {
allValues,
deeplyFulfilledObject,
makeTracer,
- objectMap,
NonNullish,
+ objectMap,
} from '@agoric/internal';
+import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
import { unsafeMakeBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js';
+import { buildManualTimer } from '@agoric/swingset-vat/tools/manual-timer.js';
+import { TimeMath } from '@agoric/time';
import {
ceilMultiplyBy,
makeRatio,
makeRatioFromAmounts,
} from '@agoric/zoe/src/contractSupport/index.js';
-import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
-import { buildManualTimer } from '@agoric/swingset-vat/tools/manual-timer.js';
-import { E } from '@endo/eventual-send';
-import { TimeMath } from '@agoric/time';
-import { assertPayoutAmount } from '@agoric/zoe/test/zoeTestHelpers.js';
import { multiplyBy } from '@agoric/zoe/src/contractSupport/ratio.js';
+import { assertPayoutAmount } from '@agoric/zoe/test/zoeTestHelpers.js';
+import { E } from '@endo/eventual-send';
import {
SECONDS_PER_DAY as ONE_DAY,
diff --git a/packages/internal/src/lib-chainStorage.js b/packages/internal/src/lib-chainStorage.js
index e67b5766166..bc43b543838 100644
--- a/packages/internal/src/lib-chainStorage.js
+++ b/packages/internal/src/lib-chainStorage.js
@@ -1,9 +1,10 @@
// @ts-check
+import { makeHeapZone } from '@agoric/base-zone/heap.js';
import { Fail } from '@endo/errors';
import { E } from '@endo/far';
import { M } from '@endo/patterns';
-import { makeHeapZone } from '@agoric/base-zone/heap.js';
+
import * as cb from './callback.js';
/**
diff --git a/packages/internal/src/lib-nodejs/spawnSubprocessWorker.js b/packages/internal/src/lib-nodejs/spawnSubprocessWorker.js
index bd79838d3b1..21d068483cf 100644
--- a/packages/internal/src/lib-nodejs/spawnSubprocessWorker.js
+++ b/packages/internal/src/lib-nodejs/spawnSubprocessWorker.js
@@ -1,12 +1,13 @@
// this file is loaded by the controller, in the start compartment
-import { spawn } from 'child_process';
import { makePromiseKit } from '@endo/promise-kit';
+import { spawn } from 'child_process';
+
import { NonNullish } from '../errors.js';
-import { arrayEncoderStream, arrayDecoderStream } from './worker-protocol.js';
import {
- netstringEncoderStream,
netstringDecoderStream,
+ netstringEncoderStream,
} from '../netstring.js';
+import { arrayDecoderStream, arrayEncoderStream } from './worker-protocol.js';
// Start a subprocess from a given executable, and arrange a bidirectional
// message channel with a "supervisor" within that process. Return a {
diff --git a/packages/internal/src/marshal.js b/packages/internal/src/marshal.js
index 3750b910ad2..6894a6de061 100644
--- a/packages/internal/src/marshal.js
+++ b/packages/internal/src/marshal.js
@@ -2,6 +2,7 @@
import { Fail } from '@endo/errors';
import { Far } from '@endo/far';
import { makeMarshal } from '@endo/marshal';
+
import { isStreamCell } from './lib-chainStorage.js';
/**
diff --git a/packages/internal/src/netstring.js b/packages/internal/src/netstring.js
index 690d3c9f832..d1ac312f5b5 100644
--- a/packages/internal/src/netstring.js
+++ b/packages/internal/src/netstring.js
@@ -1,6 +1,5 @@
/* global Buffer */
import { Fail } from '@endo/errors';
-
// adapted from 'netstring-stream', https://github.com/tlivings/netstring-stream/
import { Transform } from 'stream';
diff --git a/packages/internal/src/node/createBundles.js b/packages/internal/src/node/createBundles.js
index 116eca402cb..aedd3137fe0 100644
--- a/packages/internal/src/node/createBundles.js
+++ b/packages/internal/src/node/createBundles.js
@@ -1,11 +1,10 @@
/* global process */
// Use modules not prefixed with `node:` since some deploy scripts may
// still be running in esm emulation
-import path from 'path';
+import { Fail, q } from '@endo/errors';
import { spawnSync } from 'child_process';
import { createRequire } from 'module';
-
-import { Fail, q } from '@endo/errors';
+import path from 'path';
const BUNDLE_SOURCE_PROGRAM = 'bundle-source';
const req = createRequire(import.meta.url);
diff --git a/packages/internal/src/node/shutdown.js b/packages/internal/src/node/shutdown.js
index 400b66bde06..aad69cc817b 100644
--- a/packages/internal/src/node/shutdown.js
+++ b/packages/internal/src/node/shutdown.js
@@ -1,4 +1,5 @@
import process from 'node:process';
+
import anylogger from 'anylogger';
const console = anylogger('shutdown');
diff --git a/packages/internal/src/storage-test-utils.js b/packages/internal/src/storage-test-utils.js
index b1ce51b2cdc..e5a6b6bec3f 100644
--- a/packages/internal/src/storage-test-utils.js
+++ b/packages/internal/src/storage-test-utils.js
@@ -2,9 +2,10 @@
import { Fail } from '@endo/errors';
import { Far } from '@endo/far';
import { makeMarshal, Remotable } from '@endo/marshal';
-import { unmarshalFromVstorage } from './marshal.js';
+
import { makeTracer } from './debug.js';
import { isStreamCell, makeChainStorageRoot } from './lib-chainStorage.js';
+import { unmarshalFromVstorage } from './marshal.js';
import { bindAllMethods } from './method-tools.js';
import { eventLoopIteration } from './testing-utils.js';
diff --git a/packages/internal/src/types.d.ts b/packages/internal/src/types.d.ts
index a91602bf1f4..93bfb0711e8 100644
--- a/packages/internal/src/types.d.ts
+++ b/packages/internal/src/types.d.ts
@@ -1,6 +1,7 @@
/* eslint-disable max-classes-per-file */
import type { ERef, RemotableBrand } from '@endo/eventual-send';
import type { Primitive } from '@endo/pass-style';
+
import type { Callable } from './utils.js';
/**
diff --git a/packages/internal/src/utils.js b/packages/internal/src/utils.js
index bd69cdfabb9..57b1aca893d 100644
--- a/packages/internal/src/utils.js
+++ b/packages/internal/src/utils.js
@@ -1,7 +1,7 @@
// @ts-check
// @jessie-check
-import { q, Fail, makeError, annotateError, X } from '@endo/errors';
+import { annotateError, Fail, makeError, q, X } from '@endo/errors';
import { deeplyFulfilled, isObject } from '@endo/marshal';
import { makePromiseKit } from '@endo/promise-kit';
import { makeQueue } from '@endo/stream';
diff --git a/packages/internal/test/callback.test.js b/packages/internal/test/callback.test.js
index db0f09ef887..cf38a04e82b 100644
--- a/packages/internal/test/callback.test.js
+++ b/packages/internal/test/callback.test.js
@@ -1,8 +1,8 @@
// @ts-check
+import { makeHeapZone } from '@agoric/base-zone/heap.js';
+import { Far } from '@endo/far';
import test from 'ava';
-import { Far } from '@endo/far';
-import { makeHeapZone } from '@agoric/base-zone/heap.js';
import * as cb from '../src/callback.js';
/** @import {Callback, SyncCallback} from '../src/types.js' */
diff --git a/packages/internal/test/endo-integration.test-d.ts b/packages/internal/test/endo-integration.test-d.ts
index 6fb46cb39ae..72e9c5085b1 100644
--- a/packages/internal/test/endo-integration.test-d.ts
+++ b/packages/internal/test/endo-integration.test-d.ts
@@ -1,8 +1,6 @@
-import { expectNotType, expectType } from 'tsd';
-
-import { M } from '@endo/patterns';
-
import type { InterfaceGuard } from '@endo/patterns';
+import { M } from '@endo/patterns';
+import { expectNotType, expectType } from 'tsd';
expectType(
M.interface('some sring', { inc: M.call().returns() }),
diff --git a/packages/internal/test/netstring.test.js b/packages/internal/test/netstring.test.js
index 7526c5b927d..11499d79a93 100644
--- a/packages/internal/test/netstring.test.js
+++ b/packages/internal/test/netstring.test.js
@@ -2,10 +2,10 @@
import test from 'ava';
import {
- encode,
decode,
- netstringEncoderStream,
+ encode,
netstringDecoderStream,
+ netstringEncoderStream,
} from '../src/netstring.js';
const umlaut = 'ümlaut';
diff --git a/packages/internal/test/priority-senders.test.js b/packages/internal/test/priority-senders.test.js
index 50c4546f902..716be973077 100644
--- a/packages/internal/test/priority-senders.test.js
+++ b/packages/internal/test/priority-senders.test.js
@@ -1,9 +1,9 @@
// @ts-check
import test from 'ava';
-import { makeFakeStorageKit } from '../src/storage-test-utils.js';
import { HIGH_PRIORITY_SENDERS } from '../src/chain-storage-paths.js';
import { makePrioritySendersManager } from '../src/priority-senders.js';
+import { makeFakeStorageKit } from '../src/storage-test-utils.js';
import { eventLoopIteration as writesSettled } from '../src/testing-utils.js';
test('basic', async t => {
diff --git a/packages/internal/test/storage-test-utils.test.js b/packages/internal/test/storage-test-utils.test.js
index 7691b42e160..ebcd3726662 100644
--- a/packages/internal/test/storage-test-utils.test.js
+++ b/packages/internal/test/storage-test-utils.test.js
@@ -1,7 +1,7 @@
// @ts-check
-import test from 'ava';
import { Far } from '@endo/far';
import { makeMarshal } from '@endo/marshal';
+import test from 'ava';
import {
defaultMarshaller,
diff --git a/packages/internal/test/typeCheck.test.js b/packages/internal/test/typeCheck.test.js
index e1745ed447d..aa813d47cc3 100644
--- a/packages/internal/test/typeCheck.test.js
+++ b/packages/internal/test/typeCheck.test.js
@@ -1,8 +1,8 @@
// @ts-check
-import test from 'ava';
-
import { makeExo } from '@endo/exo';
import { M } from '@endo/patterns';
+import test from 'ava';
+
import { cast, mustMatch } from '../src/typeCheck.js';
/**
diff --git a/packages/internal/test/types.test-d.ts b/packages/internal/test/types.test-d.ts
index 9b63697ac33..d79b6694661 100644
--- a/packages/internal/test/types.test-d.ts
+++ b/packages/internal/test/types.test-d.ts
@@ -1,7 +1,8 @@
-import { expectNotType, expectType } from 'tsd';
import { E, ERef } from '@endo/far';
-import type { Remote } from '../src/types.js';
+import { expectNotType, expectType } from 'tsd';
+
import type { StorageNode } from '../src/lib-chainStorage.js';
+import type { Remote } from '../src/types.js';
const eventualStorageNode: ERef = null as any;
const remoteStorageNode: Remote = null as any;
diff --git a/packages/internal/test/upgrade-api.test.js b/packages/internal/test/upgrade-api.test.js
index 5ffc38f9b29..31ced9c7cc3 100644
--- a/packages/internal/test/upgrade-api.test.js
+++ b/packages/internal/test/upgrade-api.test.js
@@ -1,8 +1,9 @@
// @ts-check
import test from 'ava';
+
import {
- makeUpgradeDisconnection,
isUpgradeDisconnection,
+ makeUpgradeDisconnection,
} from '../src/upgrade-api.js';
test('isUpgradeDisconnection must recognize disconnection objects', t => {
diff --git a/packages/internal/test/utils.test.js b/packages/internal/test/utils.test.js
index 7d1b9ba5092..0e473a7a11f 100644
--- a/packages/internal/test/utils.test.js
+++ b/packages/internal/test/utils.test.js
@@ -1,16 +1,16 @@
// @ts-check
+import { Far } from '@endo/far';
import test from 'ava';
-import { Far } from '@endo/far';
import {
- makeMeasureSeconds,
assertAllDefined,
- whileTrue,
- untilTrue,
- forever,
deeplyFulfilledObject,
deepMapObject,
+ forever,
+ makeMeasureSeconds,
synchronizedTee,
+ untilTrue,
+ whileTrue,
} from '../src/utils.js';
test('deeplyFulfilledObject', async t => {
diff --git a/packages/kmarshal/test/basic.test.js b/packages/kmarshal/test/basic.test.js
index 0fe1a54ed07..137c451058c 100644
--- a/packages/kmarshal/test/basic.test.js
+++ b/packages/kmarshal/test/basic.test.js
@@ -1,6 +1,6 @@
import test from 'ava';
-import { kser, kunser, krefOf, kslot } from '../src/kmarshal.js';
+import { krefOf, kser, kslot, kunser } from '../src/kmarshal.js';
test('sanity check', t => {
const assertRoundTrip = (val, toComparable = v => v) => {
diff --git a/packages/network/src/bytes.js b/packages/network/src/bytes.js
index 67c0b79c241..4c54088504c 100644
--- a/packages/network/src/bytes.js
+++ b/packages/network/src/bytes.js
@@ -1,6 +1,6 @@
// @ts-check
-import { X, Fail } from '@endo/errors';
-import { encodeBase64, decodeBase64 } from '@endo/base64';
+import { decodeBase64, encodeBase64 } from '@endo/base64';
+import { Fail, X } from '@endo/errors';
import { isObject } from '@endo/pass-style';
/**
diff --git a/packages/network/src/network.js b/packages/network/src/network.js
index 4f31ef83b95..e02ce81b7ea 100644
--- a/packages/network/src/network.js
+++ b/packages/network/src/network.js
@@ -5,6 +5,7 @@
import { Fail } from '@endo/errors';
import { E } from '@endo/far';
import { M } from '@endo/patterns';
+
import { toBytes } from './bytes.js';
import { Shape } from './shapes.js';
diff --git a/packages/network/src/router.js b/packages/network/src/router.js
index b0b6f003511..ee2a098ae33 100644
--- a/packages/network/src/router.js
+++ b/packages/network/src/router.js
@@ -6,6 +6,7 @@
import { Fail } from '@endo/errors';
import { E as defaultE } from '@endo/far';
import { M } from '@endo/patterns';
+
import { ENDPOINT_SEPARATOR, prepareNetworkProtocol } from './network.js';
import { Shape } from './shapes.js';
diff --git a/packages/network/test/fakes.js b/packages/network/test/fakes.js
index 9ad80dca982..5c9650250d7 100644
--- a/packages/network/test/fakes.js
+++ b/packages/network/test/fakes.js
@@ -1,6 +1,8 @@
// @ts-check
-import { prepareVowTools } from '@agoric/vow';
import assert from 'node:assert/strict';
+
+import { prepareVowTools } from '@agoric/vow';
+
import {
prepareEchoConnectionKit,
prepareNetworkPowers,
diff --git a/packages/network/test/network-misc.test.js b/packages/network/test/network-misc.test.js
index eb56e40335a..dbeda1bd10f 100644
--- a/packages/network/test/network-misc.test.js
+++ b/packages/network/test/network-misc.test.js
@@ -1,20 +1,20 @@
// @ts-check
-import { reincarnate } from '@agoric/swingset-liveslots/tools/setup-vat-data.js';
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+import { reincarnate } from '@agoric/swingset-liveslots/tools/setup-vat-data.js';
import { prepareVowTools } from '@agoric/vow/vat.js';
import { makeDurableZone } from '@agoric/zone/durable.js';
import { E } from '@endo/far';
import {
+ CLOSE_REASON_FINALIZER,
parse,
prepareLoopbackProtocolHandler,
+ prepareNetworkPowers,
prepareNetworkProtocol,
prepareRouter,
- prepareNetworkPowers,
unparse,
- CLOSE_REASON_FINALIZER,
} from '../src/index.js';
import { fakeNetworkEchoStuff } from './fakes.js';
diff --git a/packages/notifier/src/asyncIterableAdaptor.js b/packages/notifier/src/asyncIterableAdaptor.js
index 36a37be6151..f4d61b6785c 100644
--- a/packages/notifier/src/asyncIterableAdaptor.js
+++ b/packages/notifier/src/asyncIterableAdaptor.js
@@ -1,6 +1,7 @@
///
import { E } from '@endo/far';
+
import { subscribeLatest } from './subscribe.js';
/**
diff --git a/packages/notifier/src/publish-kit.js b/packages/notifier/src/publish-kit.js
index e2403db1455..94342887038 100644
--- a/packages/notifier/src/publish-kit.js
+++ b/packages/notifier/src/publish-kit.js
@@ -1,10 +1,10 @@
///
+import { canBeDurable, prepareExoClassKit } from '@agoric/vat-data';
import { Fail, q } from '@endo/errors';
import { E, Far } from '@endo/far';
+import { getInterfaceGuardPayload, M } from '@endo/patterns';
import { makePromiseKit } from '@endo/promise-kit';
-import { M, getInterfaceGuardPayload } from '@endo/patterns';
-import { canBeDurable, prepareExoClassKit } from '@agoric/vat-data';
/**
* @import {ERef} from '@endo/far';
diff --git a/packages/notifier/src/stored-notifier.js b/packages/notifier/src/stored-notifier.js
index 0f434ed4789..32efbc2c9b2 100644
--- a/packages/notifier/src/stored-notifier.js
+++ b/packages/notifier/src/stored-notifier.js
@@ -3,6 +3,7 @@
import { assertAllDefined } from '@agoric/internal';
import { makeSerializeToStorage } from '@agoric/internal/src/lib-chainStorage.js';
import { E, Far } from '@endo/far';
+
import { observeNotifier } from './asyncIterableAdaptor.js';
/**
diff --git a/packages/notifier/src/storesub.js b/packages/notifier/src/storesub.js
index bd9d8ba64a5..251ddb66f4e 100644
--- a/packages/notifier/src/storesub.js
+++ b/packages/notifier/src/storesub.js
@@ -1,11 +1,12 @@
-import { E, Far } from '@endo/far';
-import { makeMarshal } from '@endo/marshal';
import { assertAllDefined } from '@agoric/internal';
import { makeSerializeToStorage } from '@agoric/internal/src/lib-chainStorage.js';
+import { E, Far } from '@endo/far';
+import { makeMarshal } from '@endo/marshal';
+
import { observeIteration } from './asyncIterableAdaptor.js';
import { makePublishKit } from './publish-kit.js';
-import { makeSubscriptionKit } from './subscriber.js';
import { subscribeEach } from './subscribe.js';
+import { makeSubscriptionKit } from './subscriber.js';
/**
* @import {ERef} from '@endo/far';
diff --git a/packages/notifier/src/subscribe.js b/packages/notifier/src/subscribe.js
index c0c2aec301f..b4117830028 100644
--- a/packages/notifier/src/subscribe.js
+++ b/packages/notifier/src/subscribe.js
@@ -1,7 +1,7 @@
-import { X, Fail, annotateError } from '@endo/errors';
+import { isUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
+import { annotateError, Fail, X } from '@endo/errors';
import { E, Far } from '@endo/far';
import { isObject } from '@endo/marshal';
-import { isUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
/**
* @import {ERef} from '@endo/far';
diff --git a/packages/notifier/src/subscriber.js b/packages/notifier/src/subscriber.js
index 8a613423eb4..77b4744e3b5 100644
--- a/packages/notifier/src/subscriber.js
+++ b/packages/notifier/src/subscriber.js
@@ -3,9 +3,9 @@
///
import { E, Far } from '@endo/far';
-import { subscribeEach } from './subscribe.js';
-import { makePublishKit } from './publish-kit.js';
+import { makePublishKit } from './publish-kit.js';
+import { subscribeEach } from './subscribe.js';
import { makePinnedHistoryTopic } from './topic.js';
/**
diff --git a/packages/notifier/test/iterable-testing-tools.js b/packages/notifier/test/iterable-testing-tools.js
index 1f74a720fa7..61ebda66d18 100644
--- a/packages/notifier/test/iterable-testing-tools.js
+++ b/packages/notifier/test/iterable-testing-tools.js
@@ -1,5 +1,6 @@
import { E } from '@endo/far';
import { makePromiseKit } from '@endo/promise-kit';
+
import { observeIteration, observeIterator } from '../src/index.js';
/**
diff --git a/packages/notifier/test/makeNotifierFromSubscriber.test.js b/packages/notifier/test/makeNotifierFromSubscriber.test.js
index 1193296736f..9ea34a61808 100644
--- a/packages/notifier/test/makeNotifierFromSubscriber.test.js
+++ b/packages/notifier/test/makeNotifierFromSubscriber.test.js
@@ -1,9 +1,9 @@
import { test } from './prepare-test-env-ava.js';
import {
- makePublishKit,
makeNotifierFromSubscriber,
makeNotifierKit,
+ makePublishKit,
} from '../src/index.js';
import {
delayByTurns,
diff --git a/packages/notifier/test/map-unum.js b/packages/notifier/test/map-unum.js
index a0da12b78c8..3e2e73acc55 100644
--- a/packages/notifier/test/map-unum.js
+++ b/packages/notifier/test/map-unum.js
@@ -7,7 +7,8 @@
// If this experiment works out, it or something like it may eventually move
// from test/ to src/
-import { q, Fail } from '@endo/errors';
+import { Fail, q } from '@endo/errors';
+
import {
makeNotifierKit,
makeSubscriptionKit,
diff --git a/packages/notifier/test/notifier-adaptor.test.js b/packages/notifier/test/notifier-adaptor.test.js
index 97d1a7d732f..39300edfee4 100644
--- a/packages/notifier/test/notifier-adaptor.test.js
+++ b/packages/notifier/test/notifier-adaptor.test.js
@@ -7,12 +7,12 @@ import {
observeNotifier,
} from '../src/index.js';
import {
- finiteStream,
explodingStream,
+ finiteStream,
+ makeTestIterationObserver,
+ testAutoConsumer,
testEnding,
testManualConsumer,
- testAutoConsumer,
- makeTestIterationObserver,
} from './iterable-testing-tools.js';
// /////////////// Self test the testing tools for consistency /////////////////
diff --git a/packages/notifier/test/notifier-examples.test.js b/packages/notifier/test/notifier-examples.test.js
index 1c1f3cee026..4386617140a 100644
--- a/packages/notifier/test/notifier-examples.test.js
+++ b/packages/notifier/test/notifier-examples.test.js
@@ -1,13 +1,13 @@
import { test } from './prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { E } from '@endo/far';
+
import {
- observeIteration,
- makeNotifierKit,
makeNotifier,
+ makeNotifierKit,
+ observeIteration,
} from '../src/index.js';
-import { paula, alice, bob } from './iterable-testing-tools.js';
+import { alice, bob, paula } from './iterable-testing-tools.js';
const last = array => array[array.length - 1];
diff --git a/packages/notifier/test/notifier.test.js b/packages/notifier/test/notifier.test.js
index 0d5bac94f98..3204fd09cb1 100644
--- a/packages/notifier/test/notifier.test.js
+++ b/packages/notifier/test/notifier.test.js
@@ -1,4 +1,5 @@
import { test } from './prepare-test-env-ava.js';
+
import { makeNotifierKit } from '../src/index.js';
/**
diff --git a/packages/notifier/test/publish-kit.test.js b/packages/notifier/test/publish-kit.test.js
index e0f994153a9..ab8867ae401 100644
--- a/packages/notifier/test/publish-kit.test.js
+++ b/packages/notifier/test/publish-kit.test.js
@@ -1,23 +1,24 @@
/* eslint-disable no-void */
import '@agoric/swingset-liveslots/tools/prepare-test-env.js';
-import test from 'ava';
-import { q } from '@endo/errors';
-import { E } from '@endo/far';
+import { kunser } from '@agoric/kmarshal';
+import { initSwingStore } from '@agoric/swing-store';
import {
buildKernelBundles,
initializeSwingset,
makeSwingsetController,
} from '@agoric/swingset-vat';
-import { initSwingStore } from '@agoric/swing-store';
-import { kunser } from '@agoric/kmarshal';
import { makeScalarBigMapStore } from '@agoric/vat-data/src/vat-data-bindings.js';
+import { q } from '@endo/errors';
+import { E } from '@endo/far';
+import test from 'ava';
+
import {
makePublishKit,
+ prepareDurablePublishKit,
subscribeEach,
subscribeLatest,
- prepareDurablePublishKit,
} from '../src/index.js';
import { invertPromiseSettlement } from './iterable-testing-tools.js';
diff --git a/packages/notifier/test/stored-subscription.test.js b/packages/notifier/test/stored-subscription.test.js
index a334ea6cd77..e8524ce1c7f 100644
--- a/packages/notifier/test/stored-subscription.test.js
+++ b/packages/notifier/test/stored-subscription.test.js
@@ -1,8 +1,8 @@
-// eslint-disable-next-line import/order
import { test } from './prepare-test-env-ava.js';
import { E } from '@endo/far';
import { makeMarshal } from '@endo/marshal';
+
import {
makePublishKit,
makeStoredPublishKit,
@@ -13,10 +13,9 @@ import {
} from '../src/index.js';
import {
eventLoopIteration,
- makeFakeStorage,
makeFakeMarshaller,
+ makeFakeStorage,
} from '../tools/testSupports.js';
-
import { jsonPairs } from './marshal-corpus.js';
test('stored subscription', async t => {
diff --git a/packages/notifier/test/subscriber-examples.test.js b/packages/notifier/test/subscriber-examples.test.js
index 2ca2b0ef9f5..f3c1122e7d1 100644
--- a/packages/notifier/test/subscriber-examples.test.js
+++ b/packages/notifier/test/subscriber-examples.test.js
@@ -1,13 +1,13 @@
import { test } from './prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { E } from '@endo/far';
+
import {
- observeIteration,
- makeSubscriptionKit,
makeSubscription,
+ makeSubscriptionKit,
+ observeIteration,
} from '../src/index.js';
-import { paula, alice, bob, carol } from './iterable-testing-tools.js';
+import { alice, bob, carol, paula } from './iterable-testing-tools.js';
test('subscription for-await-of success example', async t => {
const { publication, subscription } = makeSubscriptionKit();
diff --git a/packages/notifier/test/vat-integration/vat-pubsub.js b/packages/notifier/test/vat-integration/vat-pubsub.js
index ed19dc37a21..b7c60c54dc9 100644
--- a/packages/notifier/test/vat-integration/vat-pubsub.js
+++ b/packages/notifier/test/vat-integration/vat-pubsub.js
@@ -1,5 +1,6 @@
-import { Far } from '@endo/marshal';
import { provide } from '@agoric/vat-data';
+import { Far } from '@endo/marshal';
+
import {
prepareDurablePublishKit,
subscribeEach,
diff --git a/packages/orchestration/scripts/fetch-chain-info.ts b/packages/orchestration/scripts/fetch-chain-info.ts
index 9634dfc884e..d376d0c8ff6 100755
--- a/packages/orchestration/scripts/fetch-chain-info.ts
+++ b/packages/orchestration/scripts/fetch-chain-info.ts
@@ -1,8 +1,10 @@
#!/usr/bin/env tsx
/** @file Fetch canonical chain info to generate the minimum needed for agoricNames */
-import { ChainRegistryClient } from '@chain-registry/client';
import fsp from 'node:fs/promises';
+
+import { ChainRegistryClient } from '@chain-registry/client';
import prettier from 'prettier';
+
import { convertChainInfo } from '../src/utils/registry.js';
// XXX script assumes it's run from the package path
diff --git a/packages/orchestration/src/chain-info.js b/packages/orchestration/src/chain-info.js
index 34c63a62409..d0a077aa1ac 100644
--- a/packages/orchestration/src/chain-info.js
+++ b/packages/orchestration/src/chain-info.js
@@ -1,5 +1,6 @@
import { E } from '@endo/far';
import { M, mustMatch } from '@endo/patterns';
+
import {
ASSETS_KEY,
CHAIN_KEY,
diff --git a/packages/orchestration/src/cosmos-api.ts b/packages/orchestration/src/cosmos-api.ts
index 86b2f61d3b3..1319098d825 100644
--- a/packages/orchestration/src/cosmos-api.ts
+++ b/packages/orchestration/src/cosmos-api.ts
@@ -1,4 +1,5 @@
-import type { AnyJson, TypedJson, JsonSafe } from '@agoric/cosmic-proto';
+import type { AnyJson, JsonSafe, TypedJson } from '@agoric/cosmic-proto';
+import type { QueryDelegationTotalRewardsResponse } from '@agoric/cosmic-proto/cosmos/distribution/v1beta1/query.js';
import type {
Delegation,
DelegationResponse,
@@ -9,15 +10,15 @@ import type {
import type { TxBody } from '@agoric/cosmic-proto/cosmos/tx/v1beta1/tx.js';
import type { MsgTransfer } from '@agoric/cosmic-proto/ibc/applications/transfer/v1/tx.js';
import type {
- State as IBCChannelState,
Order,
+ State as IBCChannelState,
} from '@agoric/cosmic-proto/ibc/core/channel/v1/channel.js';
import type { State as IBCConnectionState } from '@agoric/cosmic-proto/ibc/core/connection/v1/connection.js';
import type {
RequestQuery,
ResponseQuery,
} from '@agoric/cosmic-proto/tendermint/abci/types.js';
-import type { Brand, Purse, Payment, Amount } from '@agoric/ertp/src/types.js';
+import type { Amount, Brand, Payment, Purse } from '@agoric/ertp/src/types.js';
import type { Port } from '@agoric/network';
import type { IBCChannelID, IBCConnectionID } from '@agoric/vats';
import type {
@@ -28,7 +29,7 @@ import type {
LocalIbcAddress,
RemoteIbcAddress,
} from '@agoric/vats/tools/ibc-utils.js';
-import type { QueryDelegationTotalRewardsResponse } from '@agoric/cosmic-proto/cosmos/distribution/v1beta1/query.js';
+
import type { AmountArg, ChainAddress, Denom, DenomAmount } from './types.js';
/** An address for a validator on some blockchain, e.g., cosmos, eth, etc. */
diff --git a/packages/orchestration/src/examples/auto-stake-it-tap-kit.js b/packages/orchestration/src/examples/auto-stake-it-tap-kit.js
index 7092c704343..61f2ba5e397 100644
--- a/packages/orchestration/src/examples/auto-stake-it-tap-kit.js
+++ b/packages/orchestration/src/examples/auto-stake-it-tap-kit.js
@@ -1,8 +1,9 @@
-import { M, mustMatch } from '@endo/patterns';
-import { E } from '@endo/far';
-import { VowShape } from '@agoric/vow';
import { makeTracer } from '@agoric/internal';
+import { VowShape } from '@agoric/vow';
import { atob } from '@endo/base64';
+import { E } from '@endo/far';
+import { M, mustMatch } from '@endo/patterns';
+
import { ChainAddressShape } from '../typeGuards.js';
const trace = makeTracer('AutoStakeItTap');
diff --git a/packages/orchestration/src/examples/auto-stake-it.contract.js b/packages/orchestration/src/examples/auto-stake-it.contract.js
index d08781e47ff..cf8ca056ac9 100644
--- a/packages/orchestration/src/examples/auto-stake-it.contract.js
+++ b/packages/orchestration/src/examples/auto-stake-it.contract.js
@@ -3,11 +3,12 @@ import {
InvitationShape,
} from '@agoric/zoe/src/typeGuards.js';
import { M } from '@endo/patterns';
+
import { prepareChainHubAdmin } from '../exos/chain-hub-admin.js';
import { preparePortfolioHolder } from '../exos/portfolio-holder-kit.js';
import { withOrchestration } from '../utils/start-helper.js';
-import { prepareStakingTap } from './auto-stake-it-tap-kit.js';
import * as flows from './auto-stake-it.flows.js';
+import { prepareStakingTap } from './auto-stake-it-tap-kit.js';
/**
* @import {Zone} from '@agoric/zone';
diff --git a/packages/orchestration/src/examples/auto-stake-it.flows.js b/packages/orchestration/src/examples/auto-stake-it.flows.js
index 74d1fc839a7..d699340c134 100644
--- a/packages/orchestration/src/examples/auto-stake-it.flows.js
+++ b/packages/orchestration/src/examples/auto-stake-it.flows.js
@@ -1,4 +1,5 @@
import { Fail } from '@endo/errors';
+
import { denomHash } from '../utils/denomHash.js';
/**
diff --git a/packages/orchestration/src/examples/basic-flows.contract.js b/packages/orchestration/src/examples/basic-flows.contract.js
index 60f58cadd1f..0a38ce7b843 100644
--- a/packages/orchestration/src/examples/basic-flows.contract.js
+++ b/packages/orchestration/src/examples/basic-flows.contract.js
@@ -4,6 +4,7 @@
*/
import { InvitationShape } from '@agoric/zoe/src/typeGuards.js';
import { M } from '@endo/patterns';
+
import { preparePortfolioHolder } from '../exos/portfolio-holder-kit.js';
import { withOrchestration } from '../utils/start-helper.js';
import * as flows from './basic-flows.flows.js';
diff --git a/packages/orchestration/src/examples/send-anywhere.contract.js b/packages/orchestration/src/examples/send-anywhere.contract.js
index ebe77f1af7d..7987c4094d8 100644
--- a/packages/orchestration/src/examples/send-anywhere.contract.js
+++ b/packages/orchestration/src/examples/send-anywhere.contract.js
@@ -2,9 +2,10 @@ import { makeSharedStateRecord } from '@agoric/async-flow';
import { AmountShape } from '@agoric/ertp';
import { InvitationShape } from '@agoric/zoe/src/typeGuards.js';
import { M } from '@endo/patterns';
+
+import { prepareChainHubAdmin } from '../exos/chain-hub-admin.js';
import { withOrchestration } from '../utils/start-helper.js';
import * as flows from './send-anywhere.flows.js';
-import { prepareChainHubAdmin } from '../exos/chain-hub-admin.js';
/**
* @import {Zone} from '@agoric/zone';
diff --git a/packages/orchestration/src/examples/stakeBld.contract.js b/packages/orchestration/src/examples/stakeBld.contract.js
index d55f82618f6..236790c150d 100644
--- a/packages/orchestration/src/examples/stakeBld.contract.js
+++ b/packages/orchestration/src/examples/stakeBld.contract.js
@@ -9,6 +9,7 @@ import { InvitationShape } from '@agoric/zoe/src/typeGuards.js';
import { makeDurableZone } from '@agoric/zone/durable.js';
import { deeplyFulfilled } from '@endo/marshal';
import { M } from '@endo/patterns';
+
import { makeChainHub } from '../exos/chain-hub.js';
import { prepareLocalOrchestrationAccountKit } from '../exos/local-orchestration-account.js';
import fetchedChainInfo from '../fetched-chain-info.js';
diff --git a/packages/orchestration/src/examples/stakeIca.contract.js b/packages/orchestration/src/examples/stakeIca.contract.js
index d6b89145368..75961ce04a5 100644
--- a/packages/orchestration/src/examples/stakeIca.contract.js
+++ b/packages/orchestration/src/examples/stakeIca.contract.js
@@ -10,8 +10,9 @@ import {
import { InvitationShape } from '@agoric/zoe/src/typeGuards.js';
import { makeDurableZone } from '@agoric/zone/durable.js';
import { M } from '@endo/patterns';
-import { prepareCosmosOrchestrationAccount } from '../exos/cosmos-orchestration-account.js';
+
import { makeChainHub } from '../exos/chain-hub.js';
+import { prepareCosmosOrchestrationAccount } from '../exos/cosmos-orchestration-account.js';
const trace = makeTracer('StakeIca');
/**
diff --git a/packages/orchestration/src/examples/staking-combinations.contract.js b/packages/orchestration/src/examples/staking-combinations.contract.js
index 209b328f674..ade336be8eb 100644
--- a/packages/orchestration/src/examples/staking-combinations.contract.js
+++ b/packages/orchestration/src/examples/staking-combinations.contract.js
@@ -8,12 +8,13 @@
import { makeSharedStateRecord } from '@agoric/async-flow';
import { AmountShape } from '@agoric/ertp';
import { M } from '@endo/patterns';
+
+import { prepareChainHubAdmin } from '../exos/chain-hub-admin.js';
import { prepareCombineInvitationMakers } from '../exos/combine-invitation-makers.js';
import { CosmosOrchestrationInvitationMakersI } from '../exos/cosmos-orchestration-account.js';
import { ChainAddressShape, DelegationShape } from '../typeGuards.js';
import { withOrchestration } from '../utils/start-helper.js';
import * as flows from './staking-combinations.flows.js';
-import { prepareChainHubAdmin } from '../exos/chain-hub-admin.js';
/**
* @import {GuestInterface} from '@agoric/async-flow';
diff --git a/packages/orchestration/src/examples/staking-combinations.flows.js b/packages/orchestration/src/examples/staking-combinations.flows.js
index 2961ee96dac..67e08af90ee 100644
--- a/packages/orchestration/src/examples/staking-combinations.flows.js
+++ b/packages/orchestration/src/examples/staking-combinations.flows.js
@@ -7,9 +7,10 @@
* @import {ZoeTools} from '../utils/zoe-tools.js';
*/
-import { mustMatch } from '@endo/patterns';
-import { makeError } from '@endo/errors';
import { makeTracer } from '@agoric/internal';
+import { makeError } from '@endo/errors';
+import { mustMatch } from '@endo/patterns';
+
import { ChainAddressShape } from '../typeGuards.js';
const trace = makeTracer('StakingCombinationsFlows');
diff --git a/packages/orchestration/src/examples/swap.contract.js b/packages/orchestration/src/examples/swap.contract.js
index fa2a7e0bff1..2883b89c2ac 100644
--- a/packages/orchestration/src/examples/swap.contract.js
+++ b/packages/orchestration/src/examples/swap.contract.js
@@ -1,6 +1,7 @@
import { StorageNodeShape } from '@agoric/internal';
import { TimerServiceShape } from '@agoric/time';
import { M } from '@endo/patterns';
+
import { withOrchestration } from '../utils/start-helper.js';
import * as flows from './swap.flows.js';
diff --git a/packages/orchestration/src/examples/unbond.contract.js b/packages/orchestration/src/examples/unbond.contract.js
index e577f2c6fec..b1e4ef79be3 100644
--- a/packages/orchestration/src/examples/unbond.contract.js
+++ b/packages/orchestration/src/examples/unbond.contract.js
@@ -1,4 +1,5 @@
import { M } from '@endo/patterns';
+
import { withOrchestration } from '../utils/start-helper.js';
import * as flows from './unbond.flows.js';
diff --git a/packages/orchestration/src/exos/chain-hub-admin.js b/packages/orchestration/src/exos/chain-hub-admin.js
index e790257b3b4..b3a1c402d5c 100644
--- a/packages/orchestration/src/exos/chain-hub-admin.js
+++ b/packages/orchestration/src/exos/chain-hub-admin.js
@@ -2,6 +2,7 @@
/* eslint-disable no-restricted-syntax */
import { heapVowE } from '@agoric/vow/vat.js';
import { M } from '@endo/patterns';
+
import { CosmosChainInfoShape } from '../typeGuards.js';
import { DenomDetailShape } from './chain-hub.js';
diff --git a/packages/orchestration/src/exos/chain-hub.js b/packages/orchestration/src/exos/chain-hub.js
index f938771a480..1e653d1536e 100644
--- a/packages/orchestration/src/exos/chain-hub.js
+++ b/packages/orchestration/src/exos/chain-hub.js
@@ -1,10 +1,10 @@
+import { BrandShape } from '@agoric/ertp/src/typeGuards.js';
+import { VowShape } from '@agoric/vow';
+import { makeHeapZone } from '@agoric/zone';
import { Fail, makeError, q } from '@endo/errors';
import { E } from '@endo/far';
import { M } from '@endo/patterns';
-import { BrandShape } from '@agoric/ertp/src/typeGuards.js';
-import { VowShape } from '@agoric/vow';
-import { makeHeapZone } from '@agoric/zone';
import { CosmosChainInfoShape, IBCConnectionInfoShape } from '../typeGuards.js';
/**
diff --git a/packages/orchestration/src/exos/combine-invitation-makers.js b/packages/orchestration/src/exos/combine-invitation-makers.js
index e7b647e3ba6..fd8e73b254b 100644
--- a/packages/orchestration/src/exos/combine-invitation-makers.js
+++ b/packages/orchestration/src/exos/combine-invitation-makers.js
@@ -1,9 +1,9 @@
-import { M } from '@endo/patterns';
+import { getMethodNames } from '@agoric/internal';
import {
- prepareGuardedAttenuator,
makeSyncMethodCallback,
+ prepareGuardedAttenuator,
} from '@agoric/internal/src/callback.js';
-import { getMethodNames } from '@agoric/internal';
+import { M } from '@endo/patterns';
/**
* @import {InvitationMakers} from '@agoric/smart-wallet/src/types.js';
diff --git a/packages/orchestration/src/exos/cosmos-interchain-service.js b/packages/orchestration/src/exos/cosmos-interchain-service.js
index 5724cc9490a..31d1550d6aa 100644
--- a/packages/orchestration/src/exos/cosmos-interchain-service.js
+++ b/packages/orchestration/src/exos/cosmos-interchain-service.js
@@ -4,6 +4,7 @@ import { Shape as NetworkShape } from '@agoric/network';
import { pickFacet } from '@agoric/vat-data';
import { E } from '@endo/far';
import { M, mustMatch } from '@endo/patterns';
+
import {
DEFAULT_ICQ_VERSION,
makeICAChannelAddress,
diff --git a/packages/orchestration/src/exos/cosmos-orchestration-account.js b/packages/orchestration/src/exos/cosmos-orchestration-account.js
index 32d0de72121..f9108dff891 100644
--- a/packages/orchestration/src/exos/cosmos-orchestration-account.js
+++ b/packages/orchestration/src/exos/cosmos-orchestration-account.js
@@ -44,6 +44,7 @@ import { VowShape } from '@agoric/vow';
import { decodeBase64 } from '@endo/base64';
import { Fail, makeError, q } from '@endo/errors';
import { E } from '@endo/far';
+
import {
AmountArgShape,
ChainAddressShape,
diff --git a/packages/orchestration/src/exos/exo-interfaces.ts b/packages/orchestration/src/exos/exo-interfaces.ts
index 9916556b9af..ff6d4aff7de 100644
--- a/packages/orchestration/src/exos/exo-interfaces.ts
+++ b/packages/orchestration/src/exos/exo-interfaces.ts
@@ -1,5 +1,6 @@
import type { IBCConnectionID } from '@agoric/vats';
import type { Vow } from '@agoric/vow';
+
import type { IcaAccount } from '../cosmos-api.ts';
import type { ICAChannelAddressOpts } from '../utils/address';
import type { ICQConnection } from './icq-connection-kit';
diff --git a/packages/orchestration/src/exos/ibc-packet.js b/packages/orchestration/src/exos/ibc-packet.js
index dd25ac55fa9..b263e0a317a 100644
--- a/packages/orchestration/src/exos/ibc-packet.js
+++ b/packages/orchestration/src/exos/ibc-packet.js
@@ -1,7 +1,7 @@
import { assertAllDefined } from '@agoric/internal';
import { base64ToBytes, Shape as NetworkShape } from '@agoric/network';
-import { M } from '@endo/patterns';
import { E } from '@endo/far';
+import { M } from '@endo/patterns';
// As specified in ICS20, the success result is a base64-encoded '\0x1' byte.
export const ICS20_TRANSFER_SUCCESS_RESULT = 'AQ==';
diff --git a/packages/orchestration/src/exos/ica-account-kit.js b/packages/orchestration/src/exos/ica-account-kit.js
index 1802666bb9f..4332c945ded 100644
--- a/packages/orchestration/src/exos/ica-account-kit.js
+++ b/packages/orchestration/src/exos/ica-account-kit.js
@@ -1,9 +1,10 @@
/** @file IcaAccount exo */
+import { makeTracer, NonNullish } from '@agoric/internal';
+import { VowShape } from '@agoric/vow';
import { Fail } from '@endo/errors';
import { E } from '@endo/far';
import { M } from '@endo/patterns';
-import { NonNullish, makeTracer } from '@agoric/internal';
-import { VowShape } from '@agoric/vow';
+
import {
ChainAddressShape,
OutboundConnectionHandlerI,
diff --git a/packages/orchestration/src/exos/icq-connection-kit.js b/packages/orchestration/src/exos/icq-connection-kit.js
index e01e4499908..70ca11470f9 100644
--- a/packages/orchestration/src/exos/icq-connection-kit.js
+++ b/packages/orchestration/src/exos/icq-connection-kit.js
@@ -1,11 +1,12 @@
/** @file ICQConnection Exo */
+import { makeTracer, NonNullish } from '@agoric/internal';
+import { VowShape } from '@agoric/vow';
import { Fail } from '@endo/errors';
import { E } from '@endo/far';
import { M } from '@endo/patterns';
-import { VowShape } from '@agoric/vow';
-import { NonNullish, makeTracer } from '@agoric/internal';
-import { makeQueryPacket, parseQueryPacket } from '../utils/packet.js';
+
import { ICQMsgShape, OutboundConnectionHandlerI } from '../typeGuards.js';
+import { makeQueryPacket, parseQueryPacket } from '../utils/packet.js';
/**
* @import {Zone} from '@agoric/base-zone';
diff --git a/packages/orchestration/src/exos/local-chain-facade.js b/packages/orchestration/src/exos/local-chain-facade.js
index 7f4ace2d8b4..36fd8dc050a 100644
--- a/packages/orchestration/src/exos/local-chain-facade.js
+++ b/packages/orchestration/src/exos/local-chain-facade.js
@@ -1,10 +1,10 @@
/** @file Localchain Facade exo */
-import { E } from '@endo/far';
+import { pickFacet } from '@agoric/vat-data';
+import { VowShape } from '@agoric/vow';
// eslint-disable-next-line no-restricted-syntax -- just the import
import { heapVowE } from '@agoric/vow/vat.js';
+import { E } from '@endo/far';
import { M } from '@endo/patterns';
-import { pickFacet } from '@agoric/vat-data';
-import { VowShape } from '@agoric/vow';
import { chainFacadeMethods, TypedJsonShape } from '../typeGuards.js';
diff --git a/packages/orchestration/src/exos/local-orchestration-account.js b/packages/orchestration/src/exos/local-orchestration-account.js
index 7fda8a8733b..1b101e55520 100644
--- a/packages/orchestration/src/exos/local-orchestration-account.js
+++ b/packages/orchestration/src/exos/local-orchestration-account.js
@@ -5,8 +5,8 @@ import { makeTracer } from '@agoric/internal';
import { Shape as NetworkShape } from '@agoric/network';
import { M } from '@agoric/vat-data';
import { VowShape } from '@agoric/vow';
-import { E } from '@endo/far';
import { Fail, q } from '@endo/errors';
+import { E } from '@endo/far';
import {
AmountArgShape,
@@ -17,12 +17,12 @@ import {
TimestampProtoShape,
TypedJsonShape,
} from '../typeGuards.js';
+import { coerceCoin, coerceDenomAmount } from '../utils/amounts.js';
import { maxClockSkew, toDenomAmount } from '../utils/cosmos.js';
import { orchestrationAccountMethods } from '../utils/orchestrationAccount.js';
import { makeTimestampHelper } from '../utils/time.js';
-import { preparePacketTools } from './packet-tools.js';
import { prepareIBCTools } from './ibc-packet.js';
-import { coerceCoin, coerceDenomAmount } from '../utils/amounts.js';
+import { preparePacketTools } from './packet-tools.js';
/**
* @import {HostOf} from '@agoric/async-flow';
diff --git a/packages/orchestration/src/exos/orchestrator.js b/packages/orchestration/src/exos/orchestrator.js
index 9a3a2ed31ad..a99dcd7de05 100644
--- a/packages/orchestration/src/exos/orchestrator.js
+++ b/packages/orchestration/src/exos/orchestrator.js
@@ -1,15 +1,16 @@
/** @file Orchestrator exo */
import { AmountShape } from '@agoric/ertp';
-import { pickFacet } from '@agoric/vat-data';
import { makeTracer } from '@agoric/internal';
import { Shape as NetworkShape } from '@agoric/network';
+import { pickFacet } from '@agoric/vat-data';
import { Fail, q } from '@endo/errors';
import { E } from '@endo/far';
import { M } from '@endo/patterns';
+
import {
- DenomInfoShape,
ChainInfoShape,
DenomAmountShape,
+ DenomInfoShape,
DenomShape,
LocalChainAccountShape,
} from '../typeGuards.js';
diff --git a/packages/orchestration/src/exos/packet-tools.js b/packages/orchestration/src/exos/packet-tools.js
index a4ba79c2455..2c238871f2b 100644
--- a/packages/orchestration/src/exos/packet-tools.js
+++ b/packages/orchestration/src/exos/packet-tools.js
@@ -1,8 +1,8 @@
-import { makeMarshal, decodeToJustin } from '@endo/marshal';
import { Shape as NetworkShape } from '@agoric/network';
-import { M, matches } from '@endo/patterns';
-import { E } from '@endo/far';
import { pickFacet } from '@agoric/vat-data';
+import { E } from '@endo/far';
+import { decodeToJustin, makeMarshal } from '@endo/marshal';
+import { M, matches } from '@endo/patterns';
const { toCapData } = makeMarshal(undefined, undefined, {
marshalName: 'JustEncoder',
diff --git a/packages/orchestration/src/exos/portfolio-holder-kit.js b/packages/orchestration/src/exos/portfolio-holder-kit.js
index 059eebe03e1..5f105f4df45 100644
--- a/packages/orchestration/src/exos/portfolio-holder-kit.js
+++ b/packages/orchestration/src/exos/portfolio-holder-kit.js
@@ -1,9 +1,9 @@
-import { M, mustMatch } from '@endo/patterns';
-import { E } from '@endo/far';
-import { Fail } from '@endo/errors';
-import { PublicTopicShape } from '@agoric/zoe/src/contractSupport/topics.js';
import { makeScalarBigMapStore } from '@agoric/vat-data';
import { VowShape } from '@agoric/vow';
+import { PublicTopicShape } from '@agoric/zoe/src/contractSupport/topics.js';
+import { Fail } from '@endo/errors';
+import { E } from '@endo/far';
+import { M, mustMatch } from '@endo/patterns';
const { fromEntries } = Object;
diff --git a/packages/orchestration/src/exos/remote-chain-facade.js b/packages/orchestration/src/exos/remote-chain-facade.js
index 3efebfff11d..ea33e086181 100644
--- a/packages/orchestration/src/exos/remote-chain-facade.js
+++ b/packages/orchestration/src/exos/remote-chain-facade.js
@@ -1,10 +1,11 @@
/** @file Remote Chain Facade exo */
import { makeTracer } from '@agoric/internal';
-import { E } from '@endo/far';
-import { Fail, q } from '@endo/errors';
-import { M } from '@endo/patterns';
import { pickFacet } from '@agoric/vat-data';
import { VowShape } from '@agoric/vow';
+import { Fail, q } from '@endo/errors';
+import { E } from '@endo/far';
+import { M } from '@endo/patterns';
+
import {
ChainAddressShape,
chainFacadeMethods,
diff --git a/packages/orchestration/src/fixtures/query-flows.contract.js b/packages/orchestration/src/fixtures/query-flows.contract.js
index d8e1c8eb271..f051755dbd8 100644
--- a/packages/orchestration/src/fixtures/query-flows.contract.js
+++ b/packages/orchestration/src/fixtures/query-flows.contract.js
@@ -3,6 +3,7 @@
*/
import { InvitationShape } from '@agoric/zoe/src/typeGuards.js';
import { M } from '@endo/patterns';
+
import { withOrchestration } from '../utils/start-helper.js';
import * as flows from './query-flows.flows.js';
diff --git a/packages/orchestration/src/orchestration-api.ts b/packages/orchestration/src/orchestration-api.ts
index b8ab3c03e6d..2764abcc2f0 100644
--- a/packages/orchestration/src/orchestration-api.ts
+++ b/packages/orchestration/src/orchestration-api.ts
@@ -13,15 +13,16 @@ import type {
} from '@agoric/vats/src/localchain.js';
import type { ResolvedPublicTopic } from '@agoric/zoe/src/contractSupport/topics.js';
import type { Passable } from '@endo/marshal';
+
import type {
AgoricChainMethods,
ChainInfo,
CosmosChainAccountMethods,
CosmosChainInfo,
IBCMsgTransferOptions,
+ ICQQueryFunction,
KnownChains,
LocalAccountMethods,
- ICQQueryFunction,
} from './types.js';
import type { ResolvedContinuingOfferResult } from './utils/zoe-tools.js';
diff --git a/packages/orchestration/src/proposals/orchestration-proposal.js b/packages/orchestration/src/proposals/orchestration-proposal.js
index 1f38c512f0c..28943a09d56 100644
--- a/packages/orchestration/src/proposals/orchestration-proposal.js
+++ b/packages/orchestration/src/proposals/orchestration-proposal.js
@@ -1,7 +1,8 @@
+import { makeTracer } from '@agoric/internal';
import { Fail } from '@endo/errors';
import { E, Far } from '@endo/far';
import { makeMarshal } from '@endo/marshal';
-import { makeTracer } from '@agoric/internal';
+
import { registerKnownChains } from '../chain-info.js';
import { CHAIN_KEY, CONNECTIONS_KEY } from '../exos/chain-hub.js';
diff --git a/packages/orchestration/src/proposals/revise-chain-info.js b/packages/orchestration/src/proposals/revise-chain-info.js
index b864bfedfc1..c428f634a35 100644
--- a/packages/orchestration/src/proposals/revise-chain-info.js
+++ b/packages/orchestration/src/proposals/revise-chain-info.js
@@ -1,4 +1,5 @@
import { makeTracer } from '@agoric/internal';
+
import { registerChain } from '../chain-info.js';
const trace = makeTracer('ReviseChainInfo', true);
diff --git a/packages/orchestration/src/proposals/start-stakeAtom.js b/packages/orchestration/src/proposals/start-stakeAtom.js
index 838bacfd832..0f00f445ad4 100644
--- a/packages/orchestration/src/proposals/start-stakeAtom.js
+++ b/packages/orchestration/src/proposals/start-stakeAtom.js
@@ -3,6 +3,7 @@ import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
import { prepareVowTools } from '@agoric/vow';
import { makeHeapZone } from '@agoric/zone';
import { E } from '@endo/far';
+
import { makeChainHub } from '../exos/chain-hub.js';
/**
diff --git a/packages/orchestration/src/proposals/start-stakeOsmo.js b/packages/orchestration/src/proposals/start-stakeOsmo.js
index 84dfadb1337..a09f081d247 100644
--- a/packages/orchestration/src/proposals/start-stakeOsmo.js
+++ b/packages/orchestration/src/proposals/start-stakeOsmo.js
@@ -3,6 +3,7 @@ import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
import { prepareVowTools } from '@agoric/vow';
import { makeHeapZone } from '@agoric/zone';
import { E } from '@endo/far';
+
import { makeChainHub } from '../exos/chain-hub.js';
/**
diff --git a/packages/orchestration/src/utils/cosmos.js b/packages/orchestration/src/utils/cosmos.js
index 5082a1c5ed9..0591e822d6f 100644
--- a/packages/orchestration/src/utils/cosmos.js
+++ b/packages/orchestration/src/utils/cosmos.js
@@ -1,6 +1,6 @@
-import { makeError } from '@endo/errors';
-import { decodeBase64 } from '@endo/base64';
import { Any } from '@agoric/cosmic-proto/google/protobuf/any.js';
+import { decodeBase64 } from '@endo/base64';
+import { makeError } from '@endo/errors';
/**
* @import {CosmosDelegationResponse, CosmosValidatorAddress, DenomAmount} from '../types.js';
diff --git a/packages/orchestration/src/utils/orchestrationAccount.js b/packages/orchestration/src/utils/orchestrationAccount.js
index 242482bce60..b316015eca3 100644
--- a/packages/orchestration/src/utils/orchestrationAccount.js
+++ b/packages/orchestration/src/utils/orchestrationAccount.js
@@ -3,6 +3,7 @@ import { Shape as NetworkShape } from '@agoric/network';
import { VowShape } from '@agoric/vow';
import { TopicsRecordShape } from '@agoric/zoe/src/contractSupport/topics.js';
import { M } from '@endo/patterns';
+
import {
AmountArgShape,
ChainAddressShape,
diff --git a/packages/orchestration/src/utils/packet.js b/packages/orchestration/src/utils/packet.js
index 70564cffdbd..b68152dd0c4 100644
--- a/packages/orchestration/src/utils/packet.js
+++ b/packages/orchestration/src/utils/packet.js
@@ -1,16 +1,16 @@
-import { Fail } from '@endo/errors';
import { TxBody } from '@agoric/cosmic-proto/cosmos/tx/v1beta1/tx.js';
import { Any } from '@agoric/cosmic-proto/google/protobuf/any.js';
+import { Type as PacketType } from '@agoric/cosmic-proto/ibc/applications/interchain_accounts/v1/packet.js';
+import {
+ CosmosQuery,
+ CosmosResponse,
+} from '@agoric/cosmic-proto/icq/v1/packet.js';
import {
RequestQuery,
ResponseQuery,
} from '@agoric/cosmic-proto/tendermint/abci/types.js';
import { atob, decodeBase64, encodeBase64 } from '@endo/base64';
-import {
- CosmosQuery,
- CosmosResponse,
-} from '@agoric/cosmic-proto/icq/v1/packet.js';
-import { Type as PacketType } from '@agoric/cosmic-proto/ibc/applications/interchain_accounts/v1/packet.js';
+import { Fail } from '@endo/errors';
/**
* @import {AnyJson, JsonSafe} from '@agoric/cosmic-proto';
diff --git a/packages/orchestration/src/utils/registry.js b/packages/orchestration/src/utils/registry.js
index d7c9555e8ce..ba3a7d99fcc 100644
--- a/packages/orchestration/src/utils/registry.js
+++ b/packages/orchestration/src/utils/registry.js
@@ -1,9 +1,10 @@
+import assert from 'node:assert';
+
import {
- State as IBCChannelState,
Order,
+ State as IBCChannelState,
} from '@agoric/cosmic-proto/ibc/core/channel/v1/channel.js';
import { State as IBCConnectionState } from '@agoric/cosmic-proto/ibc/core/connection/v1/connection.js';
-import assert from 'node:assert';
/**
* @import {IBCChannelID, IBCConnectionID} from '@agoric/vats';
diff --git a/packages/orchestration/src/utils/start-helper.js b/packages/orchestration/src/utils/start-helper.js
index f11da8db32c..630441aa2ce 100644
--- a/packages/orchestration/src/utils/start-helper.js
+++ b/packages/orchestration/src/utils/start-helper.js
@@ -2,6 +2,7 @@ import { prepareAsyncFlowTools } from '@agoric/async-flow';
import { prepareVowTools } from '@agoric/vow';
import { prepareRecorderKitMakers } from '@agoric/zoe/src/contractSupport/recorder.js';
import { makeDurableZone } from '@agoric/zone/durable.js';
+
import { makeChainHub } from '../exos/chain-hub.js';
import { prepareCosmosOrchestrationAccount } from '../exos/cosmos-orchestration-account.js';
import { prepareLocalChainFacade } from '../exos/local-chain-facade.js';
diff --git a/packages/orchestration/src/utils/time.js b/packages/orchestration/src/utils/time.js
index 06f995ab06d..3c6bca5c100 100644
--- a/packages/orchestration/src/utils/time.js
+++ b/packages/orchestration/src/utils/time.js
@@ -1,5 +1,5 @@
-import { E } from '@endo/far';
import { TimeMath } from '@agoric/time';
+import { E } from '@endo/far';
/**
* @import {RelativeTimeRecord, TimerBrand, TimerService} from '@agoric/time';
diff --git a/packages/orchestration/src/utils/zoe-tools.js b/packages/orchestration/src/utils/zoe-tools.js
index abf7f5bb683..b8825dcf846 100644
--- a/packages/orchestration/src/utils/zoe-tools.js
+++ b/packages/orchestration/src/utils/zoe-tools.js
@@ -1,5 +1,5 @@
-import { Fail } from '@endo/errors';
import { atomicTransfer } from '@agoric/zoe/src/contractSupport/index.js';
+import { Fail } from '@endo/errors';
import { E } from '@endo/far';
/**
diff --git a/packages/orchestration/src/vat-orchestration.js b/packages/orchestration/src/vat-orchestration.js
index 016ccfac7b7..dfa604fe9fc 100644
--- a/packages/orchestration/src/vat-orchestration.js
+++ b/packages/orchestration/src/vat-orchestration.js
@@ -1,6 +1,7 @@
-import { Far } from '@endo/far';
import { prepareSwingsetVowTools } from '@agoric/vow/vat.js';
import { makeDurableZone } from '@agoric/zone/durable.js';
+import { Far } from '@endo/far';
+
import { prepareCosmosInterchainService } from './exos/cosmos-interchain-service.js';
/**
diff --git a/packages/orchestration/test/chain-info.test.js b/packages/orchestration/test/chain-info.test.js
index 1c1a80c1fe0..50dbdc285f8 100644
--- a/packages/orchestration/test/chain-info.test.js
+++ b/packages/orchestration/test/chain-info.test.js
@@ -1,6 +1,6 @@
+import { makeNameHubKit } from '@agoric/vats';
import test from 'ava';
-import { makeNameHubKit } from '@agoric/vats';
import { registerKnownChains } from '../src/chain-info.js';
test('chain-info', async t => {
diff --git a/packages/orchestration/test/cosmos-interchain-service.test.ts b/packages/orchestration/test/cosmos-interchain-service.test.ts
index 7e71a39aa17..b2fdb4ce56c 100644
--- a/packages/orchestration/test/cosmos-interchain-service.test.ts
+++ b/packages/orchestration/test/cosmos-interchain-service.test.ts
@@ -1,4 +1,5 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
+
import { toRequestQueryJson } from '@agoric/cosmic-proto';
import {
QueryBalanceRequest,
@@ -9,18 +10,19 @@ import {
MsgDelegateResponse,
} from '@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js';
import { Any } from '@agoric/cosmic-proto/google/protobuf/any.js';
-import { matches } from '@endo/patterns';
-import { heapVowE as E } from '@agoric/vow/vat.js';
-import { decodeBase64 } from '@endo/base64';
-import type { LocalIbcAddress } from '@agoric/vats/tools/ibc-utils.js';
import { getMethodNames } from '@agoric/internal';
-import type { Port } from '@agoric/network';
import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
+import type { Port } from '@agoric/network';
import type { IBCMethod } from '@agoric/vats';
-import { commonSetup } from './supports.js';
+import type { LocalIbcAddress } from '@agoric/vats/tools/ibc-utils.js';
+import { heapVowE as E } from '@agoric/vow/vat.js';
+import { decodeBase64 } from '@endo/base64';
+import { matches } from '@endo/patterns';
+
import { ChainAddressShape } from '../src/typeGuards.js';
import { tryDecodeResponse } from '../src/utils/cosmos.js';
import { buildChannelCloseConfirmEvent } from '../tools/ibc-mocks.js';
+import { commonSetup } from './supports.js';
const CHAIN_ID = 'cosmoshub-99';
const HOST_CONNECTION_ID = 'connection-0';
diff --git a/packages/orchestration/test/examples/auto-stake-it.contract.test.ts b/packages/orchestration/test/examples/auto-stake-it.contract.test.ts
index 53b184ccc37..e98bffe9bfc 100644
--- a/packages/orchestration/test/examples/auto-stake-it.contract.test.ts
+++ b/packages/orchestration/test/examples/auto-stake-it.contract.test.ts
@@ -1,16 +1,18 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
+
+import { MsgDelegateResponse } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js';
+import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
+import { IBCEvent } from '@agoric/vats';
+import { heapVowE } from '@agoric/vow/vat.js';
import { setUpZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
import { E } from '@endo/far';
-import { heapVowE } from '@agoric/vow/vat.js';
import path from 'path';
-import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
-import { MsgDelegateResponse } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js';
-import { IBCEvent } from '@agoric/vats';
-import { commonSetup } from '../supports.js';
+
import {
buildMsgResponseString,
buildVTransferEvent,
} from '../../tools/ibc-mocks.js';
+import { commonSetup } from '../supports.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/orchestration/test/examples/basic-flows.contract.test.ts b/packages/orchestration/test/examples/basic-flows.contract.test.ts
index 037e8de3494..47e7db6bdec 100644
--- a/packages/orchestration/test/examples/basic-flows.contract.test.ts
+++ b/packages/orchestration/test/examples/basic-flows.contract.test.ts
@@ -1,9 +1,11 @@
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import type { TestFn } from 'ava';
-import { setUpZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
+
import type { Instance } from '@agoric/zoe/src/zoeService/utils.js';
+import { setUpZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
import { E, getInterfaceOf } from '@endo/far';
+import type { TestFn } from 'ava';
import path from 'path';
+
import { commonSetup } from '../supports.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/orchestration/test/examples/send-anywhere.test.ts b/packages/orchestration/test/examples/send-anywhere.test.ts
index 7a05060f767..397a0c7b010 100644
--- a/packages/orchestration/test/examples/send-anywhere.test.ts
+++ b/packages/orchestration/test/examples/send-anywhere.test.ts
@@ -1,20 +1,21 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { setUpZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
-import { E } from '@endo/far';
-import path from 'path';
-import { mustMatch } from '@endo/patterns';
import { makeIssuerKit } from '@agoric/ertp';
import {
eventLoopIteration,
inspectMapStore,
} from '@agoric/internal/src/testing-utils.js';
+import { setUpZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
+import { E } from '@endo/far';
+import { mustMatch } from '@endo/patterns';
+import path from 'path';
import { inspect } from 'util';
+
+import { registerChain } from '../../src/chain-info.js';
import { CosmosChainInfo, IBCConnectionInfo } from '../../src/cosmos-api.js';
-import { commonSetup } from '../supports.js';
import { SingleAmountRecord } from '../../src/examples/send-anywhere.contract.js';
-import { registerChain } from '../../src/chain-info.js';
import { buildVTransferEvent } from '../../tools/ibc-mocks.js';
+import { commonSetup } from '../supports.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/orchestration/test/examples/stake-bld.contract.test.ts b/packages/orchestration/test/examples/stake-bld.contract.test.ts
index 736e9781fad..91a2e211b0a 100644
--- a/packages/orchestration/test/examples/stake-bld.contract.test.ts
+++ b/packages/orchestration/test/examples/stake-bld.contract.test.ts
@@ -6,6 +6,7 @@ import { SIMULATED_ERRORS } from '@agoric/vats/tools/fake-bridge.js';
import { heapVowE as E } from '@agoric/vow/vat.js';
import { setUpZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
import path from 'path';
+
import { commonSetup } from '../supports.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/orchestration/test/examples/stake-ica.contract.test.ts b/packages/orchestration/test/examples/stake-ica.contract.test.ts
index 24698de61e2..6750f6f470d 100644
--- a/packages/orchestration/test/examples/stake-ica.contract.test.ts
+++ b/packages/orchestration/test/examples/stake-ica.contract.test.ts
@@ -1,26 +1,27 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { setUpZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
-import { heapVowE as E } from '@agoric/vow/vat.js';
-import path from 'path';
-import { makeNotifierFromSubscriber } from '@agoric/notifier';
-import type { Installation } from '@agoric/zoe/src/zoeService/utils.js';
import {
QueryBalanceRequest,
QueryBalanceResponse,
} from '@agoric/cosmic-proto/cosmos/bank/v1beta1/query.js';
-import { commonSetup } from '../supports.js';
+import { makeNotifierFromSubscriber } from '@agoric/notifier';
+import { heapVowE as E } from '@agoric/vow/vat.js';
+import type { Installation } from '@agoric/zoe/src/zoeService/utils.js';
+import { setUpZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
+import path from 'path';
+
+import type { CosmosChainInfo } from '../../src/cosmos-api.js';
import { type StakeIcaTerms } from '../../src/examples/stakeIca.contract.js';
+import { makeChainHub } from '../../src/exos/chain-hub.js';
import fetchedChainInfo from '../../src/fetched-chain-info.js';
+import { DenomAmount } from '../../src/orchestration-api.js';
+import { maxClockSkew } from '../../src/utils/cosmos.js';
import {
buildQueryPacketString,
buildQueryResponseString,
} from '../../tools/ibc-mocks.js';
-import type { CosmosChainInfo } from '../../src/cosmos-api.js';
-import { DenomAmount } from '../../src/orchestration-api.js';
-import { maxClockSkew } from '../../src/utils/cosmos.js';
import { UNBOND_PERIOD_SECONDS } from '../ibc-mocks.js';
-import { makeChainHub } from '../../src/exos/chain-hub.js';
+import { commonSetup } from '../supports.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/orchestration/test/examples/staking-combinations.test.ts b/packages/orchestration/test/examples/staking-combinations.test.ts
index a7540dd8a0c..6acd109234a 100644
--- a/packages/orchestration/test/examples/staking-combinations.test.ts
+++ b/packages/orchestration/test/examples/staking-combinations.test.ts
@@ -1,24 +1,25 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
+import {
+ MsgTransfer,
+ MsgTransferResponse,
+} from '@agoric/cosmic-proto/ibc/applications/transfer/v1/tx.js';
import {
eventLoopIteration,
inspectMapStore,
} from '@agoric/internal/src/testing-utils.js';
+import { IBCMethod } from '@agoric/vats';
import { setUpZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
import { E } from '@endo/far';
import path from 'path';
-import {
- MsgTransfer,
- MsgTransferResponse,
-} from '@agoric/cosmic-proto/ibc/applications/transfer/v1/tx.js';
-import { IBCMethod } from '@agoric/vats';
-import { protoMsgMocks, UNBOND_PERIOD_SECONDS } from '../ibc-mocks.js';
-import { commonSetup } from '../supports.js';
+
import {
buildMsgResponseString,
buildVTransferEvent,
parseOutgoingTxPacket,
} from '../../tools/ibc-mocks.js';
+import { protoMsgMocks, UNBOND_PERIOD_SECONDS } from '../ibc-mocks.js';
+import { commonSetup } from '../supports.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/orchestration/test/examples/swap.contract.test.ts b/packages/orchestration/test/examples/swap.contract.test.ts
index 7eb8869eb38..f9336597086 100644
--- a/packages/orchestration/test/examples/swap.contract.test.ts
+++ b/packages/orchestration/test/examples/swap.contract.test.ts
@@ -4,6 +4,7 @@ import { LOCALCHAIN_DEFAULT_ADDRESS } from '@agoric/vats/tools/fake-bridge.js';
import { setUpZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
import { E } from '@endo/far';
import path from 'path';
+
import { commonSetup } from '../supports.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/orchestration/test/examples/unbond.contract.test.ts b/packages/orchestration/test/examples/unbond.contract.test.ts
index ff89c24aa2b..1bcf64d4a10 100644
--- a/packages/orchestration/test/examples/unbond.contract.test.ts
+++ b/packages/orchestration/test/examples/unbond.contract.test.ts
@@ -1,16 +1,17 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
+import { QueryDelegatorDelegationsResponse } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/query.js';
+import { MsgUndelegateResponse } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js';
+import { inspectMapStore } from '@agoric/internal/src/testing-utils.js';
import { setUpZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
import { E } from '@endo/far';
import path from 'path';
-import { inspectMapStore } from '@agoric/internal/src/testing-utils.js';
-import { QueryDelegatorDelegationsResponse } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/query.js';
-import { MsgUndelegateResponse } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js';
-import { commonSetup } from '../supports.js';
+
import {
buildMsgResponseString,
buildQueryResponseString,
} from '../../tools/ibc-mocks.js';
+import { commonSetup } from '../supports.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/orchestration/test/exos/chain-hub.test.ts b/packages/orchestration/test/exos/chain-hub.test.ts
index bfd7fcb1dd7..368e32b28a5 100644
--- a/packages/orchestration/test/exos/chain-hub.test.ts
+++ b/packages/orchestration/test/exos/chain-hub.test.ts
@@ -1,24 +1,25 @@
/* eslint-disable @jessie.js/safe-await-separator -- XXX irrelevant for tests */
import '@agoric/swingset-liveslots/tools/prepare-test-env.js';
-import test from '@endo/ses-ava/prepare-endo.js';
+import { makeIssuerKit } from '@agoric/ertp';
import { makeNameHubKit } from '@agoric/vats';
import { prepareSwingsetVowTools } from '@agoric/vow/vat.js';
-import { E } from '@endo/far';
-import { makeIssuerKit } from '@agoric/ertp';
import { withAmountUtils } from '@agoric/zoe/tools/test-utils.js';
-import { makeChainHub, registerAssets } from '../../src/exos/chain-hub.js';
-import { provideDurableZone } from '../supports.js';
+import { E } from '@endo/far';
+import test from '@endo/ses-ava/prepare-endo.js';
+
import {
registerChainAssets,
registerKnownChains,
} from '../../src/chain-info.js';
-import knownChains from '../../src/fetched-chain-info.js';
import type {
CosmosChainInfo,
IBCConnectionInfo,
} from '../../src/cosmos-api.js';
+import { makeChainHub, registerAssets } from '../../src/exos/chain-hub.js';
+import knownChains from '../../src/fetched-chain-info.js';
import { assets as assetFixture } from '../assets.fixture.js';
+import { provideDurableZone } from '../supports.js';
const connection = {
id: 'connection-1',
diff --git a/packages/orchestration/test/exos/cosmos-orchestration-account.test.ts b/packages/orchestration/test/exos/cosmos-orchestration-account.test.ts
index 74230d14daa..02481588778 100644
--- a/packages/orchestration/test/exos/cosmos-orchestration-account.test.ts
+++ b/packages/orchestration/test/exos/cosmos-orchestration-account.test.ts
@@ -1,13 +1,5 @@
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import type { TestFn } from 'ava';
-import { heapVowE as E } from '@agoric/vow/vat.js';
-import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
-import { IBCMethod } from '@agoric/vats';
-import {
- MsgTransfer,
- MsgTransferResponse,
-} from '@agoric/cosmic-proto/ibc/applications/transfer/v1/tx.js';
-import { SIMULATED_ERRORS } from '@agoric/vats/tools/fake-bridge.js';
+
import {
QueryAllBalancesRequest,
QueryAllBalancesResponse,
@@ -15,31 +7,40 @@ import {
QueryBalanceResponse,
} from '@agoric/cosmic-proto/cosmos/bank/v1beta1/query.js';
import { Coin } from '@agoric/cosmic-proto/cosmos/base/v1beta1/coin.js';
+import {
+ QueryDelegationRewardsRequest,
+ QueryDelegationRewardsResponse,
+ QueryDelegationTotalRewardsRequest,
+ QueryDelegationTotalRewardsResponse,
+} from '@agoric/cosmic-proto/cosmos/distribution/v1beta1/query.js';
import {
QueryDelegationRequest,
- QueryDelegatorDelegationsRequest,
- QueryUnbondingDelegationRequest,
- QueryDelegatorUnbondingDelegationsRequest,
- QueryRedelegationsRequest,
QueryDelegationResponse,
+ QueryDelegatorDelegationsRequest,
QueryDelegatorDelegationsResponse,
- QueryUnbondingDelegationResponse,
+ QueryDelegatorUnbondingDelegationsRequest,
QueryDelegatorUnbondingDelegationsResponse,
+ QueryRedelegationsRequest,
QueryRedelegationsResponse,
+ QueryUnbondingDelegationRequest,
+ QueryUnbondingDelegationResponse,
} from '@agoric/cosmic-proto/cosmos/staking/v1beta1/query.js';
import {
- QueryDelegationRewardsRequest,
- QueryDelegationTotalRewardsRequest,
- QueryDelegationRewardsResponse,
- QueryDelegationTotalRewardsResponse,
-} from '@agoric/cosmic-proto/cosmos/distribution/v1beta1/query.js';
-import { commonSetup } from '../supports.js';
+ MsgTransfer,
+ MsgTransferResponse,
+} from '@agoric/cosmic-proto/ibc/applications/transfer/v1/tx.js';
+import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
+import { IBCMethod } from '@agoric/vats';
+import { SIMULATED_ERRORS } from '@agoric/vats/tools/fake-bridge.js';
+import { heapVowE as E } from '@agoric/vow/vat.js';
+import type { TestFn } from 'ava';
+
+import type { CosmosValidatorAddress } from '../../src/cosmos-api.js';
import type {
AmountArg,
ChainAddress,
Denom,
} from '../../src/orchestration-api.js';
-import { prepareMakeTestCOAKit } from './make-test-coa-kit.js';
import {
buildMsgResponseString,
buildQueryPacketString,
@@ -47,7 +48,8 @@ import {
buildTxPacketString,
parseOutgoingTxPacket,
} from '../../tools/ibc-mocks.js';
-import type { CosmosValidatorAddress } from '../../src/cosmos-api.js';
+import { commonSetup } from '../supports.js';
+import { prepareMakeTestCOAKit } from './make-test-coa-kit.js';
type TestContext = Awaited>;
diff --git a/packages/orchestration/test/exos/local-orchestration-account-kit.test.ts b/packages/orchestration/test/exos/local-orchestration-account-kit.test.ts
index 7fff8a234e0..8578d91be63 100644
--- a/packages/orchestration/test/exos/local-orchestration-account-kit.test.ts
+++ b/packages/orchestration/test/exos/local-orchestration-account-kit.test.ts
@@ -9,7 +9,8 @@ import {
} from '@agoric/vats/tools/fake-bridge.js';
import { heapVowE as VE } from '@agoric/vow/vat.js';
import { withAmountUtils } from '@agoric/zoe/tools/test-utils.js';
-import { ChainAddress, type AmountArg } from '../../src/orchestration-api.js';
+
+import { type AmountArg, ChainAddress } from '../../src/orchestration-api.js';
import { maxClockSkew } from '../../src/utils/cosmos.js';
import { NANOSECONDS_PER_SECOND } from '../../src/utils/time.js';
import { buildVTransferEvent } from '../../tools/ibc-mocks.js';
diff --git a/packages/orchestration/test/exos/make-test-coa-kit.ts b/packages/orchestration/test/exos/make-test-coa-kit.ts
index 77cb2ca3ec2..2241a67fa37 100644
--- a/packages/orchestration/test/exos/make-test-coa-kit.ts
+++ b/packages/orchestration/test/exos/make-test-coa-kit.ts
@@ -3,9 +3,10 @@ import { heapVowE as E } from '@agoric/vow/vat.js';
import { prepareRecorderKitMakers } from '@agoric/zoe/src/contractSupport/recorder.js';
import { Far } from '@endo/far';
import type { ExecutionContext } from 'ava';
+
import { prepareCosmosOrchestrationAccount } from '../../src/exos/cosmos-orchestration-account.js';
-import { commonSetup } from '../supports.js';
import type { ICQConnection } from '../../src/exos/icq-connection-kit.js';
+import { commonSetup } from '../supports.js';
/**
* A testing utility that creates a (Cosmos)ChainAccount and makes a
diff --git a/packages/orchestration/test/exos/make-test-loa-kit.ts b/packages/orchestration/test/exos/make-test-loa-kit.ts
index bb0f2cefae0..e80ddd806cb 100644
--- a/packages/orchestration/test/exos/make-test-loa-kit.ts
+++ b/packages/orchestration/test/exos/make-test-loa-kit.ts
@@ -3,6 +3,7 @@ import { heapVowE as E } from '@agoric/vow/vat.js';
import { prepareRecorderKitMakers } from '@agoric/zoe/src/contractSupport/recorder.js';
import { Far } from '@endo/far';
import { ExecutionContext } from 'ava';
+
import { prepareLocalOrchestrationAccountKit } from '../../src/exos/local-orchestration-account.js';
import { commonSetup } from '../supports.js';
diff --git a/packages/orchestration/test/exos/portfolio-holder-kit.test.ts b/packages/orchestration/test/exos/portfolio-holder-kit.test.ts
index 62f48203f25..37cc3da2145 100644
--- a/packages/orchestration/test/exos/portfolio-holder-kit.test.ts
+++ b/packages/orchestration/test/exos/portfolio-holder-kit.test.ts
@@ -1,10 +1,12 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { Far } from '@endo/far';
+
import { heapVowE as E } from '@agoric/vow/vat.js';
-import { commonSetup } from '../supports.js';
+import { Far } from '@endo/far';
+
import { preparePortfolioHolder } from '../../src/exos/portfolio-holder-kit.js';
-import { prepareMakeTestLOAKit } from './make-test-loa-kit.js';
+import { commonSetup } from '../supports.js';
import { prepareMakeTestCOAKit } from './make-test-coa-kit.js';
+import { prepareMakeTestLOAKit } from './make-test-loa-kit.js';
test('portfolio holder kit behaviors', async t => {
const common = await commonSetup(t);
diff --git a/packages/orchestration/test/facade-durability.test.ts b/packages/orchestration/test/facade-durability.test.ts
index ffc4d06f20d..fe888892889 100644
--- a/packages/orchestration/test/facade-durability.test.ts
+++ b/packages/orchestration/test/facade-durability.test.ts
@@ -4,6 +4,7 @@ import { makeIssuerKit } from '@agoric/ertp';
import { reincarnate } from '@agoric/swingset-liveslots/tools/setup-vat-data.js';
import { prepareSwingsetVowTools } from '@agoric/vow/vat.js';
import { setupZCFTest } from '@agoric/zoe/test/unitTests/zcf/setupZcfTest.js';
+
import type { CosmosChainInfo, IBCConnectionInfo } from '../src/cosmos-api.js';
import fetchedChainInfo from '../src/fetched-chain-info.js'; // Refresh with scripts/refresh-chain-info.ts
import type { Chain } from '../src/orchestration-api.js';
diff --git a/packages/orchestration/test/facade.test.ts b/packages/orchestration/test/facade.test.ts
index 8ee3e4aaa45..c5c76db4b1f 100644
--- a/packages/orchestration/test/facade.test.ts
+++ b/packages/orchestration/test/facade.test.ts
@@ -6,6 +6,7 @@ import { prepareSwingsetVowTools } from '@agoric/vow/vat.js';
import { setupZCFTest } from '@agoric/zoe/test/unitTests/zcf/setupZcfTest.js';
import { makeHeapZone } from '@agoric/zone';
import type { TestFn } from 'ava';
+
import type { OrchestrationFlow } from '../src/orchestration-api.js';
import { provideOrchestration } from '../src/utils/start-helper.js';
import { commonSetup } from './supports.js';
diff --git a/packages/orchestration/test/fixtures/query-flows.contract.test.ts b/packages/orchestration/test/fixtures/query-flows.contract.test.ts
index f3c9b88d6fe..164107dd474 100644
--- a/packages/orchestration/test/fixtures/query-flows.contract.test.ts
+++ b/packages/orchestration/test/fixtures/query-flows.contract.test.ts
@@ -1,9 +1,5 @@
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import type { TestFn } from 'ava';
-import { setUpZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
-import type { Instance } from '@agoric/zoe/src/zoeService/utils.js';
-import { E } from '@endo/far';
-import path from 'path';
+
import { JsonSafe, toRequestQueryJson, typedJson } from '@agoric/cosmic-proto';
import {
QueryAllBalancesRequest,
@@ -12,17 +8,23 @@ import {
QueryBalanceResponse,
} from '@agoric/cosmic-proto/cosmos/bank/v1beta1/query.js';
import type { ResponseQuery } from '@agoric/cosmic-proto/tendermint/abci/types.js';
-import { decodeBase64 } from '@endo/base64';
import {
LOCALCHAIN_DEFAULT_ADDRESS,
LOCALCHAIN_QUERY_ALL_BALANCES_RESPONSE,
} from '@agoric/vats/tools/fake-bridge.js';
-import { commonSetup } from '../supports.js';
-import { defaultMockAckMap } from '../ibc-mocks.js';
+import type { Instance } from '@agoric/zoe/src/zoeService/utils.js';
+import { setUpZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
+import { decodeBase64 } from '@endo/base64';
+import { E } from '@endo/far';
+import type { TestFn } from 'ava';
+import path from 'path';
+
import {
buildQueryPacketString,
buildQueryResponseString,
} from '../../tools/ibc-mocks.js';
+import { defaultMockAckMap } from '../ibc-mocks.js';
+import { commonSetup } from '../supports.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/orchestration/test/ibc-mocks.test.ts b/packages/orchestration/test/ibc-mocks.test.ts
index b970e0511d9..b015615ddc7 100644
--- a/packages/orchestration/test/ibc-mocks.test.ts
+++ b/packages/orchestration/test/ibc-mocks.test.ts
@@ -1,3 +1,5 @@
+import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
+
import {
QueryBalanceRequest,
QueryBalanceResponse,
@@ -11,7 +13,7 @@ import {
CosmosQuery,
CosmosResponse,
} from '@agoric/cosmic-proto/icq/v1/packet.js';
-import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
+
import {
buildMsgErrorString,
buildMsgResponseString,
diff --git a/packages/orchestration/test/ibc-mocks.ts b/packages/orchestration/test/ibc-mocks.ts
index 6992227ee34..604125e9482 100644
--- a/packages/orchestration/test/ibc-mocks.ts
+++ b/packages/orchestration/test/ibc-mocks.ts
@@ -3,6 +3,14 @@ import {
QueryBalanceRequest,
QueryBalanceResponse,
} from '@agoric/cosmic-proto/cosmos/bank/v1beta1/query.js';
+import {
+ MsgSend,
+ MsgSendResponse,
+} from '@agoric/cosmic-proto/cosmos/bank/v1beta1/tx.js';
+import {
+ MsgWithdrawDelegatorReward,
+ MsgWithdrawDelegatorRewardResponse,
+} from '@agoric/cosmic-proto/cosmos/distribution/v1beta1/tx.js';
import {
MsgBeginRedelegate,
MsgBeginRedelegateResponse,
@@ -11,21 +19,14 @@ import {
MsgUndelegate,
MsgUndelegateResponse,
} from '@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js';
-import {
- MsgWithdrawDelegatorReward,
- MsgWithdrawDelegatorRewardResponse,
-} from '@agoric/cosmic-proto/cosmos/distribution/v1beta1/tx.js';
import type { Timestamp } from '@agoric/cosmic-proto/google/protobuf/timestamp.js';
+
import {
- MsgSend,
- MsgSendResponse,
-} from '@agoric/cosmic-proto/cosmos/bank/v1beta1/tx.js';
-import {
+ buildMsgErrorString,
buildMsgResponseString,
+ buildQueryPacketString,
buildQueryResponseString,
- buildMsgErrorString,
buildTxPacketString,
- buildQueryPacketString,
createMockAckMap,
} from '../tools/ibc-mocks.js';
diff --git a/packages/orchestration/test/network-fakes.test.ts b/packages/orchestration/test/network-fakes.test.ts
index 937807153b9..e70ef3cfed9 100644
--- a/packages/orchestration/test/network-fakes.test.ts
+++ b/packages/orchestration/test/network-fakes.test.ts
@@ -1,11 +1,13 @@
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import type { TestFn } from 'ava';
+
+import { prepareVowTools } from '@agoric/vow';
import { heapVowE as E } from '@agoric/vow/vat.js';
import { makeHeapZone } from '@agoric/zone';
import { getInterfaceOf } from '@endo/far';
-import { prepareVowTools } from '@agoric/vow';
-import { setupFakeNetwork } from './network-fakes.js';
+import type { TestFn } from 'ava';
+
import { makeICAChannelAddress } from '../src/utils/address.js';
+import { setupFakeNetwork } from './network-fakes.js';
const test = anyTest as TestFn>;
diff --git a/packages/orchestration/test/network-fakes.ts b/packages/orchestration/test/network-fakes.ts
index 9a948ace95d..8f460997762 100644
--- a/packages/orchestration/test/network-fakes.ts
+++ b/packages/orchestration/test/network-fakes.ts
@@ -1,6 +1,6 @@
import { inspect } from 'node:util';
-import { VowTools } from '@agoric/vow';
+import { BridgeId, makeTracer } from '@agoric/internal';
import {
base64ToBytes,
prepareEchoConnectionKit,
@@ -9,24 +9,25 @@ import {
preparePortAllocator,
prepareRouterProtocol,
} from '@agoric/network';
-import type { Zone } from '@agoric/zone';
import type {
IBCChannelID,
- IBCMethod,
- IBCEvent,
- ScopedBridgeManagerMethods,
IBCConnectionID,
+ IBCEvent,
+ IBCMethod,
IBCPortID,
+ ScopedBridgeManagerMethods,
} from '@agoric/vats';
import {
prepareCallbacks as prepareIBCCallbacks,
prepareIBCProtocol,
} from '@agoric/vats/src/ibc.js';
-import { BridgeId, makeTracer } from '@agoric/internal';
-import { E, Far } from '@endo/far';
+import { VowTools } from '@agoric/vow';
+import type { Zone } from '@agoric/zone';
import type { Guarded } from '@endo/exo';
-import { defaultMockAckMap, errorAcknowledgments } from './ibc-mocks.js';
+import { E, Far } from '@endo/far';
+
import { decodeProtobufBase64 } from '../tools/protobuf-decoder.js';
+import { defaultMockAckMap, errorAcknowledgments } from './ibc-mocks.js';
const trace = makeTracer('NetworkFakes');
diff --git a/packages/orchestration/test/staking-ops.test.ts b/packages/orchestration/test/staking-ops.test.ts
index d70287b1874..29d048b0731 100644
--- a/packages/orchestration/test/staking-ops.test.ts
+++ b/packages/orchestration/test/staking-ops.test.ts
@@ -1,6 +1,5 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { Fail } from '@endo/errors';
import type { AnyJson } from '@agoric/cosmic-proto';
import type { Coin } from '@agoric/cosmic-proto/cosmos/base/v1beta1/coin.js';
import { MsgWithdrawDelegatorRewardResponse } from '@agoric/cosmic-proto/cosmos/distribution/v1beta1/tx.js';
@@ -11,20 +10,23 @@ import {
MsgUndelegateResponse,
} from '@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js';
import { Any } from '@agoric/cosmic-proto/google/protobuf/any.js';
+import { Timestamp } from '@agoric/cosmic-proto/google/protobuf/timestamp.js';
import { makeFakeStorageKit } from '@agoric/internal/src/storage-test-utils.js';
import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
import { makeNotifierFromSubscriber } from '@agoric/notifier';
import type { TimestampRecord, TimestampValue } from '@agoric/time';
-import { makeScalarBigMapStore, type Baggage } from '@agoric/vat-data';
+import { type Baggage, makeScalarBigMapStore } from '@agoric/vat-data';
+import { makeNameHubKit } from '@agoric/vats';
import { makeFakeBoard } from '@agoric/vats/tools/board-utils.js';
-import { prepareVowTools, heapVowE as E } from '@agoric/vow/vat.js';
+import { heapVowE as E, prepareVowTools } from '@agoric/vow/vat.js';
import { prepareRecorderKitMakers } from '@agoric/zoe/src/contractSupport/recorder.js';
import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
import { makeDurableZone } from '@agoric/zone/durable.js';
import { decodeBase64, encodeBase64 } from '@endo/base64';
+import { Fail } from '@endo/errors';
import { Far } from '@endo/far';
-import { Timestamp } from '@agoric/cosmic-proto/google/protobuf/timestamp.js';
-import { makeNameHubKit } from '@agoric/vats';
+
+import { makeChainHub } from '../src/exos/chain-hub.js';
import { prepareCosmosOrchestrationAccountKit } from '../src/exos/cosmos-orchestration-account.js';
import type {
ChainAddress,
@@ -33,7 +35,6 @@ import type {
ICQConnection,
} from '../src/types.js';
import { MILLISECONDS_PER_SECOND } from '../src/utils/time.js';
-import { makeChainHub } from '../src/exos/chain-hub.js';
/**
* @param {unknown} response
diff --git a/packages/orchestration/test/supports.ts b/packages/orchestration/test/supports.ts
index e5832ebe2a5..03628c6dbe2 100644
--- a/packages/orchestration/test/supports.ts
+++ b/packages/orchestration/test/supports.ts
@@ -1,6 +1,7 @@
import { makeIssuerKit } from '@agoric/ertp';
import { VTRANSFER_IBC_EVENT } from '@agoric/internal/src/action-types.js';
import { makeFakeStorageKit } from '@agoric/internal/src/storage-test-utils.js';
+import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
import { reincarnate } from '@agoric/swingset-liveslots/tools/setup-vat-data.js';
import { makeNameHubKit } from '@agoric/vats';
import { prepareBridgeTargetModule } from '@agoric/vats/src/bridge-target.js';
@@ -21,13 +22,13 @@ import { makeHeapZone, type Zone } from '@agoric/zone';
import { makeDurableZone } from '@agoric/zone/durable.js';
import { E } from '@endo/far';
import type { ExecutionContext } from 'ava';
-import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
+
import { registerKnownChains } from '../src/chain-info.js';
-import { prepareCosmosInterchainService } from '../src/exos/cosmos-interchain-service.js';
-import { setupFakeNetwork } from './network-fakes.js';
-import { buildVTransferEvent } from '../tools/ibc-mocks.js';
import { makeChainHub } from '../src/exos/chain-hub.js';
+import { prepareCosmosInterchainService } from '../src/exos/cosmos-interchain-service.js';
import fetchedChainInfo from '../src/fetched-chain-info.js';
+import { buildVTransferEvent } from '../tools/ibc-mocks.js';
+import { setupFakeNetwork } from './network-fakes.js';
export {
makeFakeLocalchainBridge,
diff --git a/packages/orchestration/test/tx-encoding.test.ts b/packages/orchestration/test/tx-encoding.test.ts
index 1206536f1a7..2ae246d6c20 100644
--- a/packages/orchestration/test/tx-encoding.test.ts
+++ b/packages/orchestration/test/tx-encoding.test.ts
@@ -7,6 +7,7 @@ import {
import { MsgDelegateResponse } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js';
import { Any } from '@agoric/cosmic-proto/google/protobuf/any.js';
import { decodeBase64, encodeBase64 } from '@endo/base64';
+
import { tryDecodeResponse } from '../src/utils/cosmos.js';
const test = anyTest;
diff --git a/packages/orchestration/test/types.test-d.ts b/packages/orchestration/test/types.test-d.ts
index 84a6b69b5be..2722f1f9e09 100644
--- a/packages/orchestration/test/types.test-d.ts
+++ b/packages/orchestration/test/types.test-d.ts
@@ -14,6 +14,7 @@ import type { Vow, VowTools } from '@agoric/vow';
import type { ResolvedPublicTopic } from '@agoric/zoe/src/contractSupport/topics.js';
import type { Passable } from '@endo/marshal';
import { expectAssignable, expectNotType, expectType } from 'tsd';
+
import { prepareCosmosOrchestrationAccount } from '../src/exos/cosmos-orchestration-account.js';
import type { LocalOrchestrationAccountKit } from '../src/exos/local-orchestration-account.js';
import type { OrchestrationFacade } from '../src/facade.js';
diff --git a/packages/orchestration/test/utils/address.test.ts b/packages/orchestration/test/utils/address.test.ts
index 9012edc9da3..83c9e54476f 100644
--- a/packages/orchestration/test/utils/address.test.ts
+++ b/packages/orchestration/test/utils/address.test.ts
@@ -1,9 +1,10 @@
-import test from '@endo/ses-ava/prepare-endo.js';
import { validateRemoteIbcAddress } from '@agoric/vats/tools/ibc-utils.js';
+import test from '@endo/ses-ava/prepare-endo.js';
+
import {
+ findAddressField,
makeICAChannelAddress,
makeICQChannelAddress,
- findAddressField,
} from '../../src/utils/address.js';
test('makeICAChannelAddress', t => {
diff --git a/packages/orchestration/test/utils/cosmos.test.ts b/packages/orchestration/test/utils/cosmos.test.ts
index f7f1c627a89..c5d71896257 100644
--- a/packages/orchestration/test/utils/cosmos.test.ts
+++ b/packages/orchestration/test/utils/cosmos.test.ts
@@ -1,4 +1,5 @@
import test from '@endo/ses-ava/prepare-endo.js';
+
import {
toDenomAmount,
toTruncatedDenomAmount,
diff --git a/packages/orchestration/test/utils/denomHash.test.ts b/packages/orchestration/test/utils/denomHash.test.ts
index db1355e2fcf..2e60777c6fb 100644
--- a/packages/orchestration/test/utils/denomHash.test.ts
+++ b/packages/orchestration/test/utils/denomHash.test.ts
@@ -1,8 +1,9 @@
-import test from '@endo/ses-ava/prepare-endo.js';
+import { createRequire } from 'node:module';
import bundleSource from '@endo/bundle-source';
import { importBundle } from '@endo/import-bundle';
-import { createRequire } from 'node:module';
+import test from '@endo/ses-ava/prepare-endo.js';
+
import { denomHash } from '../../src/utils/denomHash.js';
const nodeRequire = createRequire(import.meta.url);
diff --git a/packages/orchestration/test/utils/packet.test.ts b/packages/orchestration/test/utils/packet.test.ts
index 256bba873f3..ab48e61cd6b 100644
--- a/packages/orchestration/test/utils/packet.test.ts
+++ b/packages/orchestration/test/utils/packet.test.ts
@@ -1,16 +1,17 @@
-import test from '@endo/ses-ava/prepare-endo.js';
-import { Any } from '@agoric/cosmic-proto/google/protobuf/any.js';
import {
QueryBalanceRequest,
QueryBalanceResponse,
} from '@agoric/cosmic-proto/cosmos/bank/v1beta1/query.js';
+import { Any } from '@agoric/cosmic-proto/google/protobuf/any.js';
import { RequestQuery } from '@agoric/cosmic-proto/tendermint/abci/types.js';
import { decodeBase64 } from '@endo/base64';
+import test from '@endo/ses-ava/prepare-endo.js';
+
import {
+ makeQueryPacket,
makeTxPacket,
- parseTxPacket,
parseQueryPacket,
- makeQueryPacket,
+ parseTxPacket,
} from '../../src/utils/packet.js';
test('makeTxPacket', t => {
diff --git a/packages/orchestration/test/utils/time.test.ts b/packages/orchestration/test/utils/time.test.ts
index 7c62d63541a..9b4cceac892 100644
--- a/packages/orchestration/test/utils/time.test.ts
+++ b/packages/orchestration/test/utils/time.test.ts
@@ -1,6 +1,8 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
+
import { TimeMath } from '@agoric/time';
+import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
+
import {
makeTimestampHelper,
NANOSECONDS_PER_SECOND,
diff --git a/packages/orchestration/tools/ibc-mocks.ts b/packages/orchestration/tools/ibc-mocks.ts
index 65266645e5d..2b18cc89b80 100644
--- a/packages/orchestration/tools/ibc-mocks.ts
+++ b/packages/orchestration/tools/ibc-mocks.ts
@@ -1,28 +1,29 @@
/** @file Tools to support making IBC mocks */
+import { toRequestQueryJson } from '@agoric/cosmic-proto';
+import { TxBody } from '@agoric/cosmic-proto/cosmos/tx/v1beta1/tx.js';
import { Any } from '@agoric/cosmic-proto/google/protobuf/any.js';
+import { FungibleTokenPacketData } from '@agoric/cosmic-proto/ibc/applications/transfer/v2/packet.js';
+import type { PacketSDKType } from '@agoric/cosmic-proto/ibc/core/channel/v1/channel.js';
import { CosmosResponse } from '@agoric/cosmic-proto/icq/v1/packet.js';
import {
RequestQuery,
ResponseQuery,
} from '@agoric/cosmic-proto/tendermint/abci/types.js';
-import { encodeBase64, btoa, atob, decodeBase64 } from '@endo/base64';
-import { toRequestQueryJson } from '@agoric/cosmic-proto';
+import {
+ IBC_EVENT,
+ VTRANSFER_IBC_EVENT,
+} from '@agoric/internal/src/action-types.js';
import {
IBCChannelID,
IBCEvent,
- VTransferIBCEvent,
type IBCPacket,
+ VTransferIBCEvent,
} from '@agoric/vats';
-import {
- IBC_EVENT,
- VTRANSFER_IBC_EVENT,
-} from '@agoric/internal/src/action-types.js';
-import { FungibleTokenPacketData } from '@agoric/cosmic-proto/ibc/applications/transfer/v2/packet.js';
-import type { PacketSDKType } from '@agoric/cosmic-proto/ibc/core/channel/v1/channel.js';
import { LOCALCHAIN_DEFAULT_ADDRESS } from '@agoric/vats/tools/fake-bridge.js';
-import { TxBody } from '@agoric/cosmic-proto/cosmos/tx/v1beta1/tx.js';
-import { makeQueryPacket, makeTxPacket } from '../src/utils/packet.js';
+import { atob, btoa, decodeBase64, encodeBase64 } from '@endo/base64';
+
import { ChainAddress } from '../src/orchestration-api.js';
+import { makeQueryPacket, makeTxPacket } from '../src/utils/packet.js';
interface EncoderI {
encode: (message: T) => {
diff --git a/packages/pegasus/src/contract.js b/packages/pegasus/src/contract.js
index 9f7a89bbfdd..9e1a7de67b0 100644
--- a/packages/pegasus/src/contract.js
+++ b/packages/pegasus/src/contract.js
@@ -1,6 +1,7 @@
// @ts-check
import { prepareVowTools } from '@agoric/vow/vat.js';
import { makeDurableZone } from '@agoric/zone/durable.js';
+
import { makePegasus } from './pegasus.js';
/**
diff --git a/packages/pegasus/src/courier.js b/packages/pegasus/src/courier.js
index 7397d8a6dcd..b25173ab387 100644
--- a/packages/pegasus/src/courier.js
+++ b/packages/pegasus/src/courier.js
@@ -1,9 +1,9 @@
// @ts-check
-import { X } from '@endo/errors';
-
import { AmountMath } from '@agoric/ertp';
import { WalletName } from '@agoric/internal';
+import { X } from '@endo/errors';
import { E, Far } from '@endo/far';
+
import { makeOncePromiseKit } from './once-promise-kit.js';
/**
diff --git a/packages/pegasus/src/ibc-trace.js b/packages/pegasus/src/ibc-trace.js
index 2460027ba17..66dce5e8303 100644
--- a/packages/pegasus/src/ibc-trace.js
+++ b/packages/pegasus/src/ibc-trace.js
@@ -1,9 +1,8 @@
// @ts-check
+import { parse } from '@agoric/network';
import { Fail } from '@endo/errors';
import { Far } from '@endo/far';
-import { parse } from '@agoric/network';
-
/**
* Return a source-prefixed version of the denomination, as specified in
* ICS20-1.
diff --git a/packages/pegasus/src/ics20.js b/packages/pegasus/src/ics20.js
index cd273368d86..324676b3212 100644
--- a/packages/pegasus/src/ics20.js
+++ b/packages/pegasus/src/ics20.js
@@ -1,7 +1,7 @@
// @ts-check
-import { assert, X, Fail, annotateError } from '@endo/errors';
-import { Nat } from '@endo/nat';
+import { annotateError, assert, Fail, X } from '@endo/errors';
import { Far } from '@endo/far';
+import { Nat } from '@endo/nat';
/**
* @typedef {object} ICS20TransferPacket Packet shape defined at:
diff --git a/packages/pegasus/src/pegasus.js b/packages/pegasus/src/pegasus.js
index d96a2b1dd1b..1badf9fea77 100644
--- a/packages/pegasus/src/pegasus.js
+++ b/packages/pegasus/src/pegasus.js
@@ -1,17 +1,17 @@
// @ts-check
-import { assert, X, Fail, makeError } from '@endo/errors';
-import { makeLegacyWeakMap, makeLegacyMap } from '@agoric/store';
-import { E, Far } from '@endo/far';
+import { makeSubscriptionKit } from '@agoric/notifier';
+import { makeLegacyMap, makeLegacyWeakMap } from '@agoric/store';
import {
assertProposalShape,
atomicTransfer,
} from '@agoric/zoe/src/contractSupport/index.js';
-import { makeSubscriptionKit } from '@agoric/notifier';
+import { assert, Fail, makeError, X } from '@endo/errors';
+import { E, Far } from '@endo/far';
+import { getCourierPK, makeCourierMaker } from './courier.js';
import { IBCSourceTraceDenomTransformer } from './ibc-trace.js';
import { ICS20TransferProtocol } from './ics20.js';
-import { makeCourierMaker, getCourierPK } from './courier.js';
/**
* @import {CloseReason, Connection} from '@agoric/network';
diff --git a/packages/pegasus/src/proposals/core-proposal.js b/packages/pegasus/src/proposals/core-proposal.js
index 0bbfe5f71b3..52a313d460c 100644
--- a/packages/pegasus/src/proposals/core-proposal.js
+++ b/packages/pegasus/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, subscribeEach } from '@agoric/notifier';
+import { makeNameHubKit } from '@agoric/vats/src/nameHub.js';
+import { E, Far } from '@endo/far';
/**
* @import {Connection, Port, PortAllocator} from '@agoric/network';
diff --git a/packages/pegasus/test/fakeVatAdmin.js b/packages/pegasus/test/fakeVatAdmin.js
index 80996bdfb55..8ab914f8263 100644
--- a/packages/pegasus/test/fakeVatAdmin.js
+++ b/packages/pegasus/test/fakeVatAdmin.js
@@ -1,8 +1,7 @@
+import { evalContractBundle } from '@agoric/zoe/src/contractFacet/evalContractCode.js';
import { E } from '@endo/far';
import { makePromiseKit } from '@endo/promise-kit';
-import { evalContractBundle } from '@agoric/zoe/src/contractFacet/evalContractCode.js';
-
export default harden({
createMeter: () => {},
createUnlimitedMeter: () => {},
diff --git a/packages/pegasus/test/peg.test.js b/packages/pegasus/test/peg.test.js
index ec4d7f4a55b..7cd86a6d0a0 100644
--- a/packages/pegasus/test/peg.test.js
+++ b/packages/pegasus/test/peg.test.js
@@ -1,22 +1,20 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-import { E, Far } from '@endo/far';
+import { AmountMath } from '@agoric/ertp';
import {
- prepareNetworkProtocol,
prepareLoopbackProtocolHandler,
prepareNetworkPowers,
+ prepareNetworkProtocol,
} from '@agoric/network';
-
-import bundleSource from '@endo/bundle-source';
-import { AmountMath } from '@agoric/ertp';
-import { makeZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
import { makeSubscription } from '@agoric/notifier';
-import { prepareVowTools } from '@agoric/vow/vat.js';
-
-import { makePromiseKit } from '@endo/promise-kit';
import { makeScalarMapStore } from '@agoric/vat-data';
+import { prepareVowTools } from '@agoric/vow/vat.js';
+import { makeZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
import { makeDurableZone } from '@agoric/zone/durable.js';
+import bundleSource from '@endo/bundle-source';
+import { E, Far } from '@endo/far';
+import { makePromiseKit } from '@endo/promise-kit';
+import path from 'path';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/smart-wallet/scripts/build-bundles.js b/packages/smart-wallet/scripts/build-bundles.js
index 2879c99f6e0..e9f7c527de0 100644
--- a/packages/smart-wallet/scripts/build-bundles.js
+++ b/packages/smart-wallet/scripts/build-bundles.js
@@ -1,5 +1,6 @@
#! /usr/bin/env node
import '@endo/init';
+
import { createBundles } from '@agoric/internal/src/node/createBundles.js';
import url from 'url';
diff --git a/packages/smart-wallet/src/invitations.js b/packages/smart-wallet/src/invitations.js
index ae4ee732901..abe1f9697c6 100644
--- a/packages/smart-wallet/src/invitations.js
+++ b/packages/smart-wallet/src/invitations.js
@@ -3,6 +3,7 @@ import { mustMatch } from '@agoric/store';
import { InvitationShape } from '@agoric/zoe/src/typeGuards.js';
import { Fail } from '@endo/errors';
import { E } from '@endo/far';
+
import { shape } from './typeGuards.js';
// A safety limit
diff --git a/packages/smart-wallet/src/marshal-contexts.js b/packages/smart-wallet/src/marshal-contexts.js
index 2c6442aff03..00176be7ad6 100644
--- a/packages/smart-wallet/src/marshal-contexts.js
+++ b/packages/smart-wallet/src/marshal-contexts.js
@@ -1,10 +1,9 @@
// @ts-check
+import { makeScalarMapStore } from '@agoric/store';
+import { DEFAULT_PREFIX } from '@agoric/vats/src/lib-board.js';
import { Fail, q } from '@endo/errors';
import { HandledPromise } from '@endo/eventual-send'; // TODO: convince tsc this isn't needed
-
-import { makeScalarMapStore } from '@agoric/store';
import { Far, makeMarshal, Remotable } from '@endo/marshal';
-import { DEFAULT_PREFIX } from '@agoric/vats/src/lib-board.js';
/**
* @import {PassableCap, RemotableObject} from '@endo/marshal';
diff --git a/packages/smart-wallet/src/offerWatcher.js b/packages/smart-wallet/src/offerWatcher.js
index 4aace001224..a932e740f7f 100644
--- a/packages/smart-wallet/src/offerWatcher.js
+++ b/packages/smart-wallet/src/offerWatcher.js
@@ -1,14 +1,13 @@
-import { E, passStyleOf } from '@endo/far';
-
+import { AmountShape } from '@agoric/ertp/src/typeGuards.js';
+import { deeplyFulfilledObject, objectMap } from '@agoric/internal';
import { isUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
-import { prepareExoClassKit, watchPromise } from '@agoric/vat-data';
import { M } from '@agoric/store';
+import { prepareExoClassKit, watchPromise } from '@agoric/vat-data';
import {
PaymentPKeywordRecordShape,
SeatShape,
} from '@agoric/zoe/src/typeGuards.js';
-import { AmountShape } from '@agoric/ertp/src/typeGuards.js';
-import { deeplyFulfilledObject, objectMap } from '@agoric/internal';
+import { E, passStyleOf } from '@endo/far';
import { UNPUBLISHED_RESULT } from './offers.js';
diff --git a/packages/smart-wallet/src/proposals/upgrade-wallet-factory2-proposal.js b/packages/smart-wallet/src/proposals/upgrade-wallet-factory2-proposal.js
index a4750423d07..94aebf13210 100644
--- a/packages/smart-wallet/src/proposals/upgrade-wallet-factory2-proposal.js
+++ b/packages/smart-wallet/src/proposals/upgrade-wallet-factory2-proposal.js
@@ -1,8 +1,8 @@
// @ts-check
///
-import { E } from '@endo/far';
import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
+import { E } from '@endo/far';
/**
* @param {BootstrapPowers & ChainBootstrapSpace} powers
diff --git a/packages/smart-wallet/src/proposals/upgrade-walletFactory-proposal.js b/packages/smart-wallet/src/proposals/upgrade-walletFactory-proposal.js
index 7fd6db38760..cfbd79dcf26 100644
--- a/packages/smart-wallet/src/proposals/upgrade-walletFactory-proposal.js
+++ b/packages/smart-wallet/src/proposals/upgrade-walletFactory-proposal.js
@@ -1,8 +1,8 @@
// @ts-check
+import { allValues } from '@agoric/internal';
import { Fail } from '@endo/errors';
import { E } from '@endo/far';
import { makeMarshal } from '@endo/marshal';
-import { allValues } from '@agoric/internal';
console.warn('upgrade-walletFactory-proposal.js module evaluating');
diff --git a/packages/smart-wallet/src/smartWallet.js b/packages/smart-wallet/src/smartWallet.js
index 31e93ae41ac..2dfbc8902a6 100644
--- a/packages/smart-wallet/src/smartWallet.js
+++ b/packages/smart-wallet/src/smartWallet.js
@@ -1,5 +1,3 @@
-import { Fail, q } from '@endo/errors';
-import { E } from '@endo/far';
import {
AmountShape,
BrandShape,
@@ -28,6 +26,7 @@ import {
provide,
watchPromise,
} from '@agoric/vat-data';
+import { prepareVowTools } from '@agoric/vow';
import {
prepareRecorderKit,
SubscriberShape,
@@ -37,13 +36,14 @@ import {
AmountKeywordRecordShape,
PaymentPKeywordRecordShape,
} from '@agoric/zoe/src/typeGuards.js';
-import { prepareVowTools } from '@agoric/vow';
import { makeDurableZone } from '@agoric/zone/durable.js';
+import { Fail, q } from '@endo/errors';
+import { E } from '@endo/far';
import { makeInvitationsHelper } from './invitations.js';
+import { makeWatchOfferOutcomes, prepareOfferWatcher } from './offerWatcher.js';
import { shape } from './typeGuards.js';
import { objectMapStoragePath } from './utils.js';
-import { prepareOfferWatcher, makeWatchOfferOutcomes } from './offerWatcher.js';
/** @import {OfferId, OfferStatus} from './offers.js'; */
diff --git a/packages/smart-wallet/src/types.d.ts b/packages/smart-wallet/src/types.d.ts
index 6e6875a6818..7a4c9c407a6 100644
--- a/packages/smart-wallet/src/types.d.ts
+++ b/packages/smart-wallet/src/types.d.ts
@@ -5,12 +5,13 @@
* Downside is it can't reference any ambient types, which most of agoric-sdk type are presently.
*/
-import type { ERef } from '@endo/far';
-import type { CapData } from '@endo/marshal';
import type { agoric } from '@agoric/cosmic-proto';
-import type { AgoricNamesRemotes } from '@agoric/vats/tools/board-utils.js';
import type { StoredFacet } from '@agoric/internal/src/lib-chainStorage.js';
+import type { AgoricNamesRemotes } from '@agoric/vats/tools/board-utils.js';
import type { PublicTopic } from '@agoric/zoe/src/contractSupport/topics.js';
+import type { ERef } from '@endo/far';
+import type { CapData } from '@endo/marshal';
+
import type { OfferSpec } from './offers.js';
declare const CapDataShape: unique symbol;
diff --git a/packages/smart-wallet/src/utils.js b/packages/smart-wallet/src/utils.js
index cfb1a31ca6f..0bd8b1b7328 100644
--- a/packages/smart-wallet/src/utils.js
+++ b/packages/smart-wallet/src/utils.js
@@ -1,4 +1,4 @@
-import { deeplyFulfilledObject, objectMap, makeTracer } from '@agoric/internal';
+import { deeplyFulfilledObject, makeTracer, objectMap } from '@agoric/internal';
import { observeIteration, subscribeEach } from '@agoric/notifier';
import { E } from '@endo/far';
diff --git a/packages/smart-wallet/src/walletFactory.js b/packages/smart-wallet/src/walletFactory.js
index 9c53f674f2e..57bd75b97bc 100644
--- a/packages/smart-wallet/src/walletFactory.js
+++ b/packages/smart-wallet/src/walletFactory.js
@@ -14,6 +14,7 @@ import { makeAtomicProvider } from '@agoric/store/src/stores/store-utils.js';
import { prepareExo, provideDurableMapStore } from '@agoric/vat-data';
import { provideAll } from '@agoric/zoe/src/contractSupport/durability.js';
import { E } from '@endo/far';
+
import { prepareSmartWallet } from './smartWallet.js';
import { shape } from './typeGuards.js';
diff --git a/packages/smart-wallet/test/addAsset.test.js b/packages/smart-wallet/test/addAsset.test.js
index 4effbf96878..4882778e524 100644
--- a/packages/smart-wallet/test/addAsset.test.js
+++ b/packages/smart-wallet/test/addAsset.test.js
@@ -1,19 +1,20 @@
// @ts-check
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { Fail } from '@endo/errors';
-import { E, Far } from '@endo/far';
-import { makePromiseKit } from '@endo/promise-kit';
-import bundleSource from '@endo/bundle-source';
-import { makeMarshal } from '@endo/marshal';
import { AmountMath, makeIssuerKit } from '@agoric/ertp';
import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
import { makeCopyBag } from '@agoric/store';
-import { resolve as importMetaResolve } from 'import-meta-resolve';
import { makeFakeBankManagerKit } from '@agoric/vats/tools/bank-utils.js';
+import bundleSource from '@endo/bundle-source';
+import { Fail } from '@endo/errors';
+import { E, Far } from '@endo/far';
+import { makeMarshal } from '@endo/marshal';
+import { makePromiseKit } from '@endo/promise-kit';
+import { resolve as importMetaResolve } from 'import-meta-resolve';
+
+import { makeImportContext } from '../src/marshal-contexts.js';
import { makeDefaultTestContext } from './contexts.js';
import { ActionType, headValue, makeMockTestSpace } from './supports.js';
-import { makeImportContext } from '../src/marshal-contexts.js';
const importSpec = spec =>
importMetaResolve(spec, import.meta.url).then(u => new URL(u).pathname);
diff --git a/packages/smart-wallet/test/contexts.js b/packages/smart-wallet/test/contexts.js
index 4034e4c2f42..8d075bb3bd6 100644
--- a/packages/smart-wallet/test/contexts.js
+++ b/packages/smart-wallet/test/contexts.js
@@ -1,9 +1,10 @@
import { BridgeId, deeplyFulfilledObject } from '@agoric/internal';
-import { unsafeMakeBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js';
import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
+import { unsafeMakeBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js';
+import { makeScopedBridge } from '@agoric/vats';
import { E } from '@endo/far';
import path from 'path';
-import { makeScopedBridge } from '@agoric/vats';
+
import { withAmountUtils } from './supports.js';
/**
diff --git a/packages/smart-wallet/test/devices.js b/packages/smart-wallet/test/devices.js
index a25511e8eed..295f77747b8 100644
--- a/packages/smart-wallet/test/devices.js
+++ b/packages/smart-wallet/test/devices.js
@@ -1,7 +1,7 @@
-import { Fail } from '@endo/errors';
import centralSupply from '@agoric/vats/bundles/bundle-centralSupply.js';
import mintHolder from '@agoric/vats/bundles/bundle-mintHolder.js';
import provisionPool from '@agoric/vats/bundles/bundle-provisionPool.js';
+import { Fail } from '@endo/errors';
import walletFactory from '../bundles/bundle-walletFactory.js';
diff --git a/packages/smart-wallet/test/gameAssetContract.js b/packages/smart-wallet/test/gameAssetContract.js
index 356ec3f4236..b17f10a2f78 100644
--- a/packages/smart-wallet/test/gameAssetContract.js
+++ b/packages/smart-wallet/test/gameAssetContract.js
@@ -1,13 +1,12 @@
/** @file illustrates using non-vbank assets */
// deep import to avoid dependency on all of ERTP, vat-data
-import { Fail, q } from '@endo/errors';
-import { E, Far } from '@endo/far';
-
-import { AmountShape } from '@agoric/ertp/src/typeGuards.js';
import { AmountMath, AssetKind } from '@agoric/ertp/src/amountMath.js';
+import { AmountShape } from '@agoric/ertp/src/typeGuards.js';
import { makeTracer } from '@agoric/internal';
-import { M, getCopyBagEntries } from '@agoric/store';
+import { getCopyBagEntries, M } from '@agoric/store';
+import { Fail, q } from '@endo/errors';
+import { E, Far } from '@endo/far';
const trace = makeTracer('Game', true);
diff --git a/packages/smart-wallet/test/invitation1.test.js b/packages/smart-wallet/test/invitation1.test.js
index b530f1727ad..7bb011575aa 100644
--- a/packages/smart-wallet/test/invitation1.test.js
+++ b/packages/smart-wallet/test/invitation1.test.js
@@ -1,20 +1,22 @@
// @ts-check
/* global setTimeout */
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { createRequire } from 'module';
-import { E, Far } from '@endo/far';
+
+import { AmountMath, makeIssuerKit } from '@agoric/ertp';
+import { allValues } from '@agoric/internal';
+import { makeMockChainStorageRoot } from '@agoric/internal/src/storage-test-utils.js';
+import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
import { makeScalarMapStore } from '@agoric/store';
-import { makeDurableZone } from '@agoric/zone/durable.js';
import { makeNameHubKit, makePromiseSpace } from '@agoric/vats';
-import { makeFakeVatAdmin } from '@agoric/zoe/tools/fakeVatAdmin.js';
-import { makeZoeKitForTest } from '@agoric/zoe/tools/setup-zoe.js';
import { makeWellKnownSpaces } from '@agoric/vats/src/core/utils.js';
-import { makeMockChainStorageRoot } from '@agoric/internal/src/storage-test-utils.js';
import { makeFakeBoard } from '@agoric/vats/tools/board-utils.js';
-import { allValues } from '@agoric/internal';
-import { AmountMath, makeIssuerKit } from '@agoric/ertp';
+import { makeFakeVatAdmin } from '@agoric/zoe/tools/fakeVatAdmin.js';
+import { makeZoeKitForTest } from '@agoric/zoe/tools/setup-zoe.js';
+import { makeDurableZone } from '@agoric/zone/durable.js';
import { makeNodeBundleCache } from '@endo/bundle-source/cache.js';
-import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
+import { E, Far } from '@endo/far';
+import { createRequire } from 'module';
+
import { prepareSmartWallet } from '../src/smartWallet.js';
/** @type {import('ava').TestFn>>} */
diff --git a/packages/smart-wallet/test/marshal-contexts.test.js b/packages/smart-wallet/test/marshal-contexts.test.js
index 5af2fd47159..18f43113ddd 100644
--- a/packages/smart-wallet/test/marshal-contexts.test.js
+++ b/packages/smart-wallet/test/marshal-contexts.test.js
@@ -1,8 +1,10 @@
// @ts-check
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { Far } from '@endo/far';
+
import { makeFakeBoard } from '@agoric/vats/tools/board-utils.js';
import { makeHandle } from '@agoric/zoe/src/makeHandle.js';
+import { Far } from '@endo/far';
+
import {
makeExportContext,
makeImportContext,
diff --git a/packages/smart-wallet/test/start-game1-proposal.js b/packages/smart-wallet/test/start-game1-proposal.js
index 0cf619bf942..1ba17c82b32 100644
--- a/packages/smart-wallet/test/start-game1-proposal.js
+++ b/packages/smart-wallet/test/start-game1-proposal.js
@@ -1,8 +1,8 @@
// @ts-check
+import { AmountMath } from '@agoric/ertp/src/amountMath.js';
import { Fail } from '@endo/errors';
import { E } from '@endo/far';
import { makeMarshal } from '@endo/marshal';
-import { AmountMath } from '@agoric/ertp/src/amountMath.js';
console.warn('start-game1-proposal.js module evaluating');
diff --git a/packages/smart-wallet/test/startWalletFactory.test.js b/packages/smart-wallet/test/startWalletFactory.test.js
index 528b70655fb..80a96f1c0c1 100644
--- a/packages/smart-wallet/test/startWalletFactory.test.js
+++ b/packages/smart-wallet/test/startWalletFactory.test.js
@@ -1,9 +1,10 @@
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { unsafeMakeBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js';
import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
+import { unsafeMakeBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js';
import { E } from '@endo/far';
import path from 'path';
+
import { makeMockTestSpace } from './supports.js';
/**
diff --git a/packages/smart-wallet/test/supports.js b/packages/smart-wallet/test/supports.js
index 45628382da1..f9a0afe80e8 100644
--- a/packages/smart-wallet/test/supports.js
+++ b/packages/smart-wallet/test/supports.js
@@ -1,4 +1,3 @@
-import { Fail } from '@endo/errors';
import { AmountMath, makeIssuerKit } from '@agoric/ertp';
import * as ActionType from '@agoric/internal/src/action-types.js';
import { makeMockChainStorageRoot } from '@agoric/internal/src/storage-test-utils.js';
@@ -16,6 +15,7 @@ import { buildRootObject as mintsRoot } from '@agoric/vats/src/vat-mints.js';
import { makeFakeBankManagerKit } from '@agoric/vats/tools/bank-utils.js';
import { makeRatio } from '@agoric/zoe/src/contractSupport/ratio.js';
import { setUpZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
+import { Fail } from '@endo/errors';
import { E, Far } from '@endo/far';
/**
diff --git a/packages/smart-wallet/test/swingsetTests/upgradeWalletFactory/bootstrap-walletFactory-service-upgrade.js b/packages/smart-wallet/test/swingsetTests/upgradeWalletFactory/bootstrap-walletFactory-service-upgrade.js
index 4557a4cc954..0eb7d66855e 100644
--- a/packages/smart-wallet/test/swingsetTests/upgradeWalletFactory/bootstrap-walletFactory-service-upgrade.js
+++ b/packages/smart-wallet/test/swingsetTests/upgradeWalletFactory/bootstrap-walletFactory-service-upgrade.js
@@ -1,5 +1,4 @@
// @ts-check
-import { Fail } from '@endo/errors';
import { AmountMath, makeIssuerKit } from '@agoric/ertp';
import { makeTracer } from '@agoric/internal';
import { makeFakeStorageKit } from '@agoric/internal/src/storage-test-utils.js';
@@ -7,6 +6,7 @@ import { makeNameHubKit } from '@agoric/vats';
import { makeAgoricNamesAccess } from '@agoric/vats/src/core/utils.js';
import { makeFakeBankManagerKit } from '@agoric/vats/tools/bank-utils.js';
import { makeFakeBoard } from '@agoric/vats/tools/board-utils.js';
+import { Fail } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
import { makePromiseKit } from '@endo/promise-kit';
diff --git a/packages/smart-wallet/test/swingsetTests/upgradeWalletFactory/walletFactory-V2.js b/packages/smart-wallet/test/swingsetTests/upgradeWalletFactory/walletFactory-V2.js
index 0423969498e..c765529b443 100644
--- a/packages/smart-wallet/test/swingsetTests/upgradeWalletFactory/walletFactory-V2.js
+++ b/packages/smart-wallet/test/swingsetTests/upgradeWalletFactory/walletFactory-V2.js
@@ -11,6 +11,7 @@ import { makeAtomicProvider } from '@agoric/store/src/stores/store-utils.js';
import { prepareExo, provideDurableMapStore } from '@agoric/vat-data';
import { provideAll } from '@agoric/zoe/src/contractSupport/durability.js';
import { E } from '@endo/far';
+
import { prepareSmartWallet } from '../../../src/smartWallet.js';
import { shape } from '../../../src/typeGuards.js';
import {
diff --git a/packages/smart-wallet/test/swingsetTests/upgradeWalletFactory/walletFactory-service-upgrade.test.js b/packages/smart-wallet/test/swingsetTests/upgradeWalletFactory/walletFactory-service-upgrade.test.js
index 53fd7ec8db0..90dbebcae2c 100644
--- a/packages/smart-wallet/test/swingsetTests/upgradeWalletFactory/walletFactory-service-upgrade.test.js
+++ b/packages/smart-wallet/test/swingsetTests/upgradeWalletFactory/walletFactory-service-upgrade.test.js
@@ -1,9 +1,9 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+import { buildVatController } from '@agoric/swingset-vat';
import { assert } from '@endo/errors';
import { resolve as importMetaResolve } from 'import-meta-resolve';
-import { buildVatController } from '@agoric/swingset-vat';
import {
wfV1BundleName,
wfV2BundleName,
diff --git a/packages/smart-wallet/test/walletFactory.test.js b/packages/smart-wallet/test/walletFactory.test.js
index 4820a0a7d35..c41775823c6 100644
--- a/packages/smart-wallet/test/walletFactory.test.js
+++ b/packages/smart-wallet/test/walletFactory.test.js
@@ -2,6 +2,7 @@ import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { makeHandle } from '@agoric/zoe/src/makeHandle.js';
import { E } from '@endo/far';
+
import { makeImportContext } from '../src/marshal-contexts.js';
import { makeDefaultTestContext } from './contexts.js';
import {
diff --git a/packages/solo/src/add-chain.js b/packages/solo/src/add-chain.js
index d72095ff007..bb3bbdf52c0 100644
--- a/packages/solo/src/add-chain.js
+++ b/packages/solo/src/add-chain.js
@@ -1,10 +1,10 @@
/* eslint-env node */
+import { Fail } from '@endo/errors';
import crypto from 'crypto';
import djson from 'deterministic-json';
-import path from 'path';
import fs from 'fs';
+import path from 'path';
-import { Fail } from '@endo/errors';
import setGCIIngress from './set-gci-ingress.js';
const DEFAULT_CHAIN_CONFIG = 'https://testnet.agoric.com/network-config';
diff --git a/packages/solo/src/chain-cosmos-sdk.js b/packages/solo/src/chain-cosmos-sdk.js
index f97e9692f02..432572f1daa 100644
--- a/packages/solo/src/chain-cosmos-sdk.js
+++ b/packages/solo/src/chain-cosmos-sdk.js
@@ -1,22 +1,19 @@
/* global clearTimeout setTimeout Buffer */
-import path from 'path';
-import fs from 'fs';
-import url from 'url';
-import { execFile } from 'child_process';
-import { open as tempOpen } from 'temp';
-
-import WebSocket from 'ws';
-
-import anylogger from 'anylogger';
-import { Fail, makeError } from '@endo/errors';
-import { makePromiseKit } from '@endo/promise-kit';
-
-import { makeNotifierKit } from '@agoric/notifier';
+import { forever, whileTrue } from '@agoric/internal';
import {
DEFAULT_BATCH_TIMEOUT_MS,
makeBatchedDeliver,
} from '@agoric/internal/src/batched-deliver.js';
-import { forever, whileTrue } from '@agoric/internal';
+import { makeNotifierKit } from '@agoric/notifier';
+import { Fail, makeError } from '@endo/errors';
+import { makePromiseKit } from '@endo/promise-kit';
+import anylogger from 'anylogger';
+import { execFile } from 'child_process';
+import fs from 'fs';
+import path from 'path';
+import { open as tempOpen } from 'temp';
+import url from 'url';
+import WebSocket from 'ws';
const console = anylogger('chain-cosmos-sdk');
diff --git a/packages/solo/src/entrypoint.js b/packages/solo/src/entrypoint.js
index 4ca2f5601af..99222ef5dda 100755
--- a/packages/solo/src/entrypoint.js
+++ b/packages/solo/src/entrypoint.js
@@ -1,19 +1,17 @@
#! /usr/bin/env node
import '@endo/init/pre-bundle-source.js';
-
// Needed for legacy plugin support (dapp-oracle, for one).
import 'esm';
-
// we need to enable Math.random as a workaround for 'brace-expansion' module
// (dep chain: temp->glob->minimatch->brace-expansion)
import '@endo/init/legacy.js';
+// Configure logs.
+import '@agoric/cosmic-swingset/src/anylogger-agoric.js';
-import process from 'process';
import path from 'path';
+import process from 'process';
-// Configure logs.
-import '@agoric/cosmic-swingset/src/anylogger-agoric.js';
import solo from './main.js';
const baseprog = path.basename(process.argv[1]);
diff --git a/packages/solo/src/init-basedir.js b/packages/solo/src/init-basedir.js
index 7ad5d072c36..c7bb39e1916 100644
--- a/packages/solo/src/init-basedir.js
+++ b/packages/solo/src/init-basedir.js
@@ -1,11 +1,11 @@
// @ts-check
/* global process */
+import { assert, X } from '@endo/errors';
+import anylogger from 'anylogger';
+import { execFileSync } from 'child_process';
import fs from 'fs';
import path from 'path';
-import { execFileSync } from 'child_process';
-import { assert, X } from '@endo/errors';
-import anylogger from 'anylogger';
import { HELPER } from './chain-cosmos-sdk.js';
const console = anylogger('ag-solo:init');
diff --git a/packages/solo/src/main.js b/packages/solo/src/main.js
index f70fa8185c1..6c08c721809 100644
--- a/packages/solo/src/main.js
+++ b/packages/solo/src/main.js
@@ -1,11 +1,10 @@
+import { assert } from '@endo/errors';
+import anylogger from 'anylogger';
+import { spawnSync } from 'child_process';
import fs from 'fs';
-import path from 'path';
import parseArgs from 'minimist';
+import path from 'path';
import process from 'process';
-import { spawnSync } from 'child_process';
-import { assert } from '@endo/errors';
-
-import anylogger from 'anylogger';
// Start a network service
import addChain from './add-chain.js';
diff --git a/packages/solo/src/outbound.js b/packages/solo/src/outbound.js
index f1da2ff50de..df11c60f7de 100644
--- a/packages/solo/src/outbound.js
+++ b/packages/solo/src/outbound.js
@@ -1,7 +1,6 @@
/* global process */
-import anylogger from 'anylogger';
-
import { Fail } from '@endo/errors';
+import anylogger from 'anylogger';
// Limit the debug log length.
const SOLO_MAX_DEBUG_LENGTH =
diff --git a/packages/solo/src/pipe-entrypoint.js b/packages/solo/src/pipe-entrypoint.js
index 54266764b35..67879cbd5f5 100644
--- a/packages/solo/src/pipe-entrypoint.js
+++ b/packages/solo/src/pipe-entrypoint.js
@@ -2,14 +2,13 @@
// @ts-check
import '@endo/init/pre-bundle-source.js';
import '@endo/init/unsafe-fast.js';
-
-import { makeError } from '@endo/errors';
-import { makePromiseKit } from '@endo/promise-kit';
-import { parse, stringify } from '@endo/marshal';
-
import '@agoric/cosmic-swingset/src/anylogger-agoric.js';
+
import { connectToFakeChain } from '@agoric/cosmic-swingset/src/sim-chain.js';
import { makeShutdown } from '@agoric/internal/src/node/shutdown.js';
+import { makeError } from '@endo/errors';
+import { parse, stringify } from '@endo/marshal';
+import { makePromiseKit } from '@endo/promise-kit';
const { registerShutdown } = makeShutdown(false);
registerShutdown(() => process.exit());
diff --git a/packages/solo/src/pipe.js b/packages/solo/src/pipe.js
index 782c323c0fa..d31a5180fc1 100644
--- a/packages/solo/src/pipe.js
+++ b/packages/solo/src/pipe.js
@@ -1,12 +1,10 @@
// @ts-check
+import { makeShutdown } from '@agoric/internal/src/node/shutdown.js';
+import { parse, stringify } from '@endo/marshal';
+import { makePromiseKit } from '@endo/promise-kit';
import { fork } from 'child_process';
import path from 'path';
-import { makePromiseKit } from '@endo/promise-kit';
-import { parse, stringify } from '@endo/marshal';
-
-import { makeShutdown } from '@agoric/internal/src/node/shutdown.js';
-
const dirname = path.dirname(new URL(import.meta.url).pathname);
export const connectToPipe = async ({ method, args, deliverInboundToMbx }) => {
diff --git a/packages/solo/src/reset-state.js b/packages/solo/src/reset-state.js
index 1048538e3a8..a15dd9a7513 100644
--- a/packages/solo/src/reset-state.js
+++ b/packages/solo/src/reset-state.js
@@ -1,7 +1,6 @@
-import path from 'path';
-import fs from 'fs';
-
import { initSwingStore } from '@agoric/swing-store';
+import fs from 'fs';
+import path from 'path';
export default async function resetState(basedir) {
const mailboxStateFile = path.resolve(
diff --git a/packages/solo/src/start.js b/packages/solo/src/start.js
index 6fa76c05bb5..b7f563e6273 100644
--- a/packages/solo/src/start.js
+++ b/packages/solo/src/start.js
@@ -1,50 +1,45 @@
// @ts-check
/* global process setTimeout */
-import fs from 'fs';
-import url from 'url';
-import path from 'path';
-import temp from 'temp';
-import { fork } from 'child_process';
-import { promisify } from 'util';
-import { resolve as importMetaResolve } from 'import-meta-resolve';
-// import { createHash } from 'crypto';
-
-import createRequire from 'esm';
-
-import anylogger from 'anylogger';
-
-// import connect from 'lotion-connect';
-// import djson from 'deterministic-json';
-
-import { assert, Fail } from '@endo/errors';
-import { makeSlogSender, tryFlushSlogSender } from '@agoric/telemetry';
import {
- loadSwingsetConfigFile,
+ exportKernelStats,
+ getTelemetryProviders,
+ makeDefaultMeterProvider,
+ makeSlogCallbacks,
+} from '@agoric/cosmic-swingset/src/kernel-stats.js';
+import { makeShutdown } from '@agoric/internal/src/node/shutdown.js';
+import { makeWithQueue } from '@agoric/internal/src/queue.js';
+import { openSwingStore } from '@agoric/swing-store';
+import {
buildCommand,
- swingsetIsInitialized,
- initializeSwingset,
- makeSwingsetController,
- buildMailboxStateMap,
buildMailbox,
+ buildMailboxStateMap,
buildPlugin,
buildTimer,
+ initializeSwingset,
+ loadSwingsetConfigFile,
+ makeSwingsetController,
+ swingsetIsInitialized,
} from '@agoric/swingset-vat';
-import { openSwingStore } from '@agoric/swing-store';
-import { makeWithQueue } from '@agoric/internal/src/queue.js';
-import { makeShutdown } from '@agoric/internal/src/node/shutdown.js';
-import {
- makeDefaultMeterProvider,
- getTelemetryProviders,
- makeSlogCallbacks,
- exportKernelStats,
-} from '@agoric/cosmic-swingset/src/kernel-stats.js';
+import { makeSlogSender, tryFlushSlogSender } from '@agoric/telemetry';
+// import connect from 'lotion-connect';
+// import djson from 'deterministic-json';
+import { assert, Fail } from '@endo/errors';
+import anylogger from 'anylogger';
+import { fork } from 'child_process';
+// import { createHash } from 'crypto';
+import createRequire from 'esm';
+import fs from 'fs';
+import { resolve as importMetaResolve } from 'import-meta-resolve';
+import path from 'path';
+import temp from 'temp';
+import url from 'url';
+import { promisify } from 'util';
-import { deliver, addDeliveryTarget } from './outbound.js';
+import { connectToChain } from './chain-cosmos-sdk.js';
+import { addDeliveryTarget, deliver } from './outbound.js';
// import { connectToPipe } from './pipe.js';
import { makeHTTPListener } from './web.js';
-import { connectToChain } from './chain-cosmos-sdk.js';
-
const log = anylogger('start');
// FIXME: Needed for legacy plugins.
diff --git a/packages/solo/src/vat-http.js b/packages/solo/src/vat-http.js
index 6f6b2b93653..e6aa6f57084 100644
--- a/packages/solo/src/vat-http.js
+++ b/packages/solo/src/vat-http.js
@@ -1,11 +1,11 @@
+import { makeCache } from '@agoric/cache';
+import { makeNotifierKit } from '@agoric/notifier';
+import { getReplHandler } from '@agoric/vats/src/repl.js';
import { Fail } from '@endo/errors';
import { E } from '@endo/eventual-send';
-import { makePromiseKit } from '@endo/promise-kit';
import { Far } from '@endo/marshal';
+import { makePromiseKit } from '@endo/promise-kit';
-import { makeNotifierKit } from '@agoric/notifier';
-import { makeCache } from '@agoric/cache';
-import { getReplHandler } from '@agoric/vats/src/repl.js';
import { getCapTPHandler } from './captp.js';
// This vat contains the HTTP request handler.
diff --git a/packages/solo/src/vat-spawner.js b/packages/solo/src/vat-spawner.js
index e7b0b9f8f1a..afc0e7b1e08 100644
--- a/packages/solo/src/vat-spawner.js
+++ b/packages/solo/src/vat-spawner.js
@@ -1,6 +1,6 @@
// Copyright (C) 2018 Agoric, under Apache License 2.0
-import { Far } from '@endo/marshal';
import { makeSpawner } from '@agoric/spawner';
+import { Far } from '@endo/marshal';
function buildRootObject() {
return Far('root', {
diff --git a/packages/solo/src/vat-uploads.js b/packages/solo/src/vat-uploads.js
index ecfa8195c03..20029b6fb47 100644
--- a/packages/solo/src/vat-uploads.js
+++ b/packages/solo/src/vat-uploads.js
@@ -1,5 +1,5 @@
-import { Far } from '@endo/marshal';
import makeScratchPad from '@agoric/internal/src/scratch.js';
+import { Far } from '@endo/marshal';
// This vat contains the private upload scratch pad.
diff --git a/packages/solo/src/web.js b/packages/solo/src/web.js
index 9cae5cfccd2..f2bf5f82f2b 100644
--- a/packages/solo/src/web.js
+++ b/packages/solo/src/web.js
@@ -1,17 +1,16 @@
/* global setTimeout clearTimeout setInterval clearInterval process */
// Start a network service
-import path from 'path';
-import http from 'http';
-import { createConnection } from 'net';
-import { existsSync as existsSyncAmbient } from 'fs';
+import { getAccessToken } from '@agoric/access-token';
+import anylogger from 'anylogger';
import express from 'express';
+import { existsSync as existsSyncAmbient } from 'fs';
+import http from 'http';
import { createProxyMiddleware } from 'http-proxy-middleware';
-import WebSocket from 'ws';
-import anylogger from 'anylogger';
import morgan from 'morgan';
+import { createConnection } from 'net';
+import path from 'path';
import { format as urlFormat } from 'url';
-
-import { getAccessToken } from '@agoric/access-token';
+import WebSocket from 'ws';
const maximumBundleSize = 1024 * 1024 * 128; // 128MB
diff --git a/packages/solo/test/captp-fixture.js b/packages/solo/test/captp-fixture.js
index 9988dd314dc..01171ad5aa9 100644
--- a/packages/solo/test/captp-fixture.js
+++ b/packages/solo/test/captp-fixture.js
@@ -1,9 +1,8 @@
/* global process setTimeout */
+import { getAccessToken } from '@agoric/access-token';
+import { E, makeCapTP } from '@endo/captp';
import { spawn } from 'child_process';
import WebSocket from 'ws';
-import { makeCapTP, E } from '@endo/captp';
-
-import { getAccessToken } from '@agoric/access-token';
// Ensure we're all using the same HandledPromise.
export { E };
diff --git a/packages/solo/test/home.test.js b/packages/solo/test/home.test.js
index 96ded71f14c..30c9957f48e 100644
--- a/packages/solo/test/home.test.js
+++ b/packages/solo/test/home.test.js
@@ -2,13 +2,13 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import bundleSourceAmbient from '@endo/bundle-source';
import { AmountMath } from '@agoric/ertp';
import { TimeMath } from '@agoric/time';
+import bundleSourceAmbient from '@endo/bundle-source';
import { Far } from '@endo/marshal';
import { resolve as importMetaResolve } from 'import-meta-resolve';
-import { makeFixture, E } from './captp-fixture.js';
+import { E, makeFixture } from './captp-fixture.js';
const SOLO_PORT = 7999;
diff --git a/packages/spawner/scripts/build-bundles.js b/packages/spawner/scripts/build-bundles.js
index 2e2c899af91..d5e6f05f401 100644
--- a/packages/spawner/scripts/build-bundles.js
+++ b/packages/spawner/scripts/build-bundles.js
@@ -1,5 +1,6 @@
#! /usr/bin/env node
import '@endo/init';
+
import { createBundles } from '@agoric/internal/src/node/createBundles.js';
import url from 'url';
diff --git a/packages/spawner/test/swingsetTests/contractHost/contractHost.test.js b/packages/spawner/test/swingsetTests/contractHost/contractHost.test.js
index 802e92e1f0e..f57655bc2e9 100644
--- a/packages/spawner/test/swingsetTests/contractHost/contractHost.test.js
+++ b/packages/spawner/test/swingsetTests/contractHost/contractHost.test.js
@@ -1,12 +1,12 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-import bundleSource from '@endo/bundle-source';
import {
buildKernelBundles,
buildVatController,
loadBasedir,
} from '@agoric/swingset-vat';
+import bundleSource from '@endo/bundle-source';
+import path from 'path';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/spawner/test/swingsetTests/contractHost/vat-spawner.js b/packages/spawner/test/swingsetTests/contractHost/vat-spawner.js
index 766dfe7cb9a..e2520ab94ee 100644
--- a/packages/spawner/test/swingsetTests/contractHost/vat-spawner.js
+++ b/packages/spawner/test/swingsetTests/contractHost/vat-spawner.js
@@ -1,5 +1,6 @@
// Copyright (C) 2018 Agoric, under Apache License 2.0
import { Far } from '@endo/marshal';
+
import { makeSpawner } from '../../../src/contractHost.js';
function buildRootObject() {
diff --git a/packages/stat-logger/src/statGraph.js b/packages/stat-logger/src/statGraph.js
index 800aae4a95c..f0e6b08e014 100644
--- a/packages/stat-logger/src/statGraph.js
+++ b/packages/stat-logger/src/statGraph.js
@@ -1,9 +1,8 @@
/* global process */
+import { Fail } from '@endo/errors';
import fs from 'fs';
import path from 'path';
-import { Fail } from '@endo/errors';
-
function scanMax(filePath, fields) {
const lines = fs.readFileSync(filePath, { encoding: 'utf8' }).split('\n');
const headers = lines[0].split('\t');
diff --git a/packages/store/src/stores/scalarMapStore.js b/packages/store/src/stores/scalarMapStore.js
index 9264a70d2fb..71e1a46a0b3 100644
--- a/packages/store/src/stores/scalarMapStore.js
+++ b/packages/store/src/stores/scalarMapStore.js
@@ -1,18 +1,19 @@
import { q } from '@endo/errors';
+import { compareRank } from '@endo/marshal';
import {
- Far,
assertPassable,
+ Far,
filterIterable,
mapIterable,
} from '@endo/pass-style';
-import { compareRank } from '@endo/marshal';
import {
+ assertPattern,
assertScalarKey,
makeCopyMap,
matches,
mustMatch,
- assertPattern,
} from '@endo/patterns';
+
import { makeWeakMapStoreMethods } from './scalarWeakMapStore.js';
import { makeCurrentKeysKit } from './store-utils.js';
diff --git a/packages/store/src/stores/scalarSetStore.js b/packages/store/src/stores/scalarSetStore.js
index bf11d30ee33..7ad79cad28d 100644
--- a/packages/store/src/stores/scalarSetStore.js
+++ b/packages/store/src/stores/scalarSetStore.js
@@ -1,13 +1,14 @@
import { q } from '@endo/errors';
-import { Far, filterIterable } from '@endo/pass-style';
import { compareRank } from '@endo/marshal';
+import { Far, filterIterable } from '@endo/pass-style';
import {
+ assertPattern,
assertScalarKey,
makeCopySet,
matches,
mustMatch,
- assertPattern,
} from '@endo/patterns';
+
import { makeWeakSetStoreMethods } from './scalarWeakSetStore.js';
import { makeCurrentKeysKit } from './store-utils.js';
diff --git a/packages/store/src/stores/scalarWeakMapStore.js b/packages/store/src/stores/scalarWeakMapStore.js
index 3f9af270ace..f00f98cdd68 100644
--- a/packages/store/src/stores/scalarWeakMapStore.js
+++ b/packages/store/src/stores/scalarWeakMapStore.js
@@ -1,10 +1,10 @@
-import { q, Fail } from '@endo/errors';
-import { Far, assertPassable, passStyleOf } from '@endo/pass-style';
+import { Fail, q } from '@endo/errors';
+import { assertPassable, Far, passStyleOf } from '@endo/pass-style';
import {
- getCopyMapEntries,
- mustMatch,
assertPattern,
+ getCopyMapEntries,
isCopyMap,
+ mustMatch,
} from '@endo/patterns';
/**
diff --git a/packages/store/src/stores/scalarWeakSetStore.js b/packages/store/src/stores/scalarWeakSetStore.js
index bc06011279c..de14509edd6 100644
--- a/packages/store/src/stores/scalarWeakSetStore.js
+++ b/packages/store/src/stores/scalarWeakSetStore.js
@@ -1,10 +1,10 @@
-import { q, Fail } from '@endo/errors';
+import { Fail, q } from '@endo/errors';
import { Far, passStyleOf } from '@endo/pass-style';
import {
- getCopySetKeys,
- mustMatch,
assertPattern,
+ getCopySetKeys,
isCopySet,
+ mustMatch,
} from '@endo/patterns';
/**
diff --git a/packages/store/test/AtomicProvider.test.js b/packages/store/test/AtomicProvider.test.js
index 0da3c5e715d..47b1c161f78 100644
--- a/packages/store/test/AtomicProvider.test.js
+++ b/packages/store/test/AtomicProvider.test.js
@@ -1,5 +1,5 @@
-import test from 'ava';
import { Far } from '@endo/marshal';
+import test from 'ava';
import { setTimeout } from 'timers';
import { makeScalarMapStore } from '../src/stores/scalarMapStore.js';
diff --git a/packages/store/test/perf-patterns.js b/packages/store/test/perf-patterns.js
index 734560057fa..8dbd8002231 100644
--- a/packages/store/test/perf-patterns.js
+++ b/packages/store/test/perf-patterns.js
@@ -1,13 +1,11 @@
import { Far, makeTagged } from '@endo/marshal';
import {
+ M,
makeCopyBag,
makeCopyMap,
makeCopySet,
matches,
- M,
} from '@endo/patterns';
-import engineGC from './engine-gc.js';
-import { makeGcAndFinalize } from './gc-and-finalize.js';
import {
AmountShape,
@@ -16,6 +14,8 @@ import {
PaymentShape,
ProposalShape,
} from './borrow-guards.js';
+import engineGC from './engine-gc.js';
+import { makeGcAndFinalize } from './gc-and-finalize.js';
/**
* @import {Passable} from '@endo/pass-style';
* @import {Pattern} from '@endo/patterns';
diff --git a/packages/store/test/store.test.js b/packages/store/test/store.test.js
index 145bdb7a17e..61b29e630dc 100644
--- a/packages/store/test/store.test.js
+++ b/packages/store/test/store.test.js
@@ -1,6 +1,6 @@
+import { Far, passStyleOf } from '@endo/marshal';
import test from 'ava';
-import { Far, passStyleOf } from '@endo/marshal';
import { makeLegacyMap } from '../src/legacy/legacyMap.js';
import { makeLegacyWeakMap } from '../src/legacy/legacyWeakMap.js';
import { makeScalarMapStore } from '../src/stores/scalarMapStore.js';
diff --git a/packages/swing-store/src/archiver.js b/packages/swing-store/src/archiver.js
index c79ca9424fb..77282f5a0a4 100644
--- a/packages/swing-store/src/archiver.js
+++ b/packages/swing-store/src/archiver.js
@@ -1,6 +1,7 @@
import { finished as streamFinishedCallback, Readable } from 'node:stream';
import { promisify } from 'node:util';
import { createGzip } from 'node:zlib';
+
import { withDeferredCleanup } from '@agoric/internal';
const streamFinished = promisify(streamFinishedCallback);
diff --git a/packages/swing-store/src/bundleStore.js b/packages/swing-store/src/bundleStore.js
index ebabd352e59..a53824f1389 100644
--- a/packages/swing-store/src/bundleStore.js
+++ b/packages/swing-store/src/bundleStore.js
@@ -1,11 +1,12 @@
// @ts-check
-import { createHash } from 'crypto';
-import { Readable } from 'stream';
-import { Buffer } from 'buffer';
-import { Fail, q } from '@endo/errors';
-import { encodeBase64, decodeBase64 } from '@endo/base64';
+import { decodeBase64, encodeBase64 } from '@endo/base64';
import { checkBundle } from '@endo/check-bundle/lite.js';
+import { Fail, q } from '@endo/errors';
import { Nat } from '@endo/nat';
+import { Buffer } from 'buffer';
+import { createHash } from 'crypto';
+import { Readable } from 'stream';
+
import { createSHA256 } from './hasher.js';
/**
diff --git a/packages/swing-store/src/exporter.js b/packages/swing-store/src/exporter.js
index 0e355c50b9b..6f6ccf1c420 100644
--- a/packages/swing-store/src/exporter.js
+++ b/packages/swing-store/src/exporter.js
@@ -1,15 +1,14 @@
-import sqlite3 from 'better-sqlite3';
-
import { Fail, q } from '@endo/errors';
+import sqlite3 from 'better-sqlite3';
-import { dbFileInDirectory } from './util.js';
-import { getKeyType } from './kvStore.js';
+import { assertComplete } from './assertComplete.js';
import { makeBundleStore } from './bundleStore.js';
+import { validateArtifactMode } from './internal.js';
+import { getKeyType } from './kvStore.js';
import { makeSnapStore } from './snapStore.js';
import { makeSnapStoreIO } from './snapStoreIO.js';
import { makeTranscriptStore } from './transcriptStore.js';
-import { assertComplete } from './assertComplete.js';
-import { validateArtifactMode } from './internal.js';
+import { dbFileInDirectory } from './util.js';
/**
* @template T
diff --git a/packages/swing-store/src/hasher.js b/packages/swing-store/src/hasher.js
index 384425517e5..7339770efab 100644
--- a/packages/swing-store/src/hasher.js
+++ b/packages/swing-store/src/hasher.js
@@ -1,5 +1,4 @@
import { Fail } from '@endo/errors';
-
import { createHash } from 'crypto';
/**
diff --git a/packages/swing-store/src/importer.js b/packages/swing-store/src/importer.js
index 4fb1af6b4f6..70c1f9233a1 100644
--- a/packages/swing-store/src/importer.js
+++ b/packages/swing-store/src/importer.js
@@ -1,9 +1,9 @@
import { Fail, q } from '@endo/errors';
+import { assertComplete } from './assertComplete.js';
+import { validateArtifactMode } from './internal.js';
import { makeSwingStore } from './swingStore.js';
import { buffer } from './util.js';
-import { validateArtifactMode } from './internal.js';
-import { assertComplete } from './assertComplete.js';
/**
* @typedef { object } ImportSwingStoreOptions
diff --git a/packages/swing-store/src/repairMetadata.js b/packages/swing-store/src/repairMetadata.js
index dc570dca659..4ea8332b73c 100644
--- a/packages/swing-store/src/repairMetadata.js
+++ b/packages/swing-store/src/repairMetadata.js
@@ -1,4 +1,5 @@
import { Fail, q } from '@endo/errors';
+
import { assertComplete } from './assertComplete.js';
/**
diff --git a/packages/swing-store/src/snapStore.js b/packages/swing-store/src/snapStore.js
index e8548c77fef..87adc0af341 100644
--- a/packages/swing-store/src/snapStore.js
+++ b/packages/swing-store/src/snapStore.js
@@ -1,10 +1,11 @@
// @ts-check
+import { withDeferredCleanup } from '@agoric/internal';
+import { Fail, q } from '@endo/errors';
import { createHash } from 'crypto';
import { finished as finishedCallback, PassThrough, Readable } from 'stream';
import { promisify } from 'util';
-import { createGzip, createGunzip } from 'zlib';
-import { Fail, q } from '@endo/errors';
-import { withDeferredCleanup } from '@agoric/internal';
+import { createGunzip, createGzip } from 'zlib';
+
import { buffer } from './util.js';
/**
diff --git a/packages/swing-store/src/snapStoreIO.js b/packages/swing-store/src/snapStoreIO.js
index decb978dc82..cf7f00761d9 100644
--- a/packages/swing-store/src/snapStoreIO.js
+++ b/packages/swing-store/src/snapStoreIO.js
@@ -1,5 +1,5 @@
-import { performance } from 'perf_hooks';
import { makeMeasureSeconds } from '@agoric/internal';
+import { performance } from 'perf_hooks';
export function makeSnapStoreIO() {
return {
diff --git a/packages/swing-store/src/swingStore.js b/packages/swing-store/src/swingStore.js
index 14181a16a8c..f32fab1c79f 100644
--- a/packages/swing-store/src/swingStore.js
+++ b/packages/swing-store/src/swingStore.js
@@ -1,20 +1,18 @@
// @ts-check
/* global Buffer */
+import { Fail, q } from '@endo/errors';
+import sqlite3 from 'better-sqlite3';
import * as fs from 'fs';
import * as path from 'path';
-import sqlite3 from 'better-sqlite3';
-
-import { Fail, q } from '@endo/errors';
-
-import { dbFileInDirectory } from './util.js';
-import { makeKVStore, getKeyType } from './kvStore.js';
-import { makeTranscriptStore } from './transcriptStore.js';
-import { makeSnapStore } from './snapStore.js';
import { makeBundleStore } from './bundleStore.js';
import { createSHA256 } from './hasher.js';
-import { makeSnapStoreIO } from './snapStoreIO.js';
+import { getKeyType, makeKVStore } from './kvStore.js';
import { doRepairMetadata } from './repairMetadata.js';
+import { makeSnapStore } from './snapStore.js';
+import { makeSnapStoreIO } from './snapStoreIO.js';
+import { makeTranscriptStore } from './transcriptStore.js';
+import { dbFileInDirectory } from './util.js';
/**
* @typedef { import('./kvStore.js').KVStore } KVStore
diff --git a/packages/swing-store/src/transcriptStore.js b/packages/swing-store/src/transcriptStore.js
index 06be31aa9b0..e6071c1cd33 100644
--- a/packages/swing-store/src/transcriptStore.js
+++ b/packages/swing-store/src/transcriptStore.js
@@ -1,8 +1,9 @@
// @ts-check
-import { Readable } from 'stream';
-import { Buffer } from 'buffer';
-import { Fail, q } from '@endo/errors';
import BufferLineTransform from '@agoric/internal/src/node/buffer-line-transform.js';
+import { Fail, q } from '@endo/errors';
+import { Buffer } from 'buffer';
+import { Readable } from 'stream';
+
import { createSHA256 } from './hasher.js';
/**
diff --git a/packages/swing-store/src/util.js b/packages/swing-store/src/util.js
index 60c224a9693..905e02642a3 100644
--- a/packages/swing-store/src/util.js
+++ b/packages/swing-store/src/util.js
@@ -1,5 +1,5 @@
-import path from 'path';
import { Buffer } from 'buffer';
+import path from 'path';
/**
* This is a polyfill for the `buffer` function from Node's
diff --git a/packages/swing-store/test/bundles.test.js b/packages/swing-store/test/bundles.test.js
index 7f8cd6ed6a0..d09eebd6cef 100644
--- a/packages/swing-store/test/bundles.test.js
+++ b/packages/swing-store/test/bundles.test.js
@@ -1,11 +1,12 @@
// @ts-check
import test from 'ava';
-import tmp from 'tmp';
import { Buffer } from 'buffer';
-import { createSHA256 } from '../src/hasher.js';
-import { initSwingStore } from '../src/swingStore.js';
+import tmp from 'tmp';
+
import { makeSwingStoreExporter } from '../src/exporter.js';
+import { createSHA256 } from '../src/hasher.js';
import { importSwingStore } from '../src/importer.js';
+import { initSwingStore } from '../src/swingStore.js';
import { buffer } from '../src/util.js';
function makeB0ID(bundle) {
diff --git a/packages/swing-store/test/deletion.test.js b/packages/swing-store/test/deletion.test.js
index 19baf048d5c..0be08085bcd 100644
--- a/packages/swing-store/test/deletion.test.js
+++ b/packages/swing-store/test/deletion.test.js
@@ -1,18 +1,19 @@
// @ts-check
-import test from 'ava';
-
import { Buffer } from 'node:buffer';
-import path from 'node:path';
import fs from 'node:fs';
+import path from 'node:path';
import zlib from 'node:zlib';
+
+import { arrayIsLike } from '@agoric/internal/tools/ava-assertions.js';
+import test from 'ava';
import sqlite3 from 'better-sqlite3';
import tmp from 'tmp';
-import { arrayIsLike } from '@agoric/internal/tools/ava-assertions.js';
-import { tmpDir } from './util.js';
-import { initSwingStore } from '../src/swingStore.js';
+
import { makeArchiveSnapshot, makeArchiveTranscript } from '../src/archiver.js';
import { makeSwingStoreExporter } from '../src/exporter.js';
import { importSwingStore } from '../src/importer.js';
+import { initSwingStore } from '../src/swingStore.js';
+import { tmpDir } from './util.js';
async function* getSnapshotStream() {
yield Buffer.from('abc');
diff --git a/packages/swing-store/test/export.test.js b/packages/swing-store/test/export.test.js
index b0457665310..180d41f21d9 100644
--- a/packages/swing-store/test/export.test.js
+++ b/packages/swing-store/test/export.test.js
@@ -1,9 +1,8 @@
import test from 'ava';
-import { buffer } from '../src/util.js';
import { initSwingStore, makeSwingStoreExporter } from '../src/index.js';
-
-import { tmpDir, getSnapshotStream, makeB0ID } from './util.js';
+import { buffer } from '../src/util.js';
+import { getSnapshotStream, makeB0ID, tmpDir } from './util.js';
const rank = {
operational: 1,
diff --git a/packages/swing-store/test/exportImport.test.js b/packages/swing-store/test/exportImport.test.js
index 2458de32c55..900fca03de9 100644
--- a/packages/swing-store/test/exportImport.test.js
+++ b/packages/swing-store/test/exportImport.test.js
@@ -2,13 +2,13 @@
import { Buffer } from 'node:buffer';
+import bundleSource from '@endo/bundle-source';
import test from 'ava';
import tmp from 'tmp';
-import bundleSource from '@endo/bundle-source';
-import { initSwingStore } from '../src/swingStore.js';
import { makeSwingStoreExporter } from '../src/exporter.js';
import { importSwingStore } from '../src/importer.js';
+import { initSwingStore } from '../src/swingStore.js';
function makeExportLog() {
const exportLog = [];
diff --git a/packages/swing-store/test/exports.js b/packages/swing-store/test/exports.js
index 8839024bfc0..c57f3edfdb2 100644
--- a/packages/swing-store/test/exports.js
+++ b/packages/swing-store/test/exports.js
@@ -1,4 +1,5 @@
import { Buffer } from 'buffer';
+
import { makeB0ID } from './util.js';
export const snapshotData = 'snapshot data';
diff --git a/packages/swing-store/test/import.test.js b/packages/swing-store/test/import.test.js
index 45b7ebf41ea..4f89acc5897 100644
--- a/packages/swing-store/test/import.test.js
+++ b/packages/swing-store/test/import.test.js
@@ -1,18 +1,15 @@
// @ts-check
+import { decodeBase64 } from '@endo/base64';
+import test from 'ava';
+import sqlite3 from 'better-sqlite3';
+import { Buffer } from 'buffer';
import path from 'path';
-import { createGunzip } from 'zlib';
import { Readable } from 'stream';
-import { Buffer } from 'buffer';
-
-import sqlite3 from 'better-sqlite3';
-import test from 'ava';
-import { decodeBase64 } from '@endo/base64';
+import { createGunzip } from 'zlib';
-import { buffer } from '../src/util.js';
import { importSwingStore, makeSwingStoreExporter } from '../src/index.js';
-
-import { tmpDir } from './util.js';
+import { buffer } from '../src/util.js';
import {
buildData,
bundle0,
@@ -21,6 +18,7 @@ import {
snapHash,
snapshotData,
} from './exports.js';
+import { tmpDir } from './util.js';
const rank = {
operational: 1,
diff --git a/packages/swing-store/test/repair-metadata.test.js b/packages/swing-store/test/repair-metadata.test.js
index 9bd7b1996a6..9c788840638 100644
--- a/packages/swing-store/test/repair-metadata.test.js
+++ b/packages/swing-store/test/repair-metadata.test.js
@@ -1,12 +1,11 @@
// @ts-check
-import path from 'path';
import test from 'ava';
import sqlite3 from 'better-sqlite3';
+import path from 'path';
import { importSwingStore, openSwingStore } from '../src/index.js';
-
-import { makeExporter, buildData } from './exports.js';
+import { buildData, makeExporter } from './exports.js';
import { tmpDir } from './util.js';
test('repair metadata', async t => {
diff --git a/packages/swing-store/test/snapstore.test.js b/packages/swing-store/test/snapstore.test.js
index 1f27151be24..75f8c5dd305 100644
--- a/packages/swing-store/test/snapstore.test.js
+++ b/packages/swing-store/test/snapstore.test.js
@@ -1,16 +1,16 @@
// @ts-check
-import test from 'ava';
-
import { Buffer } from 'node:buffer';
import fs from 'node:fs';
import path from 'node:path';
import zlib from 'node:zlib';
+
+import { makeMeasureSeconds } from '@agoric/internal';
+import test from 'ava';
import sqlite3 from 'better-sqlite3';
import tmp from 'tmp';
-import { makeMeasureSeconds } from '@agoric/internal';
-import { makeSnapStore } from '../src/snapStore.js';
import { makeArchiveSnapshot } from '../src/archiver.js';
+import { makeSnapStore } from '../src/snapStore.js';
import { tmpDir } from './util.js';
function makeExportLog() {
diff --git a/packages/swing-store/test/state.test.js b/packages/swing-store/test/state.test.js
index 08f3213eb3b..76d552ecdf7 100644
--- a/packages/swing-store/test/state.test.js
+++ b/packages/swing-store/test/state.test.js
@@ -1,14 +1,13 @@
// @ts-check
-import tmp from 'tmp';
-import test from 'ava';
-
import bundleSource from '@endo/bundle-source';
+import test from 'ava';
+import tmp from 'tmp';
import {
initSwingStore,
- openSwingStore,
isSwingStore,
+ openSwingStore,
} from '../src/swingStore.js';
/**
diff --git a/packages/swing-store/test/util.js b/packages/swing-store/test/util.js
index 967bc53609c..a0b8b1c5f3b 100644
--- a/packages/swing-store/test/util.js
+++ b/packages/swing-store/test/util.js
@@ -1,5 +1,7 @@
import { Buffer } from 'node:buffer';
+
import tmp from 'tmp';
+
import { createSHA256 } from '../src/hasher.js';
/**
diff --git a/packages/swingset-liveslots/src/collectionManager.js b/packages/swingset-liveslots/src/collectionManager.js
index 9b8b6d4ff2e..2dccb2bd00f 100644
--- a/packages/swingset-liveslots/src/collectionManager.js
+++ b/packages/swingset-liveslots/src/collectionManager.js
@@ -1,29 +1,30 @@
-import { assert, q, Fail } from '@endo/errors';
+import { isCopyMap, isCopySet } from '@agoric/store';
+import { assert, Fail, q } from '@endo/errors';
import { Far, passStyleOf } from '@endo/far';
import {
- zeroPad,
- makeEncodePassable,
- makeDecodePassable,
compareRank,
+ makeDecodePassable,
+ makeEncodePassable,
+ zeroPad,
} from '@endo/marshal';
import {
assertPattern,
- matches,
- mustMatch,
- M,
- makeCopySet,
- makeCopyMap,
- getRankCover,
getCopyMapEntries,
getCopySetKeys,
+ getRankCover,
+ M,
+ makeCopyMap,
+ makeCopySet,
+ matches,
+ mustMatch,
} from '@endo/patterns';
-import { isCopyMap, isCopySet } from '@agoric/store';
+
+import { makeCache } from './cache.js';
import { makeBaseRef, parseVatSlot } from './parseVatSlots.js';
import {
enumerateKeysStartEnd,
enumerateKeysWithPrefix,
} from './vatstore-iterators.js';
-import { makeCache } from './cache.js';
/**
* @import {ToCapData, FromCapData} from '@endo/marshal';
diff --git a/packages/swingset-liveslots/src/liveslots.js b/packages/swingset-liveslots/src/liveslots.js
index 9363b15e027..0ccf63b00c8 100644
--- a/packages/swingset-liveslots/src/liveslots.js
+++ b/packages/swingset-liveslots/src/liveslots.js
@@ -1,18 +1,19 @@
import { annotateError, assert, Fail, makeError, X } from '@endo/errors';
+import { E, HandledPromise } from '@endo/eventual-send';
+import { getInterfaceOf, makeMarshal, Remotable } from '@endo/marshal';
import { passStyleOf } from '@endo/pass-style';
import { PassStyleOfEndowmentSymbol } from '@endo/pass-style/endow.js';
-import { Remotable, getInterfaceOf, makeMarshal } from '@endo/marshal';
import { isPromise } from '@endo/promise-kit';
-import { E, HandledPromise } from '@endo/eventual-send';
-import { insistVatType, makeVatSlot, parseVatSlot } from './parseVatSlots.js';
+
+import { makeBOYDKit } from './boyd-gc.js';
import { insistCapData } from './capdata.js';
+import { makeCollectionManager } from './collectionManager.js';
import { extractMethod, legibilizeMethod } from './kdebug.js';
import { insistMessage } from './message.js';
-import { makeVirtualReferenceManager } from './virtualReferences.js';
+import { insistVatType, makeVatSlot, parseVatSlot } from './parseVatSlots.js';
import { makeVirtualObjectManager } from './virtualObjectManager.js';
-import { makeCollectionManager } from './collectionManager.js';
+import { makeVirtualReferenceManager } from './virtualReferences.js';
import { makeWatchedPromiseManager } from './watchedPromises.js';
-import { makeBOYDKit } from './boyd-gc.js';
const SYSCALL_CAPDATA_BODY_SIZE_LIMIT = 10_000_000;
const SYSCALL_CAPDATA_SLOTS_LENGTH_LIMIT = 10_000;
diff --git a/packages/swingset-liveslots/src/message.js b/packages/swingset-liveslots/src/message.js
index 5dcc513b6d9..9724c820ffe 100644
--- a/packages/swingset-liveslots/src/message.js
+++ b/packages/swingset-liveslots/src/message.js
@@ -1,4 +1,5 @@
import { assert, Fail } from '@endo/errors';
+
import { insistCapData } from './capdata.js';
/**
diff --git a/packages/swingset-liveslots/src/parseVatSlots.js b/packages/swingset-liveslots/src/parseVatSlots.js
index b5e945a30a8..ae20e8ce35f 100644
--- a/packages/swingset-liveslots/src/parseVatSlots.js
+++ b/packages/swingset-liveslots/src/parseVatSlots.js
@@ -1,5 +1,5 @@
-import { Nat } from '@endo/nat';
import { assert, Fail } from '@endo/errors';
+import { Nat } from '@endo/nat';
// NOTE: confusing terminology: "slot" vs. "reference". All these things
// called "slots" are references, but the word "slot" suggests something into
diff --git a/packages/swingset-liveslots/src/vatDataTypes.d.ts b/packages/swingset-liveslots/src/vatDataTypes.d.ts
index 91cd954c784..6958c04ef8c 100644
--- a/packages/swingset-liveslots/src/vatDataTypes.d.ts
+++ b/packages/swingset-liveslots/src/vatDataTypes.d.ts
@@ -12,10 +12,11 @@ import type {
WeakMapStore,
WeakSetStore,
} from '@agoric/store';
+import type { RemotableBrand } from '@endo/eventual-send';
import type { Amplify, IsInstance, ReceivePower, StateShape } from '@endo/exo';
import type { RemotableObject } from '@endo/pass-style';
-import type { RemotableBrand } from '@endo/eventual-send';
import type { InterfaceGuard, Pattern } from '@endo/patterns';
+
import type { makeWatchedPromiseManager } from './watchedPromises.js';
// TODO should be moved into @endo/patterns and eventually imported here
diff --git a/packages/swingset-liveslots/src/virtualObjectManager.js b/packages/swingset-liveslots/src/virtualObjectManager.js
index e58430f6c4c..78d6605480a 100644
--- a/packages/swingset-liveslots/src/virtualObjectManager.js
+++ b/packages/swingset-liveslots/src/virtualObjectManager.js
@@ -1,19 +1,20 @@
/* global globalThis */
/* eslint-disable no-use-before-define, jsdoc/require-returns-type */
-import { environmentOptionsListHas } from '@endo/env-options';
-import { assert, Fail, q, b } from '@endo/errors';
import { assertPattern, mustMatch } from '@agoric/store';
+import { environmentOptionsListHas } from '@endo/env-options';
+import { assert, b, Fail, q } from '@endo/errors';
import { defendPrototype, defendPrototypeKit } from '@endo/exo/tools.js';
import { Far, passStyleOf } from '@endo/marshal';
import { Nat } from '@endo/nat';
-import { parseVatSlot, makeBaseRef } from './parseVatSlots.js';
-import { enumerateKeysWithPrefix } from './vatstore-iterators.js';
+
import { makeCache } from './cache.js';
import {
assessFacetiousness,
checkAndUpdateFacetiousness,
} from './facetiousness.js';
+import { makeBaseRef, parseVatSlot } from './parseVatSlots.js';
+import { enumerateKeysWithPrefix } from './vatstore-iterators.js';
/**
* @import {DurableKindHandle} from '@agoric/swingset-liveslots'
diff --git a/packages/swingset-liveslots/src/virtualReferences.js b/packages/swingset-liveslots/src/virtualReferences.js
index ffe0daca3bb..83e89ce6df6 100644
--- a/packages/swingset-liveslots/src/virtualReferences.js
+++ b/packages/swingset-liveslots/src/virtualReferences.js
@@ -2,6 +2,7 @@
import { assert, Fail } from '@endo/errors';
import { Nat } from '@endo/nat';
+
import { parseVatSlot } from './parseVatSlots.js';
import {
enumerateKeysWithPrefix,
diff --git a/packages/swingset-liveslots/src/watchedPromises.js b/packages/swingset-liveslots/src/watchedPromises.js
index 799171f5d99..04b11110220 100644
--- a/packages/swingset-liveslots/src/watchedPromises.js
+++ b/packages/swingset-liveslots/src/watchedPromises.js
@@ -2,9 +2,10 @@
// no-lonely-if is a stupid rule that really should be disabled globally
/* eslint-disable no-lonely-if */
-import { Fail, assert } from '@endo/errors';
-import { E } from '@endo/eventual-send';
import { initEmpty, M } from '@agoric/store';
+import { assert, Fail } from '@endo/errors';
+import { E } from '@endo/eventual-send';
+
import { parseVatSlot } from './parseVatSlots.js';
/**
diff --git a/packages/swingset-liveslots/test/baggage.test.js b/packages/swingset-liveslots/test/baggage.test.js
index a1523b647a4..91b52270c37 100644
--- a/packages/swingset-liveslots/test/baggage.test.js
+++ b/packages/swingset-liveslots/test/baggage.test.js
@@ -1,10 +1,10 @@
+import { kunser } from '@agoric/kmarshal';
+import { Far } from '@endo/marshal';
import test from 'ava';
-import { Far } from '@endo/marshal';
-import { kunser } from '@agoric/kmarshal';
+import { parseVatSlot } from '../src/parseVatSlots.js';
import { setupTestLiveslots } from './liveslots-helpers.js';
import { vstr } from './util.js';
-import { parseVatSlot } from '../src/parseVatSlots.js';
function buildRootObject(vatPowers, vatParameters, baggage) {
baggage.has('outside');
diff --git a/packages/swingset-liveslots/test/clear-collection.test.js b/packages/swingset-liveslots/test/clear-collection.test.js
index 313f0d941df..62c60f6e470 100644
--- a/packages/swingset-liveslots/test/clear-collection.test.js
+++ b/packages/swingset-liveslots/test/clear-collection.test.js
@@ -1,12 +1,12 @@
+import { kser, kslot } from '@agoric/kmarshal';
+import { Far } from '@endo/marshal';
import test from 'ava';
-import { Far } from '@endo/marshal';
-import { kser, kslot } from '@agoric/kmarshal';
import { makeLiveSlots } from '../src/liveslots.js';
import { parseVatSlot } from '../src/parseVatSlots.js';
import { buildSyscall } from './liveslots-helpers.js';
-import { makeMessage, makeStartVat, makeBringOutYourDead } from './util.js';
import { makeMockGC } from './mock-gc.js';
+import { makeBringOutYourDead, makeMessage, makeStartVat } from './util.js';
const getPrefixedKeys = (map, prefix) => {
const keys = [];
diff --git a/packages/swingset-liveslots/test/collection-schema-refcount.test.js b/packages/swingset-liveslots/test/collection-schema-refcount.test.js
index e563ecf5227..9e88cfb0801 100644
--- a/packages/swingset-liveslots/test/collection-schema-refcount.test.js
+++ b/packages/swingset-liveslots/test/collection-schema-refcount.test.js
@@ -1,12 +1,12 @@
+import { kser } from '@agoric/kmarshal';
+import { Far } from '@endo/marshal';
import test from 'ava';
-import { Far } from '@endo/marshal';
-import { kser } from '@agoric/kmarshal';
import { makeLiveSlots } from '../src/liveslots.js';
import { parseVatSlot } from '../src/parseVatSlots.js';
import { buildSyscall } from './liveslots-helpers.js';
-import { makeStartVat, makeBringOutYourDead } from './util.js';
import { makeMockGC } from './mock-gc.js';
+import { makeBringOutYourDead, makeStartVat } from './util.js';
// virtual/durable collections serialize their keyShape/valueShape,
// any Remotables therein must be compatible, and we should have
diff --git a/packages/swingset-liveslots/test/collection-upgrade.test.js b/packages/swingset-liveslots/test/collection-upgrade.test.js
index ca329209659..206fecbdc51 100644
--- a/packages/swingset-liveslots/test/collection-upgrade.test.js
+++ b/packages/swingset-liveslots/test/collection-upgrade.test.js
@@ -1,13 +1,13 @@
-import test from 'ava';
-
-import { Far } from '@endo/marshal';
import { kser } from '@agoric/kmarshal';
import { M } from '@agoric/store';
+import { Far } from '@endo/marshal';
+import test from 'ava';
+
import { makeLiveSlots } from '../src/liveslots.js';
import { parseVatSlot } from '../src/parseVatSlots.js';
import { buildSyscall } from './liveslots-helpers.js';
-import { makeStartVat } from './util.js';
import { makeMockGC } from './mock-gc.js';
+import { makeStartVat } from './util.js';
test('durable collections survive upgrade', async t => {
let map1;
diff --git a/packages/swingset-liveslots/test/collections.test.js b/packages/swingset-liveslots/test/collections.test.js
index f4cc62bfbb9..2774c0e04c4 100644
--- a/packages/swingset-liveslots/test/collections.test.js
+++ b/packages/swingset-liveslots/test/collections.test.js
@@ -1,9 +1,9 @@
// @ts-nocheck
-import test from 'ava';
-
-import { Far } from '@endo/marshal';
import { M } from '@agoric/store';
+import { Far } from '@endo/marshal';
import { makeCopyMap, makeCopySet } from '@endo/patterns';
+import test from 'ava';
+
import { makeFakeCollectionManager } from '../tools/fakeVirtualSupport.js';
const {
diff --git a/packages/swingset-liveslots/test/dropped-collection-weakrefs.test.js b/packages/swingset-liveslots/test/dropped-collection-weakrefs.test.js
index 8c197fc79ea..8efb8b0676e 100644
--- a/packages/swingset-liveslots/test/dropped-collection-weakrefs.test.js
+++ b/packages/swingset-liveslots/test/dropped-collection-weakrefs.test.js
@@ -1,10 +1,11 @@
-import test from 'ava';
-import { Far } from '@endo/marshal';
import { kser } from '@agoric/kmarshal';
+import { Far } from '@endo/marshal';
+import test from 'ava';
+
import { makeLiveSlots } from '../src/liveslots.js';
import { buildSyscall } from './liveslots-helpers.js';
-import { makeStartVat } from './util.js';
import { makeMockGC } from './mock-gc.js';
+import { makeStartVat } from './util.js';
test('droppedCollectionWeakRefs', async t => {
const { syscall } = buildSyscall();
diff --git a/packages/swingset-liveslots/test/dropped-weakset-9939.test.js b/packages/swingset-liveslots/test/dropped-weakset-9939.test.js
index 251bfcaff4e..e5a063a8818 100644
--- a/packages/swingset-liveslots/test/dropped-weakset-9939.test.js
+++ b/packages/swingset-liveslots/test/dropped-weakset-9939.test.js
@@ -1,10 +1,11 @@
-import test from 'ava';
-import { Far } from '@endo/marshal';
import { kser, kslot } from '@agoric/kmarshal';
+import { Far } from '@endo/marshal';
+import test from 'ava';
+
import { makeLiveSlots } from '../src/liveslots.js';
import { buildSyscall } from './liveslots-helpers.js';
-import { makeStartVat, makeMessage, makeBringOutYourDead } from './util.js';
import { makeMockGC } from './mock-gc.js';
+import { makeBringOutYourDead, makeMessage, makeStartVat } from './util.js';
// Test for https://github.com/Agoric/agoric-sdk/issues/9939
diff --git a/packages/swingset-liveslots/test/durabilityChecks.test.js b/packages/swingset-liveslots/test/durabilityChecks.test.js
index dafb3408598..f74591a8a2d 100644
--- a/packages/swingset-liveslots/test/durabilityChecks.test.js
+++ b/packages/swingset-liveslots/test/durabilityChecks.test.js
@@ -1,6 +1,6 @@
+import { Far } from '@endo/marshal';
import test from 'ava';
-import { Far } from '@endo/marshal';
import { makeFakeVirtualStuff } from '../tools/fakeVirtualSupport.js';
async function runDurabilityCheckTest(t, relaxDurabilityRules) {
diff --git a/packages/swingset-liveslots/test/facetiousness.test.js b/packages/swingset-liveslots/test/facetiousness.test.js
index 36de5230827..c714800908c 100644
--- a/packages/swingset-liveslots/test/facetiousness.test.js
+++ b/packages/swingset-liveslots/test/facetiousness.test.js
@@ -1,4 +1,5 @@
import test from 'ava';
+
import {
assessFacetiousness,
checkAndUpdateFacetiousness,
diff --git a/packages/swingset-liveslots/test/gc-before-finalizer.test.js b/packages/swingset-liveslots/test/gc-before-finalizer.test.js
index 92a0955fb3d..2254ca25883 100644
--- a/packages/swingset-liveslots/test/gc-before-finalizer.test.js
+++ b/packages/swingset-liveslots/test/gc-before-finalizer.test.js
@@ -1,10 +1,11 @@
-import test from 'ava';
-import { Far } from '@endo/marshal';
import { kser, kslot } from '@agoric/kmarshal';
+import { Far } from '@endo/marshal';
+import test from 'ava';
+
import { makeLiveSlots } from '../src/liveslots.js';
import { buildSyscall } from './liveslots-helpers.js';
-import { makeStartVat, makeMessage, makeBringOutYourDead } from './util.js';
import { makeMockGC } from './mock-gc.js';
+import { makeBringOutYourDead, makeMessage, makeStartVat } from './util.js';
const justGC = log =>
log.filter(
diff --git a/packages/swingset-liveslots/test/gc-helpers.js b/packages/swingset-liveslots/test/gc-helpers.js
index db41df76bb1..6d065f4c910 100644
--- a/packages/swingset-liveslots/test/gc-helpers.js
+++ b/packages/swingset-liveslots/test/gc-helpers.js
@@ -1,6 +1,7 @@
-import { Far } from '@endo/marshal';
+import { kser, kslot } from '@agoric/kmarshal';
import { M } from '@agoric/store';
-import { kslot, kser } from '@agoric/kmarshal';
+import { Far } from '@endo/marshal';
+
import { parseVatSlot } from '../src/parseVatSlots.js';
// These tests follow the model described in
diff --git a/packages/swingset-liveslots/test/gc-sensitivity.test.js b/packages/swingset-liveslots/test/gc-sensitivity.test.js
index 4952446c911..8303e600031 100644
--- a/packages/swingset-liveslots/test/gc-sensitivity.test.js
+++ b/packages/swingset-liveslots/test/gc-sensitivity.test.js
@@ -1,9 +1,10 @@
// @ts-nocheck
-import test from 'ava';
-import { Far } from '@endo/marshal';
import { kser } from '@agoric/kmarshal';
-import { buildSyscall } from './liveslots-helpers.js';
+import { Far } from '@endo/marshal';
+import test from 'ava';
+
import { makeLiveSlots } from '../src/liveslots.js';
+import { buildSyscall } from './liveslots-helpers.js';
import { makeMockGC } from './mock-gc.js';
import { makeMessage, makeStartVat } from './util.js';
diff --git a/packages/swingset-liveslots/test/handled-promises.test.js b/packages/swingset-liveslots/test/handled-promises.test.js
index e9e7bd3c29e..a16223c2392 100644
--- a/packages/swingset-liveslots/test/handled-promises.test.js
+++ b/packages/swingset-liveslots/test/handled-promises.test.js
@@ -1,15 +1,15 @@
-import test from 'ava';
-
-import { Fail } from '@endo/errors';
-import { Far } from '@endo/marshal';
-import { M, provideLazy as provide } from '@agoric/store';
-import { makePromiseKit } from '@endo/promise-kit';
// Disabled to avoid circular dependencies.
// import { makeStoreUtils } from '@agoric/vat-data/src/vat-data-bindings.js';
// import { makeExoUtils } from '@agoric/vat-data/src/exo-utils.js';
-import { kslot, kser } from '@agoric/kmarshal';
+import { kser, kslot } from '@agoric/kmarshal';
+import { M, provideLazy as provide } from '@agoric/store';
+import { Fail } from '@endo/errors';
+import { Far } from '@endo/marshal';
+import { makePromiseKit } from '@endo/promise-kit';
+import test from 'ava';
+
import { setupTestLiveslots } from './liveslots-helpers.js';
-import { makeResolve, makeReject } from './util.js';
+import { makeReject, makeResolve } from './util.js';
// eslint-disable-next-line no-unused-vars
const compareEntriesByKey = ([ka], [kb]) => (ka < kb ? -1 : 1);
diff --git a/packages/swingset-liveslots/test/initial-vrefs.test.js b/packages/swingset-liveslots/test/initial-vrefs.test.js
index c53262d95ad..6bf316e95db 100644
--- a/packages/swingset-liveslots/test/initial-vrefs.test.js
+++ b/packages/swingset-liveslots/test/initial-vrefs.test.js
@@ -1,8 +1,8 @@
-import test from 'ava';
-
-import { Far } from '@endo/far';
import { kunser } from '@agoric/kmarshal';
import { M } from '@agoric/store';
+import { Far } from '@endo/far';
+import test from 'ava';
+
import { setupTestLiveslots } from './liveslots-helpers.js';
function buildRootObject(vatPowers, vatParameters, baggage) {
diff --git a/packages/swingset-liveslots/test/liveslots-helpers.js b/packages/swingset-liveslots/test/liveslots-helpers.js
index e2f8c41feb7..52e41be65e1 100644
--- a/packages/swingset-liveslots/test/liveslots-helpers.js
+++ b/packages/swingset-liveslots/test/liveslots-helpers.js
@@ -1,18 +1,18 @@
/* global WeakRef, FinalizationRegistry */
import { kser } from '@agoric/kmarshal';
+import { makeLiveSlots } from '../src/liveslots.js';
+import { makeDummyMeterControl } from './dummyMeterControl.js';
import engineGC from './engine-gc.js';
-import { waitUntilQuiescent } from './waitUntilQuiescent.js';
import { makeGcAndFinalize } from './gc-and-finalize.js';
-import { makeDummyMeterControl } from './dummyMeterControl.js';
-import { makeLiveSlots } from '../src/liveslots.js';
import {
- makeMessage,
+ makeBringOutYourDead,
makeDropExports,
- makeRetireImports,
+ makeMessage,
makeRetireExports,
- makeBringOutYourDead,
+ makeRetireImports,
} from './util.js';
+import { waitUntilQuiescent } from './waitUntilQuiescent.js';
/**
* @param {object} [options]
diff --git a/packages/swingset-liveslots/test/liveslots-mock-gc.test.js b/packages/swingset-liveslots/test/liveslots-mock-gc.test.js
index 1ab290c621b..930aab551e1 100644
--- a/packages/swingset-liveslots/test/liveslots-mock-gc.test.js
+++ b/packages/swingset-liveslots/test/liveslots-mock-gc.test.js
@@ -1,19 +1,19 @@
// @ts-nocheck
+import { kser, kslot } from '@agoric/kmarshal';
+import { Far } from '@endo/marshal';
import test from 'ava';
-import { Far } from '@endo/marshal';
-import { kslot, kser } from '@agoric/kmarshal';
import { makeLiveSlots } from '../src/liveslots.js';
import { parseVatSlot } from '../src/parseVatSlots.js';
import { buildSyscall } from './liveslots-helpers.js';
+import { makeMockGC } from './mock-gc.js';
import {
- makeMessage,
- makeStartVat,
makeBringOutYourDead,
+ makeMessage,
makeResolve,
makeRetireImports,
+ makeStartVat,
} from './util.js';
-import { makeMockGC } from './mock-gc.js';
test('dropImports', async t => {
const { syscall } = buildSyscall();
diff --git a/packages/swingset-liveslots/test/liveslots-real-gc.test.js b/packages/swingset-liveslots/test/liveslots-real-gc.test.js
index 80641d82a44..232042ceff8 100644
--- a/packages/swingset-liveslots/test/liveslots-real-gc.test.js
+++ b/packages/swingset-liveslots/test/liveslots-real-gc.test.js
@@ -1,17 +1,17 @@
// @ts-nocheck
/* global process */
-import test from 'ava';
-
+import { kser, kslot } from '@agoric/kmarshal';
import { Far } from '@endo/marshal';
import { makePromiseKit } from '@endo/promise-kit';
-import { kslot, kser } from '@agoric/kmarshal';
+import test from 'ava';
+
import engineGC from './engine-gc.js';
-import { watchCollected, makeGcAndFinalize } from './gc-and-finalize.js';
+import { makeGcAndFinalize, watchCollected } from './gc-and-finalize.js';
import { buildSyscall, makeDispatch } from './liveslots-helpers.js';
import {
- makeMessage,
makeBringOutYourDead,
makeDropExports,
+ makeMessage,
makeRetireExports,
makeRetireImports,
} from './util.js';
diff --git a/packages/swingset-liveslots/test/liveslots.test.js b/packages/swingset-liveslots/test/liveslots.test.js
index 24eeed6182f..5aed4e398ae 100644
--- a/packages/swingset-liveslots/test/liveslots.test.js
+++ b/packages/swingset-liveslots/test/liveslots.test.js
@@ -1,16 +1,16 @@
// @ts-nocheck
-import test from 'ava';
-
+import { kser, kslot, kunser } from '@agoric/kmarshal';
+import { M } from '@agoric/store';
import { Fail } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
import { makePromiseKit } from '@endo/promise-kit';
-import { kslot, kser, kunser } from '@agoric/kmarshal';
-import { M } from '@agoric/store';
+import test from 'ava';
+
import { makeLiveSlots, makeMarshaller } from '../src/liveslots.js';
import { buildSyscall, makeDispatch } from './liveslots-helpers.js';
-import { makeMessage, makeStartVat, makeResolve, makeReject } from './util.js';
import { makeMockGC } from './mock-gc.js';
+import { makeMessage, makeReject, makeResolve, makeStartVat } from './util.js';
function matchIDCounterSet(t, log) {
t.like(log.shift(), { type: 'vatstoreSet', key: 'idCounters' });
diff --git a/packages/swingset-liveslots/test/mock-gc.js b/packages/swingset-liveslots/test/mock-gc.js
index 09a5171b0d0..34b589ac553 100644
--- a/packages/swingset-liveslots/test/mock-gc.js
+++ b/packages/swingset-liveslots/test/mock-gc.js
@@ -1,6 +1,6 @@
// @ts-nocheck
-import { waitUntilQuiescent } from './waitUntilQuiescent.js';
import { makeDummyMeterControl } from './dummyMeterControl.js';
+import { waitUntilQuiescent } from './waitUntilQuiescent.js';
// Create a WeakRef/FinalizationRegistry pair that can be manipulated for
// tests. Limitations:
diff --git a/packages/swingset-liveslots/test/storeGC/lifecycle.test.js b/packages/swingset-liveslots/test/storeGC/lifecycle.test.js
index 2f998917b04..db87ab60715 100644
--- a/packages/swingset-liveslots/test/storeGC/lifecycle.test.js
+++ b/packages/swingset-liveslots/test/storeGC/lifecycle.test.js
@@ -1,13 +1,13 @@
// @ts-nocheck
+import { kslot, kunser } from '@agoric/kmarshal';
import test from 'ava';
-import { kslot, kunser } from '@agoric/kmarshal';
+import { parseVatSlot } from '../../src/parseVatSlots.js';
+import { buildRootObject, mainHeldIdx, mapRef } from '../gc-helpers.js';
import {
- setupTestLiveslots,
findSyscallsByType,
+ setupTestLiveslots,
} from '../liveslots-helpers.js';
-import { buildRootObject, mainHeldIdx, mapRef } from '../gc-helpers.js';
-import { parseVatSlot } from '../../src/parseVatSlots.js';
// These tests follow the model described in
// ../virtualObjects/test-virtualObjectGC.js
diff --git a/packages/swingset-liveslots/test/storeGC/refcount-management.test.js b/packages/swingset-liveslots/test/storeGC/refcount-management.test.js
index 65fd4aaa426..8237f33f018 100644
--- a/packages/swingset-liveslots/test/storeGC/refcount-management.test.js
+++ b/packages/swingset-liveslots/test/storeGC/refcount-management.test.js
@@ -1,17 +1,17 @@
+import { kslot } from '@agoric/kmarshal';
import test from 'ava';
-import { kslot } from '@agoric/kmarshal';
-import {
- findSyscallsByType,
- setupTestLiveslots,
-} from '../liveslots-helpers.js';
import {
+ assertCollectionDeleted,
buildRootObject,
deduceCollectionID,
recognizersOf,
refValString,
- assertCollectionDeleted,
} from '../gc-helpers.js';
+import {
+ findSyscallsByType,
+ setupTestLiveslots,
+} from '../liveslots-helpers.js';
import { vstr } from '../util.js';
// These tests follow the model described in
diff --git a/packages/swingset-liveslots/test/storeGC/scalar-store-kind.test.js b/packages/swingset-liveslots/test/storeGC/scalar-store-kind.test.js
index 328948103e1..3963c8cc3d1 100644
--- a/packages/swingset-liveslots/test/storeGC/scalar-store-kind.test.js
+++ b/packages/swingset-liveslots/test/storeGC/scalar-store-kind.test.js
@@ -1,7 +1,7 @@
import test from 'ava';
-import { setupTestLiveslots } from '../liveslots-helpers.js';
import { buildRootObject, mapRef } from '../gc-helpers.js';
+import { setupTestLiveslots } from '../liveslots-helpers.js';
// These tests follow the model described in test-virtualObjectGC.js
diff --git a/packages/swingset-liveslots/test/storeGC/weak-key.test.js b/packages/swingset-liveslots/test/storeGC/weak-key.test.js
index a074705240b..aeb54b59c31 100644
--- a/packages/swingset-liveslots/test/storeGC/weak-key.test.js
+++ b/packages/swingset-liveslots/test/storeGC/weak-key.test.js
@@ -1,13 +1,13 @@
+import { kslot } from '@agoric/kmarshal';
import test from 'ava';
-import { kslot } from '@agoric/kmarshal';
-import { setupTestLiveslots } from '../liveslots-helpers.js';
import {
- buildRootObject,
- refValString,
assertCollectionDeleted,
+ buildRootObject,
deduceCollectionID,
+ refValString,
} from '../gc-helpers.js';
+import { setupTestLiveslots } from '../liveslots-helpers.js';
import { vstr } from '../util.js';
// These tests follow the model described in test-virtualObjectGC.js
diff --git a/packages/swingset-liveslots/test/util.js b/packages/swingset-liveslots/test/util.js
index a6f815964cc..63e17af7645 100644
--- a/packages/swingset-liveslots/test/util.js
+++ b/packages/swingset-liveslots/test/util.js
@@ -1,4 +1,5 @@
import { kser } from '@agoric/kmarshal';
+
import { vstr } from './vat-util.js';
export { vstr };
diff --git a/packages/swingset-liveslots/test/vat-environment.test.js b/packages/swingset-liveslots/test/vat-environment.test.js
index 96b7f111089..076b84feef3 100644
--- a/packages/swingset-liveslots/test/vat-environment.test.js
+++ b/packages/swingset-liveslots/test/vat-environment.test.js
@@ -1,14 +1,16 @@
// @ts-nocheck
import '@endo/init/debug.js';
-import test from 'ava';
-import { Far } from '@endo/marshal';
+
import { kser } from '@agoric/kmarshal';
+import { Far } from '@endo/marshal';
import { passStyleOf } from '@endo/pass-style';
import { PassStyleOfEndowmentSymbol } from '@endo/pass-style/endow.js';
+import test from 'ava';
+
import { makeLiveSlots } from '../src/index.js';
-import { makeStartVat } from './util.js';
import { buildSyscall } from './liveslots-helpers.js';
import { makeMockGC } from './mock-gc.js';
+import { makeStartVat } from './util.js';
test('vat globals', async t => {
const { syscall } = buildSyscall();
diff --git a/packages/swingset-liveslots/test/vat-util.js b/packages/swingset-liveslots/test/vat-util.js
index 974addf801c..3360ea9ea3e 100644
--- a/packages/swingset-liveslots/test/vat-util.js
+++ b/packages/swingset-liveslots/test/vat-util.js
@@ -1,8 +1,8 @@
// this file is imported by some test vats, so don't import any non-pure
// modules
-import { Fail } from '@endo/errors';
import { kser, kunser } from '@agoric/kmarshal';
+import { Fail } from '@endo/errors';
export function extractMessage(vatDeliverObject) {
const [type, ...vdoargs] = vatDeliverObject;
diff --git a/packages/swingset-liveslots/test/virtual-objects/cease-recognition.test.js b/packages/swingset-liveslots/test/virtual-objects/cease-recognition.test.js
index 3fcf7adbe1f..8ae9522a688 100644
--- a/packages/swingset-liveslots/test/virtual-objects/cease-recognition.test.js
+++ b/packages/swingset-liveslots/test/virtual-objects/cease-recognition.test.js
@@ -2,8 +2,8 @@
/* global FinalizationRegistry WeakRef */
import test from 'ava';
-import { buildSyscall } from '../liveslots-helpers.js';
import { makeVirtualReferenceManager } from '../../src/virtualReferences.js';
+import { buildSyscall } from '../liveslots-helpers.js';
function makeVRM() {
const { log, syscall } = buildSyscall();
diff --git a/packages/swingset-liveslots/test/virtual-objects/kind-changes.test.js b/packages/swingset-liveslots/test/virtual-objects/kind-changes.test.js
index 7642eb3a43b..d284d3632f9 100644
--- a/packages/swingset-liveslots/test/virtual-objects/kind-changes.test.js
+++ b/packages/swingset-liveslots/test/virtual-objects/kind-changes.test.js
@@ -1,13 +1,14 @@
// @ts-nocheck
-import test from 'ava';
-import { Far } from '@endo/marshal';
import { kser } from '@agoric/kmarshal';
-import { makeFakeVirtualStuff } from '../../tools/fakeVirtualSupport.js';
+import { Far } from '@endo/marshal';
+import test from 'ava';
+
import { makeLiveSlots } from '../../src/liveslots.js';
import { parseVatSlot } from '../../src/parseVatSlots.js';
+import { makeFakeVirtualStuff } from '../../tools/fakeVirtualSupport.js';
import { buildSyscall } from '../liveslots-helpers.js';
-import { makeStartVat, makeMessage } from '../util.js';
import { makeMockGC } from '../mock-gc.js';
+import { makeMessage, makeStartVat } from '../util.js';
const init = () => ({});
const behavior = {};
diff --git a/packages/swingset-liveslots/test/virtual-objects/reachable-vrefs.test.js b/packages/swingset-liveslots/test/virtual-objects/reachable-vrefs.test.js
index 5a1a00caa68..ae13cbda806 100644
--- a/packages/swingset-liveslots/test/virtual-objects/reachable-vrefs.test.js
+++ b/packages/swingset-liveslots/test/virtual-objects/reachable-vrefs.test.js
@@ -1,8 +1,7 @@
// @ts-nocheck
-import test from 'ava';
-
-import { Remotable } from '@endo/marshal';
import { initEmpty } from '@agoric/store';
+import { Remotable } from '@endo/marshal';
+import test from 'ava';
import { makeVatSlot } from '../../src/parseVatSlots.js';
import { makeFakeVirtualStuff } from '../../tools/fakeVirtualSupport.js';
diff --git a/packages/swingset-liveslots/test/virtual-objects/rep-tostring.test.js b/packages/swingset-liveslots/test/virtual-objects/rep-tostring.test.js
index ebf6079f9f6..b1a916cacea 100644
--- a/packages/swingset-liveslots/test/virtual-objects/rep-tostring.test.js
+++ b/packages/swingset-liveslots/test/virtual-objects/rep-tostring.test.js
@@ -1,14 +1,14 @@
-import test from 'ava';
// this sets process.env.DEBUG = 'label-instances'
import './set-debug-label-instances.js';
-import { passStyleOf } from '@endo/far';
-
// this samples it
import { q } from '@endo/errors';
-import { makeFakeVirtualStuff } from '../../tools/fakeVirtualSupport.js';
+import { passStyleOf } from '@endo/far';
+import test from 'ava';
+
// all tests in this file will be run with DEBUG='label-instances'
import { parseVatSlot } from '../../src/parseVatSlots.js';
+import { makeFakeVirtualStuff } from '../../tools/fakeVirtualSupport.js';
const init = () => ({});
const behavior = {};
diff --git a/packages/swingset-liveslots/test/virtual-objects/retain-remotable.test.js b/packages/swingset-liveslots/test/virtual-objects/retain-remotable.test.js
index 67ba267dcb4..462faec7625 100644
--- a/packages/swingset-liveslots/test/virtual-objects/retain-remotable.test.js
+++ b/packages/swingset-liveslots/test/virtual-objects/retain-remotable.test.js
@@ -1,12 +1,11 @@
// @ts-nocheck
-import test from 'ava';
-
-import { Far } from '@endo/marshal';
import { initEmpty } from '@agoric/store';
+import { Far } from '@endo/marshal';
+import test from 'ava';
+import { makeFakeVirtualStuff } from '../../tools/fakeVirtualSupport.js';
import engineGC from '../engine-gc.js';
import { makeGcAndFinalize, watchCollected } from '../gc-and-finalize.js';
-import { makeFakeVirtualStuff } from '../../tools/fakeVirtualSupport.js';
function makeStashKit(name = 'held') {
const held = Far(name);
diff --git a/packages/swingset-liveslots/test/virtual-objects/state-shape.test.js b/packages/swingset-liveslots/test/virtual-objects/state-shape.test.js
index 7c9257ba1f6..699f9166124 100644
--- a/packages/swingset-liveslots/test/virtual-objects/state-shape.test.js
+++ b/packages/swingset-liveslots/test/virtual-objects/state-shape.test.js
@@ -1,14 +1,14 @@
// @ts-nocheck
-import test from 'ava';
-
-import { Far } from '@endo/marshal';
import { kser, kslot } from '@agoric/kmarshal';
import { M } from '@agoric/store';
+import { Far } from '@endo/marshal';
+import test from 'ava';
+
import { makeLiveSlots } from '../../src/liveslots.js';
+import { makeFakeVirtualStuff } from '../../tools/fakeVirtualSupport.js';
import { buildSyscall } from '../liveslots-helpers.js';
-import { makeStartVat, makeMessage } from '../util.js';
import { makeMockGC } from '../mock-gc.js';
-import { makeFakeVirtualStuff } from '../../tools/fakeVirtualSupport.js';
+import { makeMessage, makeStartVat } from '../util.js';
function makeGenericRemotable(typeName) {
return Far(typeName, {
diff --git a/packages/swingset-liveslots/test/virtual-objects/virtualObjectGC.test.js b/packages/swingset-liveslots/test/virtual-objects/virtualObjectGC.test.js
index 2adf582af06..b3a4d72ab9a 100644
--- a/packages/swingset-liveslots/test/virtual-objects/virtualObjectGC.test.js
+++ b/packages/swingset-liveslots/test/virtual-objects/virtualObjectGC.test.js
@@ -1,13 +1,13 @@
// @ts-nocheck
+import { krefOf, kser, kslot } from '@agoric/kmarshal';
+import { Far } from '@endo/marshal';
import test from 'ava';
-import { Far } from '@endo/marshal';
-import { krefOf, kser, kslot } from '@agoric/kmarshal';
+import { parseVatSlot } from '../../src/parseVatSlots.js';
import {
- setupTestLiveslots,
findSyscallsByType,
+ setupTestLiveslots,
} from '../liveslots-helpers.js';
-import { parseVatSlot } from '../../src/parseVatSlots.js';
// Legs:
//
diff --git a/packages/swingset-liveslots/test/virtual-objects/virtualObjectManager.test.js b/packages/swingset-liveslots/test/virtual-objects/virtualObjectManager.test.js
index 6730608f62b..60f3cf028d2 100644
--- a/packages/swingset-liveslots/test/virtual-objects/virtualObjectManager.test.js
+++ b/packages/swingset-liveslots/test/virtual-objects/virtualObjectManager.test.js
@@ -1,12 +1,11 @@
// @ts-nocheck
+import { kser, kslot } from '@agoric/kmarshal';
import test from 'ava';
-import { kser, kslot } from '@agoric/kmarshal';
import {
makeFakeVirtualObjectManager,
makeFakeVirtualStuff,
} from '../../tools/fakeVirtualSupport.js';
-
import { vstr } from '../util.js';
function initThing(label = 'thing', counter = 0) {
diff --git a/packages/swingset-liveslots/test/virtual-objects/vo-real-gc.test.js b/packages/swingset-liveslots/test/virtual-objects/vo-real-gc.test.js
index d2108e7bf9c..cdf145bdcdc 100644
--- a/packages/swingset-liveslots/test/virtual-objects/vo-real-gc.test.js
+++ b/packages/swingset-liveslots/test/virtual-objects/vo-real-gc.test.js
@@ -1,10 +1,10 @@
// @ts-nocheck
+import { kser, kunser } from '@agoric/kmarshal';
+import { Far } from '@endo/marshal';
import test from 'ava';
-import { Far } from '@endo/marshal';
-import { kser, kunser } from '@agoric/kmarshal';
-import { setupTestLiveslots } from '../liveslots-helpers.js';
import { watchCollected } from '../gc-and-finalize.js';
+import { setupTestLiveslots } from '../liveslots-helpers.js';
test('virtual object state writes', async t => {
let collected;
diff --git a/packages/swingset-liveslots/test/vo-test-harness.test.js b/packages/swingset-liveslots/test/vo-test-harness.test.js
index d8341c7405c..c2e24bb1045 100644
--- a/packages/swingset-liveslots/test/vo-test-harness.test.js
+++ b/packages/swingset-liveslots/test/vo-test-harness.test.js
@@ -1,4 +1,5 @@
import test from 'ava';
+
import { runVOTest } from '../tools/vo-test-harness.js';
async function voTestTest(t, mode) {
diff --git a/packages/swingset-liveslots/test/vpid-liveslots.test.js b/packages/swingset-liveslots/test/vpid-liveslots.test.js
index 9257a15cdbc..87c35937050 100644
--- a/packages/swingset-liveslots/test/vpid-liveslots.test.js
+++ b/packages/swingset-liveslots/test/vpid-liveslots.test.js
@@ -1,13 +1,13 @@
// @ts-nocheck
-import test from 'ava';
-
+import { kser, kslot } from '@agoric/kmarshal';
import { Fail } from '@endo/errors';
import { E } from '@endo/eventual-send';
-import { makePromiseKit } from '@endo/promise-kit';
import { Far } from '@endo/marshal';
-import { kser, kslot } from '@agoric/kmarshal';
+import { makePromiseKit } from '@endo/promise-kit';
+import test from 'ava';
+
import { buildSyscall, makeDispatch } from './liveslots-helpers.js';
-import { makeMessage, makeResolve, makeReject } from './util.js';
+import { makeMessage, makeReject, makeResolve } from './util.js';
function hush(p) {
p.then(
diff --git a/packages/swingset-liveslots/test/weakset-dropped-remotable.test.js b/packages/swingset-liveslots/test/weakset-dropped-remotable.test.js
index 76618297370..bc093aceed4 100644
--- a/packages/swingset-liveslots/test/weakset-dropped-remotable.test.js
+++ b/packages/swingset-liveslots/test/weakset-dropped-remotable.test.js
@@ -1,10 +1,11 @@
-import test from 'ava';
-import { Far } from '@endo/marshal';
import { kser, kslot } from '@agoric/kmarshal';
+import { Far } from '@endo/marshal';
+import test from 'ava';
+
import { makeLiveSlots } from '../src/liveslots.js';
import { buildSyscall } from './liveslots-helpers.js';
-import { makeStartVat, makeMessage, makeBringOutYourDead } from './util.js';
import { makeMockGC } from './mock-gc.js';
+import { makeBringOutYourDead, makeMessage, makeStartVat } from './util.js';
// Test for https://github.com/Agoric/agoric-sdk/issues/9956
diff --git a/packages/swingset-liveslots/tools/fakeVirtualSupport.js b/packages/swingset-liveslots/tools/fakeVirtualSupport.js
index 9a4658c0163..7e6a2ab3007 100644
--- a/packages/swingset-liveslots/tools/fakeVirtualSupport.js
+++ b/packages/swingset-liveslots/tools/fakeVirtualSupport.js
@@ -7,8 +7,8 @@ import { isPromise } from '@endo/promise-kit';
import { parseVatSlot } from '../src/parseVatSlots.js';
import { makeVirtualReferenceManager } from '../src/virtualReferences.js';
import { makeWatchedPromiseManager } from '../src/watchedPromises.js';
-import { makeFakeVirtualObjectManager } from './fakeVirtualObjectManager.js';
import { makeFakeCollectionManager } from './fakeCollectionManager.js';
+import { makeFakeVirtualObjectManager } from './fakeVirtualObjectManager.js';
const {
WeakRef: RealWeakRef,
diff --git a/packages/swingset-liveslots/tools/setup-vat-data.js b/packages/swingset-liveslots/tools/setup-vat-data.js
index c3781d904ce..8981ed5587f 100644
--- a/packages/swingset-liveslots/tools/setup-vat-data.js
+++ b/packages/swingset-liveslots/tools/setup-vat-data.js
@@ -8,6 +8,7 @@
import { passStyleOf } from '@endo/pass-style';
import { PassStyleOfEndowmentSymbol } from '@endo/pass-style/endow.js';
+
import { makeFakeVirtualStuff } from './fakeVirtualSupport.js';
const { WeakMap, WeakSet } = globalThis;
diff --git a/packages/swingset-liveslots/tools/vo-test-harness.js b/packages/swingset-liveslots/tools/vo-test-harness.js
index 4885246d7d9..bdc0ae2ac74 100644
--- a/packages/swingset-liveslots/tools/vo-test-harness.js
+++ b/packages/swingset-liveslots/tools/vo-test-harness.js
@@ -1,4 +1,5 @@
import { Far } from '@endo/marshal';
+
import { setupTestLiveslots } from '../test/liveslots-helpers.js';
// This file contains a test harness for virtual objects. runVOTest()
diff --git a/packages/swingset-runner/demo/exchangeBenchmark/bootstrap.js b/packages/swingset-runner/demo/exchangeBenchmark/bootstrap.js
index fe1ea9cc611..461b970b0a9 100644
--- a/packages/swingset-runner/demo/exchangeBenchmark/bootstrap.js
+++ b/packages/swingset-runner/demo/exchangeBenchmark/bootstrap.js
@@ -1,4 +1,4 @@
-import { makeIssuerKit, AmountMath } from '@agoric/ertp';
+import { AmountMath, makeIssuerKit } from '@agoric/ertp';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
diff --git a/packages/swingset-runner/demo/exchangeBenchmark/exchanger.js b/packages/swingset-runner/demo/exchangeBenchmark/exchanger.js
index 6343e247eae..52a7a22fec7 100755
--- a/packages/swingset-runner/demo/exchangeBenchmark/exchanger.js
+++ b/packages/swingset-runner/demo/exchangeBenchmark/exchanger.js
@@ -1,10 +1,10 @@
// @ts-check
+import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
-import { showPurseBalance, setupPurses } from './helpers.js';
+import { setupPurses, showPurseBalance } from './helpers.js';
import { makePrintLog } from './printLog.js';
const log = makePrintLog();
diff --git a/packages/swingset-runner/demo/exchangeBenchmark/helpers.js b/packages/swingset-runner/demo/exchangeBenchmark/helpers.js
index f17ad876042..6d59ae87a1c 100644
--- a/packages/swingset-runner/demo/exchangeBenchmark/helpers.js
+++ b/packages/swingset-runner/demo/exchangeBenchmark/helpers.js
@@ -1,5 +1,5 @@
-import { E } from '@endo/eventual-send';
import { AmountMath } from '@agoric/ertp';
+import { E } from '@endo/eventual-send';
export async function showPurseBalance(purseP, name, log) {
try {
diff --git a/packages/swingset-runner/demo/exchangeBenchmark/prepareContracts.js b/packages/swingset-runner/demo/exchangeBenchmark/prepareContracts.js
index 66f9832289b..7725a53defd 100644
--- a/packages/swingset-runner/demo/exchangeBenchmark/prepareContracts.js
+++ b/packages/swingset-runner/demo/exchangeBenchmark/prepareContracts.js
@@ -1,9 +1,9 @@
import '@endo/init/pre-bundle-source.js';
import '@endo/init';
-import bundleSource from '@endo/bundle-source';
-import { resolve as importMetaResolve } from 'import-meta-resolve';
+import bundleSource from '@endo/bundle-source';
import fs from 'fs';
+import { resolve as importMetaResolve } from 'import-meta-resolve';
const CONTRACT_FILES = ['simpleExchange.js'];
diff --git a/packages/swingset-runner/demo/swapBenchmark/bootstrap.js b/packages/swingset-runner/demo/swapBenchmark/bootstrap.js
index c65ae41639d..b2241d3db8c 100644
--- a/packages/swingset-runner/demo/swapBenchmark/bootstrap.js
+++ b/packages/swingset-runner/demo/swapBenchmark/bootstrap.js
@@ -1,9 +1,9 @@
-import { makeIssuerKit, AmountMath } from '@agoric/ertp';
+import { AmountMath, makeIssuerKit } from '@agoric/ertp';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { makePrintLog } from './printLog.js';
import atomicSwapBundle from './bundle-atomicSwap.js';
+import { makePrintLog } from './printLog.js';
const log = makePrintLog();
diff --git a/packages/swingset-runner/demo/swapBenchmark/exchanger.js b/packages/swingset-runner/demo/swapBenchmark/exchanger.js
index 422dc108bce..4836ad7ac32 100755
--- a/packages/swingset-runner/demo/swapBenchmark/exchanger.js
+++ b/packages/swingset-runner/demo/swapBenchmark/exchanger.js
@@ -1,10 +1,10 @@
// @ts-check
+import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
-import { showPurseBalance, setupPurses } from './helpers.js';
+import { setupPurses, showPurseBalance } from './helpers.js';
import { makePrintLog } from './printLog.js';
const log = makePrintLog();
diff --git a/packages/swingset-runner/demo/swapBenchmark/helpers.js b/packages/swingset-runner/demo/swapBenchmark/helpers.js
index 9883cb1557e..75700a6233e 100644
--- a/packages/swingset-runner/demo/swapBenchmark/helpers.js
+++ b/packages/swingset-runner/demo/swapBenchmark/helpers.js
@@ -1,5 +1,5 @@
-import { E } from '@endo/eventual-send';
import { AmountMath } from '@agoric/ertp';
+import { E } from '@endo/eventual-send';
export async function showPurseBalance(purseP, name, log) {
try {
diff --git a/packages/swingset-runner/demo/swapBenchmark/prepareContracts.js b/packages/swingset-runner/demo/swapBenchmark/prepareContracts.js
index b617741e982..dad129e33cc 100644
--- a/packages/swingset-runner/demo/swapBenchmark/prepareContracts.js
+++ b/packages/swingset-runner/demo/swapBenchmark/prepareContracts.js
@@ -1,9 +1,9 @@
import '@endo/init/pre-bundle-source.js';
import '@endo/init';
-import bundleSource from '@endo/bundle-source';
-import { resolve as importMetaResolve } from 'import-meta-resolve';
+import bundleSource from '@endo/bundle-source';
import fs from 'fs';
+import { resolve as importMetaResolve } from 'import-meta-resolve';
const CONTRACT_FILES = ['atomicSwap.js'];
diff --git a/packages/swingset-runner/demo/vatFailure/vat-bad.js b/packages/swingset-runner/demo/vatFailure/vat-bad.js
index c4343ce5f9c..da2fcd72a2a 100644
--- a/packages/swingset-runner/demo/vatFailure/vat-bad.js
+++ b/packages/swingset-runner/demo/vatFailure/vat-bad.js
@@ -1,5 +1,5 @@
-import { assert } from '@endo/errors';
import { kser } from '@agoric/kmarshal';
+import { assert } from '@endo/errors';
export default function setup(syscall, _state, _helpers, _vatPowers) {
function deliver(target, method, args) {
diff --git a/packages/swingset-runner/demo/vatStore1/vat-bob.js b/packages/swingset-runner/demo/vatStore1/vat-bob.js
index dc186eab68a..4e9e2c20cf2 100644
--- a/packages/swingset-runner/demo/vatStore1/vat-bob.js
+++ b/packages/swingset-runner/demo/vatStore1/vat-bob.js
@@ -1,5 +1,5 @@
-import { Far } from '@endo/marshal';
import { defineKind } from '@agoric/vat-data';
+import { Far } from '@endo/marshal';
const p = console.log;
diff --git a/packages/swingset-runner/demo/vatStore2/bootstrap.js b/packages/swingset-runner/demo/vatStore2/bootstrap.js
index 8c86e3e2459..ce585ed6e22 100644
--- a/packages/swingset-runner/demo/vatStore2/bootstrap.js
+++ b/packages/swingset-runner/demo/vatStore2/bootstrap.js
@@ -1,6 +1,7 @@
import { Fail } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
+
import { makeXorShift128 } from './xorshift128.js';
const p = console.log;
diff --git a/packages/swingset-runner/demo/vatStore2/thingHolder.js b/packages/swingset-runner/demo/vatStore2/thingHolder.js
index b926c0da65b..b85bcedf648 100644
--- a/packages/swingset-runner/demo/vatStore2/thingHolder.js
+++ b/packages/swingset-runner/demo/vatStore2/thingHolder.js
@@ -1,6 +1,6 @@
+import { defineKind, makeScalarBigWeakMapStore } from '@agoric/vat-data';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { defineKind, makeScalarBigWeakMapStore } from '@agoric/vat-data';
const p = console.log;
diff --git a/packages/swingset-runner/demo/vatStore3/vat-bob.js b/packages/swingset-runner/demo/vatStore3/vat-bob.js
index 01a16911ab8..c4b5a7dce85 100644
--- a/packages/swingset-runner/demo/vatStore3/vat-bob.js
+++ b/packages/swingset-runner/demo/vatStore3/vat-bob.js
@@ -1,6 +1,6 @@
+import { defineKind } from '@agoric/vat-data';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { defineKind } from '@agoric/vat-data';
const things = [];
diff --git a/packages/swingset-runner/demo/vaultPerfTest/vat-benchmark.js b/packages/swingset-runner/demo/vaultPerfTest/vat-benchmark.js
index 8a211a30f05..dd59cd77a41 100644
--- a/packages/swingset-runner/demo/vaultPerfTest/vat-benchmark.js
+++ b/packages/swingset-runner/demo/vaultPerfTest/vat-benchmark.js
@@ -10,12 +10,11 @@
// vat-benchmark.js driver and the JSON config file (and possibly the runner
// itself, if it's not on your $PATH) accordingly.
+import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
import { assert } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
-
const log = console.log;
const collateralBrandKey = 'ATOM';
diff --git a/packages/swingset-runner/demo/virtualObjectGC/vat-bob.js b/packages/swingset-runner/demo/virtualObjectGC/vat-bob.js
index 96973b34a46..ab6372fca8f 100644
--- a/packages/swingset-runner/demo/virtualObjectGC/vat-bob.js
+++ b/packages/swingset-runner/demo/virtualObjectGC/vat-bob.js
@@ -1,6 +1,6 @@
+import { defineKind } from '@agoric/vat-data';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { defineKind } from '@agoric/vat-data';
export function buildRootObject() {
const makeThing = defineKind('thing', label => ({ label }), {
diff --git a/packages/swingset-runner/demo/zoeTests/bootstrap.js b/packages/swingset-runner/demo/zoeTests/bootstrap.js
index e3e91c2637a..a38045cd535 100644
--- a/packages/swingset-runner/demo/zoeTests/bootstrap.js
+++ b/packages/swingset-runner/demo/zoeTests/bootstrap.js
@@ -1,19 +1,18 @@
+import { AmountMath, makeIssuerKit } from '@agoric/ertp';
+import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { makeIssuerKit, AmountMath } from '@agoric/ertp';
-import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
-
-import { makePrintLog } from './printLog.js';
-import automaticRefundBundle from './bundle-automaticRefund.js';
-import coveredCallBundle from './bundle-coveredCall.js';
-import secondPriceAuctionBundle from './bundle-secondPriceAuction.js';
import atomicSwapBundle from './bundle-atomicSwap.js';
-import simpleExchangeBundle from './bundle-simpleExchange.js';
+import automaticRefundBundle from './bundle-automaticRefund.js';
import autoswapBundle from './bundle-autoswap.js';
-import sellItemsBundle from './bundle-sellItems.js';
+import coveredCallBundle from './bundle-coveredCall.js';
import mintAndSellNFTBundle from './bundle-mintAndSellNFT.js';
import otcDeskBundle from './bundle-otcDesk.js';
+import secondPriceAuctionBundle from './bundle-secondPriceAuction.js';
+import sellItemsBundle from './bundle-sellItems.js';
+import simpleExchangeBundle from './bundle-simpleExchange.js';
+import { makePrintLog } from './printLog.js';
const setupBasicMints = () => {
const all = [
diff --git a/packages/swingset-runner/demo/zoeTests/helpers.js b/packages/swingset-runner/demo/zoeTests/helpers.js
index 5763ff4159f..f4e2caf9591 100644
--- a/packages/swingset-runner/demo/zoeTests/helpers.js
+++ b/packages/swingset-runner/demo/zoeTests/helpers.js
@@ -1,5 +1,5 @@
-import { E } from '@endo/eventual-send';
import { AmountMath } from '@agoric/ertp';
+import { E } from '@endo/eventual-send';
export const showPurseBalance = async (purseP, name, log) => {
try {
diff --git a/packages/swingset-runner/demo/zoeTests/prepareContracts.js b/packages/swingset-runner/demo/zoeTests/prepareContracts.js
index 57854710ee0..037a8a5f138 100644
--- a/packages/swingset-runner/demo/zoeTests/prepareContracts.js
+++ b/packages/swingset-runner/demo/zoeTests/prepareContracts.js
@@ -1,9 +1,9 @@
import '@endo/init/pre-bundle-source.js';
import '@endo/init';
-import bundleSource from '@endo/bundle-source';
-import { resolve as importMetaResolve } from 'import-meta-resolve';
+import bundleSource from '@endo/bundle-source';
import fs from 'fs';
+import { resolve as importMetaResolve } from 'import-meta-resolve';
const CONTRACT_FILES = [
'automaticRefund',
diff --git a/packages/swingset-runner/demo/zoeTests/vat-alice.js b/packages/swingset-runner/demo/zoeTests/vat-alice.js
index 5b8fdb4cdf7..0aa815274ac 100644
--- a/packages/swingset-runner/demo/zoeTests/vat-alice.js
+++ b/packages/swingset-runner/demo/zoeTests/vat-alice.js
@@ -1,11 +1,10 @@
-import { E } from '@endo/eventual-send';
-import { Far } from '@endo/marshal';
-import { Fail } from '@endo/errors';
import { AmountMath } from '@agoric/ertp';
import { SECOND_PRICE } from '@agoric/zoe/src/contracts/auction/index.js';
+import { Fail } from '@endo/errors';
+import { E } from '@endo/eventual-send';
+import { Far } from '@endo/marshal';
-import { showPurseBalance, setupIssuers } from './helpers.js';
-
+import { setupIssuers, showPurseBalance } from './helpers.js';
import { makePrintLog } from './printLog.js';
const build = async (log, zoe, issuers, payments, installations, timer) => {
diff --git a/packages/swingset-runner/demo/zoeTests/vat-bob.js b/packages/swingset-runner/demo/zoeTests/vat-bob.js
index 2291af8de87..c47280ad21e 100644
--- a/packages/swingset-runner/demo/zoeTests/vat-bob.js
+++ b/packages/swingset-runner/demo/zoeTests/vat-bob.js
@@ -1,12 +1,11 @@
-import { assert, X, Fail } from '@endo/errors';
-import { E } from '@endo/eventual-send';
-import { Far } from '@endo/marshal';
-import { keyEQ } from '@agoric/store';
import { AmountMath, isSetValue } from '@agoric/ertp';
import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
+import { keyEQ } from '@agoric/store';
+import { assert, Fail, X } from '@endo/errors';
+import { E } from '@endo/eventual-send';
+import { Far } from '@endo/marshal';
-import { showPurseBalance, setupIssuers } from './helpers.js';
-
+import { setupIssuers, showPurseBalance } from './helpers.js';
import { makePrintLog } from './printLog.js';
const build = async (log, zoe, issuers, payments, installations, timer) => {
diff --git a/packages/swingset-runner/demo/zoeTests/vat-carol.js b/packages/swingset-runner/demo/zoeTests/vat-carol.js
index bf4e22f5430..55a85e8a789 100644
--- a/packages/swingset-runner/demo/zoeTests/vat-carol.js
+++ b/packages/swingset-runner/demo/zoeTests/vat-carol.js
@@ -1,10 +1,10 @@
+import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
+import { keyEQ } from '@agoric/store';
import { assert, Fail } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { keyEQ } from '@agoric/store';
-import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
-import { showPurseBalance, setupIssuers } from './helpers.js';
+import { setupIssuers, showPurseBalance } from './helpers.js';
import { makePrintLog } from './printLog.js';
const build = async (log, zoe, issuers, payments, installations) => {
diff --git a/packages/swingset-runner/demo/zoeTests/vat-dave.js b/packages/swingset-runner/demo/zoeTests/vat-dave.js
index 28a80c0a9e8..75dd03ae4c9 100644
--- a/packages/swingset-runner/demo/zoeTests/vat-dave.js
+++ b/packages/swingset-runner/demo/zoeTests/vat-dave.js
@@ -1,11 +1,11 @@
-import { assert, X, Fail } from '@endo/errors';
-import { E } from '@endo/eventual-send';
-import { Far } from '@endo/marshal';
-import { keyEQ } from '@agoric/store';
import { AmountMath } from '@agoric/ertp';
import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
-import { showPurseBalance, setupIssuers } from './helpers.js';
+import { keyEQ } from '@agoric/store';
+import { assert, Fail, X } from '@endo/errors';
+import { E } from '@endo/eventual-send';
+import { Far } from '@endo/marshal';
+import { setupIssuers, showPurseBalance } from './helpers.js';
import { makePrintLog } from './printLog.js';
const build = async (log, zoe, issuers, payments, installations, timer) => {
diff --git a/packages/swingset-runner/src/auditstore.js b/packages/swingset-runner/src/auditstore.js
index 568196df3a1..cccd6ee90f7 100644
--- a/packages/swingset-runner/src/auditstore.js
+++ b/packages/swingset-runner/src/auditstore.js
@@ -1,6 +1,6 @@
-import { Fail } from '@endo/errors';
import { parseReachableAndVatSlot } from '@agoric/swingset-vat/src/kernel/state/reachable.js';
import { parseVatSlot } from '@agoric/swingset-vat/src/lib/parseVatSlots.js';
+import { Fail } from '@endo/errors';
/* eslint-disable no-use-before-define */
export function auditRefCounts(store, doDump, printPrefix) {
diff --git a/packages/swingset-runner/src/chain.js b/packages/swingset-runner/src/chain.js
index 888dba5a84a..dfcf2e4b612 100644
--- a/packages/swingset-runner/src/chain.js
+++ b/packages/swingset-runner/src/chain.js
@@ -1,9 +1,9 @@
-import { Fail, q } from '@endo/errors';
-import { buildBridge } from '@agoric/swingset-vat';
+import { extractCoreProposalBundles } from '@agoric/deploy-script-support/src/extract-proposal.js';
import { BridgeId, VBankAccount } from '@agoric/internal';
-import { makeFakeStorageKit } from '@agoric/internal/src/storage-test-utils.js';
import * as STORAGE_PATH from '@agoric/internal/src/chain-storage-paths.js';
-import { extractCoreProposalBundles } from '@agoric/deploy-script-support/src/extract-proposal.js';
+import { makeFakeStorageKit } from '@agoric/internal/src/storage-test-utils.js';
+import { buildBridge } from '@agoric/swingset-vat';
+import { Fail, q } from '@endo/errors';
/**
* Export any specified storage subtrees, then delete the ones marked to clear.
diff --git a/packages/swingset-runner/src/dataGraphApp.js b/packages/swingset-runner/src/dataGraphApp.js
index ae069f5d425..28d324bcbf3 100644
--- a/packages/swingset-runner/src/dataGraphApp.js
+++ b/packages/swingset-runner/src/dataGraphApp.js
@@ -1,12 +1,11 @@
-import path from 'path';
-import process from 'process';
-
import {
- initGraphSpec,
addDataToGraphSpec,
addGraphToGraphSpec,
+ initGraphSpec,
renderGraph,
} from '@agoric/stat-logger';
+import path from 'path';
+import process from 'process';
// prettier-ignore
const colors = [
diff --git a/packages/swingset-runner/src/kerneldump-entrypoint.js b/packages/swingset-runner/src/kerneldump-entrypoint.js
index b1a347ebc75..7c326f03a80 100755
--- a/packages/swingset-runner/src/kerneldump-entrypoint.js
+++ b/packages/swingset-runner/src/kerneldump-entrypoint.js
@@ -9,6 +9,7 @@
// Now do lockdown.
import '@endo/init';
+
import { main } from './kerneldump.js';
process.exitCode = 1;
diff --git a/packages/swingset-runner/src/kerneldump.js b/packages/swingset-runner/src/kerneldump.js
index 0b088ca4992..e4236537601 100644
--- a/packages/swingset-runner/src/kerneldump.js
+++ b/packages/swingset-runner/src/kerneldump.js
@@ -1,11 +1,10 @@
+import { openSwingStore } from '@agoric/swing-store';
import fs from 'fs';
import path from 'path';
import process from 'process';
-import { openSwingStore } from '@agoric/swing-store';
-
-import { dumpStore } from './dumpstore.js';
import { auditRefCounts } from './auditstore.js';
+import { dumpStore } from './dumpstore.js';
import { organizeMainStats, printMainStats } from './printStats.js';
function usage() {
diff --git a/packages/swingset-runner/src/main.js b/packages/swingset-runner/src/main.js
index 6003a30227d..41b55969bc1 100644
--- a/packages/swingset-runner/src/main.js
+++ b/packages/swingset-runner/src/main.js
@@ -1,32 +1,30 @@
-import path from 'path';
-import fs from 'fs';
-import process from 'process';
-import repl from 'repl';
-import util from 'util';
-
+import engineGC from '@agoric/internal/src/lib-nodejs/engine-gc.js';
import { makeStatLogger } from '@agoric/stat-logger';
+import { initSwingStore, openSwingStore } from '@agoric/swing-store';
import {
buildTimer,
- loadSwingsetConfigFile,
- loadBasedir,
initializeSwingset,
+ loadBasedir,
+ loadSwingsetConfigFile,
makeSwingsetController,
} from '@agoric/swingset-vat';
import { buildLoopbox } from '@agoric/swingset-vat/src/devices/loopbox/loopbox.js';
-import engineGC from '@agoric/internal/src/lib-nodejs/engine-gc.js';
-
-import { initSwingStore, openSwingStore } from '@agoric/swing-store';
import { makeSlogSender } from '@agoric/telemetry';
+import fs from 'fs';
+import path from 'path';
+import process from 'process';
+import repl from 'repl';
+import util from 'util';
-import { dumpStore } from './dumpstore.js';
import { auditRefCounts } from './auditstore.js';
import { initEmulatedChain } from './chain.js';
+import { dumpStore } from './dumpstore.js';
import {
organizeBenchmarkStats,
- printBenchmarkStats,
organizeMainStats,
- printMainStats,
outputStats,
+ printBenchmarkStats,
+ printMainStats,
} from './printStats.js';
const log = console.log;
diff --git a/packages/swingset-runner/src/runner-debug-entrypoint.js b/packages/swingset-runner/src/runner-debug-entrypoint.js
index a458a410599..4a71ea7cb64 100755
--- a/packages/swingset-runner/src/runner-debug-entrypoint.js
+++ b/packages/swingset-runner/src/runner-debug-entrypoint.js
@@ -7,9 +7,9 @@
*/
import '@endo/init/pre.js';
-
// Now do lockdown.
import '@endo/init';
+
import { main } from './main.js';
process.exitCode = 1;
diff --git a/packages/swingset-runner/src/runner-entrypoint.js b/packages/swingset-runner/src/runner-entrypoint.js
index 9a5b2a45dca..04f27473b3a 100755
--- a/packages/swingset-runner/src/runner-entrypoint.js
+++ b/packages/swingset-runner/src/runner-entrypoint.js
@@ -9,9 +9,9 @@
*/
import '@endo/init/pre-bundle-source.js';
-
// Now do lockdown.
import '@endo/init';
+
import { main } from './main.js';
process.exitCode = 1;
diff --git a/packages/swingset-runner/src/slogulator-debug-entrypoint.js b/packages/swingset-runner/src/slogulator-debug-entrypoint.js
index 370303d0148..cd802bcd369 100755
--- a/packages/swingset-runner/src/slogulator-debug-entrypoint.js
+++ b/packages/swingset-runner/src/slogulator-debug-entrypoint.js
@@ -6,6 +6,7 @@
* as yet not-entirely-ESM-supporting version of NodeJS.
*/
import '@endo/init';
+
import { main } from './slogulator.js';
process.exitCode = 1;
diff --git a/packages/swingset-runner/src/slogulator-entrypoint.js b/packages/swingset-runner/src/slogulator-entrypoint.js
index 294b9e61440..4dc9e050c5b 100755
--- a/packages/swingset-runner/src/slogulator-entrypoint.js
+++ b/packages/swingset-runner/src/slogulator-entrypoint.js
@@ -6,6 +6,7 @@
* as yet not-entirely-ESM-supporting version of NodeJS.
*/
import '@endo/init';
+
import { main } from './slogulator.js';
process.exitCode = 1;
diff --git a/packages/swingset-runner/src/slogulator.js b/packages/swingset-runner/src/slogulator.js
index 9d8bb9c504a..e2a43b8cf89 100644
--- a/packages/swingset-runner/src/slogulator.js
+++ b/packages/swingset-runner/src/slogulator.js
@@ -1,10 +1,9 @@
+import { Fail } from '@endo/errors';
import fs from 'fs';
-import process from 'process';
import Readlines from 'n-readlines';
+import process from 'process';
import yargs from 'yargs';
-import { Fail } from '@endo/errors';
-
/* eslint-disable no-use-before-define */
function usage() {
diff --git a/packages/swingset-xsnap-supervisor/lib/supervisor-subprocess-xsnap.js b/packages/swingset-xsnap-supervisor/lib/supervisor-subprocess-xsnap.js
index d7eb1325744..8962a2d130c 100644
--- a/packages/swingset-xsnap-supervisor/lib/supervisor-subprocess-xsnap.js
+++ b/packages/swingset-xsnap-supervisor/lib/supervisor-subprocess-xsnap.js
@@ -1,21 +1,21 @@
/* global globalThis WeakRef FinalizationRegistry */
-import { assert, Fail } from '@endo/errors';
-import { importBundle } from '@endo/import-bundle';
import {
- makeLiveSlots,
insistVatDeliveryObject,
insistVatSyscallResult,
+ makeLiveSlots,
} from '@agoric/swingset-liveslots';
-// import '../../types-ambient.js';
-// grumble... waitUntilQuiescent is exported and closes over ambient authority
-import { waitUntilQuiescent } from './waitUntilQuiescent.js';
-import { makeGcAndFinalize } from './gc-and-finalize.js';
+import { assert, Fail } from '@endo/errors';
+import { importBundle } from '@endo/import-bundle';
+import { makeGcAndFinalize } from './gc-and-finalize.js';
import {
makeSupervisorDispatch,
makeSupervisorSyscall,
makeVatConsole,
} from './supervisor-helper.js';
+// import '../../types-ambient.js';
+// grumble... waitUntilQuiescent is exported and closes over ambient authority
+import { waitUntilQuiescent } from './waitUntilQuiescent.js';
/**
* @import {VatDeliveryObject} from '@agoric/swingset-liveslots'
diff --git a/packages/swingset-xsnap-supervisor/scripts/build-bundle.js b/packages/swingset-xsnap-supervisor/scripts/build-bundle.js
index afb1d9d4ce2..aaa74a307c8 100644
--- a/packages/swingset-xsnap-supervisor/scripts/build-bundle.js
+++ b/packages/swingset-xsnap-supervisor/scripts/build-bundle.js
@@ -1,12 +1,13 @@
#! /usr/bin/env node
import '@endo/init';
-import path from 'path';
-import fs from 'fs';
+
+import bundleSource from '@endo/bundle-source';
import crypto from 'crypto';
+import fs from 'fs';
+import path from 'path';
import process from 'process';
-import bundleSource from '@endo/bundle-source';
-import { bundlePaths, hashPaths, entryPaths } from '../src/paths.js';
+import { bundlePaths, entryPaths, hashPaths } from '../src/paths.js';
/** @param {Uint8Array | string} bytes */
const computeSha256 = bytes => {
diff --git a/packages/swingset-xsnap-supervisor/src/index.js b/packages/swingset-xsnap-supervisor/src/index.js
index f8e789806c9..35a5db9140d 100644
--- a/packages/swingset-xsnap-supervisor/src/index.js
+++ b/packages/swingset-xsnap-supervisor/src/index.js
@@ -1,4 +1,5 @@
import fs from 'fs';
+
import { bundlePaths, hashPaths } from './paths.js';
const read = (name, path) => {
diff --git a/packages/swingset-xsnap-supervisor/test/bundle.test.js b/packages/swingset-xsnap-supervisor/test/bundle.test.js
index 8eb07282a39..dd2a0094052 100644
--- a/packages/swingset-xsnap-supervisor/test/bundle.test.js
+++ b/packages/swingset-xsnap-supervisor/test/bundle.test.js
@@ -1,6 +1,6 @@
import test from 'ava';
-import fs from 'fs';
import crypto from 'crypto';
+import fs from 'fs';
import {
getSupervisorBundle,
diff --git a/packages/telemetry/src/flight-recorder.js b/packages/telemetry/src/flight-recorder.js
index 8273396c6fe..f8d161280fa 100644
--- a/packages/telemetry/src/flight-recorder.js
+++ b/packages/telemetry/src/flight-recorder.js
@@ -5,7 +5,9 @@
import fs from 'node:fs';
import fsp from 'node:fs/promises';
import path from 'node:path';
+
import { Fail } from '@endo/errors';
+
import { serializeSlogObj } from './serialize-slog-obj.js';
export const DEFAULT_CBUF_SIZE = 100 * 1024 * 1024;
diff --git a/packages/telemetry/src/index.js b/packages/telemetry/src/index.js
index 82e58ff7449..3eff8442eb7 100644
--- a/packages/telemetry/src/index.js
+++ b/packages/telemetry/src/index.js
@@ -1,7 +1,7 @@
/* globals globalThis, process */
-import { MeterProvider } from '@opentelemetry/sdk-metrics';
import { PrometheusExporter } from '@opentelemetry/exporter-prometheus';
import { Resource } from '@opentelemetry/resources';
+import { MeterProvider } from '@opentelemetry/sdk-metrics';
import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
export * from './make-slog-sender.js';
diff --git a/packages/telemetry/src/ingest-slog-entrypoint.js b/packages/telemetry/src/ingest-slog-entrypoint.js
index bdb5985faad..4ffd8055e5b 100755
--- a/packages/telemetry/src/ingest-slog-entrypoint.js
+++ b/packages/telemetry/src/ingest-slog-entrypoint.js
@@ -3,9 +3,9 @@
import '@endo/init';
import fs from 'fs';
-import zlib from 'zlib';
-import readline from 'readline';
import process from 'process';
+import readline from 'readline';
+import zlib from 'zlib';
import { makeSlogSender } from './make-slog-sender.js';
diff --git a/packages/telemetry/src/make-slog-sender.js b/packages/telemetry/src/make-slog-sender.js
index 94693661087..6c7aef685af 100644
--- a/packages/telemetry/src/make-slog-sender.js
+++ b/packages/telemetry/src/make-slog-sender.js
@@ -1,6 +1,7 @@
+import { PromiseAllOrErrors } from '@agoric/internal';
import path from 'path';
import tmp from 'tmp';
-import { PromiseAllOrErrors } from '@agoric/internal';
+
import { serializeSlogObj } from './serialize-slog-obj.js';
export const DEFAULT_SLOGSENDER_MODULE =
diff --git a/packages/telemetry/src/otel-and-flight-recorder.js b/packages/telemetry/src/otel-and-flight-recorder.js
index 5ce1103daa1..3d36cd13c13 100644
--- a/packages/telemetry/src/otel-and-flight-recorder.js
+++ b/packages/telemetry/src/otel-and-flight-recorder.js
@@ -1,4 +1,5 @@
import { NonNullish } from '@agoric/internal';
+
import { makeSlogSender as makeSlogSenderFromEnv } from './make-slog-sender.js';
/**
diff --git a/packages/telemetry/src/otel-trace.js b/packages/telemetry/src/otel-trace.js
index 03fa348f082..6e501310aa2 100644
--- a/packages/telemetry/src/otel-trace.js
+++ b/packages/telemetry/src/otel-trace.js
@@ -1,13 +1,12 @@
/* globals process */
+import { makeShutdown } from '@agoric/internal/src/node/shutdown.js';
+import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
+import { Resource } from '@opentelemetry/resources';
import {
BasicTracerProvider,
BatchSpanProcessor,
} from '@opentelemetry/sdk-trace-base';
-import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
-import { Resource } from '@opentelemetry/resources';
-import { makeShutdown } from '@agoric/internal/src/node/shutdown.js';
-
import { getResourceAttributes } from './index.js';
import { makeSlogToOtelKit } from './slog-to-otel.js';
diff --git a/packages/telemetry/src/slog-file.js b/packages/telemetry/src/slog-file.js
index 3c091211a5f..4e2d843087e 100644
--- a/packages/telemetry/src/slog-file.js
+++ b/packages/telemetry/src/slog-file.js
@@ -1,4 +1,5 @@
import { makeFsStreamWriter } from '@agoric/internal/src/node/fs-stream.js';
+
import { serializeSlogObj } from './serialize-slog-obj.js';
/** @param {import('./index.js').MakeSlogSenderOptions} opts */
diff --git a/packages/telemetry/src/slog-sender-pipe-entrypoint.js b/packages/telemetry/src/slog-sender-pipe-entrypoint.js
index d4d3c01edde..a04456e53f1 100644
--- a/packages/telemetry/src/slog-sender-pipe-entrypoint.js
+++ b/packages/telemetry/src/slog-sender-pipe-entrypoint.js
@@ -1,8 +1,8 @@
/* global process */
import '@endo/init';
-import anylogger from 'anylogger';
import { makeShutdown } from '@agoric/internal/src/node/shutdown.js';
+import anylogger from 'anylogger';
import { makeSlogSender } from './make-slog-sender.js';
diff --git a/packages/telemetry/src/slog-sender-pipe.js b/packages/telemetry/src/slog-sender-pipe.js
index 1ff69f76273..770f191b435 100644
--- a/packages/telemetry/src/slog-sender-pipe.js
+++ b/packages/telemetry/src/slog-sender-pipe.js
@@ -1,10 +1,8 @@
+import { makeShutdown } from '@agoric/internal/src/node/shutdown.js';
+import { makeQueue } from '@endo/stream';
+import anylogger from 'anylogger';
import { fork } from 'child_process';
import path from 'path';
-import anylogger from 'anylogger';
-
-import { makeQueue } from '@endo/stream';
-
-import { makeShutdown } from '@agoric/internal/src/node/shutdown.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/telemetry/src/slog-to-otel.js b/packages/telemetry/src/slog-to-otel.js
index d4b4abc4a44..703cb035006 100644
--- a/packages/telemetry/src/slog-to-otel.js
+++ b/packages/telemetry/src/slog-to-otel.js
@@ -1,13 +1,12 @@
-import otel, { SpanStatusCode } from '@opentelemetry/api';
-
+import { makeLegacyMap } from '@agoric/store';
import { Fail, q } from '@endo/errors';
import { makeMarshal, Remotable } from '@endo/marshal';
+import otel, { SpanStatusCode } from '@opentelemetry/api';
-import { makeLegacyMap } from '@agoric/store';
import {
+ makeKVDatabaseTransactionManager,
makeKVStringStore,
makeTempKVDatabase,
- makeKVDatabaseTransactionManager,
} from './kv-string-store.js';
// import { diag, DiagConsoleLogger, DiagLogLevel } from '@opentelemetry/api';
diff --git a/packages/telemetry/test/flight-recorder.test.js b/packages/telemetry/test/flight-recorder.test.js
index 27cfada2c3a..95c316c47d2 100644
--- a/packages/telemetry/test/flight-recorder.test.js
+++ b/packages/telemetry/test/flight-recorder.test.js
@@ -1,6 +1,8 @@
+import { test } from './prepare-test-env-ava.js';
+
import fs from 'node:fs';
+
import tmp from 'tmp';
-import { test } from './prepare-test-env-ava.js';
import {
makeSimpleCircularBuffer,
diff --git a/packages/time/src/timeMath.js b/packages/time/src/timeMath.js
index 2deef471443..bcc925ce4d0 100644
--- a/packages/time/src/timeMath.js
+++ b/packages/time/src/timeMath.js
@@ -1,6 +1,7 @@
-import { Nat } from '@endo/nat';
-import { Fail, q } from '@endo/errors';
import { mustMatch } from '@agoric/store';
+import { Fail, q } from '@endo/errors';
+import { Nat } from '@endo/nat';
+
import { RelativeTimeRecordShape, TimestampRecordShape } from './typeGuards.js';
/**
diff --git a/packages/time/src/types.d.ts b/packages/time/src/types.d.ts
index 42e8544f36f..1d985322b66 100644
--- a/packages/time/src/types.d.ts
+++ b/packages/time/src/types.d.ts
@@ -1,5 +1,4 @@
import type { ERef, RemotableBrand } from '@endo/eventual-send';
-
import type { RankComparison, RemotableObject } from '@endo/marshal';
///
diff --git a/packages/time/test/timeMath.test.js b/packages/time/test/timeMath.test.js
index fcea87331bd..c5f252a5024 100644
--- a/packages/time/test/timeMath.test.js
+++ b/packages/time/test/timeMath.test.js
@@ -1,5 +1,6 @@
-import test from 'ava';
import { Far } from '@endo/far';
+import test from 'ava';
+
import { TimeMath } from '../src/timeMath.js';
/**
diff --git a/packages/vat-data/src/index.test-d.ts b/packages/vat-data/src/index.test-d.ts
index 4280850379a..04bfb7a6b7b 100644
--- a/packages/vat-data/src/index.test-d.ts
+++ b/packages/vat-data/src/index.test-d.ts
@@ -1,17 +1,18 @@
/* eslint-disable no-use-before-define */
-import { expectType } from 'tsd';
import type {
- KindFacets,
DurableKindHandle,
- KindFacet,
FunctionsPlusContext,
+ KindFacet,
+ KindFacets,
} from '@agoric/swingset-liveslots';
import { VirtualObjectManager } from '@agoric/swingset-liveslots/src/virtualObjectManager.js';
+import { expectType } from 'tsd';
+
import {
+ defineDurableKind,
defineKind,
defineKindMulti,
makeKindHandle,
- defineDurableKind,
partialAssign,
watchPromise,
} from './index.js';
diff --git a/packages/vat-data/src/vat-data-bindings.js b/packages/vat-data/src/vat-data-bindings.js
index 395bbedde25..c2584c3d9ea 100644
--- a/packages/vat-data/src/vat-data-bindings.js
+++ b/packages/vat-data/src/vat-data-bindings.js
@@ -1,7 +1,7 @@
/* global globalThis */
-import { Fail } from '@endo/errors';
import { provideLazy } from '@agoric/store';
+import { Fail } from '@endo/errors';
/** @import {Baggage, PickFacet, VatData} from '@agoric/swingset-liveslots' */
diff --git a/packages/vat-data/test/amplify-virtual-class-kits.test.js b/packages/vat-data/test/amplify-virtual-class-kits.test.js
index b349903722d..f3a7b116d8f 100644
--- a/packages/vat-data/test/amplify-virtual-class-kits.test.js
+++ b/packages/vat-data/test/amplify-virtual-class-kits.test.js
@@ -1,8 +1,8 @@
// modeled on test-amplify-heap-class-kits.js
import { test } from './prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { M } from '@endo/patterns';
+
import {
defineVirtualExoClass,
defineVirtualExoClassKit,
diff --git a/packages/vat-data/test/durable-classes.test.js b/packages/vat-data/test/durable-classes.test.js
index 17c01d1ebcb..4aaab6c8e97 100644
--- a/packages/vat-data/test/durable-classes.test.js
+++ b/packages/vat-data/test/durable-classes.test.js
@@ -2,16 +2,16 @@
import { test } from './prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { M } from '@agoric/store';
-import {
- makeKindHandle,
- makeScalarBigMapStore,
-} from '../src/vat-data-bindings.js';
+
import {
defineDurableExoClass,
defineDurableExoClassKit,
} from '../src/exo-utils.js';
+import {
+ makeKindHandle,
+ makeScalarBigMapStore,
+} from '../src/vat-data-bindings.js';
const UpCounterI = M.interface('UpCounter', {
incr: M.call()
diff --git a/packages/vat-data/test/is-instance-virtual-class-kits.test.js b/packages/vat-data/test/is-instance-virtual-class-kits.test.js
index 37f36844347..f4ae4eedffc 100644
--- a/packages/vat-data/test/is-instance-virtual-class-kits.test.js
+++ b/packages/vat-data/test/is-instance-virtual-class-kits.test.js
@@ -2,8 +2,8 @@
import { test } from './prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { M } from '@endo/patterns';
+
import {
defineVirtualExoClass,
defineVirtualExoClassKit,
diff --git a/packages/vat-data/test/prepare.test.js b/packages/vat-data/test/prepare.test.js
index 87b8d9013a3..c860c4c3c88 100644
--- a/packages/vat-data/test/prepare.test.js
+++ b/packages/vat-data/test/prepare.test.js
@@ -2,12 +2,12 @@
import { test } from './prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { M } from '@agoric/store';
+
import {
+ prepareExo,
prepareExoClass,
prepareExoClassKit,
- prepareExo,
} from '../src/exo-utils.js';
import { makeScalarBigMapStore } from '../src/vat-data-bindings.js';
diff --git a/packages/vat-data/test/scalar-only-keys.test.js b/packages/vat-data/test/scalar-only-keys.test.js
index 179550ecb29..4463c5255bf 100644
--- a/packages/vat-data/test/scalar-only-keys.test.js
+++ b/packages/vat-data/test/scalar-only-keys.test.js
@@ -2,8 +2,8 @@
import { test } from './prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { M, makeScalarMapStore } from '@agoric/store';
+
import { makeScalarBigMapStore } from '../src/vat-data-bindings.js';
test('scalar maps should reject non-scalar keys', t => {
diff --git a/packages/vat-data/test/virtual-classes.test.js b/packages/vat-data/test/virtual-classes.test.js
index 245b562fdde..1a173b1abbb 100644
--- a/packages/vat-data/test/virtual-classes.test.js
+++ b/packages/vat-data/test/virtual-classes.test.js
@@ -2,8 +2,8 @@
import { test } from './prepare-test-env-ava.js';
-// eslint-disable-next-line import/order
import { M } from '@agoric/store';
+
import {
defineVirtualExoClass,
defineVirtualExoClassKit,
diff --git a/packages/vats/scripts/build-bundles.js b/packages/vats/scripts/build-bundles.js
index df42abc085c..c0c01842ac8 100755
--- a/packages/vats/scripts/build-bundles.js
+++ b/packages/vats/scripts/build-bundles.js
@@ -1,5 +1,6 @@
#! /usr/bin/env node
import '@endo/init';
+
import { createBundles } from '@agoric/internal/src/node/createBundles.js';
import url from 'url';
diff --git a/packages/vats/src/bridge-target.js b/packages/vats/src/bridge-target.js
index 626d9f5e22e..78bd9530fff 100644
--- a/packages/vats/src/bridge-target.js
+++ b/packages/vats/src/bridge-target.js
@@ -1,4 +1,4 @@
-import { X, Fail, makeError } from '@endo/errors';
+import { Fail, makeError, X } from '@endo/errors';
import { E } from '@endo/far';
import { M } from '@endo/patterns';
diff --git a/packages/vats/src/bridge.js b/packages/vats/src/bridge.js
index 1da85fc9c57..c221861ec55 100644
--- a/packages/vats/src/bridge.js
+++ b/packages/vats/src/bridge.js
@@ -1,5 +1,5 @@
-import { Fail, X } from '@endo/errors';
import { M } from '@agoric/store';
+import { Fail, X } from '@endo/errors';
import { E } from '@endo/far';
/**
diff --git a/packages/vats/src/core/basic-behaviors.js b/packages/vats/src/core/basic-behaviors.js
index 4bbbdf69ad9..98161bbbdf4 100644
--- a/packages/vats/src/core/basic-behaviors.js
+++ b/packages/vats/src/core/basic-behaviors.js
@@ -1,23 +1,23 @@
-import { Nat } from '@endo/nat';
-import { Fail, X } from '@endo/errors';
-import { E, getInterfaceOf } from '@endo/far';
-
import { AssetKind } from '@agoric/ertp';
import { CONTRACT_ELECTORATE, ParamTypes } from '@agoric/governance';
-import { Stable, Stake } from '@agoric/internal/src/tokens.js';
import {
BridgeId,
deeplyFulfilledObject,
+ NonNullish,
VBankAccount,
WalletName,
- NonNullish,
} from '@agoric/internal';
+import { Stable, Stake } from '@agoric/internal/src/tokens.js';
import { keyEQ, makeScalarMapStore } from '@agoric/store';
import { provideLazy } from '@agoric/store/src/stores/store-utils.js';
+import { Fail, X } from '@endo/errors';
+import { E, getInterfaceOf } from '@endo/far';
+import { Nat } from '@endo/nat';
+
+import { makeScopedBridge } from '../bridge.js';
import { makeNameHubKit } from '../nameHub.js';
import { PowerFlags } from '../walletFlags.js';
import { feeIssuerConfig, makeMyAddressNameAdminKit } from './utils.js';
-import { makeScopedBridge } from '../bridge.js';
/** @import {GovernableStartFn, GovernanceFacetKit} from '@agoric/governance/src/types.js'; */
diff --git a/packages/vats/src/core/boot-chain.js b/packages/vats/src/core/boot-chain.js
index e6784893711..ccff5e463cc 100644
--- a/packages/vats/src/core/boot-chain.js
+++ b/packages/vats/src/core/boot-chain.js
@@ -1,8 +1,8 @@
import { makeDurableZone } from '@agoric/zone/durable.js';
-import { makeBootstrap } from './lib-boot.js';
import * as basicBehaviorsPlus from './basic-behaviors.js';
import * as chainBehaviorsPlus from './chain-behaviors.js';
+import { makeBootstrap } from './lib-boot.js';
import * as utils from './utils.js';
const { BASIC_BOOTSTRAP_PERMITS: _b, ...basicBehaviors } = basicBehaviorsPlus;
diff --git a/packages/vats/src/core/boot-sim.js b/packages/vats/src/core/boot-sim.js
index 87f85756839..8a9d1df9e47 100644
--- a/packages/vats/src/core/boot-sim.js
+++ b/packages/vats/src/core/boot-sim.js
@@ -1,7 +1,6 @@
-import { makeBootstrap } from './lib-boot.js';
-
import * as basicBehaviorsPlus from './basic-behaviors.js';
import * as chainBehaviorsPlus from './chain-behaviors.js';
+import { makeBootstrap } from './lib-boot.js';
import * as simBehaviorsPlus from './sim-behaviors.js';
import * as utils from './utils.js';
diff --git a/packages/vats/src/core/boot-solo.js b/packages/vats/src/core/boot-solo.js
index be4561c32be..360e89bfeda 100644
--- a/packages/vats/src/core/boot-solo.js
+++ b/packages/vats/src/core/boot-solo.js
@@ -1,8 +1,7 @@
-import { makeBootstrap } from './lib-boot.js';
-
import * as basicBehaviorsPlus from './basic-behaviors.js';
import * as chainBehaviorsPlus from './chain-behaviors.js';
import * as clientBehaviorsPlus from './client-behaviors.js';
+import { makeBootstrap } from './lib-boot.js';
import * as utils from './utils.js';
const { BASIC_BOOTSTRAP_PERMITS: _b, ...basicBehaviors } = basicBehaviorsPlus;
diff --git a/packages/vats/src/core/chain-behaviors.js b/packages/vats/src/core/chain-behaviors.js
index b8b14c01c11..a24a8c20eac 100644
--- a/packages/vats/src/core/chain-behaviors.js
+++ b/packages/vats/src/core/chain-behaviors.js
@@ -1,10 +1,4 @@
/* global globalThis */
-import { Fail } from '@endo/errors';
-import * as farExports from '@endo/far';
-import { E, Far } from '@endo/far';
-import { importBundle } from '@endo/import-bundle';
-import { makePromiseKit } from '@endo/promise-kit';
-
import { allValues, BridgeId as BRIDGE_ID } from '@agoric/internal';
import * as STORAGE_PATH from '@agoric/internal/src/chain-storage-paths.js';
import { makePrioritySendersManager } from '@agoric/internal/src/priority-senders.js';
@@ -15,10 +9,16 @@ import {
} from '@agoric/notifier';
import { makeScalarBigMapStore } from '@agoric/vat-data';
import { prepareRecorderKit } from '@agoric/zoe/src/contractSupport/recorder.js';
+import { Fail } from '@endo/errors';
+import * as farExports from '@endo/far';
+import { E, Far } from '@endo/far';
+import { importBundle } from '@endo/import-bundle';
+import { makePromiseKit } from '@endo/promise-kit';
+
+import { makeScopedBridge } from '../bridge.js';
import { PowerFlags } from '../walletFlags.js';
import { BASIC_BOOTSTRAP_PERMITS } from './basic-behaviors.js';
import { agoricNamesReserved, callProperties, extractPowers } from './utils.js';
-import { makeScopedBridge } from '../bridge.js';
const { keys } = Object;
diff --git a/packages/vats/src/core/client-behaviors.js b/packages/vats/src/core/client-behaviors.js
index d7071a0bae3..182a0c6c11e 100644
--- a/packages/vats/src/core/client-behaviors.js
+++ b/packages/vats/src/core/client-behaviors.js
@@ -1,7 +1,8 @@
-import { E, Far } from '@endo/far';
-import { makePluginManager } from '@agoric/swingset-vat/src/vats/plugin-manager.js';
-import { observeNotifier } from '@agoric/notifier';
import { deeplyFulfilledObject } from '@agoric/internal';
+import { observeNotifier } from '@agoric/notifier';
+import { makePluginManager } from '@agoric/swingset-vat/src/vats/plugin-manager.js';
+import { E, Far } from '@endo/far';
+
import { registerNetworkProtocols } from '../proposals/network-proposal.js';
import { makeVatsFromBundles } from './basic-behaviors.js';
diff --git a/packages/vats/src/core/demoIssuers.js b/packages/vats/src/core/demoIssuers.js
index c48a8890969..fd156b60123 100644
--- a/packages/vats/src/core/demoIssuers.js
+++ b/packages/vats/src/core/demoIssuers.js
@@ -1,15 +1,14 @@
-import { Fail, q } from '@endo/errors';
-import { Nat } from '@endo/nat';
-import { E, Far } from '@endo/far';
-
import { AmountMath, AssetKind } from '@agoric/ertp';
import { split, splitMany } from '@agoric/ertp/src/legacy-payment-helpers.js';
+import { notForProductionUse } from '@agoric/internal/src/magic-cookie-test-only.js';
+import { Stable, Stake } from '@agoric/internal/src/tokens.js';
import {
makeRatio,
natSafeMath,
} from '@agoric/zoe/src/contractSupport/index.js';
-import { notForProductionUse } from '@agoric/internal/src/magic-cookie-test-only.js';
-import { Stake, Stable } from '@agoric/internal/src/tokens.js';
+import { Fail, q } from '@endo/errors';
+import { E, Far } from '@endo/far';
+import { Nat } from '@endo/nat';
const { multiply, floorDivide } = natSafeMath;
const { entries, fromEntries, keys, values } = Object;
diff --git a/packages/vats/src/core/lib-boot.js b/packages/vats/src/core/lib-boot.js
index 486a7f12603..c9c01e2f1e5 100644
--- a/packages/vats/src/core/lib-boot.js
+++ b/packages/vats/src/core/lib-boot.js
@@ -1,12 +1,13 @@
+import { makeHeapZone } from '@agoric/zone';
import { Fail, q } from '@endo/errors';
import { E, Far } from '@endo/far';
-import { makeHeapZone } from '@agoric/zone';
+
+import { makePromiseSpace } from './promise-space.js';
import {
makeVatSpace,
makeWellKnownSpaces,
runModuleBehaviors,
} from './utils.js';
-import { makePromiseSpace } from './promise-space.js';
/**
* @typedef {true
diff --git a/packages/vats/src/core/promise-space.js b/packages/vats/src/core/promise-space.js
index 535e40e82a1..d68f47eb844 100644
--- a/packages/vats/src/core/promise-space.js
+++ b/packages/vats/src/core/promise-space.js
@@ -1,6 +1,6 @@
-import { E } from '@endo/far';
import { assertKey } from '@agoric/store';
import { canBeDurable } from '@agoric/vat-data';
+import { E } from '@endo/far';
import { makePromiseKit } from '@endo/promise-kit';
/**
diff --git a/packages/vats/src/core/sim-behaviors.js b/packages/vats/src/core/sim-behaviors.js
index fd8a1a61d24..8109787acca 100644
--- a/packages/vats/src/core/sim-behaviors.js
+++ b/packages/vats/src/core/sim-behaviors.js
@@ -1,4 +1,5 @@
import { E, Far } from '@endo/far';
+
import { connectFaucet } from './demoIssuers.js';
import { addRemote } from './utils.js';
diff --git a/packages/vats/src/core/startWalletFactory.js b/packages/vats/src/core/startWalletFactory.js
index a8009a19534..a3e1e629eb7 100644
--- a/packages/vats/src/core/startWalletFactory.js
+++ b/packages/vats/src/core/startWalletFactory.js
@@ -1,14 +1,15 @@
-import { makeMap } from 'jessie.js';
-import { E, Far } from '@endo/far';
-import { deeplyFulfilled } from '@endo/marshal';
-import { makeTracer, VBankAccount } from '@agoric/internal';
import { AmountMath } from '@agoric/ertp';
import { ParamTypes } from '@agoric/governance';
+import { makeTracer, VBankAccount } from '@agoric/internal';
import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
import { Stable } from '@agoric/internal/src/tokens.js';
+import { E, Far } from '@endo/far';
+import { deeplyFulfilled } from '@endo/marshal';
+import { makeMap } from 'jessie.js';
+
import {
- makeHistoryReviver,
makeBoardRemote,
+ makeHistoryReviver,
slotToBoardRemote,
} from '../../tools/board-utils.js';
diff --git a/packages/vats/src/core/utils.js b/packages/vats/src/core/utils.js
index 95020941bab..875bb97f69a 100644
--- a/packages/vats/src/core/utils.js
+++ b/packages/vats/src/core/utils.js
@@ -1,15 +1,16 @@
-import { Fail, q } from '@endo/errors';
-import { Stable, Stake } from '@agoric/internal/src/tokens.js';
+import './types-ambient.js';
+
import { WalletName } from '@agoric/internal';
-import { E, Far } from '@endo/far';
+import { Stable, Stake } from '@agoric/internal/src/tokens.js';
+import { keyEQ } from '@agoric/store';
import { makeAtomicProvider } from '@agoric/store/src/stores/store-utils.js';
import { makeScalarBigMapStore, makeScalarMapStore } from '@agoric/vat-data';
-import { keyEQ } from '@agoric/store';
+import { Fail, q } from '@endo/errors';
+import { E, Far } from '@endo/far';
+
import { makeNameHubKit } from '../nameHub.js';
import { makeLogHooks, makePromiseSpace } from './promise-space.js';
-import './types-ambient.js';
-
const { entries, fromEntries, keys } = Object;
/**
diff --git a/packages/vats/src/ibc.js b/packages/vats/src/ibc.js
index 52ec6a8d566..e88b8a0e24a 100644
--- a/packages/vats/src/ibc.js
+++ b/packages/vats/src/ibc.js
@@ -1,16 +1,15 @@
// @ts-check
-import { assert, X, Fail } from '@endo/errors';
+import { makeTracer } from '@agoric/internal';
+import { base64ToBytes, byteSourceToBase64 } from '@agoric/network';
+import { assert, Fail, X } from '@endo/errors';
import { E } from '@endo/far';
-import { byteSourceToBase64, base64ToBytes } from '@agoric/network';
-
-import { makeTracer } from '@agoric/internal';
import {
- localAddrToPortID,
decodeRemoteIbcAddress,
encodeLocalIbcAddress,
encodeRemoteIbcAddress,
+ localAddrToPortID,
} from '../tools/ibc-utils.js';
const trace = makeTracer('IBC', false);
diff --git a/packages/vats/src/lib-board.js b/packages/vats/src/lib-board.js
index 69c0dc7ed41..02242edb281 100644
--- a/packages/vats/src/lib-board.js
+++ b/packages/vats/src/lib-board.js
@@ -3,13 +3,13 @@
* @see prepareBoardKit()
*/
-import { assert, Fail, q } from '@endo/errors';
import { prepareDurablePublishKit } from '@agoric/notifier';
import { M, makeScalarBigMapStore, prepareExoClassKit } from '@agoric/vat-data';
import {
defineRecorderKit,
prepareRecorder,
} from '@agoric/zoe/src/contractSupport/recorder.js';
+import { assert, Fail, q } from '@endo/errors';
import { E, Far } from '@endo/far';
import { isRemotable, makeMarshal } from '@endo/marshal';
diff --git a/packages/vats/src/localchain.js b/packages/vats/src/localchain.js
index 0f7543b59ec..cfbb8780759 100644
--- a/packages/vats/src/localchain.js
+++ b/packages/vats/src/localchain.js
@@ -1,7 +1,4 @@
// @ts-check
-import { Fail } from '@endo/errors';
-import { E } from '@endo/far';
-import { M } from '@endo/patterns';
import {
AmountPatternShape,
AmountShape,
@@ -9,6 +6,9 @@ import {
PaymentShape,
} from '@agoric/ertp';
import { Shape as NetworkShape } from '@agoric/network';
+import { Fail } from '@endo/errors';
+import { E } from '@endo/far';
+import { M } from '@endo/patterns';
const { Vow$ } = NetworkShape;
diff --git a/packages/vats/src/nameHub.js b/packages/vats/src/nameHub.js
index c6597c78725..617995cf109 100644
--- a/packages/vats/src/nameHub.js
+++ b/packages/vats/src/nameHub.js
@@ -1,15 +1,14 @@
-import { assert, Fail, q } from '@endo/errors';
-import { E } from '@endo/far';
-import { makePromiseKit } from '@endo/promise-kit';
-import { M, getInterfaceGuardPayload } from '@endo/patterns';
-
+import { deeplyFulfilledObject, NonNullish } from '@agoric/internal';
///
import {
makeSyncMethodCallback,
prepareGuardedAttenuator,
} from '@agoric/internal/src/callback.js';
import { makeHeapZone } from '@agoric/zone';
-import { deeplyFulfilledObject, NonNullish } from '@agoric/internal';
+import { assert, Fail, q } from '@endo/errors';
+import { E } from '@endo/far';
+import { getInterfaceGuardPayload, M } from '@endo/patterns';
+import { makePromiseKit } from '@endo/promise-kit';
const KeyShape = M.string();
const PathShape = M.arrayOf(KeyShape);
diff --git a/packages/vats/src/priceAuthorityRegistry.js b/packages/vats/src/priceAuthorityRegistry.js
index a6ebab20258..a06f89bd2f7 100644
--- a/packages/vats/src/priceAuthorityRegistry.js
+++ b/packages/vats/src/priceAuthorityRegistry.js
@@ -1,16 +1,15 @@
-import { Fail } from '@endo/errors';
-import { E } from '@endo/far';
-import { Far } from '@endo/marshal';
-
import { BrandShape } from '@agoric/ertp';
+import { provideLazy } from '@agoric/store';
import {
M,
- prepareExo,
makeScalarBigMapStore,
+ prepareExo,
provideDurableMapStore,
} from '@agoric/vat-data';
-import { provideLazy } from '@agoric/store';
import { PriceAuthorityI } from '@agoric/zoe/src/contractSupport/priceAuthority.js';
+import { Fail } from '@endo/errors';
+import { E } from '@endo/far';
+import { Far } from '@endo/marshal';
/**
* @import {Baggage} from '@agoric/vat-data';
diff --git a/packages/vats/src/proposals/localchain-proposal.js b/packages/vats/src/proposals/localchain-proposal.js
index 947c427b190..a2942e86505 100644
--- a/packages/vats/src/proposals/localchain-proposal.js
+++ b/packages/vats/src/proposals/localchain-proposal.js
@@ -1,6 +1,7 @@
// @ts-check
-import { E } from '@endo/far';
import { BridgeId as BRIDGE_ID } from '@agoric/internal';
+import { E } from '@endo/far';
+
import { makeScopedBridge } from '../bridge.js';
/**
diff --git a/packages/vats/src/proposals/localchain-test.js b/packages/vats/src/proposals/localchain-test.js
index 201de2e38d2..a5b6556280a 100644
--- a/packages/vats/src/proposals/localchain-test.js
+++ b/packages/vats/src/proposals/localchain-test.js
@@ -1,6 +1,6 @@
// @ts-check
-import { heapVowE as E } from '@agoric/vow/vat.js';
import { typedJson } from '@agoric/cosmic-proto';
+import { heapVowE as E } from '@agoric/vow/vat.js';
/**
* @param {BootstrapPowers & {
diff --git a/packages/vats/src/proposals/network-proposal.js b/packages/vats/src/proposals/network-proposal.js
index c5aa8afdaa2..c227f655829 100644
--- a/packages/vats/src/proposals/network-proposal.js
+++ b/packages/vats/src/proposals/network-proposal.js
@@ -2,14 +2,13 @@
* @file CoreEval module to set up network, IBC vats.
* @see {setupNetworkProtocols}
*/
-import { E } from '@endo/far';
import { BridgeId as BRIDGE_ID } from '@agoric/internal';
-
import { makeScalarBigMapStore } from '@agoric/vat-data';
-
// Heap-based vow resolution is used for this module because the
// bootstrap vat can't yet be upgraded.
import { heapVowTools } from '@agoric/vow/vat.js';
+import { E } from '@endo/far';
+
import { makeScopedBridge } from '../bridge.js';
const { when } = heapVowTools;
diff --git a/packages/vats/src/proposals/probeZcfBundle.js b/packages/vats/src/proposals/probeZcfBundle.js
index ee44affb2c6..901e87ccfcd 100644
--- a/packages/vats/src/proposals/probeZcfBundle.js
+++ b/packages/vats/src/proposals/probeZcfBundle.js
@@ -1,5 +1,5 @@
-import { E } from '@endo/far';
import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
+import { E } from '@endo/far';
// verify that Zoe remembers the zcfBundleCap across upgrades
export const probeZcfBundleCap = async (
diff --git a/packages/vats/src/proposals/restart-vats-proposal.js b/packages/vats/src/proposals/restart-vats-proposal.js
index fe4d1611034..1a86adfd3d3 100644
--- a/packages/vats/src/proposals/restart-vats-proposal.js
+++ b/packages/vats/src/proposals/restart-vats-proposal.js
@@ -1,6 +1,6 @@
-import { Fail } from '@endo/errors';
import { deeplyFulfilledObject, makeTracer } from '@agoric/internal';
import { M, mustMatch } from '@agoric/store';
+import { Fail } from '@endo/errors';
import { E, getInterfaceOf } from '@endo/far';
const trace = makeTracer('RV');
diff --git a/packages/vats/src/proposals/transfer-proposal.js b/packages/vats/src/proposals/transfer-proposal.js
index 7e6cfea000b..a1a370bb17d 100644
--- a/packages/vats/src/proposals/transfer-proposal.js
+++ b/packages/vats/src/proposals/transfer-proposal.js
@@ -1,7 +1,8 @@
// @ts-check
-import { E } from '@endo/far';
import { BridgeId as BRIDGE_ID } from '@agoric/internal';
import { VTRANSFER_IBC_EVENT } from '@agoric/internal/src/action-types.js';
+import { E } from '@endo/far';
+
import { makeScopedBridge } from '../bridge.js';
/**
diff --git a/packages/vats/src/repl.js b/packages/vats/src/repl.js
index fb8736482ef..1c102d5fe3a 100644
--- a/packages/vats/src/repl.js
+++ b/packages/vats/src/repl.js
@@ -1,12 +1,11 @@
/* global globalThis */
-import { isPromise } from '@endo/promise-kit';
-import { Far } from '@endo/far';
import { heapVowE as E } from '@agoric/vow/vat.js';
import * as vowExports from '@agoric/vow/vat.js';
+import { Far } from '@endo/far';
import * as farExports from '@endo/far';
-
import { Nat } from '@endo/nat';
+import { isPromise } from '@endo/promise-kit';
const UNJSONABLES = new Map([
[NaN, 'NaN'],
diff --git a/packages/vats/src/transfer.js b/packages/vats/src/transfer.js
index 2e75ebc8540..25af296e93a 100644
--- a/packages/vats/src/transfer.js
+++ b/packages/vats/src/transfer.js
@@ -1,10 +1,11 @@
// @ts-check
-import { Fail, b } from '@endo/errors';
+import { VTRANSFER_IBC_EVENT } from '@agoric/internal/src/action-types.js';
+import { byteSourceToBase64, coerceToByteSource } from '@agoric/network';
+import { b, Fail } from '@endo/errors';
import { E } from '@endo/far';
import { M } from '@endo/patterns';
-import { VTRANSFER_IBC_EVENT } from '@agoric/internal/src/action-types.js';
-import { coerceToByteSource, byteSourceToBase64 } from '@agoric/network';
-import { TargetAppI, AppTransformerI } from './bridge-target.js';
+
+import { AppTransformerI, TargetAppI } from './bridge-target.js';
/**
* @import {TargetApp, TargetHost} from './bridge-target.js'
diff --git a/packages/vats/src/types.d.ts b/packages/vats/src/types.d.ts
index e4a7f330ace..457cee63015 100644
--- a/packages/vats/src/types.d.ts
+++ b/packages/vats/src/types.d.ts
@@ -2,8 +2,9 @@ import type { FungibleTokenPacketData } from '@agoric/cosmic-proto/ibc/applicati
import type { BridgeIdValue, Remote } from '@agoric/internal';
import type { Bytes } from '@agoric/network';
import type { Guarded } from '@endo/exo';
-import type { LocalChainAccount } from './localchain.js';
+
import type { TargetApp } from './bridge-target.js';
+import type { LocalChainAccount } from './localchain.js';
export type Board = ReturnType<
ReturnType
diff --git a/packages/vats/src/vat-agoricNames.js b/packages/vats/src/vat-agoricNames.js
index 601e616ee08..bc457cf68da 100644
--- a/packages/vats/src/vat-agoricNames.js
+++ b/packages/vats/src/vat-agoricNames.js
@@ -1,9 +1,10 @@
// @jessy-check
-import { E, Far } from '@endo/far';
import { BrandI } from '@agoric/ertp';
+import { provideLazy } from '@agoric/store';
import { provide } from '@agoric/vat-data';
import { makeDurableZone } from '@agoric/zone/durable.js';
-import { provideLazy } from '@agoric/store';
+import { E, Far } from '@endo/far';
+
import { prepareNameHubKit } from './nameHub.js';
/** @param {import('@agoric/zone').Zone} zone */
diff --git a/packages/vats/src/vat-bank.js b/packages/vats/src/vat-bank.js
index e7dd101408f..8a0e7585322 100644
--- a/packages/vats/src/vat-bank.js
+++ b/packages/vats/src/vat-bank.js
@@ -1,7 +1,3 @@
-import { Fail } from '@endo/errors';
-import { E, Far } from '@endo/far';
-import { M, getInterfaceGuardPayload } from '@endo/patterns';
-
import { AmountMath, AssetKind, BrandShape } from '@agoric/ertp';
import { deeplyFulfilledObject } from '@agoric/internal';
import { prepareGuardedAttenuator } from '@agoric/internal/src/callback.js';
@@ -13,8 +9,12 @@ import {
subscribeEach,
} from '@agoric/notifier';
import { provideLazy } from '@agoric/store';
-import { makeDurableZone } from '@agoric/zone/durable.js';
import { makeAtomicProvider } from '@agoric/store/src/stores/store-utils.js';
+import { makeDurableZone } from '@agoric/zone/durable.js';
+import { Fail } from '@endo/errors';
+import { E, Far } from '@endo/far';
+import { getInterfaceGuardPayload, M } from '@endo/patterns';
+
import { BridgeHandlerI, BridgeScopedManagerI } from './bridge.js';
import {
makeVirtualPurseKitIKit,
diff --git a/packages/vats/src/vat-board.js b/packages/vats/src/vat-board.js
index 3c8096565d4..4da5595eac7 100644
--- a/packages/vats/src/vat-board.js
+++ b/packages/vats/src/vat-board.js
@@ -1,7 +1,8 @@
import { provide } from '@agoric/vat-data';
import { makeDurableZone } from '@agoric/zone/durable.js';
import { Far } from '@endo/marshal';
-import { prepareRecorderFactory, prepareBoardKit } from './lib-board.js';
+
+import { prepareBoardKit, prepareRecorderFactory } from './lib-board.js';
// There is only one board in this vat.
const THE_BOARD = 'theboard';
diff --git a/packages/vats/src/vat-bridge.js b/packages/vats/src/vat-bridge.js
index 12afdf1e09e..d0468947a8b 100644
--- a/packages/vats/src/vat-bridge.js
+++ b/packages/vats/src/vat-bridge.js
@@ -1,8 +1,9 @@
-import { Fail } from '@endo/errors';
-import { Far } from '@endo/far';
-import { makeDurableZone } from '@agoric/zone/durable.js';
import * as cb from '@agoric/internal/src/callback.js';
import { prepareChainStorageNode } from '@agoric/internal/src/lib-chainStorage.js';
+import { makeDurableZone } from '@agoric/zone/durable.js';
+import { Fail } from '@endo/errors';
+import { Far } from '@endo/far';
+
import { prepareBridgeManager } from './bridge.js';
export function buildRootObject(vatPowers, _args, baggage) {
diff --git a/packages/vats/src/vat-ibc.js b/packages/vats/src/vat-ibc.js
index 92bd4c099ea..95c7baccc0a 100644
--- a/packages/vats/src/vat-ibc.js
+++ b/packages/vats/src/vat-ibc.js
@@ -1,6 +1,7 @@
-import { Far } from '@endo/far';
-import { makeDurableZone } from '@agoric/zone/durable.js';
import { prepareVowTools } from '@agoric/vow/vat.js';
+import { makeDurableZone } from '@agoric/zone/durable.js';
+import { Far } from '@endo/far';
+
import { prepareCallbacks, prepareIBCProtocol } from './ibc.js';
export function buildRootObject(_vatPowers, _args, baggage) {
diff --git a/packages/vats/src/vat-localchain.js b/packages/vats/src/vat-localchain.js
index 501d94f0cd3..b630238d601 100644
--- a/packages/vats/src/vat-localchain.js
+++ b/packages/vats/src/vat-localchain.js
@@ -1,7 +1,7 @@
// @ts-check
-import { Far } from '@endo/far';
-import { makeDurableZone } from '@agoric/zone/durable.js';
import { prepareVowTools } from '@agoric/vow/vat.js';
+import { makeDurableZone } from '@agoric/zone/durable.js';
+import { Far } from '@endo/far';
import { prepareLocalChainTools } from './localchain.js';
diff --git a/packages/vats/src/vat-mints.js b/packages/vats/src/vat-mints.js
index 7e03cb1ed80..f097db4bf13 100644
--- a/packages/vats/src/vat-mints.js
+++ b/packages/vats/src/vat-mints.js
@@ -1,8 +1,7 @@
-import { Far } from '@endo/far';
-import { makeIssuerKit, AmountMath } from '@agoric/ertp';
-
-import { makeScalarMapStore } from '@agoric/store';
+import { AmountMath, makeIssuerKit } from '@agoric/ertp';
import { notForProductionUse } from '@agoric/internal/src/magic-cookie-test-only.js';
+import { makeScalarMapStore } from '@agoric/store';
+import { Far } from '@endo/far';
// This vat contains two starting mints for demos: moolaMint and
// simoleanMint.
diff --git a/packages/vats/src/vat-network.js b/packages/vats/src/vat-network.js
index 2b42b1c9b1c..a74e4c3c2d6 100644
--- a/packages/vats/src/vat-network.js
+++ b/packages/vats/src/vat-network.js
@@ -1,5 +1,4 @@
// @ts-check
-import { makeDurableZone } from '@agoric/zone/durable.js';
import {
prepareEchoConnectionKit,
prepareLoopbackProtocolHandler,
@@ -8,6 +7,7 @@ import {
prepareRouterProtocol,
} from '@agoric/network';
import { prepareVowTools } from '@agoric/vow/vat.js';
+import { makeDurableZone } from '@agoric/zone/durable.js';
import { Far } from '@endo/far';
export function buildRootObject(_vatPowers, _args, baggage) {
diff --git a/packages/vats/src/vat-priceAuthority.js b/packages/vats/src/vat-priceAuthority.js
index 86cc49eb790..9d6bdd52be4 100644
--- a/packages/vats/src/vat-priceAuthority.js
+++ b/packages/vats/src/vat-priceAuthority.js
@@ -1,4 +1,5 @@
import { Far } from '@endo/marshal';
+
import { providePriceAuthorityRegistry } from './priceAuthorityRegistry.js';
/**
diff --git a/packages/vats/src/vat-provisioning.js b/packages/vats/src/vat-provisioning.js
index ecccd9a07f2..7bdeab24354 100644
--- a/packages/vats/src/vat-provisioning.js
+++ b/packages/vats/src/vat-provisioning.js
@@ -1,11 +1,12 @@
-import { E, Far } from '@endo/far';
-import { makeNotifierKit } from '@agoric/notifier';
import {
makeSyncMethodCallback,
prepareGuardedAttenuator,
} from '@agoric/internal/src/callback.js';
-import { makeDurableZone } from '@agoric/zone/durable.js';
+import { makeNotifierKit } from '@agoric/notifier';
import { provide } from '@agoric/vat-data';
+import { makeDurableZone } from '@agoric/zone/durable.js';
+import { E, Far } from '@endo/far';
+
import {
NameHubIKit,
prepareMixinMyAddress,
diff --git a/packages/vats/src/vat-transfer.js b/packages/vats/src/vat-transfer.js
index fdb85e8c675..4be486393f8 100644
--- a/packages/vats/src/vat-transfer.js
+++ b/packages/vats/src/vat-transfer.js
@@ -1,9 +1,9 @@
// @ts-check
-import { Far } from '@endo/far';
-import { makeDurableZone } from '@agoric/zone/durable.js';
-
import { provideLazy } from '@agoric/store';
import { prepareVowTools } from '@agoric/vow/vat.js';
+import { makeDurableZone } from '@agoric/zone/durable.js';
+import { Far } from '@endo/far';
+
import { prepareBridgeTargetModule } from './bridge-target.js';
import { prepareTransferTools } from './transfer.js';
diff --git a/packages/vats/src/vat-zoe.js b/packages/vats/src/vat-zoe.js
index f37422e4853..36fdf302611 100644
--- a/packages/vats/src/vat-zoe.js
+++ b/packages/vats/src/vat-zoe.js
@@ -1,5 +1,5 @@
-import { Far } from '@endo/far';
import { makeDurableZoeKit } from '@agoric/zoe';
+import { Far } from '@endo/far';
const BUILD_PARAMS_KEY = 'buildZoeParams';
diff --git a/packages/vats/src/virtual-purse.js b/packages/vats/src/virtual-purse.js
index 155f29e31a9..12245dc83e3 100644
--- a/packages/vats/src/virtual-purse.js
+++ b/packages/vats/src/virtual-purse.js
@@ -1,9 +1,3 @@
-import { Fail } from '@endo/errors';
-import { E } from '@endo/far';
-import { isPromise } from '@endo/promise-kit';
-import { getInterfaceGuardPayload, matches } from '@endo/patterns';
-
-import { M } from '@agoric/store';
import {
AmountPatternShape,
AmountShape,
@@ -12,6 +6,11 @@ import {
NotifierShape,
PaymentShape,
} from '@agoric/ertp';
+import { M } from '@agoric/store';
+import { Fail } from '@endo/errors';
+import { E } from '@endo/far';
+import { getInterfaceGuardPayload, matches } from '@endo/patterns';
+import { isPromise } from '@endo/promise-kit';
/**
* @param {Pattern} [brandShape]
diff --git a/packages/vats/test/boot.test.js b/packages/vats/test/boot.test.js
index 57a92979772..352755a434f 100644
--- a/packages/vats/test/boot.test.js
+++ b/packages/vats/test/boot.test.js
@@ -1,4 +1,5 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+
import { makeScalarBigMapStore } from '@agoric/vat-data';
import { makeFakeVatAdmin } from '@agoric/zoe/tools/fakeVatAdmin.js';
import bundleSourceAmbient from '@endo/bundle-source';
@@ -9,7 +10,6 @@ import { buildRootObject as buildSimRootObject } from '../src/core/boot-sim.js';
import { buildRootObject as buildSoloRootObject } from '../src/core/boot-solo.js';
import { bridgeCoreEval } from '../src/core/chain-behaviors.js';
import { makePromiseSpace } from '../src/core/promise-space.js';
-
import {
makeMock,
mockDProxy,
diff --git a/packages/vats/test/bootstrapPayment.test.js b/packages/vats/test/bootstrapPayment.test.js
index d0212fc136b..e05e4a4eb27 100644
--- a/packages/vats/test/bootstrapPayment.test.js
+++ b/packages/vats/test/bootstrapPayment.test.js
@@ -1,10 +1,11 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { E } from '@endo/far';
-import { deeplyFulfilled } from '@endo/marshal';
-import { setUpZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
import { AmountMath } from '@agoric/ertp';
import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
+import { setUpZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
+import { E } from '@endo/far';
+import { deeplyFulfilled } from '@endo/marshal';
+
import centralSupplyBundle from '../bundles/bundle-centralSupply.js';
import { feeIssuerConfig } from '../src/core/utils.js';
diff --git a/packages/vats/test/clientBundle.test.js b/packages/vats/test/clientBundle.test.js
index 4bf665efeb5..7b65fc16dd1 100644
--- a/packages/vats/test/clientBundle.test.js
+++ b/packages/vats/test/clientBundle.test.js
@@ -1,27 +1,27 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { E, Far } from '@endo/far';
-import { setUpZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
import { makeIssuerKit } from '@agoric/ertp';
+import { Stake } from '@agoric/internal/src/tokens.js';
import { makeScalarBigMapStore } from '@agoric/vat-data';
+import { setUpZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
import { makeHeapZone } from '@agoric/zone';
-import { Stake } from '@agoric/internal/src/tokens.js';
-import { connectFaucet, showAmount } from '../src/core/demoIssuers.js';
-import { setupClientManager } from '../src/core/chain-behaviors.js';
-import { makeAgoricNamesAccess, feeIssuerConfig } from '../src/core/utils.js';
-import { makePromiseSpace } from '../src/core/promise-space.js';
-import { buildRootObject as mintsRoot } from '../src/vat-mints.js';
-import { buildRootObject as boardRoot } from '../src/vat-board.js';
+import { E, Far } from '@endo/far';
+
import {
installBootContracts,
makeAddressNameHubs,
makeBoard,
makeClientBanks,
} from '../src/core/basic-behaviors.js';
+import { setupClientManager } from '../src/core/chain-behaviors.js';
+import { connectFaucet, showAmount } from '../src/core/demoIssuers.js';
+import { makePromiseSpace } from '../src/core/promise-space.js';
+import { feeIssuerConfig, makeAgoricNamesAccess } from '../src/core/utils.js';
+import { makeNameHubKit, prepareMixinMyAddress } from '../src/nameHub.js';
+import { buildRootObject as boardRoot } from '../src/vat-board.js';
+import { buildRootObject as mintsRoot } from '../src/vat-mints.js';
import { buildRootObject as buildProvisioningRoot } from '../src/vat-provisioning.js';
-
import { makePopulatedFakeVatAdmin } from '../tools/boot-test-utils.js';
-import { makeNameHubKit, prepareMixinMyAddress } from '../src/nameHub.js';
/**
* @typedef {{
diff --git a/packages/vats/test/demoAMM.test.js b/packages/vats/test/demoAMM.test.js
index 5a031e6c583..a4dc28d9713 100644
--- a/packages/vats/test/demoAMM.test.js
+++ b/packages/vats/test/demoAMM.test.js
@@ -1,4 +1,5 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+
import { AmountMath, makeIssuerKit } from '@agoric/ertp';
import { Stable } from '@agoric/internal/src/tokens.js';
diff --git a/packages/vats/test/fake-bridge.test.js b/packages/vats/test/fake-bridge.test.js
index 63329d1459d..f7acc846b4c 100644
--- a/packages/vats/test/fake-bridge.test.js
+++ b/packages/vats/test/fake-bridge.test.js
@@ -4,6 +4,7 @@ import { makeIssuerKit } from '@agoric/ertp';
import { withAmountUtils } from '@agoric/zoe/tools/test-utils.js';
import { makeHeapZone } from '@agoric/zone';
import { E } from '@endo/far';
+
import { buildRootObject as buildBankVatRoot } from '../src/vat-bank.js';
import { makeFakeBankBridge } from '../tools/fake-bridge.js';
diff --git a/packages/vats/test/ibc-utils.test.js b/packages/vats/test/ibc-utils.test.js
index cfd0b538c3c..c9d1966ec45 100644
--- a/packages/vats/test/ibc-utils.test.js
+++ b/packages/vats/test/ibc-utils.test.js
@@ -1,4 +1,5 @@
import test from 'ava';
+
import {
decodeRemoteIbcAddress,
localAddrToPortID,
diff --git a/packages/vats/test/lib-board.test.js b/packages/vats/test/lib-board.test.js
index 70e90b15949..6dca69a4a7b 100644
--- a/packages/vats/test/lib-board.test.js
+++ b/packages/vats/test/lib-board.test.js
@@ -1,6 +1,7 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
import { E, Far } from '@endo/far';
+
import { makeFakeBoard } from '../tools/board-utils.js';
test('makeBoard', async t => {
diff --git a/packages/vats/test/localchain.test.js b/packages/vats/test/localchain.test.js
index 05abdadab11..798429bfe84 100644
--- a/packages/vats/test/localchain.test.js
+++ b/packages/vats/test/localchain.test.js
@@ -1,16 +1,17 @@
// @ts-check
import { test as anyTest } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { NonNullish } from '@agoric/internal';
import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
+import { NonNullish } from '@agoric/internal';
+import { VTRANSFER_IBC_EVENT } from '@agoric/internal/src/action-types.js';
import { reincarnate } from '@agoric/swingset-liveslots/tools/setup-vat-data.js';
+import { heapVowE as E, prepareVowTools } from '@agoric/vow/vat.js';
import { withAmountUtils } from '@agoric/zoe/tools/test-utils.js';
import { makeDurableZone } from '@agoric/zone/durable.js';
import { getInterfaceOf } from '@endo/marshal';
-import { VTRANSFER_IBC_EVENT } from '@agoric/internal/src/action-types.js';
-import { prepareVowTools, heapVowE as E } from '@agoric/vow/vat.js';
-import { prepareLocalChainTools } from '../src/localchain.js';
+
import { prepareBridgeTargetModule } from '../src/bridge-target.js';
+import { prepareLocalChainTools } from '../src/localchain.js';
import { prepareTransferTools } from '../src/transfer.js';
import { makeFakeBankManagerKit } from '../tools/bank-utils.js';
import {
diff --git a/packages/vats/test/name-hub-published.test.js b/packages/vats/test/name-hub-published.test.js
index f33ba8cc1d6..3aa76df0f68 100644
--- a/packages/vats/test/name-hub-published.test.js
+++ b/packages/vats/test/name-hub-published.test.js
@@ -1,20 +1,21 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
import { makeMockChainStorageRoot } from '@agoric/internal/src/storage-test-utils.js';
-import { makeHandle } from '@agoric/zoe/src/makeHandle.js';
import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
-import {
- makeAgoricNamesAccess,
- makePromiseSpaceForNameHub,
-} from '../src/core/utils.js';
-import { makePromiseSpace } from '../src/core/promise-space.js';
+import { makeHandle } from '@agoric/zoe/src/makeHandle.js';
+
+import { makeAddressNameHubs } from '../src/core/basic-behaviors.js';
import {
publishAgoricNames,
setupClientManager,
} from '../src/core/chain-behaviors.js';
-import { makeFakeBoard } from '../tools/board-utils.js';
-import { makeAddressNameHubs } from '../src/core/basic-behaviors.js';
+import { makePromiseSpace } from '../src/core/promise-space.js';
+import {
+ makeAgoricNamesAccess,
+ makePromiseSpaceForNameHub,
+} from '../src/core/utils.js';
import { makeNameHubKit } from '../src/nameHub.js';
+import { makeFakeBoard } from '../tools/board-utils.js';
test('publishAgoricNames publishes AMM instance', async t => {
const space = makePromiseSpace();
diff --git a/packages/vats/test/name-hub.test.js b/packages/vats/test/name-hub.test.js
index 3911a3e6773..7ab5c1dae40 100644
--- a/packages/vats/test/name-hub.test.js
+++ b/packages/vats/test/name-hub.test.js
@@ -1,4 +1,5 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+
import { Far } from '@endo/far';
import { makeNameHubKit } from '../src/nameHub.js';
diff --git a/packages/vats/test/network.test.js b/packages/vats/test/network.test.js
index 7f4b739db1d..cade1edce1c 100644
--- a/packages/vats/test/network.test.js
+++ b/packages/vats/test/network.test.js
@@ -1,22 +1,21 @@
-import { reincarnate } from '@agoric/swingset-liveslots/tools/setup-vat-data.js';
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+import { prepareNetworkPowers } from '@agoric/network';
import {
makePinnedHistoryTopic,
prepareDurablePublishKit,
subscribeEach,
} from '@agoric/notifier';
+import { reincarnate } from '@agoric/swingset-liveslots/tools/setup-vat-data.js';
import { prepareVowTools } from '@agoric/vow/vat.js';
import { makeDurableZone } from '@agoric/zone/durable.js';
import { E } from '@endo/far';
-import { prepareNetworkPowers } from '@agoric/network';
+import { registerNetworkProtocols } from '../src/proposals/network-proposal.js';
import { buildRootObject as ibcBuildRootObject } from '../src/vat-ibc.js';
import { buildRootObject as networkBuildRootObject } from '../src/vat-network.js';
import { makeFakeIbcBridge } from '../tools/fake-bridge.js';
-import { registerNetworkProtocols } from '../src/proposals/network-proposal.js';
-
const { fakeVomKit } = reincarnate({ relaxDurabilityRules: false });
const provideBaggage = key => {
const root = fakeVomKit.cm.provideBaggage();
diff --git a/packages/vats/test/priceAuthorityRegistry.test.js b/packages/vats/test/priceAuthorityRegistry.test.js
index dd27478c865..1e22c501796 100644
--- a/packages/vats/test/priceAuthorityRegistry.test.js
+++ b/packages/vats/test/priceAuthorityRegistry.test.js
@@ -5,6 +5,7 @@ import { buildManualTimer } from '@agoric/swingset-vat/tools/manual-timer.js';
import { makeScalarBigMapStore } from '@agoric/vat-data';
import { makeFakePriceAuthority } from '@agoric/zoe/tools/fakePriceAuthority.js';
import { E } from '@endo/far';
+
import { providePriceAuthorityRegistry } from '../src/priceAuthorityRegistry.js';
test('price authority confused stores', async t => {
diff --git a/packages/vats/test/promise-space.test.js b/packages/vats/test/promise-space.test.js
index 7fd4855ce17..caa95a2a4f0 100644
--- a/packages/vats/test/promise-space.test.js
+++ b/packages/vats/test/promise-space.test.js
@@ -1,4 +1,5 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+
import { makeScalarBigMapStore } from '@agoric/vat-data';
import { makePromiseSpace } from '../src/core/promise-space.js';
diff --git a/packages/vats/test/repl.test.js b/packages/vats/test/repl.test.js
index 30d8fb0b21b..3f83ca1875f 100644
--- a/packages/vats/test/repl.test.js
+++ b/packages/vats/test/repl.test.js
@@ -1,5 +1,6 @@
-import test from 'ava';
import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
+import test from 'ava';
+
import { getReplHandler } from '../src/repl.js';
function make() {
diff --git a/packages/vats/test/tokens.test.js b/packages/vats/test/tokens.test.js
index 6a70e569fbf..ca2d51b8315 100644
--- a/packages/vats/test/tokens.test.js
+++ b/packages/vats/test/tokens.test.js
@@ -1,9 +1,7 @@
-import test from 'ava';
-
-import { assertKeywordName } from '@agoric/zoe/src/cleanProposal.js';
-
import { AssetKind } from '@agoric/ertp';
import { Stable, Stake } from '@agoric/internal/src/tokens.js';
+import { assertKeywordName } from '@agoric/zoe/src/cleanProposal.js';
+import test from 'ava';
test('token symbols are keywords', t => {
t.notThrows(() => assertKeywordName(Stable.symbol));
diff --git a/packages/vats/test/types-ambient.test-d.ts b/packages/vats/test/types-ambient.test-d.ts
index 32745f25477..418047cafdd 100644
--- a/packages/vats/test/types-ambient.test-d.ts
+++ b/packages/vats/test/types-ambient.test-d.ts
@@ -9,9 +9,8 @@
///
import type { start as assetReserveStart } from '@agoric/inter-protocol/src/reserve/assetReserve.js';
-import { expectNotType, expectType } from 'tsd';
-
import type { Instance } from '@agoric/zoe/src/zoeService/utils.js';
+import { expectNotType, expectType } from 'tsd';
const mock = null as any;
diff --git a/packages/vats/test/vat-bank-integration.test.js b/packages/vats/test/vat-bank-integration.test.js
index 33cfe964744..cc9c6dada4f 100644
--- a/packages/vats/test/vat-bank-integration.test.js
+++ b/packages/vats/test/vat-bank-integration.test.js
@@ -1,22 +1,22 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+import { observeIteration } from '@agoric/notifier';
import { makeScalarMapStore } from '@agoric/vat-data';
-
-import { E } from '@endo/far';
-import { makePromiseKit } from '@endo/promise-kit';
import { makeZoeKitForTest } from '@agoric/zoe/tools/setup-zoe.js';
-import { observeIteration } from '@agoric/notifier';
import { makeHeapZone } from '@agoric/zone';
-import { buildRootObject } from '../src/vat-bank.js';
+import { E } from '@endo/far';
+import { makePromiseKit } from '@endo/promise-kit';
+
import {
- mintInitialSupply,
addBankAssets,
installBootContracts,
- produceStartUpgradable,
+ mintInitialSupply,
produceDiagnostics,
+ produceStartUpgradable,
} from '../src/core/basic-behaviors.js';
-import { makeAgoricNamesAccess } from '../src/core/utils.js';
import { makePromiseSpace } from '../src/core/promise-space.js';
+import { makeAgoricNamesAccess } from '../src/core/utils.js';
+import { buildRootObject } from '../src/vat-bank.js';
import { makePopulatedFakeVatAdmin } from '../tools/boot-test-utils.js';
test('mintInitialSupply, addBankAssets bootstrap actions', async t => {
diff --git a/packages/vats/test/vat-bank.test.js b/packages/vats/test/vat-bank.test.js
index 6a193c6d075..8a2c59cd96c 100644
--- a/packages/vats/test/vat-bank.test.js
+++ b/packages/vats/test/vat-bank.test.js
@@ -1,11 +1,12 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { reincarnate } from '@agoric/swingset-liveslots/tools/setup-vat-data.js';
-import { E } from '@endo/far';
-import { AmountMath, makeIssuerKit, AssetKind } from '@agoric/ertp';
-import { makeDurableZone } from '@agoric/zone/durable.js';
-import { makeHeapZone } from '@agoric/zone';
+import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
import { subscribeEach } from '@agoric/notifier';
+import { reincarnate } from '@agoric/swingset-liveslots/tools/setup-vat-data.js';
+import { makeHeapZone } from '@agoric/zone';
+import { makeDurableZone } from '@agoric/zone/durable.js';
+import { E } from '@endo/far';
+
import { buildRootObject } from '../src/vat-bank.js';
/**
diff --git a/packages/vats/test/vpurse.test.js b/packages/vats/test/vpurse.test.js
index ca0da5744ea..a6a3dde938f 100644
--- a/packages/vats/test/vpurse.test.js
+++ b/packages/vats/test/vpurse.test.js
@@ -1,13 +1,13 @@
-import { M } from '@endo/patterns';
import { test as rawTest } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { reincarnate } from '@agoric/swingset-liveslots/tools/setup-vat-data.js';
-import { E } from '@endo/far';
import { AmountMath, makeIssuerKit } from '@agoric/ertp';
import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
-
import { makeNotifierKit } from '@agoric/notifier';
+import { reincarnate } from '@agoric/swingset-liveslots/tools/setup-vat-data.js';
import { makeDurableZone } from '@agoric/zone/durable.js';
+import { E } from '@endo/far';
+import { M } from '@endo/patterns';
+
import { prepareVirtualPurse } from '../src/virtual-purse.js';
/** @type {import('ava').TestFn>} */
diff --git a/packages/vats/tools/bank-utils.js b/packages/vats/tools/bank-utils.js
index cf077e6807d..2266b1db0aa 100644
--- a/packages/vats/tools/bank-utils.js
+++ b/packages/vats/tools/bank-utils.js
@@ -3,6 +3,7 @@ import { makeScalarBigMapStore, makeScalarMapStore } from '@agoric/vat-data';
import { makeDurableZone } from '@agoric/zone/durable.js';
import { E } from '@endo/far';
import { Far } from '@endo/marshal';
+
import { buildRootObject as buildBankVatRoot } from '../src/vat-bank.js';
import { FAUCET_ADDRESS, makeFakeBankBridge } from './fake-bridge.js';
diff --git a/packages/vats/tools/board-utils.js b/packages/vats/tools/board-utils.js
index c9ee33bb416..aeafa7b085c 100644
--- a/packages/vats/tools/board-utils.js
+++ b/packages/vats/tools/board-utils.js
@@ -26,6 +26,7 @@ import {
} from '@agoric/internal/src/marshal.js';
import { makeScalarBigMapStore } from '@agoric/vat-data';
import { makeMarshal } from '@endo/marshal';
+
import { prepareBoardKit } from '../src/lib-board.js';
export * from '@agoric/internal/src/marshal.js';
diff --git a/packages/vats/tools/boot-test-utils.js b/packages/vats/tools/boot-test-utils.js
index f43f6e15552..b1455b26e5d 100644
--- a/packages/vats/tools/boot-test-utils.js
+++ b/packages/vats/tools/boot-test-utils.js
@@ -1,14 +1,12 @@
-import { Fail } from '@endo/errors';
-import { E } from '@endo/far';
-import { Far } from '@endo/marshal';
-
+import { makeScalarBigMapStore } from '@agoric/vat-data';
import {
makeFakeVatAdmin,
zcfBundleCap,
} from '@agoric/zoe/tools/fakeVatAdmin.js';
import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
-import { makeScalarBigMapStore } from '@agoric/vat-data';
-import { bundles, devices } from '../test/devices.js';
+import { Fail } from '@endo/errors';
+import { E } from '@endo/far';
+import { Far } from '@endo/marshal';
import { buildRootObject as agoricNamesRoot } from '../src/vat-agoricNames.js';
import { buildRootObject as bankRoot } from '../src/vat-bank.js';
@@ -19,6 +17,7 @@ import { buildRootObject as networkRoot } from '../src/vat-network.js';
import { buildRootObject as priceAuthorityRoot } from '../src/vat-priceAuthority.js';
import { buildRootObject as provisioningRoot } from '../src/vat-provisioning.js';
import { buildRootObject as zoeRoot } from '../src/vat-zoe.js';
+import { bundles, devices } from '../test/devices.js';
export const vatRoots = {
agoricNames: agoricNamesRoot,
diff --git a/packages/vats/tools/fake-bridge.js b/packages/vats/tools/fake-bridge.js
index 36c39af8d37..cf7f4239b78 100644
--- a/packages/vats/tools/fake-bridge.js
+++ b/packages/vats/tools/fake-bridge.js
@@ -1,8 +1,8 @@
// @ts-check
-import { assert, Fail } from '@endo/errors';
import { makeTracer, VBankAccount } from '@agoric/internal';
-import { E } from '@endo/far';
import { makeWhen } from '@agoric/vow/src/when.js';
+import { assert, Fail } from '@endo/errors';
+import { E } from '@endo/far';
import { Nat } from '@endo/nat';
/**
diff --git a/packages/vow/src/E.js b/packages/vow/src/E.js
index c07bb8f3f8d..6fba83a53e1 100644
--- a/packages/vow/src/E.js
+++ b/packages/vow/src/E.js
@@ -15,9 +15,10 @@
* designed to be a drop-in replacement for the version in
* `@endo/eventual-send/src/E.js` which contained no concept of "unwrap",
*/
-import { X, q, Fail, makeError } from '@endo/errors';
-import { trackTurns } from './track-turns.js';
+import { Fail, makeError, q, X } from '@endo/errors';
+
import { makeMessageBreakpointTester } from './message-breakpoints.js';
+import { trackTurns } from './track-turns.js';
const { assign, create } = Object;
diff --git a/packages/vow/src/message-breakpoints.js b/packages/vow/src/message-breakpoints.js
index 860cf6fbe1a..9378c7d383c 100644
--- a/packages/vow/src/message-breakpoints.js
+++ b/packages/vow/src/message-breakpoints.js
@@ -1,7 +1,6 @@
// @ts-check
import { getEnvironmentOption } from '@endo/env-options';
-
-import { q, Fail } from '@endo/errors';
+import { Fail, q } from '@endo/errors';
const { hasOwn, freeze, entries } = Object;
diff --git a/packages/vow/src/tools.js b/packages/vow/src/tools.js
index ff35539726c..e50ad603449 100644
--- a/packages/vow/src/tools.js
+++ b/packages/vow/src/tools.js
@@ -1,8 +1,8 @@
// @ts-check
-import { makeAsVow } from './vow-utils.js';
import { prepareVowKit } from './vow.js';
-import { prepareWatchUtils } from './watch-utils.js';
+import { makeAsVow } from './vow-utils.js';
import { prepareWatch } from './watch.js';
+import { prepareWatchUtils } from './watch-utils.js';
import { makeWhen } from './when.js';
/**
diff --git a/packages/vow/src/track-turns.js b/packages/vow/src/track-turns.js
index e81b0c4b2dd..fb3716814bc 100644
--- a/packages/vow/src/track-turns.js
+++ b/packages/vow/src/track-turns.js
@@ -1,10 +1,9 @@
// @ts-check
/* global globalThis */
import {
- getEnvironmentOption,
environmentOptionsListHas,
+ getEnvironmentOption,
} from '@endo/env-options';
-
// Note that in the original track-turns.js in @endo/eventual-send we
// can't simply import these because `assert` is not in scope before lockdown.
// But this copy in @agoric/vow the import is fine.
diff --git a/packages/vow/src/vow.js b/packages/vow/src/vow.js
index e2539baf06f..8df1750a740 100644
--- a/packages/vow/src/vow.js
+++ b/packages/vow/src/vow.js
@@ -1,8 +1,8 @@
// @ts-check
-import { makePromiseKit } from '@endo/promise-kit';
-import { M } from '@endo/patterns';
-import { makeTagged } from '@endo/pass-style';
import { PromiseWatcherI } from '@agoric/base-zone';
+import { makeTagged } from '@endo/pass-style';
+import { M } from '@endo/patterns';
+import { makePromiseKit } from '@endo/promise-kit';
const { details: X } = assert;
diff --git a/packages/vow/src/watch-utils.js b/packages/vow/src/watch-utils.js
index 0bb740530bc..8e0e7a1c668 100644
--- a/packages/vow/src/watch-utils.js
+++ b/packages/vow/src/watch-utils.js
@@ -1,7 +1,7 @@
// @ts-check
-import { M } from '@endo/patterns';
import { PromiseWatcherI } from '@agoric/base-zone';
+import { M } from '@endo/patterns';
const { Fail, bare, details: X } = assert;
diff --git a/packages/vow/src/watch.js b/packages/vow/src/watch.js
index fb5a793500b..b0cb1fd6e76 100644
--- a/packages/vow/src/watch.js
+++ b/packages/vow/src/watch.js
@@ -1,6 +1,7 @@
// @ts-check
import { PromiseWatcherI } from '@agoric/base-zone';
-import { getVowPayload, basicE } from './vow-utils.js';
+
+import { basicE, getVowPayload } from './vow-utils.js';
const { apply } = Reflect;
diff --git a/packages/vow/src/when.js b/packages/vow/src/when.js
index c9befef854b..ba6ed665c4d 100644
--- a/packages/vow/src/when.js
+++ b/packages/vow/src/when.js
@@ -1,5 +1,5 @@
// @ts-check
-import { getVowPayload, basicE } from './vow-utils.js';
+import { basicE, getVowPayload } from './vow-utils.js';
/** @import { IsRetryableReason, EUnwrap } from './types.js' */
diff --git a/packages/vow/test/asVow.test.js b/packages/vow/test/asVow.test.js
index 35756da0dd3..2e0208dc867 100644
--- a/packages/vow/test/asVow.test.js
+++ b/packages/vow/test/asVow.test.js
@@ -1,8 +1,7 @@
// @ts-check
-import test from 'ava';
-
-import { E } from '@endo/far';
import { makeHeapZone } from '@agoric/base-zone/heap.js';
+import { E } from '@endo/far';
+import test from 'ava';
import { prepareBasicVowTools } from '../src/tools.js';
import { getVowPayload, isVow } from '../src/vow-utils.js';
diff --git a/packages/vow/test/disconnect.test.js b/packages/vow/test/disconnect.test.js
index 5ea0e73e4c3..7fe0a8c8368 100644
--- a/packages/vow/test/disconnect.test.js
+++ b/packages/vow/test/disconnect.test.js
@@ -1,8 +1,8 @@
// @ts-check
-import test from 'ava';
-
import { makeHeapZone } from '@agoric/base-zone/heap.js';
import { makeTagged } from '@endo/pass-style';
+import test from 'ava';
+
import { prepareBasicVowTools } from '../src/tools.js';
/** @import {Vow} from '../src/types.js' */
diff --git a/packages/vow/test/types.test-d.ts b/packages/vow/test/types.test-d.ts
index 8a859348caf..82e2a7dfee8 100644
--- a/packages/vow/test/types.test-d.ts
+++ b/packages/vow/test/types.test-d.ts
@@ -1,7 +1,8 @@
-import { expectType } from 'tsd';
import type { Zone } from '@agoric/base-zone';
-import type { Vow } from '../src/types.js';
+import { expectType } from 'tsd';
+
import type { VowTools } from '../src/tools.js';
+import type { Vow } from '../src/types.js';
const vt: VowTools = null as any;
diff --git a/packages/vow/test/vat.test.js b/packages/vow/test/vat.test.js
index 4babdb3a04b..376a9f5da8c 100644
--- a/packages/vow/test/vat.test.js
+++ b/packages/vow/test/vat.test.js
@@ -1,6 +1,6 @@
// @ts-check
-import test from 'ava';
import { E, Far } from '@endo/far';
+import test from 'ava';
import { heapVowE as VE, heapVowTools } from '../vat.js';
diff --git a/packages/vow/test/watch-utils.test.js b/packages/vow/test/watch-utils.test.js
index 13e5be07d5d..07035f74df5 100644
--- a/packages/vow/test/watch-utils.test.js
+++ b/packages/vow/test/watch-utils.test.js
@@ -1,8 +1,7 @@
// @ts-check
-import test from 'ava';
-
import { makeHeapZone } from '@agoric/base-zone/heap.js';
import { E, getInterfaceOf } from '@endo/far';
+import test from 'ava';
import { prepareBasicVowTools } from '../src/tools.js';
diff --git a/packages/vow/test/watch.test.js b/packages/vow/test/watch.test.js
index 61ccec95a9b..d009d1cb6e0 100644
--- a/packages/vow/test/watch.test.js
+++ b/packages/vow/test/watch.test.js
@@ -1,7 +1,6 @@
// @ts-check
-import test from 'ava';
-
import { makeHeapZone } from '@agoric/base-zone/heap.js';
+import test from 'ava';
import { prepareBasicVowTools } from '../src/tools.js';
diff --git a/packages/vow/vat.js b/packages/vow/vat.js
index a486730b9c4..6255e8dbff8 100644
--- a/packages/vow/vat.js
+++ b/packages/vow/vat.js
@@ -5,11 +5,11 @@
/* global globalThis */
// @ts-check
-import { isUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
import { makeHeapZone } from '@agoric/base-zone/heap.js';
+import { isUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
-import { prepareBasicVowTools } from './src/tools.js';
import makeE from './src/E.js';
+import { prepareBasicVowTools } from './src/tools.js';
/** @type {import('./src/types.js').IsRetryableReason} */
const isRetryableReason = (reason, priorRetryValue) => {
diff --git a/packages/wallet/api/scripts/build-bundles.js b/packages/wallet/api/scripts/build-bundles.js
index d2b7ab87754..ca23303e941 100644
--- a/packages/wallet/api/scripts/build-bundles.js
+++ b/packages/wallet/api/scripts/build-bundles.js
@@ -1,5 +1,6 @@
#! /usr/bin/env node
import '@endo/init';
+
import { createBundles } from '@agoric/internal/src/node/createBundles.js';
import url from 'url';
diff --git a/packages/wallet/api/src/actions.js b/packages/wallet/api/src/actions.js
index c5bf3469969..101bb2de103 100644
--- a/packages/wallet/api/src/actions.js
+++ b/packages/wallet/api/src/actions.js
@@ -1,8 +1,8 @@
// @ts-check
-import { makePromiseKit } from '@endo/promise-kit';
-import { Far } from '@endo/marshal';
import { E } from '@endo/eventual-send';
+import { Far } from '@endo/marshal';
+import { makePromiseKit } from '@endo/promise-kit';
export const makePaymentActions = ({
getBrandRecord,
diff --git a/packages/wallet/api/src/date-now.js b/packages/wallet/api/src/date-now.js
index 742e5fac263..0d68a978bdf 100644
--- a/packages/wallet/api/src/date-now.js
+++ b/packages/wallet/api/src/date-now.js
@@ -1,5 +1,5 @@
-import { E } from '@endo/eventual-send';
import { observeNotifier } from '@agoric/notifier';
+import { E } from '@endo/eventual-send';
import { makePromiseKit } from '@endo/promise-kit';
export const DEFAULT_TIMER_SERVICE_POLL_INTERVAL = 60_000n;
diff --git a/packages/wallet/api/src/findOrMakeInvitation.js b/packages/wallet/api/src/findOrMakeInvitation.js
index a993a179343..efe3c8b066e 100644
--- a/packages/wallet/api/src/findOrMakeInvitation.js
+++ b/packages/wallet/api/src/findOrMakeInvitation.js
@@ -1,7 +1,7 @@
+import { AmountMath } from '@agoric/ertp';
import { assert, Fail, q } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { passStyleOf } from '@endo/marshal';
-import { AmountMath } from '@agoric/ertp';
export const makeId = (dappOrigin, rawId) => `${dappOrigin}#${rawId}`;
diff --git a/packages/wallet/api/src/issuerTable.js b/packages/wallet/api/src/issuerTable.js
index 9a5e6552c2e..d92a98fa920 100644
--- a/packages/wallet/api/src/issuerTable.js
+++ b/packages/wallet/api/src/issuerTable.js
@@ -1,11 +1,10 @@
// @ts-check
-import { assert } from '@endo/errors';
-import { E } from '@endo/eventual-send';
+import './internal-types.js';
import { makeScalarWeakMapStore } from '@agoric/store';
-
-import './internal-types.js';
+import { assert } from '@endo/errors';
+import { E } from '@endo/eventual-send';
/**
* IssuerTable
diff --git a/packages/wallet/api/src/lib-dehydrate.js b/packages/wallet/api/src/lib-dehydrate.js
index 5f96148f1a2..90d54a17a2a 100644
--- a/packages/wallet/api/src/lib-dehydrate.js
+++ b/packages/wallet/api/src/lib-dehydrate.js
@@ -1,8 +1,8 @@
// @ts-check
+import { makeLegacyMap, makeScalarMapStore } from '@agoric/store';
import { assert, Fail, q } from '@endo/errors';
import { makeMarshal, mapIterable } from '@endo/marshal';
-import { makeLegacyMap, makeScalarMapStore } from '@agoric/store';
/**
* @typedef {string[]} Path
diff --git a/packages/wallet/api/src/lib-wallet.js b/packages/wallet/api/src/lib-wallet.js
index 721ebb256ae..930d505291b 100644
--- a/packages/wallet/api/src/lib-wallet.js
+++ b/packages/wallet/api/src/lib-wallet.js
@@ -11,38 +11,37 @@
* and dapps.
*/
-import { assert, q, Fail } from '@endo/errors';
+import './internal-types.js';
+
import { makeScalarStoreCoordinator } from '@agoric/cache';
+import { AmountMath } from '@agoric/ertp';
import { objectMap, WalletName } from '@agoric/internal';
import { slotStringUnserialize } from '@agoric/internal/src/storage-test-utils.js';
+import {
+ makeNotifierFromSubscriber,
+ makeNotifierKit,
+ observeIteration,
+ observeNotifier,
+ subscribeEach,
+} from '@agoric/notifier';
+import { makeExportContext } from '@agoric/smart-wallet/src/marshal-contexts.js';
import {
makeLegacyMap,
makeScalarMapStore,
makeScalarWeakMapStore,
} from '@agoric/store';
import { makeScalarBigMapStore } from '@agoric/vat-data';
-import { AmountMath } from '@agoric/ertp';
+import { assert, Fail, q } from '@endo/errors';
import { E } from '@endo/eventual-send';
-
-import { passStyleOf, Far, mapIterable } from '@endo/marshal';
+import { Far, mapIterable, passStyleOf } from '@endo/marshal';
import { Nat } from '@endo/nat';
-import {
- makeNotifierFromSubscriber,
- makeNotifierKit,
- observeIteration,
- observeNotifier,
- subscribeEach,
-} from '@agoric/notifier';
import { makePromiseKit } from '@endo/promise-kit';
-import { makeExportContext } from '@agoric/smart-wallet/src/marshal-contexts.js';
+import { makePaymentActions } from './actions.js';
+import { bigintStringify } from './bigintStringify.js';
+import { findOrMakeInvitation, makeId } from './findOrMakeInvitation.js';
import { makeIssuerTable } from './issuerTable.js';
import { makeDehydrator } from './lib-dehydrate.js';
-import { makeId, findOrMakeInvitation } from './findOrMakeInvitation.js';
-import { bigintStringify } from './bigintStringify.js';
-import { makePaymentActions } from './actions.js';
-
-import './internal-types.js';
// does nothing
const noActionStateChangeHandler = _newState => {};
diff --git a/packages/wallet/api/src/wallet.js b/packages/wallet/api/src/wallet.js
index b00a28a9245..abb2ee8b1d9 100644
--- a/packages/wallet/api/src/wallet.js
+++ b/packages/wallet/api/src/wallet.js
@@ -8,16 +8,16 @@
* itself. The parts that are relied on by other dapps are documented in the
* types.js file.
*/
-import { E } from '@endo/eventual-send';
+import './internal-types.js';
+
import { makeNotifierKit, observeIteration } from '@agoric/notifier';
+import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { makeWalletRoot } from './lib-wallet.js';
-import pubsub from './pubsub.js';
import { bigintStringify } from './bigintStringify.js';
import { makeTimerDeviceDateNow, makeTimerServiceDateNow } from './date-now.js';
-
-import './internal-types.js';
+import { makeWalletRoot } from './lib-wallet.js';
+import pubsub from './pubsub.js';
/**
* @typedef {{
diff --git a/packages/wallet/api/test/getPursesNotifier.test.js b/packages/wallet/api/test/getPursesNotifier.test.js
index e1d74cd6ef4..c1cdc8639c0 100644
--- a/packages/wallet/api/test/getPursesNotifier.test.js
+++ b/packages/wallet/api/test/getPursesNotifier.test.js
@@ -2,13 +2,14 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { makeIssuerKit } from '@agoric/ertp';
-import { makeZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
-import { makeFakeBoard } from '@agoric/vats/tools/board-utils.js';
-import { makeHeapZone } from '@agoric/zone';
import {
makeNameHubKit,
prepareMixinMyAddress,
} from '@agoric/vats/src/nameHub.js';
+import { makeFakeBoard } from '@agoric/vats/tools/board-utils.js';
+import { makeZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
+import { makeHeapZone } from '@agoric/zone';
+
import { makeWalletRoot } from '../src/lib-wallet.js';
const mixinMyAddress = prepareMixinMyAddress(makeHeapZone());
diff --git a/packages/wallet/api/test/lib-wallet.test.js b/packages/wallet/api/test/lib-wallet.test.js
index 99d00560268..1b07560d5b1 100644
--- a/packages/wallet/api/test/lib-wallet.test.js
+++ b/packages/wallet/api/test/lib-wallet.test.js
@@ -1,22 +1,21 @@
// @ts-check
import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { assert } from '@endo/errors';
-import { E } from '@endo/eventual-send';
-import bundleSource from '@endo/bundle-source';
-
-import { M } from '@agoric/store';
import { makeCache } from '@agoric/cache';
-import { makeIssuerKit, AmountMath, AssetKind } from '@agoric/ertp';
-import { makeZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
-
-import { makeFakeBoard } from '@agoric/vats/tools/board-utils.js';
+import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
+import { M } from '@agoric/store';
import {
makeNameHubKit,
prepareMixinMyAddress,
} from '@agoric/vats/src/nameHub.js';
-import { resolve as importMetaResolve } from 'import-meta-resolve';
+import { makeFakeBoard } from '@agoric/vats/tools/board-utils.js';
+import { makeZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
import { makeHeapZone } from '@agoric/zone';
+import bundleSource from '@endo/bundle-source';
+import { assert } from '@endo/errors';
+import { E } from '@endo/eventual-send';
+import { resolve as importMetaResolve } from 'import-meta-resolve';
+
import { makeWalletRoot } from '../src/lib-wallet.js';
const ZOE_INVITE_PURSE_PETNAME = 'Default Zoe invite purse';
diff --git a/packages/wallet/api/test/middleware.test.js b/packages/wallet/api/test/middleware.test.js
index 6cbb124fc6b..acdd98376e3 100644
--- a/packages/wallet/api/test/middleware.test.js
+++ b/packages/wallet/api/test/middleware.test.js
@@ -1,11 +1,12 @@
// @ts-check
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { E, Far } from '@endo/far';
+
import {
makeExportContext,
makeImportContext,
makeLoggingPresence,
} from '@agoric/smart-wallet/src/marshal-contexts.js';
+import { E, Far } from '@endo/far';
const capData1 = {
body: '#[["applyMethod","$0.Alleged: purse.actions","deposit",["$1.Alleged: payment"]],["applyFunction","$0",[1,"thing"]]]',
diff --git a/packages/xsnap-lockdown/lib/ses-boot-debug.js b/packages/xsnap-lockdown/lib/ses-boot-debug.js
index e044c73646f..29fad9624ba 100644
--- a/packages/xsnap-lockdown/lib/ses-boot-debug.js
+++ b/packages/xsnap-lockdown/lib/ses-boot-debug.js
@@ -7,9 +7,10 @@
///
-import { setObjectInspector } from './console-shim.js';
import '@endo/init/debug.js';
+
import confinedObjectInspect from './confined-object-inspect.js';
+import { setObjectInspector } from './console-shim.js';
setObjectInspector(confinedObjectInspect);
diff --git a/packages/xsnap-lockdown/lib/ses-boot.js b/packages/xsnap-lockdown/lib/ses-boot.js
index d18a0c739f8..969cfc17e0c 100644
--- a/packages/xsnap-lockdown/lib/ses-boot.js
+++ b/packages/xsnap-lockdown/lib/ses-boot.js
@@ -7,9 +7,10 @@
///
-import { setObjectInspector } from './console-shim.js';
import '@endo/init';
+
import confinedObjectInspect from './confined-object-inspect.js';
+import { setObjectInspector } from './console-shim.js';
setObjectInspector(confinedObjectInspect);
diff --git a/packages/xsnap-lockdown/scripts/build-bundle.js b/packages/xsnap-lockdown/scripts/build-bundle.js
index 69ff2069efe..68757cddf02 100644
--- a/packages/xsnap-lockdown/scripts/build-bundle.js
+++ b/packages/xsnap-lockdown/scripts/build-bundle.js
@@ -1,11 +1,12 @@
#! /usr/bin/env node
import '@endo/init';
-import path from 'path';
-import { promises as fsp } from 'fs';
+
+import bundleSource from '@endo/bundle-source';
import crypto from 'crypto';
+import { promises as fsp } from 'fs';
+import path from 'path';
import process from 'process';
-import bundleSource from '@endo/bundle-source';
import { bundlePaths, entryPaths, hashPaths } from '../src/paths.js';
/** @param {Uint8Array | string} bytes */
diff --git a/packages/xsnap-lockdown/src/index.js b/packages/xsnap-lockdown/src/index.js
index 096b32c5e62..dfc8ad878d3 100644
--- a/packages/xsnap-lockdown/src/index.js
+++ b/packages/xsnap-lockdown/src/index.js
@@ -1,4 +1,5 @@
import fs from 'fs';
+
import { bundlePaths, hashPaths } from './paths.js';
const read = (name, path) => {
diff --git a/packages/xsnap-lockdown/test/bundle.test.js b/packages/xsnap-lockdown/test/bundle.test.js
index 6dd3b4f9c01..6f38aadd3b1 100644
--- a/packages/xsnap-lockdown/test/bundle.test.js
+++ b/packages/xsnap-lockdown/test/bundle.test.js
@@ -1,11 +1,11 @@
import test from 'ava';
-import fs from 'fs';
import crypto from 'crypto';
+import fs from 'fs';
import {
+ getDebugLockdownBundle,
getLockdownBundle,
getLockdownBundleSHA256,
- getDebugLockdownBundle,
} from '../src/index.js';
import { bundlePaths } from '../src/paths.js';
diff --git a/packages/xsnap-lockdown/test/inspect.test.js b/packages/xsnap-lockdown/test/inspect.test.js
index 8693ba62dc6..cd3ef5e5134 100644
--- a/packages/xsnap-lockdown/test/inspect.test.js
+++ b/packages/xsnap-lockdown/test/inspect.test.js
@@ -1,4 +1,5 @@
import test from 'ava';
+
import unconfinedInspect from '../lib/object-inspect.js';
const testCases = [
diff --git a/packages/xsnap/src/ava-xs.js b/packages/xsnap/src/ava-xs.js
index 82e94bca671..8f560123d62 100755
--- a/packages/xsnap/src/ava-xs.js
+++ b/packages/xsnap/src/ava-xs.js
@@ -1,12 +1,13 @@
#!/usr/bin/env node
import '@endo/init';
-import process from 'process';
+
+import bundleSource from '@endo/bundle-source';
import { spawn } from 'child_process';
-import { type as osType } from 'os';
import { promises as fsp } from 'fs';
-import path from 'path';
import glob from 'glob';
-import bundleSource from '@endo/bundle-source';
+import { type as osType } from 'os';
+import path from 'path';
+import process from 'process';
import { main, makeBundleResolve } from './avaXS.js';
diff --git a/packages/xsnap/src/avaXS.js b/packages/xsnap/src/avaXS.js
index 28bb74df5b7..15e4487c8e0 100644
--- a/packages/xsnap/src/avaXS.js
+++ b/packages/xsnap/src/avaXS.js
@@ -8,12 +8,12 @@ Usage:
import '@endo/init';
+import { getDebugLockdownBundle } from '@agoric/xsnap-lockdown';
+import { assert, Fail, q } from '@endo/errors';
import fs from 'fs';
-import { fileURLToPath } from 'url';
import { tmpName } from 'tmp';
+import { fileURLToPath } from 'url';
-import { assert, q, Fail } from '@endo/errors';
-import { getDebugLockdownBundle } from '@agoric/xsnap-lockdown';
import { xsnap } from './xsnap.js';
// scripts for use in xsnap subprocesses
diff --git a/packages/xsnap/src/build.js b/packages/xsnap/src/build.js
index 5583d74d868..b654d8e4d3b 100644
--- a/packages/xsnap/src/build.js
+++ b/packages/xsnap/src/build.js
@@ -1,9 +1,9 @@
#!/usr/bin/env node
/* global process */
import * as childProcessTop from 'child_process';
-import { fileURLToPath } from 'url';
import fsTop from 'fs';
import osTop from 'os';
+import { fileURLToPath } from 'url';
const { freeze } = Object;
diff --git a/packages/xsnap/src/replay.js b/packages/xsnap/src/replay.js
index c806743ee16..92da8741d64 100644
--- a/packages/xsnap/src/replay.js
+++ b/packages/xsnap/src/replay.js
@@ -8,14 +8,15 @@
* replay steps 00001 to the first snapshot step.
* 3. For the last folder, play steps 00001 to last.
*/
+import { makeQueue } from '@endo/stream';
import childProcessPowers from 'child_process';
-import osPowers from 'os';
import fsPowers from 'fs';
+import osPowers from 'os';
import { Readable } from 'stream';
import { tmpName as tmpNamePower } from 'tmp';
import { fileURLToPath } from 'url';
-import { makeQueue } from '@endo/stream';
-import { xsnap, DEFAULT_CRANK_METERING_LIMIT } from './xsnap.js';
+
+import { DEFAULT_CRANK_METERING_LIMIT, xsnap } from './xsnap.js';
const { freeze } = Object;
diff --git a/packages/xsnap/src/xsnap.js b/packages/xsnap/src/xsnap.js
index dcce6295a07..f93c164c2cb 100644
--- a/packages/xsnap/src/xsnap.js
+++ b/packages/xsnap/src/xsnap.js
@@ -1,16 +1,17 @@
/* global process */
/* eslint no-await-in-loop: ["off"] */
-import { finished } from 'stream/promises';
-import { PassThrough, Readable } from 'stream';
-import { promisify } from 'util';
-import { fileURLToPath } from 'url';
+import { forever } from '@agoric/internal';
import { Fail, q } from '@endo/errors';
import { makeNetstringReader, makeNetstringWriter } from '@endo/netstring';
-import { makeNodeReader, makeNodeWriter } from '@endo/stream-node';
import { makePromiseKit, racePromises } from '@endo/promise-kit';
-import { forever } from '@agoric/internal';
-import { ErrorCode, ErrorSignal, ErrorMessage, METER_TYPE } from '../api.js';
+import { makeNodeReader, makeNodeWriter } from '@endo/stream-node';
+import { PassThrough, Readable } from 'stream';
+import { finished } from 'stream/promises';
+import { fileURLToPath } from 'url';
+import { promisify } from 'util';
+
+import { ErrorCode, ErrorMessage, ErrorSignal, METER_TYPE } from '../api.js';
/** @import {PromiseKit} from '@endo/promise-kit' */
diff --git a/packages/xsnap/src/xsrepl.js b/packages/xsnap/src/xsrepl.js
index 3eede346bba..1e20fcf3e8e 100755
--- a/packages/xsnap/src/xsrepl.js
+++ b/packages/xsnap/src/xsrepl.js
@@ -4,12 +4,13 @@
import '@endo/init';
+import { makePromiseKit } from '@endo/promise-kit';
import * as childProcess from 'child_process';
import fs from 'fs';
-import { tmpName } from 'tmp';
import * as os from 'os';
import * as readline from 'readline';
-import { makePromiseKit } from '@endo/promise-kit';
+import { tmpName } from 'tmp';
+
import { xsnap } from './xsnap.js';
/** @import {PromiseKit} from '@endo/promise-kit' */
diff --git a/packages/xsnap/test/boot-lockdown.test.js b/packages/xsnap/test/boot-lockdown.test.js
index c5ebfc49124..487044ef55b 100644
--- a/packages/xsnap/test/boot-lockdown.test.js
+++ b/packages/xsnap/test/boot-lockdown.test.js
@@ -1,17 +1,14 @@
/* global globalThis */
+import { getLockdownBundle } from '@agoric/xsnap-lockdown';
import test from 'ava';
-
import * as proc from 'child_process';
-import * as os from 'os';
import * as fs from 'fs';
+import * as os from 'os';
import { tmpName } from 'tmp';
-import { getLockdownBundle } from '@agoric/xsnap-lockdown';
-
import { xsnap } from '../src/xsnap.js';
-
-import { options, loader } from './message-tools.js';
+import { loader, options } from './message-tools.js';
const io = { spawn: proc.spawn, os: os.type(), fs, tmpName }; // WARNING: ambient
const ld = loader(import.meta.url, fs.promises.readFile);
diff --git a/packages/xsnap/test/err-stack.test.js b/packages/xsnap/test/err-stack.test.js
index 8e4c3cec599..309268a6a1a 100644
--- a/packages/xsnap/test/err-stack.test.js
+++ b/packages/xsnap/test/err-stack.test.js
@@ -5,6 +5,7 @@ import * as proc from 'child_process';
import fs from 'fs';
import * as os from 'os';
import { tmpName } from 'tmp';
+
import { xsnap } from '../src/xsnap.js';
import { options } from './message-tools.js';
diff --git a/packages/xsnap/test/gc.test.js b/packages/xsnap/test/gc.test.js
index 4f5d2c03c2e..e7e5b8f7820 100644
--- a/packages/xsnap/test/gc.test.js
+++ b/packages/xsnap/test/gc.test.js
@@ -1,13 +1,12 @@
/* global FinalizationRegistry WeakRef */
import test from 'ava';
-
import * as proc from 'child_process';
import fs from 'fs';
import * as os from 'os';
import { tmpName } from 'tmp';
-import { xsnap } from '../src/xsnap.js';
+import { xsnap } from '../src/xsnap.js';
import { makeGcAndFinalize } from './gc.js';
import { options } from './message-tools.js';
diff --git a/packages/xsnap/test/inspect.test.js b/packages/xsnap/test/inspect.test.js
index b895f2a3333..7e266e38471 100644
--- a/packages/xsnap/test/inspect.test.js
+++ b/packages/xsnap/test/inspect.test.js
@@ -1,10 +1,10 @@
+import { getLockdownBundle } from '@agoric/xsnap-lockdown';
import test from 'ava';
-
import * as proc from 'child_process';
import fs from 'fs';
import * as os from 'os';
import { tmpName } from 'tmp';
-import { getLockdownBundle } from '@agoric/xsnap-lockdown';
+
import { xsnap } from '../src/xsnap.js';
import { options } from './message-tools.js';
diff --git a/packages/xsnap/test/leakiness.test.js b/packages/xsnap/test/leakiness.test.js
index 903ecc3cdf4..1738341960b 100644
--- a/packages/xsnap/test/leakiness.test.js
+++ b/packages/xsnap/test/leakiness.test.js
@@ -1,12 +1,11 @@
/** global FinalizationRegistry */
-import test from 'ava';
-
import process from 'node:process';
import v8 from 'node:v8';
import engineGC from '@agoric/internal/src/lib-nodejs/engine-gc.js';
import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
+import test from 'ava';
import { spawnRetentiveVatSequence } from './leakiness.mjs';
diff --git a/packages/xsnap/test/replay.test.js b/packages/xsnap/test/replay.test.js
index a47040b499b..f491788d0af 100644
--- a/packages/xsnap/test/replay.test.js
+++ b/packages/xsnap/test/replay.test.js
@@ -1,15 +1,13 @@
/* global Buffer */
import test from 'ava';
-
import * as proc from 'child_process';
import fs from 'fs';
import * as os from 'os';
import { tmpName } from 'tmp';
import { recordXSnap, replayXSnap } from '../src/replay.js';
-
-import { options, encode, decode } from './message-tools.js';
+import { decode, encode, options } from './message-tools.js';
const io = { spawn: proc.spawn, os: os.type(), fs, tmpName }; // WARNING: ambient
diff --git a/packages/xsnap/test/xs-js.test.js b/packages/xsnap/test/xs-js.test.js
index 418ddf28ecf..11e43f370e4 100644
--- a/packages/xsnap/test/xs-js.test.js
+++ b/packages/xsnap/test/xs-js.test.js
@@ -1,11 +1,12 @@
// JavaScript correctness tests
+import { encodeBase64 } from '@endo/base64';
import test from 'ava';
import * as proc from 'child_process';
import fs from 'fs';
import * as os from 'os';
import { tmpName } from 'tmp';
-import { encodeBase64 } from '@endo/base64';
+
import { xsnap } from '../src/xsnap.js';
import { options } from './message-tools.js';
diff --git a/packages/xsnap/test/xs-limits.test.js b/packages/xsnap/test/xs-limits.test.js
index 7f9b6613cd7..ee46e9ea42f 100644
--- a/packages/xsnap/test/xs-limits.test.js
+++ b/packages/xsnap/test/xs-limits.test.js
@@ -1,15 +1,13 @@
// XS resource exhaustion tests
import test from 'ava';
-
import * as proc from 'child_process';
import fs from 'fs';
import * as os from 'os';
import { tmpName } from 'tmp';
-import { xsnap } from '../src/xsnap.js';
import { ExitCode } from '../api.js';
-
+import { xsnap } from '../src/xsnap.js';
import { options } from './message-tools.js';
const io = { spawn: proc.spawn, os: os.type(), fs, tmpName }; // WARNING: ambient
diff --git a/packages/xsnap/test/xs-perf.test.js b/packages/xsnap/test/xs-perf.test.js
index b1fe95bf7d4..a822419b528 100644
--- a/packages/xsnap/test/xs-perf.test.js
+++ b/packages/xsnap/test/xs-perf.test.js
@@ -1,16 +1,14 @@
/* global performance */
import test from 'ava';
-
import * as proc from 'child_process';
import fs from 'fs';
import * as os from 'os';
import { tmpName } from 'tmp';
-import { xsnap } from '../src/xsnap.js';
import { METER_TYPE } from '../api.js';
-
-import { options, decode, encode } from './message-tools.js';
+import { xsnap } from '../src/xsnap.js';
+import { decode, encode, options } from './message-tools.js';
const io = { spawn: proc.spawn, os: os.type(), fs, tmpName }; // WARNING: ambien
diff --git a/packages/xsnap/test/xsnap.test.js b/packages/xsnap/test/xsnap.test.js
index 3b58edbf1b3..1d9a9fffccb 100644
--- a/packages/xsnap/test/xsnap.test.js
+++ b/packages/xsnap/test/xsnap.test.js
@@ -1,19 +1,17 @@
/* global setTimeout, FinalizationRegistry, setImmediate, process */
import test from 'ava';
-
-import { createHash } from 'crypto';
import * as proc from 'child_process';
-import * as os from 'os';
+import { createHash } from 'crypto';
import fs from 'fs';
+import * as os from 'os';
import path from 'path';
import { tmpName } from 'tmp';
-import { xsnap } from '../src/xsnap.js';
+import { ErrorCode, ExitCode } from '../api.js';
import { recordXSnap } from '../src/replay.js';
-import { ExitCode, ErrorCode } from '../api.js';
-
-import { options, decode, encode, loader } from './message-tools.js';
+import { xsnap } from '../src/xsnap.js';
+import { decode, encode, loader, options } from './message-tools.js';
const io = { spawn: proc.spawn, os: os.type(), fs, tmpName }; // WARNING: ambient
const ld = loader(import.meta.url);
diff --git a/packages/zoe/scripts/build-bundles.js b/packages/zoe/scripts/build-bundles.js
index 69254e341ba..30fa8b3e289 100644
--- a/packages/zoe/scripts/build-bundles.js
+++ b/packages/zoe/scripts/build-bundles.js
@@ -2,6 +2,7 @@
// @jessie-check
import '@endo/init';
+
import { createBundles } from '@agoric/internal/src/node/createBundles.js';
import url from 'url';
diff --git a/packages/zoe/src/cleanProposal.js b/packages/zoe/src/cleanProposal.js
index fdeafe30034..cffd16847f3 100644
--- a/packages/zoe/src/cleanProposal.js
+++ b/packages/zoe/src/cleanProposal.js
@@ -1,11 +1,12 @@
-import { assert, q, Fail } from '@endo/errors';
+import './internal-types.js';
+
import { AmountMath, getAssetKind } from '@agoric/ertp';
import { objectMap } from '@agoric/internal';
+import { assertKey, assertPattern, isKey, mustMatch } from '@agoric/store';
+import { assert, Fail, q } from '@endo/errors';
import { assertRecord } from '@endo/marshal';
-import { assertKey, assertPattern, mustMatch, isKey } from '@agoric/store';
-import { FullProposalShape } from './typeGuards.js';
-import './internal-types.js';
+import { FullProposalShape } from './typeGuards.js';
const { ownKeys } = Reflect;
diff --git a/packages/zoe/src/contractFacet/allocationMath.js b/packages/zoe/src/contractFacet/allocationMath.js
index 47a74bda32e..9258f91bf5d 100644
--- a/packages/zoe/src/contractFacet/allocationMath.js
+++ b/packages/zoe/src/contractFacet/allocationMath.js
@@ -1,5 +1,5 @@
-import { Fail, q } from '@endo/errors';
import { AmountMath } from '@agoric/ertp';
+import { Fail, q } from '@endo/errors';
/**
* @callback Operation
diff --git a/packages/zoe/src/contractFacet/evalContractCode.js b/packages/zoe/src/contractFacet/evalContractCode.js
index b95a901056d..6f27bcd56d0 100644
--- a/packages/zoe/src/contractFacet/evalContractCode.js
+++ b/packages/zoe/src/contractFacet/evalContractCode.js
@@ -4,6 +4,7 @@
/* global globalThis */
import { importBundle } from '@endo/import-bundle';
+
import { handlePWarning } from '../handleWarning.js';
const evalContractBundle = (bundle, additionalEndowments = {}) => {
diff --git a/packages/zoe/src/contractFacet/exit.js b/packages/zoe/src/contractFacet/exit.js
index 3dcb79f9936..3e69064a155 100644
--- a/packages/zoe/src/contractFacet/exit.js
+++ b/packages/zoe/src/contractFacet/exit.js
@@ -1,12 +1,12 @@
+import { initEmpty, M } from '@agoric/store';
+import { TimestampShape } from '@agoric/time';
+import { prepareExoClass, provideDurableSetStore } from '@agoric/vat-data';
import { Fail, q } from '@endo/errors';
import { E } from '@endo/eventual-send';
-import { prepareExoClass, provideDurableSetStore } from '@agoric/vat-data';
-import { M, initEmpty } from '@agoric/store';
-import { TimestampShape } from '@agoric/time';
import {
- isOnDemandExitRule,
isAfterDeadlineExitRule,
+ isOnDemandExitRule,
isWaivedExitRule,
} from '../typeGuards.js';
diff --git a/packages/zoe/src/contractFacet/offerHandlerStorage.js b/packages/zoe/src/contractFacet/offerHandlerStorage.js
index 528c089aee5..91551ba6a4a 100644
--- a/packages/zoe/src/contractFacet/offerHandlerStorage.js
+++ b/packages/zoe/src/contractFacet/offerHandlerStorage.js
@@ -1,8 +1,8 @@
// @jessie-check
import { makeScalarWeakMapStore } from '@agoric/store';
-import { ToFarFunction } from '@endo/marshal';
import { canBeDurable, provideDurableWeakMapStore } from '@agoric/vat-data';
+import { ToFarFunction } from '@endo/marshal';
import { defineDurableHandle } from '../makeHandle.js';
diff --git a/packages/zoe/src/contractFacet/reallocate.js b/packages/zoe/src/contractFacet/reallocate.js
index 997a9e996e5..b78e36530c8 100644
--- a/packages/zoe/src/contractFacet/reallocate.js
+++ b/packages/zoe/src/contractFacet/reallocate.js
@@ -1,8 +1,8 @@
-import { Fail } from '@endo/errors';
import { makeScalarMapStore } from '@agoric/vat-data';
+import { Fail } from '@endo/errors';
-import { assertRightsConserved } from './rightsConservation.js';
import { addToAllocation, subtractFromAllocation } from './allocationMath.js';
+import { assertRightsConserved } from './rightsConservation.js';
/** @typedef {Array} TransactionList */
diff --git a/packages/zoe/src/contractFacet/rightsConservation.js b/packages/zoe/src/contractFacet/rightsConservation.js
index 084c0bdb966..d14477ac5ed 100644
--- a/packages/zoe/src/contractFacet/rightsConservation.js
+++ b/packages/zoe/src/contractFacet/rightsConservation.js
@@ -1,8 +1,8 @@
-import { assert, Fail } from '@endo/errors';
-import { makeScalarMapStore } from '@agoric/store';
-import { AmountMath } from '@agoric/ertp';
-
import '../internal-types.js';
+
+import { AmountMath } from '@agoric/ertp';
+import { makeScalarMapStore } from '@agoric/store';
+import { assert, Fail } from '@endo/errors';
/**
* @import {MapStore} from '@agoric/store';
*/
diff --git a/packages/zoe/src/contractFacet/typeGuards.js b/packages/zoe/src/contractFacet/typeGuards.js
index 044a283298e..c7b01995307 100644
--- a/packages/zoe/src/contractFacet/typeGuards.js
+++ b/packages/zoe/src/contractFacet/typeGuards.js
@@ -1,4 +1,5 @@
import { M } from '@endo/patterns';
+
import { AmountKeywordRecordShape, IssuerRecordShape } from '../typeGuards.js';
export const ZcfSeatShape = M.remotable('zcfSeat');
diff --git a/packages/zoe/src/contractFacet/vatRoot.js b/packages/zoe/src/contractFacet/vatRoot.js
index 00404e0c003..97ed96983fb 100644
--- a/packages/zoe/src/contractFacet/vatRoot.js
+++ b/packages/zoe/src/contractFacet/vatRoot.js
@@ -7,11 +7,11 @@
// time this file is edited, the bundle must be manually rebuilt with
// `yarn build-zcfBundle`.
+import '../internal-types.js';
+
import { Fail } from '@endo/errors';
-import { Far } from '@endo/marshal';
import { E } from '@endo/far';
-
-import '../internal-types.js';
+import { Far } from '@endo/marshal';
import { makeZCFZygote } from './zcfZygote.js';
diff --git a/packages/zoe/src/contractFacet/zcfMint.js b/packages/zoe/src/contractFacet/zcfMint.js
index 1c07c0d0dc4..aed3d96e638 100644
--- a/packages/zoe/src/contractFacet/zcfMint.js
+++ b/packages/zoe/src/contractFacet/zcfMint.js
@@ -1,16 +1,16 @@
-import { Fail } from '@endo/errors';
-import { E } from '@endo/eventual-send';
+import '../internal-types.js';
+import './internal-types.js';
+import './types-ambient.js';
+
import { AmountMath } from '@agoric/ertp';
import { prepareExoClass } from '@agoric/vat-data';
+import { Fail } from '@endo/errors';
+import { E } from '@endo/eventual-send';
import { coerceAmountKeywordRecord } from '../cleanProposal.js';
import { assertFullIssuerRecord, makeIssuerRecord } from '../issuerRecord.js';
import { addToAllocation, subtractFromAllocation } from './allocationMath.js';
-
-import '../internal-types.js';
import { ZcfMintI } from './typeGuards.js';
-import './internal-types.js';
-import './types-ambient.js';
/**
* @param {AmountKeywordRecord} amr
diff --git a/packages/zoe/src/contractFacet/zcfSeat.js b/packages/zoe/src/contractFacet/zcfSeat.js
index 1e304abdfa3..3ce4bc4391f 100644
--- a/packages/zoe/src/contractFacet/zcfSeat.js
+++ b/packages/zoe/src/contractFacet/zcfSeat.js
@@ -1,5 +1,5 @@
-import { annotateError, Fail } from '@endo/errors';
-import { E } from '@endo/eventual-send';
+import { AmountMath } from '@agoric/ertp';
+import { initEmpty, M } from '@agoric/store';
import {
makeScalarBigWeakMapStore,
prepareExoClass,
@@ -8,20 +8,20 @@ import {
provideDurableMapStore,
provideDurableWeakMapStore,
} from '@agoric/vat-data';
-import { AmountMath } from '@agoric/ertp';
-import { initEmpty, M } from '@agoric/store';
+import { annotateError, Fail } from '@endo/errors';
+import { E } from '@endo/eventual-send';
-import { isOfferSafe } from './offerSafety.js';
-import { assertRightsConserved } from './rightsConservation.js';
-import { addToAllocation, subtractFromAllocation } from './allocationMath.js';
import { coerceAmountKeywordRecord } from '../cleanProposal.js';
+import { TransferPartShape } from '../contractSupport/atomicTransfer.js';
import {
AmountKeywordRecordShape,
SeatDataShape,
SeatShape,
} from '../typeGuards.js';
+import { addToAllocation, subtractFromAllocation } from './allocationMath.js';
+import { isOfferSafe } from './offerSafety.js';
import { makeAllocationMap } from './reallocate.js';
-import { TransferPartShape } from '../contractSupport/atomicTransfer.js';
+import { assertRightsConserved } from './rightsConservation.js';
/**
* The SeatManager holds the active zcfSeats and can reallocate and
diff --git a/packages/zoe/src/contractFacet/zcfZygote.js b/packages/zoe/src/contractFacet/zcfZygote.js
index a63a25e9fbb..3710a0f0f7a 100644
--- a/packages/zoe/src/contractFacet/zcfZygote.js
+++ b/packages/zoe/src/contractFacet/zcfZygote.js
@@ -1,9 +1,5 @@
-import { Fail } from '@endo/errors';
-import { E } from '@endo/eventual-send';
-import { passStyleOf } from '@endo/pass-style';
-import { makePromiseKit } from '@endo/promise-kit';
-
import { AssetKind } from '@agoric/ertp';
+import { objectMap } from '@agoric/internal';
import { assertPattern, mustMatch } from '@agoric/store';
import {
canBeDurable,
@@ -13,21 +9,23 @@ import {
prepareExoClass,
provideDurableMapStore,
} from '@agoric/vat-data';
-import { objectMap } from '@agoric/internal';
+import { Fail } from '@endo/errors';
+import { E } from '@endo/eventual-send';
+import { passStyleOf } from '@endo/pass-style';
+import { makePromiseKit } from '@endo/promise-kit';
import { cleanProposal } from '../cleanProposal.js';
import { handlePKitWarning } from '../handleWarning.js';
import { makeInstanceRecordStorage } from '../instanceRecordStorage.js';
import { provideIssuerStorage } from '../issuerStorage.js';
import { defineDurableHandle } from '../makeHandle.js';
+import { HandleOfferI, InvitationHandleShape } from '../typeGuards.js';
import { evalContractBundle } from './evalContractCode.js';
import { makeMakeExiter } from './exit.js';
import { makeOfferHandlerStorage } from './offerHandlerStorage.js';
-import { createSeatManager } from './zcfSeat.js';
-
-import { HandleOfferI, InvitationHandleShape } from '../typeGuards.js';
-import { prepareZcMint } from './zcfMint.js';
import { ZcfI } from './typeGuards.js';
+import { prepareZcMint } from './zcfMint.js';
+import { createSeatManager } from './zcfSeat.js';
///
///
diff --git a/packages/zoe/src/contractSupport/atomicTransfer.js b/packages/zoe/src/contractSupport/atomicTransfer.js
index befda09311c..8b3bf8b07ff 100644
--- a/packages/zoe/src/contractSupport/atomicTransfer.js
+++ b/packages/zoe/src/contractSupport/atomicTransfer.js
@@ -1,4 +1,5 @@
import { M } from '@agoric/store';
+
import { AmountKeywordRecordShape, SeatShape } from '../typeGuards.js';
export const TransferPartShape = M.splitArray(
diff --git a/packages/zoe/src/contractSupport/bondingCurves.js b/packages/zoe/src/contractSupport/bondingCurves.js
index 0f81d25ff3e..0c67408ed96 100644
--- a/packages/zoe/src/contractSupport/bondingCurves.js
+++ b/packages/zoe/src/contractSupport/bondingCurves.js
@@ -1,7 +1,8 @@
// @jessie-check
-import { Nat } from '@endo/nat';
import { Fail } from '@endo/errors';
+import { Nat } from '@endo/nat';
+
import { natSafeMath } from './safeMath.js';
const { subtract, add, multiply, floorDivide } = natSafeMath;
diff --git a/packages/zoe/src/contractSupport/prepare-ownable.js b/packages/zoe/src/contractSupport/prepare-ownable.js
index 0f563056eb3..5d08191a722 100644
--- a/packages/zoe/src/contractSupport/prepare-ownable.js
+++ b/packages/zoe/src/contractSupport/prepare-ownable.js
@@ -1,5 +1,6 @@
-import { M } from '@endo/patterns';
import { prepareRevocableMakerKit } from '@agoric/base-zone/zone-helpers.js';
+import { M } from '@endo/patterns';
+
import { OfferHandlerI } from '../typeGuards.js';
const TransferProposalShape = M.splitRecord({
diff --git a/packages/zoe/src/contractSupport/priceAuthority.js b/packages/zoe/src/contractSupport/priceAuthority.js
index 82be9565080..cb52e4e3c07 100644
--- a/packages/zoe/src/contractSupport/priceAuthority.js
+++ b/packages/zoe/src/contractSupport/priceAuthority.js
@@ -1,13 +1,12 @@
-import { q, Fail } from '@endo/errors';
-import { E } from '@endo/eventual-send';
-import { Far } from '@endo/marshal';
-import { makePromiseKit } from '@endo/promise-kit';
-
import { AmountMath, AmountShape, BrandShape } from '@agoric/ertp';
-import { makeNotifier } from '@agoric/notifier';
import { makeTracer } from '@agoric/internal';
-import { TimestampShape } from '@agoric/time';
+import { makeNotifier } from '@agoric/notifier';
import { M } from '@agoric/store';
+import { TimestampShape } from '@agoric/time';
+import { Fail, q } from '@endo/errors';
+import { E } from '@endo/eventual-send';
+import { Far } from '@endo/marshal';
+import { makePromiseKit } from '@endo/promise-kit';
/**
* @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery, PriceQuoteCreate, PriceAuthorityKit, PriceQuoteTrigger, MutableQuote,} from '@agoric/zoe/tools/types.js';
diff --git a/packages/zoe/src/contractSupport/priceAuthorityInitial.js b/packages/zoe/src/contractSupport/priceAuthorityInitial.js
index b5378654542..92a0a6cc93e 100644
--- a/packages/zoe/src/contractSupport/priceAuthorityInitial.js
+++ b/packages/zoe/src/contractSupport/priceAuthorityInitial.js
@@ -1,14 +1,13 @@
// @ts-check
// @jessie-check
+import { AmountMath } from '@agoric/ertp';
+import { makeNotifier } from '@agoric/notifier';
import { E } from '@endo/far';
import { Far } from '@endo/marshal';
-import { makeNotifier } from '@agoric/notifier';
-import { AmountMath } from '@agoric/ertp';
-
-import { multiplyBy } from './ratio.js';
import { mintQuote } from './priceAuthorityTransform.js';
+import { multiplyBy } from './ratio.js';
/**
* @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
diff --git a/packages/zoe/src/contractSupport/priceAuthorityTransform.js b/packages/zoe/src/contractSupport/priceAuthorityTransform.js
index ce2d79217b9..e2781a42d25 100644
--- a/packages/zoe/src/contractSupport/priceAuthorityTransform.js
+++ b/packages/zoe/src/contractSupport/priceAuthorityTransform.js
@@ -1,8 +1,8 @@
-import { Fail, assert } from '@endo/errors';
-import { E } from '@endo/eventual-send';
-import { Far } from '@endo/marshal';
import { AmountMath } from '@agoric/ertp';
import { makeNotifier } from '@agoric/notifier';
+import { assert, Fail } from '@endo/errors';
+import { E } from '@endo/eventual-send';
+import { Far } from '@endo/marshal';
/**
* @import {EOnly} from '@endo/eventual-send';
diff --git a/packages/zoe/src/contractSupport/priceQuote.js b/packages/zoe/src/contractSupport/priceQuote.js
index 33d18db434e..2b9b73bb7f9 100644
--- a/packages/zoe/src/contractSupport/priceQuote.js
+++ b/packages/zoe/src/contractSupport/priceQuote.js
@@ -1,9 +1,9 @@
// @jessie-check
+import { AmountMath } from '@agoric/ertp';
import { Fail } from '@endo/errors';
-import { Nat } from '@endo/nat';
import { E } from '@endo/eventual-send';
-import { AmountMath } from '@agoric/ertp';
+import { Nat } from '@endo/nat';
/**
* @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
diff --git a/packages/zoe/src/contractSupport/ratio.js b/packages/zoe/src/contractSupport/ratio.js
index 72dd7b22498..2c35c4b0408 100644
--- a/packages/zoe/src/contractSupport/ratio.js
+++ b/packages/zoe/src/contractSupport/ratio.js
@@ -1,6 +1,6 @@
///
-import { q, Fail } from '@endo/errors';
import { AmountMath } from '@agoric/ertp';
+import { Fail, q } from '@endo/errors';
import { assertRecord } from '@endo/marshal';
import { isNat } from '@endo/nat';
diff --git a/packages/zoe/src/contractSupport/recorder.js b/packages/zoe/src/contractSupport/recorder.js
index 620fb04619d..3155d7e73a7 100644
--- a/packages/zoe/src/contractSupport/recorder.js
+++ b/packages/zoe/src/contractSupport/recorder.js
@@ -1,4 +1,3 @@
-import { Fail } from '@endo/errors';
import { StorageNodeShape } from '@agoric/internal';
import { prepareDurablePublishKit } from '@agoric/notifier';
import {
@@ -7,6 +6,7 @@ import {
} from '@agoric/notifier/tools/testSupports.js';
import { mustMatch } from '@agoric/store';
import { M, makeScalarBigMapStore, prepareExoClass } from '@agoric/vat-data';
+import { Fail } from '@endo/errors';
import { E } from '@endo/eventual-send';
/**
diff --git a/packages/zoe/src/contractSupport/zoeHelpers.js b/packages/zoe/src/contractSupport/zoeHelpers.js
index 45a0c5c5732..9d04132da04 100644
--- a/packages/zoe/src/contractSupport/zoeHelpers.js
+++ b/packages/zoe/src/contractSupport/zoeHelpers.js
@@ -1,9 +1,10 @@
+import { AssetKind } from '@agoric/ertp';
+import { fromUniqueEntries } from '@agoric/internal';
+import { keyEQ, mustMatch } from '@agoric/store';
import { Fail } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { makePromiseKit } from '@endo/promise-kit';
-import { mustMatch, keyEQ } from '@agoric/store';
-import { AssetKind } from '@agoric/ertp';
-import { fromUniqueEntries } from '@agoric/internal';
+
import { satisfiesWant } from '../contractFacet/offerSafety.js';
import { atomicTransfer, fromOnly, toOnly } from './atomicTransfer.js';
diff --git a/packages/zoe/src/contracts/atomicSwap.js b/packages/zoe/src/contracts/atomicSwap.js
index 4dcdda0e584..c8857c6c37a 100644
--- a/packages/zoe/src/contracts/atomicSwap.js
+++ b/packages/zoe/src/contracts/atomicSwap.js
@@ -1,8 +1,8 @@
// Eventually will be importable from '@agoric/zoe-contract-support'
import {
assertIssuerKeywords,
- swap,
assertProposalShape,
+ swap,
} from '../contractSupport/index.js';
/**
diff --git a/packages/zoe/src/contracts/auction/assertBidSeat.js b/packages/zoe/src/contracts/auction/assertBidSeat.js
index be392b81187..f9499832e65 100644
--- a/packages/zoe/src/contracts/auction/assertBidSeat.js
+++ b/packages/zoe/src/contracts/auction/assertBidSeat.js
@@ -1,5 +1,5 @@
-import { Fail } from '@endo/errors';
import { AmountMath } from '@agoric/ertp';
+import { Fail } from '@endo/errors';
export const assertBidSeat = (zcf, sellSeat, bidSeat) => {
const minBid = sellSeat.getProposal().want.Ask;
diff --git a/packages/zoe/src/contracts/auction/index.js b/packages/zoe/src/contracts/auction/index.js
index fd3bc2060ca..223b883728f 100644
--- a/packages/zoe/src/contracts/auction/index.js
+++ b/packages/zoe/src/contracts/auction/index.js
@@ -1,18 +1,18 @@
+import { RelativeTimeShape, TimeMath } from '@agoric/time';
import { Fail } from '@endo/errors';
import { E } from '@endo/eventual-send';
-import { mustMatch } from '@endo/patterns';
import { Far } from '@endo/marshal';
-import { TimeMath, RelativeTimeShape } from '@agoric/time';
+import { mustMatch } from '@endo/patterns';
// Eventually will be importable from '@agoric/zoe-contract-support'
import {
- defaultAcceptanceMsg,
assertIssuerKeywords,
assertProposalShape,
+ defaultAcceptanceMsg,
} from '../../contractSupport/index.js';
-import * as secondPriceLogic from './secondPriceLogic.js';
-import * as firstPriceLogic from './firstPriceLogic.js';
import { assertBidSeat } from './assertBidSeat.js';
+import * as firstPriceLogic from './firstPriceLogic.js';
+import * as secondPriceLogic from './secondPriceLogic.js';
const FIRST_PRICE = 'first-price';
const SECOND_PRICE = 'second-price';
diff --git a/packages/zoe/src/contracts/autoswap.js b/packages/zoe/src/contracts/autoswap.js
index 269f7335722..25e32fa6302 100644
--- a/packages/zoe/src/contracts/autoswap.js
+++ b/packages/zoe/src/contracts/autoswap.js
@@ -1,16 +1,16 @@
+import { AmountMath, isNatValue } from '@agoric/ertp';
import { assert } from '@endo/errors';
import { Far } from '@endo/marshal';
-import { AmountMath, isNatValue } from '@agoric/ertp';
// Eventually will be importable from '@agoric/zoe-contract-support'
import {
- getInputPrice,
- getOutputPrice,
- calcLiqValueToMint,
- calcValueToRemove,
- assertProposalShape,
assertNatAssetKind,
+ assertProposalShape,
+ calcLiqValueToMint,
calcSecondaryRequired,
+ calcValueToRemove,
+ getInputPrice,
+ getOutputPrice,
} from '../contractSupport/index.js';
/**
diff --git a/packages/zoe/src/contracts/barterExchange.js b/packages/zoe/src/contracts/barterExchange.js
index 5320359e212..4c1a6a46f3a 100644
--- a/packages/zoe/src/contracts/barterExchange.js
+++ b/packages/zoe/src/contracts/barterExchange.js
@@ -1,5 +1,6 @@
-import { Far } from '@endo/marshal';
import { makeLegacyMap } from '@agoric/store';
+import { Far } from '@endo/marshal';
+
// Eventually will be importable from '@agoric/zoe-contract-support'
import { satisfies } from '../contractSupport/index.js';
diff --git a/packages/zoe/src/contracts/callSpread/calculateShares.js b/packages/zoe/src/contracts/callSpread/calculateShares.js
index 7f1de802d54..6d13c6e6057 100644
--- a/packages/zoe/src/contracts/callSpread/calculateShares.js
+++ b/packages/zoe/src/contracts/callSpread/calculateShares.js
@@ -1,9 +1,10 @@
///
-import { assert } from '@endo/errors';
import { AmountMath, isNatValue } from '@agoric/ertp';
+import { assert } from '@endo/errors';
+
import { makeRatio, oneMinus } from '../../contractSupport/index.js';
-import { make100Percent, make0Percent } from './percent.js';
+import { make0Percent, make100Percent } from './percent.js';
/**
* Calculate the portion (as a Ratio) of the collateral that should be
diff --git a/packages/zoe/src/contracts/callSpread/fundedCallSpread.js b/packages/zoe/src/contracts/callSpread/fundedCallSpread.js
index bf695aad499..3dcb6727cf3 100644
--- a/packages/zoe/src/contracts/callSpread/fundedCallSpread.js
+++ b/packages/zoe/src/contracts/callSpread/fundedCallSpread.js
@@ -1,12 +1,13 @@
///
-import { makePromiseKit } from '@endo/promise-kit';
-import { E } from '@endo/eventual-send';
import { AmountMath } from '@agoric/ertp';
+import { E } from '@endo/eventual-send';
+import { makePromiseKit } from '@endo/promise-kit';
+
import {
+ assertNatAssetKind,
assertProposalShape,
depositToSeat,
- assertNatAssetKind,
} from '../../contractSupport/index.js';
import { makePayoffHandler } from './payoffHandler.js';
import { Position } from './position.js';
diff --git a/packages/zoe/src/contracts/callSpread/payoffHandler.js b/packages/zoe/src/contracts/callSpread/payoffHandler.js
index 5825b494bab..8926210d2fc 100644
--- a/packages/zoe/src/contracts/callSpread/payoffHandler.js
+++ b/packages/zoe/src/contracts/callSpread/payoffHandler.js
@@ -1,14 +1,15 @@
///
-import { E } from '@endo/eventual-send';
import { AmountMath } from '@agoric/ertp';
+import { E } from '@endo/eventual-send';
+
import {
- getAmountOut,
- ceilMultiplyBy,
atomicTransfer,
+ ceilMultiplyBy,
+ getAmountOut,
} from '../../contractSupport/index.js';
-import { Position } from './position.js';
import { calculateShares } from './calculateShares.js';
+import { Position } from './position.js';
/**
* makePayoffHandler returns an object with methods that are useful for
diff --git a/packages/zoe/src/contracts/callSpread/pricedCallSpread.js b/packages/zoe/src/contracts/callSpread/pricedCallSpread.js
index 93838be87ea..5f92a3ecd7b 100644
--- a/packages/zoe/src/contracts/callSpread/pricedCallSpread.js
+++ b/packages/zoe/src/contracts/callSpread/pricedCallSpread.js
@@ -1,16 +1,17 @@
///
+import { AmountMath } from '@agoric/ertp';
import { Fail } from '@endo/errors';
-import { makePromiseKit } from '@endo/promise-kit';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { AmountMath } from '@agoric/ertp';
+import { makePromiseKit } from '@endo/promise-kit';
+
import {
+ assertNatAssetKind,
assertProposalShape,
+ ceilMultiplyBy,
depositToSeat,
- assertNatAssetKind,
makeRatio,
- ceilMultiplyBy,
} from '../../contractSupport/index.js';
import { makePayoffHandler } from './payoffHandler.js';
import { Position } from './position.js';
diff --git a/packages/zoe/src/contracts/coveredCall-durable.js b/packages/zoe/src/contracts/coveredCall-durable.js
index bcac0693003..16504530fd7 100644
--- a/packages/zoe/src/contracts/coveredCall-durable.js
+++ b/packages/zoe/src/contracts/coveredCall-durable.js
@@ -1,6 +1,7 @@
-import { Fail } from '@endo/errors';
-import { mustMatch, M } from '@agoric/store';
+import { M, mustMatch } from '@agoric/store';
import { prepareExo, prepareExoClass } from '@agoric/vat-data';
+import { Fail } from '@endo/errors';
+
import { swapExact } from '../contractSupport/index.js';
import { isAfterDeadlineExitRule, OfferHandlerI } from '../typeGuards.js';
diff --git a/packages/zoe/src/contracts/coveredCall.js b/packages/zoe/src/contracts/coveredCall.js
index 1f441aebb57..7d417e7b4f4 100644
--- a/packages/zoe/src/contracts/coveredCall.js
+++ b/packages/zoe/src/contracts/coveredCall.js
@@ -1,5 +1,6 @@
-import { Fail, q } from '@endo/errors';
import { M, mustMatch } from '@agoric/store';
+import { Fail, q } from '@endo/errors';
+
// Eventually will be importable from '@agoric/zoe-contract-support'
import { swapExact } from '../contractSupport/index.js';
import { isAfterDeadlineExitRule } from '../typeGuards.js';
diff --git a/packages/zoe/src/contracts/loan/addCollateral.js b/packages/zoe/src/contracts/loan/addCollateral.js
index 959cf142cc0..71d2b76e72f 100644
--- a/packages/zoe/src/contracts/loan/addCollateral.js
+++ b/packages/zoe/src/contracts/loan/addCollateral.js
@@ -2,7 +2,6 @@ import {
assertProposalShape,
atomicTransfer,
} from '../../contractSupport/index.js';
-
import { scheduleLiquidation } from './scheduleLiquidation.js';
// Create an invitation to add collateral to the loan. Part of the
diff --git a/packages/zoe/src/contracts/loan/borrow.js b/packages/zoe/src/contracts/loan/borrow.js
index aca8c6fc426..95faa581a75 100644
--- a/packages/zoe/src/contracts/loan/borrow.js
+++ b/packages/zoe/src/contracts/loan/borrow.js
@@ -1,20 +1,19 @@
+import { AmountMath } from '@agoric/ertp';
import { assert, Fail } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
import { makePromiseKit } from '@endo/promise-kit';
-import { AmountMath } from '@agoric/ertp';
import {
assertProposalShape,
- getAmountOut,
ceilMultiplyBy,
+ getAmountOut,
getTimestamp,
} from '../../contractSupport/index.js';
-
+import { makeAddCollateralInvitation } from './addCollateral.js';
+import { makeCloseLoanInvitation } from './close.js';
import { scheduleLiquidation } from './scheduleLiquidation.js';
import { calculateInterest, makeDebtCalculator } from './updateDebt.js';
-import { makeCloseLoanInvitation } from './close.js';
-import { makeAddCollateralInvitation } from './addCollateral.js';
/** @type {MakeBorrowInvitation} */
export const makeBorrowInvitation = (zcf, config) => {
diff --git a/packages/zoe/src/contracts/loan/close.js b/packages/zoe/src/contracts/loan/close.js
index 38db51aa9e0..e69ec1d6e3b 100644
--- a/packages/zoe/src/contracts/loan/close.js
+++ b/packages/zoe/src/contracts/loan/close.js
@@ -1,7 +1,7 @@
///
-import { Fail } from '@endo/errors';
import { AmountMath } from '@agoric/ertp';
+import { Fail } from '@endo/errors';
import { assertProposalShape } from '../../contractSupport/index.js';
diff --git a/packages/zoe/src/contracts/loan/liquidate.js b/packages/zoe/src/contracts/loan/liquidate.js
index 8d15e561ac9..f7abde79126 100644
--- a/packages/zoe/src/contracts/loan/liquidate.js
+++ b/packages/zoe/src/contracts/loan/liquidate.js
@@ -1,5 +1,5 @@
-import { E } from '@endo/eventual-send';
import { AmountMath } from '@agoric/ertp';
+import { E } from '@endo/eventual-send';
import { offerTo } from '../../contractSupport/zoeHelpers.js';
diff --git a/packages/zoe/src/contracts/loan/scheduleLiquidation.js b/packages/zoe/src/contracts/loan/scheduleLiquidation.js
index cf040bb2c9f..995f554790b 100644
--- a/packages/zoe/src/contracts/loan/scheduleLiquidation.js
+++ b/packages/zoe/src/contracts/loan/scheduleLiquidation.js
@@ -1,12 +1,12 @@
-import { E } from '@endo/eventual-send';
import { AmountMath } from '@agoric/ertp';
+import { E } from '@endo/eventual-send';
-import { liquidate } from './liquidate.js';
import {
- getAmountIn,
- ceilMultiplyBy,
atomicTransfer,
+ ceilMultiplyBy,
+ getAmountIn,
} from '../../contractSupport/index.js';
+import { liquidate } from './liquidate.js';
/** @type {ScheduleLiquidation} */
export const scheduleLiquidation = (zcf, configWithBorrower) => {
diff --git a/packages/zoe/src/contracts/loan/updateDebt.js b/packages/zoe/src/contracts/loan/updateDebt.js
index 8930d806492..0691a43f232 100644
--- a/packages/zoe/src/contracts/loan/updateDebt.js
+++ b/packages/zoe/src/contracts/loan/updateDebt.js
@@ -1,11 +1,11 @@
-import { annotateError, X } from '@endo/errors';
-import { Far } from '@endo/marshal';
-import { makeNotifierKit, observeNotifier } from '@agoric/notifier';
import { AmountMath } from '@agoric/ertp';
+import { makeNotifierKit, observeNotifier } from '@agoric/notifier';
import { TimeMath } from '@agoric/time';
+import { annotateError, X } from '@endo/errors';
+import { Far } from '@endo/marshal';
-import { scheduleLiquidation } from './scheduleLiquidation.js';
import { ceilMultiplyBy } from '../../contractSupport/index.js';
+import { scheduleLiquidation } from './scheduleLiquidation.js';
// Update the debt by adding the new interest on every period, as
// indicated by the periodNotifier
diff --git a/packages/zoe/src/contracts/mintAndSellNFT.js b/packages/zoe/src/contracts/mintAndSellNFT.js
index f1531a70130..aad4d392a02 100644
--- a/packages/zoe/src/contracts/mintAndSellNFT.js
+++ b/packages/zoe/src/contracts/mintAndSellNFT.js
@@ -1,10 +1,9 @@
+import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
+import { notForProductionUse } from '@agoric/internal/src/magic-cookie-test-only.js';
import { assert } from '@endo/errors';
-import { makeIssuerKit, AssetKind, AmountMath } from '@agoric/ertp';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { notForProductionUse } from '@agoric/internal/src/magic-cookie-test-only.js';
-
/**
* This contract mints non-fungible tokens and creates a selling contract
* instance to sell the tokens in exchange for some sort of money.
diff --git a/packages/zoe/src/contracts/mintPayments.js b/packages/zoe/src/contracts/mintPayments.js
index 8536abaef6d..e46244b7d95 100644
--- a/packages/zoe/src/contracts/mintPayments.js
+++ b/packages/zoe/src/contracts/mintPayments.js
@@ -1,5 +1,5 @@
-import { Far } from '@endo/marshal';
import { AmountMath } from '@agoric/ertp';
+import { Far } from '@endo/marshal';
/**
* This is a very simple contract that creates a new issuer and mints payments
diff --git a/packages/zoe/src/contracts/oracle.js b/packages/zoe/src/contracts/oracle.js
index 96f7c6cdd15..69c8be0dde5 100644
--- a/packages/zoe/src/contracts/oracle.js
+++ b/packages/zoe/src/contracts/oracle.js
@@ -1,8 +1,8 @@
+import { AmountMath } from '@agoric/ertp';
import { assert, Fail } from '@endo/errors';
+import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { AmountMath } from '@agoric/ertp';
-import { E } from '@endo/eventual-send';
import { atomicTransfer } from '../contractSupport/index.js';
/**
diff --git a/packages/zoe/src/contracts/otcDesk.js b/packages/zoe/src/contracts/otcDesk.js
index 483f4e842f7..02a7368891e 100644
--- a/packages/zoe/src/contracts/otcDesk.js
+++ b/packages/zoe/src/contracts/otcDesk.js
@@ -1,11 +1,12 @@
import { assert } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
+
import {
- offerTo,
- saveAllIssuers,
assertProposalShape,
atomicTransfer,
+ offerTo,
+ saveAllIssuers,
} from '../contractSupport/index.js';
/**
diff --git a/packages/zoe/src/contracts/priceAggregator.js b/packages/zoe/src/contracts/priceAggregator.js
index 0a50a514c82..701a753f411 100644
--- a/packages/zoe/src/contracts/priceAggregator.js
+++ b/packages/zoe/src/contracts/priceAggregator.js
@@ -1,6 +1,6 @@
-import { Fail, q } from '@endo/errors';
import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
import { assertAllDefined } from '@agoric/internal';
+import { notForProductionUse } from '@agoric/internal/src/magic-cookie-test-only.js';
import {
makeNotifierKit,
makeStoredPublishKit,
@@ -8,9 +8,9 @@ import {
} from '@agoric/notifier';
import { makeLegacyMap } from '@agoric/store';
import { TimeMath } from '@agoric/time';
+import { Fail, q } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { notForProductionUse } from '@agoric/internal/src/magic-cookie-test-only.js';
import {
calculateMedian,
diff --git a/packages/zoe/src/contracts/scaledPriceAuthority.js b/packages/zoe/src/contracts/scaledPriceAuthority.js
index b558a315c16..708e80d52b8 100644
--- a/packages/zoe/src/contracts/scaledPriceAuthority.js
+++ b/packages/zoe/src/contracts/scaledPriceAuthority.js
@@ -1,4 +1,5 @@
import { M, prepareExo } from '@agoric/vat-data';
+
import {
ceilDivideBy,
ceilMultiplyBy,
@@ -6,8 +7,8 @@ import {
floorMultiplyBy,
} from '../contractSupport/index.js';
import { makeInitialTransform } from '../contractSupport/priceAuthorityInitial.js';
-import { makePriceAuthorityTransform } from '../contractSupport/priceAuthorityTransform.js';
import { provideQuoteMint } from '../contractSupport/priceAuthorityQuoteMint.js';
+import { makePriceAuthorityTransform } from '../contractSupport/priceAuthorityTransform.js';
/**
* @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
diff --git a/packages/zoe/src/contracts/sellItems.js b/packages/zoe/src/contracts/sellItems.js
index 2376011a2cf..c8e9b348dde 100644
--- a/packages/zoe/src/contracts/sellItems.js
+++ b/packages/zoe/src/contracts/sellItems.js
@@ -1,17 +1,18 @@
-import { Fail } from '@endo/errors';
-import { Far } from '@endo/marshal';
-import { Nat } from '@endo/nat';
import { AmountMath } from '@agoric/ertp';
import {
makeNotifierKit,
observeIteration,
subscribeLatest,
} from '@agoric/notifier';
+import { Fail } from '@endo/errors';
+import { Far } from '@endo/marshal';
+import { Nat } from '@endo/nat';
+
import {
assertIssuerKeywords,
- defaultAcceptanceMsg,
- assertProposalShape,
assertNatAssetKind,
+ assertProposalShape,
+ defaultAcceptanceMsg,
} from '../contractSupport/index.js';
/**
diff --git a/packages/zoe/src/contracts/simpleExchange.js b/packages/zoe/src/contracts/simpleExchange.js
index 46915503549..977887f8163 100644
--- a/packages/zoe/src/contracts/simpleExchange.js
+++ b/packages/zoe/src/contracts/simpleExchange.js
@@ -2,10 +2,10 @@ import { makeNotifierKit } from '@agoric/notifier';
import { Far } from '@endo/marshal';
import {
- swap,
- satisfies,
- assertProposalShape,
assertIssuerKeywords,
+ assertProposalShape,
+ satisfies,
+ swap,
} from '../contractSupport/zoeHelpers.js';
/**
diff --git a/packages/zoe/src/instanceRecordStorage.js b/packages/zoe/src/instanceRecordStorage.js
index 2405c4caee3..775eca85e8b 100644
--- a/packages/zoe/src/instanceRecordStorage.js
+++ b/packages/zoe/src/instanceRecordStorage.js
@@ -1,5 +1,6 @@
-import { q, Fail } from '@endo/errors';
-import { prepareExoClass, M } from '@agoric/vat-data';
+import { M, prepareExoClass } from '@agoric/vat-data';
+import { Fail, q } from '@endo/errors';
+
import { assertKeywordName } from './cleanProposal.js';
import {
BrandKeywordRecordShape,
diff --git a/packages/zoe/src/issuerStorage.js b/packages/zoe/src/issuerStorage.js
index ffcc37d2a28..59a374aa3d2 100644
--- a/packages/zoe/src/issuerStorage.js
+++ b/packages/zoe/src/issuerStorage.js
@@ -1,7 +1,7 @@
-import { Fail } from '@endo/errors';
-import { E } from '@endo/eventual-send';
import { deeplyFulfilledObject, objectMap } from '@agoric/internal';
import { provideDurableWeakMapStore } from '@agoric/vat-data';
+import { Fail } from '@endo/errors';
+import { E } from '@endo/eventual-send';
import { cleanKeywords } from './cleanProposal.js';
import { makeIssuerRecord } from './issuerRecord.js';
diff --git a/packages/zoe/src/makeHandle.js b/packages/zoe/src/makeHandle.js
index 8801e011fd7..17d321d9fe3 100644
--- a/packages/zoe/src/makeHandle.js
+++ b/packages/zoe/src/makeHandle.js
@@ -1,8 +1,8 @@
// @jessie-check
-import { Fail } from '@endo/errors';
import { initEmpty, makeExo } from '@agoric/store';
import { prepareExoClass } from '@agoric/vat-data';
+import { Fail } from '@endo/errors';
import { HandleI } from './typeGuards.js';
diff --git a/packages/zoe/src/zoeService/createZCFVat.js b/packages/zoe/src/zoeService/createZCFVat.js
index 003f8989bf2..b0fc6e65946 100644
--- a/packages/zoe/src/zoeService/createZCFVat.js
+++ b/packages/zoe/src/zoeService/createZCFVat.js
@@ -1,8 +1,7 @@
// @jessie-check
-import { E } from '@endo/eventual-send';
-
import { Fail, q } from '@endo/errors';
+import { E } from '@endo/eventual-send';
export const getZcfBundleCap = (zcfSpec, vatAdminSvc) => {
let zcfBundleCapP;
diff --git a/packages/zoe/src/zoeService/escrowStorage.js b/packages/zoe/src/zoeService/escrowStorage.js
index 76bd3d1e57f..f7f8acd3e88 100644
--- a/packages/zoe/src/zoeService/escrowStorage.js
+++ b/packages/zoe/src/zoeService/escrowStorage.js
@@ -1,11 +1,11 @@
+///
+import './internal-types.js';
+
import { AmountMath } from '@agoric/ertp';
-import { E } from '@endo/eventual-send';
-import { q, Fail } from '@endo/errors';
import { deeplyFulfilledObject, objectMap } from '@agoric/internal';
import { provideDurableWeakMapStore } from '@agoric/vat-data';
-
-///
-import './internal-types.js';
+import { Fail, q } from '@endo/errors';
+import { E } from '@endo/eventual-send';
import { cleanKeywords } from '../cleanProposal.js';
diff --git a/packages/zoe/src/zoeService/feeMint.js b/packages/zoe/src/zoeService/feeMint.js
index a8f9771707b..e2e7de6cfb0 100644
--- a/packages/zoe/src/zoeService/feeMint.js
+++ b/packages/zoe/src/zoeService/feeMint.js
@@ -1,17 +1,18 @@
import {
AssetKind,
- IssuerShape,
BrandShape,
- prepareIssuerKit,
hasIssuer,
+ IssuerShape,
+ prepareIssuerKit,
} from '@agoric/ertp';
import { initEmpty, M } from '@agoric/store';
import {
- provideDurableMapStore,
- provide,
prepareExoClassKit,
+ provide,
+ provideDurableMapStore,
} from '@agoric/vat-data';
import { Fail, q } from '@endo/errors';
+
import { FeeMintAccessShape } from '../typeGuards.js';
/** @deprecated Redundant. Just omit it. */
diff --git a/packages/zoe/src/zoeService/installationStorage.js b/packages/zoe/src/zoeService/installationStorage.js
index f931c68838a..9fb1f914e93 100644
--- a/packages/zoe/src/zoeService/installationStorage.js
+++ b/packages/zoe/src/zoeService/installationStorage.js
@@ -1,10 +1,11 @@
-import { Fail, q } from '@endo/errors';
import {
M,
prepareExo,
prepareKind,
provideDurableWeakMapStore,
} from '@agoric/vat-data';
+import { Fail, q } from '@endo/errors';
+
import {
InstallationShape,
InstanceHandleShape,
diff --git a/packages/zoe/src/zoeService/instanceAdminStorage.js b/packages/zoe/src/zoeService/instanceAdminStorage.js
index 65ff6ae1dc4..9e83d1f03a4 100644
--- a/packages/zoe/src/zoeService/instanceAdminStorage.js
+++ b/packages/zoe/src/zoeService/instanceAdminStorage.js
@@ -1,14 +1,15 @@
import {
canBeDurable,
+ M,
makeScalarBigSetStore,
- provideDurableWeakMapStore,
- prepareKindMulti,
prepareExoClassKit,
- M,
+ prepareKindMulti,
provide,
+ provideDurableWeakMapStore,
} from '@agoric/vat-data';
+import { Fail, q } from '@endo/errors';
import { E } from '@endo/eventual-send';
-import { q, Fail } from '@endo/errors';
+
import { defineDurableHandle } from '../makeHandle.js';
import {
BrandKeywordRecordShape,
diff --git a/packages/zoe/src/zoeService/invitationQueries.js b/packages/zoe/src/zoeService/invitationQueries.js
index df5d670012a..93157a6881b 100644
--- a/packages/zoe/src/zoeService/invitationQueries.js
+++ b/packages/zoe/src/zoeService/invitationQueries.js
@@ -1,6 +1,6 @@
// @jessie-check
-import { X, Fail, q, makeError, annotateError } from '@endo/errors';
+import { annotateError, Fail, makeError, q, X } from '@endo/errors';
import { E } from '@endo/eventual-send';
export const makeInvitationQueryFns = invitationIssuer => {
diff --git a/packages/zoe/src/zoeService/makeInvitation.js b/packages/zoe/src/zoeService/makeInvitation.js
index b6e5c20242f..eb5c1046a50 100644
--- a/packages/zoe/src/zoeService/makeInvitation.js
+++ b/packages/zoe/src/zoeService/makeInvitation.js
@@ -1,8 +1,9 @@
// @jessie-check
-import { Fail, q } from '@endo/errors';
-import { provideDurableMapStore } from '@agoric/vat-data';
import { AssetKind, hasIssuer, prepareIssuerKit } from '@agoric/ertp';
+import { provideDurableMapStore } from '@agoric/vat-data';
+import { Fail, q } from '@endo/errors';
+
import { InvitationElementShape } from '../typeGuards.js';
/**
diff --git a/packages/zoe/src/zoeService/offer/burnInvitation.js b/packages/zoe/src/zoeService/offer/burnInvitation.js
index 42b8c9dea05..06ed0211972 100644
--- a/packages/zoe/src/zoeService/offer/burnInvitation.js
+++ b/packages/zoe/src/zoeService/offer/burnInvitation.js
@@ -1,6 +1,6 @@
// @jessie-check
-import { Fail, assert, X, makeError, annotateError } from '@endo/errors';
+import { annotateError, assert, Fail, makeError, X } from '@endo/errors';
import { E } from '@endo/eventual-send';
/**
diff --git a/packages/zoe/src/zoeService/offer/offer.js b/packages/zoe/src/zoeService/offer/offer.js
index 092e3d9f223..b02ca9f4cc4 100644
--- a/packages/zoe/src/zoeService/offer/offer.js
+++ b/packages/zoe/src/zoeService/offer/offer.js
@@ -1,15 +1,15 @@
// @jessie-check
-import { q, Fail } from '@endo/errors';
-import { passStyleOf } from '@endo/marshal';
+import '../internal-types.js';
+
import { mustMatch } from '@agoric/store';
+import { Fail, q } from '@endo/errors';
import { E } from '@endo/eventual-send';
+import { passStyleOf } from '@endo/marshal';
import { cleanProposal } from '../../cleanProposal.js';
-import { burnInvitation } from './burnInvitation.js';
import { makeInvitationQueryFns } from '../invitationQueries.js';
-
-import '../internal-types.js';
+import { burnInvitation } from './burnInvitation.js';
export const makeOfferMethod = offerDataAccess => {
/** @type {Offer} */
diff --git a/packages/zoe/src/zoeService/originalZoeSeat.js b/packages/zoe/src/zoeService/originalZoeSeat.js
index f60d02057a6..9f639c46336 100644
--- a/packages/zoe/src/zoeService/originalZoeSeat.js
+++ b/packages/zoe/src/zoeService/originalZoeSeat.js
@@ -1,17 +1,18 @@
-import { Fail } from '@endo/errors';
+import '../types-ambient.js';
+import '../internal-types.js';
+
import { SubscriberShape } from '@agoric/notifier';
-import { E } from '@endo/eventual-send';
import { M, prepareExoClassKit } from '@agoric/vat-data';
+import { Fail } from '@endo/errors';
+import { E } from '@endo/eventual-send';
import { deeplyFulfilled } from '@endo/marshal';
import { makePromiseKit } from '@endo/promise-kit';
import { satisfiesWant } from '../contractFacet/offerSafety.js';
-import '../types-ambient.js';
-import '../internal-types.js';
import {
AmountKeywordRecordShape,
- KeywordShape,
ExitObjectShape,
+ KeywordShape,
PaymentPKeywordRecordShape,
} from '../typeGuards.js';
diff --git a/packages/zoe/src/zoeService/startInstance.js b/packages/zoe/src/zoeService/startInstance.js
index ae3d1487cf5..150358db928 100644
--- a/packages/zoe/src/zoeService/startInstance.js
+++ b/packages/zoe/src/zoeService/startInstance.js
@@ -1,23 +1,23 @@
-import { E } from '@endo/eventual-send';
-import { passStyleOf } from '@endo/marshal';
+import { isUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
+import { initEmpty } from '@agoric/store';
import {
M,
- provideDurableWeakMapStore,
- prepareExoClass,
prepareExo,
+ prepareExoClass,
+ provideDurableWeakMapStore,
watchPromise,
} from '@agoric/vat-data';
-import { initEmpty } from '@agoric/store';
-import { isUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
-
import { Fail, q } from '@endo/errors';
+import { E } from '@endo/eventual-send';
+import { passStyleOf } from '@endo/marshal';
+
import { defineDurableHandle } from '../makeHandle.js';
-import { makeInstanceAdminMaker } from './instanceAdminStorage.js';
import {
AdminFacetI,
InstanceAdminI,
InstanceAdminShape,
} from '../typeGuards.js';
+import { makeInstanceAdminMaker } from './instanceAdminStorage.js';
// import '../internal-types.js';
diff --git a/packages/zoe/src/zoeService/utils.d.ts b/packages/zoe/src/zoeService/utils.d.ts
index 1b27843320c..590b34c189a 100644
--- a/packages/zoe/src/zoeService/utils.d.ts
+++ b/packages/zoe/src/zoeService/utils.d.ts
@@ -6,8 +6,8 @@ import type { Issuer } from '@agoric/ertp/src/types.js';
import type { TagContainer } from '@agoric/internal/src/tagged.js';
import type { Baggage } from '@agoric/swingset-liveslots';
import type { VatUpgradeResults } from '@agoric/swingset-vat';
-import type { RemotableObject } from '@endo/marshal';
import type { FarRef } from '@endo/far';
+import type { RemotableObject } from '@endo/marshal';
// XXX https://github.com/Agoric/agoric-sdk/issues/4565
type SourceBundle = Record;
diff --git a/packages/zoe/src/zoeService/utils.test-d.ts b/packages/zoe/src/zoeService/utils.test-d.ts
index 90c61472899..56aeb0b3a38 100644
--- a/packages/zoe/src/zoeService/utils.test-d.ts
+++ b/packages/zoe/src/zoeService/utils.test-d.ts
@@ -1,4 +1,5 @@
import { E } from '@endo/far';
+
import type { StartedInstanceKit } from './utils';
const someContractStartFn = (
diff --git a/packages/zoe/src/zoeService/zoe.js b/packages/zoe/src/zoeService/zoe.js
index 44990d6e4c1..111ea898b45 100644
--- a/packages/zoe/src/zoeService/zoe.js
+++ b/packages/zoe/src/zoeService/zoe.js
@@ -14,19 +14,19 @@
///
///
+import { M } from '@agoric/store';
+import { makeScalarBigMapStore, prepareExo } from '@agoric/vat-data';
+import { Fail } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { makeScalarBigMapStore, prepareExo } from '@agoric/vat-data';
-import { M } from '@agoric/store';
-import { Fail } from '@endo/errors';
-import { makeZoeStorageManager } from './zoeStorageManager.js';
-import { makeStartInstance } from './startInstance.js';
-import { makeOfferMethod } from './offer/offer.js';
-import { makeInvitationQueryFns } from './invitationQueries.js';
+import { ZoeServiceI } from '../typeGuards.js';
import { getZcfBundleCap } from './createZCFVat.js';
import { defaultFeeIssuerConfig, prepareFeeMint } from './feeMint.js';
-import { ZoeServiceI } from '../typeGuards.js';
+import { makeInvitationQueryFns } from './invitationQueries.js';
+import { makeOfferMethod } from './offer/offer.js';
+import { makeStartInstance } from './startInstance.js';
+import { makeZoeStorageManager } from './zoeStorageManager.js';
/** @import {Baggage} from '@agoric/vat-data' */
diff --git a/packages/zoe/src/zoeService/zoeSeat.js b/packages/zoe/src/zoeService/zoeSeat.js
index acaae2e2c20..40fc5b78660 100644
--- a/packages/zoe/src/zoeService/zoeSeat.js
+++ b/packages/zoe/src/zoeService/zoeSeat.js
@@ -1,18 +1,19 @@
-import { Fail } from '@endo/errors';
+import '../types-ambient.js';
+import '../internal-types.js';
+
import { prepareDurablePublishKit } from '@agoric/notifier';
-import { E } from '@endo/eventual-send';
import { M, prepareExoClassKit } from '@agoric/vat-data';
+import { Fail } from '@endo/errors';
+import { E } from '@endo/eventual-send';
import { deeplyFulfilled } from '@endo/marshal';
import { makePromiseKit } from '@endo/promise-kit';
import { satisfiesWant } from '../contractFacet/offerSafety.js';
-import '../types-ambient.js';
-import '../internal-types.js';
import {
+ coreUserSeatMethods,
declareOldZoeSeatAdminKind,
OriginalZoeSeatIKit,
ZoeUserSeatShape,
- coreUserSeatMethods,
} from './originalZoeSeat.js';
// ZoeSeatAdmin has the implementation of coreUserSeatMethods, but ZoeUserSeat
diff --git a/packages/zoe/src/zoeService/zoeStorageManager.js b/packages/zoe/src/zoeService/zoeStorageManager.js
index 80d0c2cd5d6..936340bacbf 100644
--- a/packages/zoe/src/zoeService/zoeStorageManager.js
+++ b/packages/zoe/src/zoeService/zoeStorageManager.js
@@ -1,33 +1,33 @@
-import { E } from '@endo/far';
+///
+import './internal-types.js';
+
import {
+ AmountMath,
AssetKind,
makeDurableIssuerKit,
- AmountMath,
upgradeIssuerKit,
} from '@agoric/ertp';
import {
makeScalarBigMapStore,
- provideDurableWeakMapStore,
- prepareExoClassKit,
prepareExoClass,
+ prepareExoClassKit,
provideDurableSetStore,
+ provideDurableWeakMapStore,
} from '@agoric/vat-data';
+import { E } from '@endo/far';
-import { provideIssuerStorage } from '../issuerStorage.js';
import { makeInstanceRecordStorage } from '../instanceRecordStorage.js';
import { makeIssuerRecord } from '../issuerRecord.js';
-import { provideEscrowStorage } from './escrowStorage.js';
-import { prepareInvitationKit } from './makeInvitation.js';
-import { makeInstanceAdminStorage } from './instanceAdminStorage.js';
-import { makeInstallationStorage } from './installationStorage.js';
-
-///
-import './internal-types.js';
+import { provideIssuerStorage } from '../issuerStorage.js';
import {
InstanceStorageManagerIKit,
ZoeMintI,
ZoeStorageManagerIKit,
} from '../typeGuards.js';
+import { provideEscrowStorage } from './escrowStorage.js';
+import { makeInstallationStorage } from './installationStorage.js';
+import { makeInstanceAdminStorage } from './instanceAdminStorage.js';
+import { prepareInvitationKit } from './makeInvitation.js';
/** @import {Baggage} from '@agoric/vat-data' */
diff --git a/packages/zoe/test/autoswapJig.js b/packages/zoe/test/autoswapJig.js
index 3bcd6275602..f59e11ae19d 100644
--- a/packages/zoe/test/autoswapJig.js
+++ b/packages/zoe/test/autoswapJig.js
@@ -1,6 +1,6 @@
+import { AmountMath } from '@agoric/ertp';
import { E } from '@endo/eventual-send';
import { Remotable } from '@endo/marshal';
-import { AmountMath } from '@agoric/ertp';
import { natSafeMath } from '../src/contractSupport/index.js';
import { assertOfferResult, assertPayoutAmount } from './zoeTestHelpers.js';
diff --git a/packages/zoe/test/runMintContract.js b/packages/zoe/test/runMintContract.js
index ab851e78167..4c327eac919 100644
--- a/packages/zoe/test/runMintContract.js
+++ b/packages/zoe/test/runMintContract.js
@@ -1,6 +1,6 @@
+import { AmountMath } from '@agoric/ertp';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { AmountMath } from '@agoric/ertp';
/**
* @param {ZCF} zcf
diff --git a/packages/zoe/test/swingsetTests/brokenContracts/bootstrap.js b/packages/zoe/test/swingsetTests/brokenContracts/bootstrap.js
index f29b387c32d..d2fa83a4ea4 100644
--- a/packages/zoe/test/swingsetTests/brokenContracts/bootstrap.js
+++ b/packages/zoe/test/swingsetTests/brokenContracts/bootstrap.js
@@ -1,6 +1,6 @@
+import { AmountMath, makeIssuerKit } from '@agoric/ertp';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { makeIssuerKit, AmountMath } from '@agoric/ertp';
const setupBasicMints = () => {
const all = [
diff --git a/packages/zoe/test/swingsetTests/brokenContracts/crashingAutoRefund.js b/packages/zoe/test/swingsetTests/brokenContracts/crashingAutoRefund.js
index e3d73e15984..3d01a13471b 100644
--- a/packages/zoe/test/swingsetTests/brokenContracts/crashingAutoRefund.js
+++ b/packages/zoe/test/swingsetTests/brokenContracts/crashingAutoRefund.js
@@ -1,9 +1,9 @@
import { Far } from '@endo/marshal';
import {
- swap,
assertIssuerKeywords,
assertProposalShape,
+ swap,
} from '../../../src/contractSupport/index.js';
/**
diff --git a/packages/zoe/test/swingsetTests/brokenContracts/crashingContract.test.js b/packages/zoe/test/swingsetTests/brokenContracts/crashingContract.test.js
index 806527aa9a4..0d374143008 100644
--- a/packages/zoe/test/swingsetTests/brokenContracts/crashingContract.test.js
+++ b/packages/zoe/test/swingsetTests/brokenContracts/crashingContract.test.js
@@ -1,10 +1,10 @@
// @ts-nocheck
+import { buildVatController, loadBasedir } from '@agoric/swingset-vat';
+import bundleSource from '@endo/bundle-source';
import test from 'ava';
import path from 'path';
-import { loadBasedir, buildVatController } from '@agoric/swingset-vat';
-import bundleSource from '@endo/bundle-source';
import zcfBundle from '../../../bundles/bundle-contractFacet.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/swingsetTests/brokenContracts/vat-alice.js b/packages/zoe/test/swingsetTests/brokenContracts/vat-alice.js
index 13f5921b9e1..6a2cae438eb 100644
--- a/packages/zoe/test/swingsetTests/brokenContracts/vat-alice.js
+++ b/packages/zoe/test/swingsetTests/brokenContracts/vat-alice.js
@@ -3,7 +3,8 @@
import { assert, X } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { showPurseBalance, setupIssuers } from '../helpers.js';
+
+import { setupIssuers, showPurseBalance } from '../helpers.js';
async function logCounter(log, publicAPI) {
log(`counter: ${await E(publicAPI).getOffersCount()}`);
diff --git a/packages/zoe/test/swingsetTests/helpers.js b/packages/zoe/test/swingsetTests/helpers.js
index 0f6add5ac9b..e4446b8a011 100644
--- a/packages/zoe/test/swingsetTests/helpers.js
+++ b/packages/zoe/test/swingsetTests/helpers.js
@@ -1,5 +1,5 @@
-import { E } from '@endo/eventual-send';
import { AmountMath } from '@agoric/ertp';
+import { E } from '@endo/eventual-send';
export const showPurseBalance = async (purseP, name, log) => {
try {
diff --git a/packages/zoe/test/swingsetTests/makeKind/makeKind.test.js b/packages/zoe/test/swingsetTests/makeKind/makeKind.test.js
index d1331a2c7a8..304775813ff 100644
--- a/packages/zoe/test/swingsetTests/makeKind/makeKind.test.js
+++ b/packages/zoe/test/swingsetTests/makeKind/makeKind.test.js
@@ -1,7 +1,8 @@
+import { buildKernelBundles, buildVatController } from '@agoric/swingset-vat';
+import bundleSource from '@endo/bundle-source';
import anyTest from 'ava';
import path from 'path';
-import { buildVatController, buildKernelBundles } from '@agoric/swingset-vat';
-import bundleSource from '@endo/bundle-source';
+
import zcfBundle from '../../../bundles/bundle-contractFacet.js';
const CONTRACT_FILES = ['minimalMakeKindContract'];
diff --git a/packages/zoe/test/swingsetTests/offerArgs/offerArgs.test.js b/packages/zoe/test/swingsetTests/offerArgs/offerArgs.test.js
index 94a1f9f1222..58077439fc7 100644
--- a/packages/zoe/test/swingsetTests/offerArgs/offerArgs.test.js
+++ b/packages/zoe/test/swingsetTests/offerArgs/offerArgs.test.js
@@ -1,7 +1,8 @@
+import { buildKernelBundles, buildVatController } from '@agoric/swingset-vat';
+import bundleSource from '@endo/bundle-source';
import anyTest from 'ava';
import path from 'path';
-import { buildVatController, buildKernelBundles } from '@agoric/swingset-vat';
-import bundleSource from '@endo/bundle-source';
+
import zcfBundle from '../../../bundles/bundle-contractFacet.js';
const CONTRACT_FILES = ['offerArgsUsageContract'];
diff --git a/packages/zoe/test/swingsetTests/privateArgs/privateArgs.test.js b/packages/zoe/test/swingsetTests/privateArgs/privateArgs.test.js
index 6e66d4b78ef..46914d6420f 100644
--- a/packages/zoe/test/swingsetTests/privateArgs/privateArgs.test.js
+++ b/packages/zoe/test/swingsetTests/privateArgs/privateArgs.test.js
@@ -1,7 +1,8 @@
+import { buildKernelBundles, buildVatController } from '@agoric/swingset-vat';
+import bundleSource from '@endo/bundle-source';
import anyTest from 'ava';
import path from 'path';
-import { buildVatController, buildKernelBundles } from '@agoric/swingset-vat';
-import bundleSource from '@endo/bundle-source';
+
import zcfBundle from '../../../bundles/bundle-contractFacet.js';
const CONTRACT_FILES = ['privateArgsUsageContract'];
diff --git a/packages/zoe/test/swingsetTests/runMint/runMint.test.js b/packages/zoe/test/swingsetTests/runMint/runMint.test.js
index 2907f973564..769ac8cea98 100644
--- a/packages/zoe/test/swingsetTests/runMint/runMint.test.js
+++ b/packages/zoe/test/swingsetTests/runMint/runMint.test.js
@@ -1,7 +1,8 @@
+import { buildKernelBundles, buildVatController } from '@agoric/swingset-vat';
+import bundleSource from '@endo/bundle-source';
import anyTest from 'ava';
import path from 'path';
-import { buildVatController, buildKernelBundles } from '@agoric/swingset-vat';
-import bundleSource from '@endo/bundle-source';
+
import zcfBundle from '../../../bundles/bundle-contractFacet.js';
// offerArgsUsageContract is just used as a generic contract for the
diff --git a/packages/zoe/test/swingsetTests/upgradeCoveredCall/bootstrap-coveredCall-service-upgrade.js b/packages/zoe/test/swingsetTests/upgradeCoveredCall/bootstrap-coveredCall-service-upgrade.js
index 90c0faeb701..6f69033e9a6 100644
--- a/packages/zoe/test/swingsetTests/upgradeCoveredCall/bootstrap-coveredCall-service-upgrade.js
+++ b/packages/zoe/test/swingsetTests/upgradeCoveredCall/bootstrap-coveredCall-service-upgrade.js
@@ -1,7 +1,8 @@
+import { AmountMath } from '@agoric/ertp';
import { q, X } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { AmountMath } from '@agoric/ertp';
+
import buildManualTimer from '../../../tools/manualTimer.js';
const mintInto = (kit, purse, value) =>
diff --git a/packages/zoe/test/swingsetTests/upgradeCoveredCall/coveredCall-durable-V3.js b/packages/zoe/test/swingsetTests/upgradeCoveredCall/coveredCall-durable-V3.js
index 5391381995c..dc23f2476ca 100644
--- a/packages/zoe/test/swingsetTests/upgradeCoveredCall/coveredCall-durable-V3.js
+++ b/packages/zoe/test/swingsetTests/upgradeCoveredCall/coveredCall-durable-V3.js
@@ -1,6 +1,7 @@
-import { X } from '@endo/errors';
import { M, mustMatch } from '@agoric/store';
-import { prepareExoClass, prepareExo } from '@agoric/vat-data';
+import { prepareExo, prepareExoClass } from '@agoric/vat-data';
+import { X } from '@endo/errors';
+
import { swapExact } from '../../../src/contractSupport/index.js';
import {
InvitationShape,
diff --git a/packages/zoe/test/swingsetTests/upgradeCoveredCall/coveredCall-service-upgrade.test.js b/packages/zoe/test/swingsetTests/upgradeCoveredCall/coveredCall-service-upgrade.test.js
index 0b78463dc3d..1be4469aa40 100644
--- a/packages/zoe/test/swingsetTests/upgradeCoveredCall/coveredCall-service-upgrade.test.js
+++ b/packages/zoe/test/swingsetTests/upgradeCoveredCall/coveredCall-service-upgrade.test.js
@@ -1,7 +1,7 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { assert } from '@endo/errors';
import { buildVatController } from '@agoric/swingset-vat';
+import { assert } from '@endo/errors';
const bfile = name => new URL(name, import.meta.url).pathname;
diff --git a/packages/zoe/test/swingsetTests/upgradeCoveredCall/vat-ertp-service.js b/packages/zoe/test/swingsetTests/upgradeCoveredCall/vat-ertp-service.js
index 90ba1196fd6..8f3281e5d11 100644
--- a/packages/zoe/test/swingsetTests/upgradeCoveredCall/vat-ertp-service.js
+++ b/packages/zoe/test/swingsetTests/upgradeCoveredCall/vat-ertp-service.js
@@ -1,6 +1,6 @@
-import { Far } from '@endo/marshal';
import { AmountMath } from '@agoric/ertp';
import { prepareErtpService } from '@agoric/ertp/test/swingsetTests/ertpService/vat-ertp-service.js';
+import { Far } from '@endo/marshal';
export const buildRootObject = async (vatPowers, _vatParams, baggage) => {
const exportableAmountMath = Far('AmountMath', { ...AmountMath });
diff --git a/packages/zoe/test/swingsetTests/zoe/bootstrap.js b/packages/zoe/test/swingsetTests/zoe/bootstrap.js
index a04e6bbed6d..ff2dcd2781e 100644
--- a/packages/zoe/test/swingsetTests/zoe/bootstrap.js
+++ b/packages/zoe/test/swingsetTests/zoe/bootstrap.js
@@ -1,6 +1,7 @@
+import { AmountMath, makeIssuerKit } from '@agoric/ertp';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { makeIssuerKit, AmountMath } from '@agoric/ertp';
+
import buildManualTimer from '../../../tools/manualTimer.js';
const setupBasicMints = () => {
diff --git a/packages/zoe/test/swingsetTests/zoe/vat-alice.js b/packages/zoe/test/swingsetTests/zoe/vat-alice.js
index 774c6aa5960..9b6cad63bdb 100644
--- a/packages/zoe/test/swingsetTests/zoe/vat-alice.js
+++ b/packages/zoe/test/swingsetTests/zoe/vat-alice.js
@@ -1,10 +1,10 @@
+import { AmountMath } from '@agoric/ertp';
import { assert, X } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { AmountMath } from '@agoric/ertp';
-import { showPurseBalance, setupIssuers } from '../helpers.js';
import { SECOND_PRICE } from '../../../src/contracts/auction/index.js';
+import { setupIssuers, showPurseBalance } from '../helpers.js';
const build = async (log, zoe, issuers, payments, installations, timer) => {
const { moola, simoleans, bucks, purses } = await setupIssuers(zoe, issuers);
diff --git a/packages/zoe/test/swingsetTests/zoe/vat-bob.js b/packages/zoe/test/swingsetTests/zoe/vat-bob.js
index 55eacaa551d..8e508c8fe83 100644
--- a/packages/zoe/test/swingsetTests/zoe/vat-bob.js
+++ b/packages/zoe/test/swingsetTests/zoe/vat-bob.js
@@ -1,11 +1,11 @@
+import { AmountMath, isSetValue } from '@agoric/ertp';
+import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
+import { keyEQ } from '@agoric/store';
import { assert, X } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { keyEQ } from '@agoric/store';
-import { AmountMath, isSetValue } from '@agoric/ertp';
-import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
-import { showPurseBalance, setupIssuers } from '../helpers.js';
+import { setupIssuers, showPurseBalance } from '../helpers.js';
const build = async (log, zoe, issuers, payments, installations, timer) => {
const { moola, simoleans, bucks, purses } = await setupIssuers(zoe, issuers);
diff --git a/packages/zoe/test/swingsetTests/zoe/vat-carol.js b/packages/zoe/test/swingsetTests/zoe/vat-carol.js
index eba052ca353..4620f7eb7f4 100644
--- a/packages/zoe/test/swingsetTests/zoe/vat-carol.js
+++ b/packages/zoe/test/swingsetTests/zoe/vat-carol.js
@@ -1,9 +1,10 @@
+import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
+import { keyEQ } from '@agoric/store';
import { assert, X } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { keyEQ } from '@agoric/store';
-import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
-import { showPurseBalance, setupIssuers } from '../helpers.js';
+
+import { setupIssuers, showPurseBalance } from '../helpers.js';
const build = async (log, zoe, issuers, payments, installations) => {
const { moola, simoleans, purses } = await setupIssuers(zoe, issuers);
diff --git a/packages/zoe/test/swingsetTests/zoe/vat-dave.js b/packages/zoe/test/swingsetTests/zoe/vat-dave.js
index 38a56fc53e9..707b66ec0ea 100644
--- a/packages/zoe/test/swingsetTests/zoe/vat-dave.js
+++ b/packages/zoe/test/swingsetTests/zoe/vat-dave.js
@@ -1,10 +1,11 @@
-import { assert, X, Fail } from '@endo/errors';
-import { E } from '@endo/eventual-send';
-import { Far } from '@endo/marshal';
-import { keyEQ } from '@agoric/store';
import { AmountMath } from '@agoric/ertp';
import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
-import { showPurseBalance, setupIssuers } from '../helpers.js';
+import { keyEQ } from '@agoric/store';
+import { assert, Fail, X } from '@endo/errors';
+import { E } from '@endo/eventual-send';
+import { Far } from '@endo/marshal';
+
+import { setupIssuers, showPurseBalance } from '../helpers.js';
const build = async (log, zoe, issuers, payments, installations, timer) => {
const { moola, simoleans, bucks, purses } = await setupIssuers(zoe, issuers);
diff --git a/packages/zoe/test/swingsetTests/zoe/zoe-upgrade.test.js b/packages/zoe/test/swingsetTests/zoe/zoe-upgrade.test.js
index 68b503ffcf3..9b2e31605d7 100644
--- a/packages/zoe/test/swingsetTests/zoe/zoe-upgrade.test.js
+++ b/packages/zoe/test/swingsetTests/zoe/zoe-upgrade.test.js
@@ -1,9 +1,9 @@
import '@agoric/swingset-liveslots/tools/prepare-test-env.js';
-import test from 'ava';
-import bundleSource from '@endo/bundle-source';
-import { buildVatController } from '@agoric/swingset-vat';
import { kunser } from '@agoric/kmarshal';
+import { buildVatController } from '@agoric/swingset-vat';
+import bundleSource from '@endo/bundle-source';
+import test from 'ava';
const bfile = name => new URL(name, import.meta.url).pathname;
diff --git a/packages/zoe/test/swingsetTests/zoe/zoe.test.js b/packages/zoe/test/swingsetTests/zoe/zoe.test.js
index 20ca2522fef..fbdebd8d509 100644
--- a/packages/zoe/test/swingsetTests/zoe/zoe.test.js
+++ b/packages/zoe/test/swingsetTests/zoe/zoe.test.js
@@ -1,8 +1,9 @@
// @ts-nocheck
+import { buildKernelBundles, buildVatController } from '@agoric/swingset-vat';
+import bundleSource from '@endo/bundle-source';
import test from 'ava';
import path from 'path';
-import { buildVatController, buildKernelBundles } from '@agoric/swingset-vat';
-import bundleSource from '@endo/bundle-source';
+
import zcfBundle from '../../../bundles/bundle-contractFacet.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/types.test-d.ts b/packages/zoe/test/types.test-d.ts
index 0301025a531..bcf470e9121 100644
--- a/packages/zoe/test/types.test-d.ts
+++ b/packages/zoe/test/types.test-d.ts
@@ -5,9 +5,9 @@
*/
import { E, RemoteFunctions } from '@endo/eventual-send';
+import { type Key, M } from '@endo/patterns';
import { expectNotType, expectType } from 'tsd';
-import { M, type Key } from '@endo/patterns';
// 'prepare' is deprecated but still supported
import type { prepare as scaledPriceAuthorityStart } from '../src/contracts/scaledPriceAuthority.js';
import type { Instance } from '../src/zoeService/utils.js';
diff --git a/packages/zoe/test/unitTests/blockedOffers.test.js b/packages/zoe/test/unitTests/blockedOffers.test.js
index d59cea38d6f..9e50c40703d 100644
--- a/packages/zoe/test/unitTests/blockedOffers.test.js
+++ b/packages/zoe/test/unitTests/blockedOffers.test.js
@@ -1,19 +1,18 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
-import { E } from '@endo/eventual-send';
import bundleSource from '@endo/bundle-source';
+import { E } from '@endo/eventual-send';
+import path from 'path';
-import { setup } from './setupBasicMints.js';
-import { makeZoeForTest } from '../../tools/setup-zoe.js';
-import { makeFakeVatAdmin } from '../../tools/fakeVatAdmin.js';
import {
depositToSeat,
withdrawFromSeat,
} from '../../src/contractSupport/index.js';
+import { makeFakeVatAdmin } from '../../tools/fakeVatAdmin.js';
+import { makeZoeForTest } from '../../tools/setup-zoe.js';
import { assertPayoutAmount } from '../zoeTestHelpers.js';
import { makeOffer } from './makeOffer.js';
+import { setup } from './setupBasicMints.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/unitTests/bounty.js b/packages/zoe/test/unitTests/bounty.js
index bfec6ca4185..083fdc743ee 100644
--- a/packages/zoe/test/unitTests/bounty.js
+++ b/packages/zoe/test/unitTests/bounty.js
@@ -1,7 +1,7 @@
+import { AmountMath } from '@agoric/ertp';
import { assert, X } from '@endo/errors';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { AmountMath } from '@agoric/ertp';
/**
* This contract lets a funder endow a bounty that will pay out if an Oracle
diff --git a/packages/zoe/test/unitTests/cleanProposal.test.js b/packages/zoe/test/unitTests/cleanProposal.test.js
index b7aea585489..2b5c666f0f0 100644
--- a/packages/zoe/test/unitTests/cleanProposal.test.js
+++ b/packages/zoe/test/unitTests/cleanProposal.test.js
@@ -1,9 +1,10 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+
import { M } from '@agoric/store';
import { cleanProposal } from '../../src/cleanProposal.js';
-import { setup } from './setupBasicMints.js';
import buildManualTimer from '../../tools/manualTimer.js';
+import { setup } from './setupBasicMints.js';
const proposeGood = (t, proposal, assetKind, expected) =>
t.deepEqual(
diff --git a/packages/zoe/test/unitTests/contractSupport/bondingCurves.test.js b/packages/zoe/test/unitTests/contractSupport/bondingCurves.test.js
index 87ffaa36e8e..e57b9cdc45b 100644
--- a/packages/zoe/test/unitTests/contractSupport/bondingCurves.test.js
+++ b/packages/zoe/test/unitTests/contractSupport/bondingCurves.test.js
@@ -1,9 +1,9 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
import {
+ calcLiqValueToMint,
getInputPrice,
getOutputPrice,
- calcLiqValueToMint,
} from '../../../src/contractSupport/index.js';
const testGetPrice = (
diff --git a/packages/zoe/test/unitTests/contractSupport/depositTo.test.js b/packages/zoe/test/unitTests/contractSupport/depositTo.test.js
index c9f31c365be..a833efb11b2 100644
--- a/packages/zoe/test/unitTests/contractSupport/depositTo.test.js
+++ b/packages/zoe/test/unitTests/contractSupport/depositTo.test.js
@@ -1,15 +1,14 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
-import { E } from '@endo/eventual-send';
import bundleSource from '@endo/bundle-source';
+import { E } from '@endo/eventual-send';
+import path from 'path';
-import { setup } from '../setupBasicMints.js';
-import { makeZoeForTest } from '../../../tools/setup-zoe.js';
-import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
import { depositToSeat } from '../../../src/contractSupport/zoeHelpers.js';
+import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
+import { makeZoeForTest } from '../../../tools/setup-zoe.js';
import { makeOffer } from '../makeOffer.js';
+import { setup } from '../setupBasicMints.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/unitTests/contractSupport/offerTo.test.js b/packages/zoe/test/unitTests/contractSupport/offerTo.test.js
index 020eb923d23..e9aa0a85f1e 100644
--- a/packages/zoe/test/unitTests/contractSupport/offerTo.test.js
+++ b/packages/zoe/test/unitTests/contractSupport/offerTo.test.js
@@ -1,15 +1,14 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
-import { E } from '@endo/eventual-send';
import bundleSource from '@endo/bundle-source';
+import { E } from '@endo/eventual-send';
+import path from 'path';
-import { setup } from '../setupBasicMints.js';
-import { makeZoeForTest } from '../../../tools/setup-zoe.js';
-import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
import { offerTo, swapExact } from '../../../src/contractSupport/zoeHelpers.js';
+import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
+import { makeZoeForTest } from '../../../tools/setup-zoe.js';
import { makeOffer } from '../makeOffer.js';
+import { setup } from '../setupBasicMints.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/unitTests/contractSupport/percentSupport.test.js b/packages/zoe/test/unitTests/contractSupport/percentSupport.test.js
index eab2c0f20bf..911c58521ef 100644
--- a/packages/zoe/test/unitTests/contractSupport/percentSupport.test.js
+++ b/packages/zoe/test/unitTests/contractSupport/percentSupport.test.js
@@ -1,12 +1,12 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { makeIssuerKit, AmountMath } from '@agoric/ertp';
+import { AmountMath, makeIssuerKit } from '@agoric/ertp';
-import { floorMultiplyBy } from '../../../src/contractSupport/index.js';
import {
- make100Percent,
make0Percent,
+ make100Percent,
} from '../../../src/contracts/callSpread/percent.js';
+import { floorMultiplyBy } from '../../../src/contractSupport/index.js';
// duplicated from test-ratio, but should go away with the amount refactoring
function amountsEqual(t, a1, a2, brand) {
diff --git a/packages/zoe/test/unitTests/contractSupport/ratio.test.js b/packages/zoe/test/unitTests/contractSupport/ratio.test.js
index 8a4632b5fc5..6173e9a4579 100644
--- a/packages/zoe/test/unitTests/contractSupport/ratio.test.js
+++ b/packages/zoe/test/unitTests/contractSupport/ratio.test.js
@@ -1,22 +1,23 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { makeIssuerKit, AmountMath } from '@agoric/ertp';
+import { AmountMath, makeIssuerKit } from '@agoric/ertp';
+
import {
- makeRatio,
- makeRatioFromAmounts,
- floorMultiplyBy,
- floorDivideBy,
- ceilMultiplyBy,
+ addRatios,
ceilDivideBy,
+ ceilMultiplyBy,
+ divideBy,
+ floorDivideBy,
+ floorMultiplyBy,
invertRatio,
- oneMinus,
+ makeRatio,
+ makeRatioFromAmounts,
+ multiplyBy,
multiplyRatios,
- addRatios,
+ oneMinus,
+ parseRatio,
quantize,
- multiplyBy,
subtractRatios,
- parseRatio,
- divideBy,
} from '../../../src/contractSupport/ratio.js';
/**
diff --git a/packages/zoe/test/unitTests/contractSupport/withdrawFrom.test.js b/packages/zoe/test/unitTests/contractSupport/withdrawFrom.test.js
index d5f359c8324..436eb50dfbb 100644
--- a/packages/zoe/test/unitTests/contractSupport/withdrawFrom.test.js
+++ b/packages/zoe/test/unitTests/contractSupport/withdrawFrom.test.js
@@ -1,19 +1,18 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
-import { E } from '@endo/eventual-send';
import bundleSource from '@endo/bundle-source';
+import { E } from '@endo/eventual-send';
+import path from 'path';
-import { setup } from '../setupBasicMints.js';
-import { makeZoeForTest } from '../../../tools/setup-zoe.js';
-import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
import {
depositToSeat,
withdrawFromSeat,
} from '../../../src/contractSupport/index.js';
+import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
+import { makeZoeForTest } from '../../../tools/setup-zoe.js';
import { assertPayoutAmount } from '../../zoeTestHelpers.js';
import { makeOffer } from '../makeOffer.js';
+import { setup } from '../setupBasicMints.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/unitTests/contractSupport/zoeHelpers.test.js b/packages/zoe/test/unitTests/contractSupport/zoeHelpers.test.js
index 03f7e19a100..099433dcfce 100644
--- a/packages/zoe/test/unitTests/contractSupport/zoeHelpers.test.js
+++ b/packages/zoe/test/unitTests/contractSupport/zoeHelpers.test.js
@@ -1,13 +1,13 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { Far } from '@endo/marshal';
import { makeScalarMapStore } from '@agoric/store';
-import { setup } from '../setupBasicMints.js';
+import { Far } from '@endo/marshal';
import {
defaultAcceptanceMsg,
satisfies,
} from '../../../src/contractSupport/index.js';
+import { setup } from '../setupBasicMints.js';
test('ZoeHelpers messages', t => {
t.is(
diff --git a/packages/zoe/test/unitTests/contracts/atomicSwap.test.js b/packages/zoe/test/unitTests/contracts/atomicSwap.test.js
index ae03d3a7155..8d137c3534c 100644
--- a/packages/zoe/test/unitTests/contracts/atomicSwap.test.js
+++ b/packages/zoe/test/unitTests/contracts/atomicSwap.test.js
@@ -1,15 +1,14 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
+import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
import bundleSource from '@endo/bundle-source';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
+import path from 'path';
+import { assertAmountsEqual } from '../../zoeTestHelpers.js';
import { setup } from '../setupBasicMints.js';
import { setupNonFungible } from '../setupNonFungibleMints.js';
-import { assertAmountsEqual } from '../../zoeTestHelpers.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/unitTests/contracts/auction.test.js b/packages/zoe/test/unitTests/contracts/auction.test.js
index ea2cbdfca57..ae1ef4e1c24 100644
--- a/packages/zoe/test/unitTests/contracts/auction.test.js
+++ b/packages/zoe/test/unitTests/contracts/auction.test.js
@@ -1,12 +1,11 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
+import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
+import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
import bundleSource from '@endo/bundle-source';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
-import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
+import path from 'path';
import buildManualTimer from '../../../tools/manualTimer.js';
import { setup } from '../setupBasicMints.js';
diff --git a/packages/zoe/test/unitTests/contracts/automaticRefund.test.js b/packages/zoe/test/unitTests/contracts/automaticRefund.test.js
index 73b3ad18813..cc5b8a0ffc7 100644
--- a/packages/zoe/test/unitTests/contracts/automaticRefund.test.js
+++ b/packages/zoe/test/unitTests/contracts/automaticRefund.test.js
@@ -1,10 +1,9 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
+import { claim, splitMany } from '@agoric/ertp/src/legacy-payment-helpers.js';
import bundleSource from '@endo/bundle-source';
import { E } from '@endo/eventual-send';
-import { claim, splitMany } from '@agoric/ertp/src/legacy-payment-helpers.js';
+import path from 'path';
import { setup } from '../setupBasicMints.js';
import { setupNonFungible } from '../setupNonFungibleMints.js';
diff --git a/packages/zoe/test/unitTests/contracts/autoswap.test.js b/packages/zoe/test/unitTests/contracts/autoswap.test.js
index 8cb619ffe1f..79ade4ef303 100644
--- a/packages/zoe/test/unitTests/contracts/autoswap.test.js
+++ b/packages/zoe/test/unitTests/contracts/autoswap.test.js
@@ -1,10 +1,9 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
-import { E } from '@endo/eventual-send';
import { AmountMath } from '@agoric/ertp';
import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
+import { E } from '@endo/eventual-send';
+import path from 'path';
import {
makeTrader,
@@ -13,9 +12,9 @@ import {
scaleForAddLiquidity,
updatePoolState,
} from '../../autoswapJig.js';
-import { setup } from '../setupBasicMints.js';
-import { installationPFromSource } from '../installFromSource.js';
import { assertOfferResult, assertPayoutAmount } from '../../zoeTestHelpers.js';
+import { installationPFromSource } from '../installFromSource.js';
+import { setup } from '../setupBasicMints.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/unitTests/contracts/barter.test.js b/packages/zoe/test/unitTests/contracts/barter.test.js
index 1bc33791679..a53a1343276 100644
--- a/packages/zoe/test/unitTests/contracts/barter.test.js
+++ b/packages/zoe/test/unitTests/contracts/barter.test.js
@@ -1,14 +1,13 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
-import { E } from '@endo/eventual-send';
import { AmountMath } from '@agoric/ertp';
import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
+import { E } from '@endo/eventual-send';
+import path from 'path';
-import { setup } from '../setupBasicMints.js';
+import { assertOfferResult, assertPayoutAmount } from '../../zoeTestHelpers.js';
import { installationPFromSource } from '../installFromSource.js';
-import { assertPayoutAmount, assertOfferResult } from '../../zoeTestHelpers.js';
+import { setup } from '../setupBasicMints.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/unitTests/contracts/brokenContract.test.js b/packages/zoe/test/unitTests/contracts/brokenContract.test.js
index 746daf4cfd4..e3f8eac4276 100644
--- a/packages/zoe/test/unitTests/contracts/brokenContract.test.js
+++ b/packages/zoe/test/unitTests/contracts/brokenContract.test.js
@@ -1,13 +1,12 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
import bundleSource from '@endo/bundle-source';
import { E } from '@endo/eventual-send';
+import path from 'path';
+import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
import { makeZoeForTest } from '../../../tools/setup-zoe.js';
import { setup } from '../setupBasicMints.js';
-import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/unitTests/contracts/callSpread-calculation.test.js b/packages/zoe/test/unitTests/contracts/callSpread-calculation.test.js
index 9754210a81d..3ef7194f358 100644
--- a/packages/zoe/test/unitTests/contracts/callSpread-calculation.test.js
+++ b/packages/zoe/test/unitTests/contracts/callSpread-calculation.test.js
@@ -1,15 +1,15 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { setup } from '../setupBasicMints.js';
import { calculateShares } from '../../../src/contracts/callSpread/calculateShares.js';
-import {
- ceilMultiplyBy,
- floorMultiplyBy,
-} from '../../../src/contractSupport/index.js';
import {
make0Percent,
make100Percent,
} from '../../../src/contracts/callSpread/percent.js';
+import {
+ ceilMultiplyBy,
+ floorMultiplyBy,
+} from '../../../src/contractSupport/index.js';
+import { setup } from '../setupBasicMints.js';
function compareShareRatios(t, actual, expected, amount) {
t.deepEqual(
diff --git a/packages/zoe/test/unitTests/contracts/callSpread.test.js b/packages/zoe/test/unitTests/contracts/callSpread.test.js
index b9ffec421fb..08932096711 100644
--- a/packages/zoe/test/unitTests/contracts/callSpread.test.js
+++ b/packages/zoe/test/unitTests/contracts/callSpread.test.js
@@ -1,18 +1,17 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
+import { E } from '@endo/eventual-send';
import path from 'path';
-import { E } from '@endo/eventual-send';
-import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
+import { makeFakePriceAuthority } from '../../../tools/fakePriceAuthority.js';
import buildManualTimer from '../../../tools/manualTimer.js';
-
-import { setup } from '../setupBasicMints.js';
-import { installationPFromSource } from '../installFromSource.js';
import {
- assertPayoutDeposit,
assertPayoutAmount,
+ assertPayoutDeposit,
} from '../../zoeTestHelpers.js';
-import { makeFakePriceAuthority } from '../../../tools/fakePriceAuthority.js';
+import { installationPFromSource } from '../installFromSource.js';
+import { setup } from '../setupBasicMints.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/unitTests/contracts/coveredCall-want-pattern.test.js b/packages/zoe/test/unitTests/contracts/coveredCall-want-pattern.test.js
index c9446b44bb8..88fab72529d 100644
--- a/packages/zoe/test/unitTests/contracts/coveredCall-want-pattern.test.js
+++ b/packages/zoe/test/unitTests/contracts/coveredCall-want-pattern.test.js
@@ -1,13 +1,12 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
-import bundleSource from '@endo/bundle-source';
-import { E } from '@endo/eventual-send';
-import { M, mustMatch, keyEQ } from '@agoric/store';
import { AmountMath, AssetKind, BrandShape } from '@agoric/ertp';
import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
+import { keyEQ, M, mustMatch } from '@agoric/store';
import { TimeMath } from '@agoric/time';
+import bundleSource from '@endo/bundle-source';
+import { E } from '@endo/eventual-send';
+import path from 'path';
import buildManualTimer from '../../../tools/manualTimer.js';
import { setup } from '../setupBasicMints.js';
diff --git a/packages/zoe/test/unitTests/contracts/coveredCall.test.js b/packages/zoe/test/unitTests/contracts/coveredCall.test.js
index 6a6d6f788bc..94e54aa4109 100644
--- a/packages/zoe/test/unitTests/contracts/coveredCall.test.js
+++ b/packages/zoe/test/unitTests/contracts/coveredCall.test.js
@@ -1,19 +1,18 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
-import bundleSource from '@endo/bundle-source';
-import { E } from '@endo/eventual-send';
-import { Far } from '@endo/marshal';
import { AmountMath, AssetKind } from '@agoric/ertp';
import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
import { keyEQ } from '@agoric/store';
import { TimeMath } from '@agoric/time';
+import bundleSource from '@endo/bundle-source';
+import { E } from '@endo/eventual-send';
+import { Far } from '@endo/marshal';
+import path from 'path';
import buildManualTimer from '../../../tools/manualTimer.js';
+import { assertAmountsEqual } from '../../zoeTestHelpers.js';
import { setup } from '../setupBasicMints.js';
import { setupNonFungible } from '../setupNonFungibleMints.js';
-import { assertAmountsEqual } from '../../zoeTestHelpers.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/unitTests/contracts/escrowToVote.js b/packages/zoe/test/unitTests/contracts/escrowToVote.js
index 9d3f83ee612..a96410c38a3 100644
--- a/packages/zoe/test/unitTests/contracts/escrowToVote.js
+++ b/packages/zoe/test/unitTests/contracts/escrowToVote.js
@@ -1,14 +1,15 @@
// @ts-nocheck
-import { X, q } from '@endo/errors';
-import { Far } from '@endo/marshal';
-import { makeScalarMapStore } from '@agoric/store';
import { AmountMath } from '@agoric/ertp';
+import { makeScalarMapStore } from '@agoric/store';
+import { q, X } from '@endo/errors';
+import { Far } from '@endo/marshal';
+
// Eventually will be importable from '@agoric/zoe-contract-support'
import {
assertIssuerKeywords,
- assertProposalShape,
assertNatAssetKind,
+ assertProposalShape,
} from '../../../src/contractSupport/index.js';
/**
diff --git a/packages/zoe/test/unitTests/contracts/escrowToVote.test.js b/packages/zoe/test/unitTests/contracts/escrowToVote.test.js
index 151b87d855e..bfad7edac15 100644
--- a/packages/zoe/test/unitTests/contracts/escrowToVote.test.js
+++ b/packages/zoe/test/unitTests/contracts/escrowToVote.test.js
@@ -1,13 +1,12 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
import bundleSource from '@endo/bundle-source';
import { E } from '@endo/eventual-send';
+import path from 'path';
+import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
import { makeZoeForTest } from '../../../tools/setup-zoe.js';
import { setup } from '../setupBasicMints.js';
-import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/unitTests/contracts/invitation-details.test.js b/packages/zoe/test/unitTests/contracts/invitation-details.test.js
index 86f221ccb13..7be50cfe3b0 100644
--- a/packages/zoe/test/unitTests/contracts/invitation-details.test.js
+++ b/packages/zoe/test/unitTests/contracts/invitation-details.test.js
@@ -1,13 +1,12 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
+import { AmountMath } from '@agoric/ertp';
import bundleSource from '@endo/bundle-source';
import { E } from '@endo/eventual-send';
-import { AmountMath } from '@agoric/ertp';
+import path from 'path';
-import { makeZoeForTest } from '../../../tools/setup-zoe.js';
import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
+import { makeZoeForTest } from '../../../tools/setup-zoe.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/unitTests/contracts/loan/addCollateral.test.js b/packages/zoe/test/unitTests/contracts/loan/addCollateral.test.js
index f37dfe1a663..c739b6bd11d 100644
--- a/packages/zoe/test/unitTests/contracts/loan/addCollateral.test.js
+++ b/packages/zoe/test/unitTests/contracts/loan/addCollateral.test.js
@@ -4,15 +4,14 @@ import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
import { AmountMath } from '@agoric/ertp';
import { makeAddCollateralInvitation } from '../../../../src/contracts/loan/addCollateral.js';
+import { makeRatio } from '../../../../src/contractSupport/index.js';
import { makeFakePriceAuthority } from '../../../../tools/fakePriceAuthority.js';
import buildManualTimer from '../../../../tools/manualTimer.js';
-
import {
- setupLoanUnitTest,
makeSeatKit,
performAddCollateral,
+ setupLoanUnitTest,
} from './helpers.js';
-import { makeRatio } from '../../../../src/contractSupport/index.js';
test.todo('makeAddCollateralInvitation - test bad proposal');
diff --git a/packages/zoe/test/unitTests/contracts/loan/borrow.test.js b/packages/zoe/test/unitTests/contracts/loan/borrow.test.js
index 5869457a4d8..8777e005bc8 100644
--- a/packages/zoe/test/unitTests/contracts/loan/borrow.test.js
+++ b/packages/zoe/test/unitTests/contracts/loan/borrow.test.js
@@ -2,31 +2,29 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
import { AmountMath } from '@agoric/ertp';
-import { E } from '@endo/eventual-send';
+import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
import { makeNotifierKit } from '@agoric/notifier';
import { TimeMath } from '@agoric/time';
+import { E } from '@endo/eventual-send';
-import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
+import { makeAddCollateralInvitation } from '../../../../src/contracts/loan/addCollateral.js';
+import { makeBorrowInvitation } from '../../../../src/contracts/loan/borrow.js';
+import { makeCloseLoanInvitation } from '../../../../src/contracts/loan/close.js';
+import { makeRatio } from '../../../../src/contractSupport/index.js';
+import { makeFakePriceAuthority } from '../../../../tools/fakePriceAuthority.js';
+import buildManualTimer from '../../../../tools/manualTimer.js';
+import { assertAmountsEqual } from '../../../zoeTestHelpers.js';
import {
- setupLoanUnitTest,
- makeSeatKit,
- checkDetails,
- performAddCollateral,
checkDescription,
+ checkDetails,
checkNoNewOffers,
checkPayouts,
makeAutoswapInstance,
+ makeSeatKit,
+ performAddCollateral,
+ setupLoanUnitTest,
} from './helpers.js';
-import { makeFakePriceAuthority } from '../../../../tools/fakePriceAuthority.js';
-import buildManualTimer from '../../../../tools/manualTimer.js';
-
-import { makeBorrowInvitation } from '../../../../src/contracts/loan/borrow.js';
-import { makeAddCollateralInvitation } from '../../../../src/contracts/loan/addCollateral.js';
-import { makeCloseLoanInvitation } from '../../../../src/contracts/loan/close.js';
-import { makeRatio } from '../../../../src/contractSupport/index.js';
-import { assertAmountsEqual } from '../../../zoeTestHelpers.js';
-
const BASIS_POINTS = 10000n;
const setupBorrow = async (
diff --git a/packages/zoe/test/unitTests/contracts/loan/close.test.js b/packages/zoe/test/unitTests/contracts/loan/close.test.js
index e6965d15d1d..f5f515a1db8 100644
--- a/packages/zoe/test/unitTests/contracts/loan/close.test.js
+++ b/packages/zoe/test/unitTests/contracts/loan/close.test.js
@@ -1,19 +1,18 @@
// @ts-nocheck
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { E } from '@endo/eventual-send';
import { AmountMath } from '@agoric/ertp';
+import { E } from '@endo/eventual-send';
+import { makeCloseLoanInvitation } from '../../../../src/contracts/loan/close.js';
import {
- setupLoanUnitTest,
checkDescription,
- makeSeatKit,
- checkPayouts,
checkNoNewOffers,
+ checkPayouts,
+ makeSeatKit,
+ setupLoanUnitTest,
} from './helpers.js';
-import { makeCloseLoanInvitation } from '../../../../src/contracts/loan/close.js';
-
test.todo('makeCloseLoanInvitation repay partial fails');
test.todo(`makeCloseLoanInvitation repay but don't repay interest`);
test.todo(`repay but wrong proposal type`);
diff --git a/packages/zoe/test/unitTests/contracts/loan/helpers.js b/packages/zoe/test/unitTests/contracts/loan/helpers.js
index 74df0dadd92..32d3c596d08 100644
--- a/packages/zoe/test/unitTests/contracts/loan/helpers.js
+++ b/packages/zoe/test/unitTests/contracts/loan/helpers.js
@@ -1,15 +1,14 @@
// @ts-nocheck
import '@agoric/swingset-liveslots/tools/prepare-test-env.js';
-import path from 'path';
-
-import { E } from '@endo/eventual-send';
+import { AmountMath, makeIssuerKit } from '@agoric/ertp';
import bundleSource from '@endo/bundle-source';
-import { makeIssuerKit, AmountMath } from '@agoric/ertp';
+import { E } from '@endo/eventual-send';
+import path from 'path';
-import { setupZCFTest } from '../../zcf/setupZcfTest.js';
import { makeRatio } from '../../../../src/contractSupport/index.js';
import { assertAmountsEqual } from '../../../zoeTestHelpers.js';
+import { setupZCFTest } from '../../zcf/setupZcfTest.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/unitTests/contracts/loan/lend.test.js b/packages/zoe/test/unitTests/contracts/loan/lend.test.js
index 8f728b23938..69634a1e820 100644
--- a/packages/zoe/test/unitTests/contracts/loan/lend.test.js
+++ b/packages/zoe/test/unitTests/contracts/loan/lend.test.js
@@ -1,13 +1,12 @@
// @ts-nocheck
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { E } from '@endo/eventual-send';
import { AmountMath } from '@agoric/ertp';
-
-import { setupLoanUnitTest, checkDescription } from './helpers.js';
+import { E } from '@endo/eventual-send';
import { makeLendInvitation } from '../../../../src/contracts/loan/lend.js';
import { makeRatio } from '../../../../src/contractSupport/index.js';
+import { checkDescription, setupLoanUnitTest } from './helpers.js';
test('makeLendInvitation', async t => {
const { zcf, zoe, loanKit } = await setupLoanUnitTest();
diff --git a/packages/zoe/test/unitTests/contracts/loan/liquidate.test.js b/packages/zoe/test/unitTests/contracts/loan/liquidate.test.js
index 2fc65c4a122..892a486a9c7 100644
--- a/packages/zoe/test/unitTests/contracts/loan/liquidate.test.js
+++ b/packages/zoe/test/unitTests/contracts/loan/liquidate.test.js
@@ -3,12 +3,11 @@ import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
import { AmountMath } from '@agoric/ertp';
import { doLiquidation } from '../../../../src/contracts/loan/liquidate.js';
-
import {
- setupLoanUnitTest,
- makeSeatKit,
checkNoNewOffers,
checkPayouts,
+ makeSeatKit,
+ setupLoanUnitTest,
} from './helpers.js';
test('test doLiquidation with mocked autoswap', async t => {
diff --git a/packages/zoe/test/unitTests/contracts/loan/loan-e2e.test.js b/packages/zoe/test/unitTests/contracts/loan/loan-e2e.test.js
index ee15d579199..e39fd5af6b4 100644
--- a/packages/zoe/test/unitTests/contracts/loan/loan-e2e.test.js
+++ b/packages/zoe/test/unitTests/contracts/loan/loan-e2e.test.js
@@ -1,17 +1,17 @@
// @ts-nocheck
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-import { E } from '@endo/eventual-send';
import { AmountMath } from '@agoric/ertp';
-import bundleSource from '@endo/bundle-source';
import { makeNotifierKit } from '@agoric/notifier';
+import bundleSource from '@endo/bundle-source';
+import { E } from '@endo/eventual-send';
+import path from 'path';
-import { checkDetails, checkPayout } from './helpers.js';
-import { setup } from '../../setupBasicMints.js';
+import { makeRatio } from '../../../../src/contractSupport/index.js';
import { makeFakePriceAuthority } from '../../../../tools/fakePriceAuthority.js';
import buildManualTimer from '../../../../tools/manualTimer.js';
-import { makeRatio } from '../../../../src/contractSupport/index.js';
+import { setup } from '../../setupBasicMints.js';
+import { checkDetails, checkPayout } from './helpers.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/unitTests/contracts/mintPayments.test.js b/packages/zoe/test/unitTests/contracts/mintPayments.test.js
index d4bd1d0b5bc..775de88466a 100644
--- a/packages/zoe/test/unitTests/contracts/mintPayments.test.js
+++ b/packages/zoe/test/unitTests/contracts/mintPayments.test.js
@@ -1,14 +1,12 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
+import { AmountMath, makeIssuerKit } from '@agoric/ertp';
+import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
import bundleSource from '@endo/bundle-source';
import { E } from '@endo/eventual-send';
-import { makeIssuerKit, AmountMath } from '@agoric/ertp';
-import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
+import path from 'path';
import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
-
import { makeZoeForTest } from '../../../tools/setup-zoe.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/unitTests/contracts/oracle.test.js b/packages/zoe/test/unitTests/contracts/oracle.test.js
index 4680c10fd64..8f0b41e11f4 100644
--- a/packages/zoe/test/unitTests/contracts/oracle.test.js
+++ b/packages/zoe/test/unitTests/contracts/oracle.test.js
@@ -1,13 +1,11 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
-import { assert, X } from '@endo/errors';
+import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
import bundleSource from '@endo/bundle-source';
-import { Far } from '@endo/marshal';
+import { assert, X } from '@endo/errors';
import { E } from '@endo/eventual-send';
-
-import { makeIssuerKit, AssetKind, AmountMath } from '@agoric/ertp';
+import { Far } from '@endo/marshal';
+import path from 'path';
import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
import { makeZoeForTest } from '../../../tools/setup-zoe.js';
diff --git a/packages/zoe/test/unitTests/contracts/otcDesk.test.js b/packages/zoe/test/unitTests/contracts/otcDesk.test.js
index 6d48aecea32..fbaf581d171 100644
--- a/packages/zoe/test/unitTests/contracts/otcDesk.test.js
+++ b/packages/zoe/test/unitTests/contracts/otcDesk.test.js
@@ -1,15 +1,14 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
+import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
import bundleSource from '@endo/bundle-source';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
+import path from 'path';
-import { setup } from '../setupBasicMints.js';
import buildManualTimer from '../../../tools/manualTimer.js';
import { assertPayoutAmount } from '../../zoeTestHelpers.js';
+import { setup } from '../setupBasicMints.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/unitTests/contracts/ownable-counter.js b/packages/zoe/test/unitTests/contracts/ownable-counter.js
index 59302023c75..e71fdef5008 100644
--- a/packages/zoe/test/unitTests/contracts/ownable-counter.js
+++ b/packages/zoe/test/unitTests/contracts/ownable-counter.js
@@ -1,5 +1,6 @@
-import { M } from '@endo/patterns';
import { makeDurableZone } from '@agoric/zone/durable.js';
+import { M } from '@endo/patterns';
+
import { prepareOwnable } from '../../../src/contractSupport/prepare-ownable.js';
/**
diff --git a/packages/zoe/test/unitTests/contracts/ownable-counter.test.js b/packages/zoe/test/unitTests/contracts/ownable-counter.test.js
index 9784adb00a4..e48c0597811 100644
--- a/packages/zoe/test/unitTests/contracts/ownable-counter.test.js
+++ b/packages/zoe/test/unitTests/contracts/ownable-counter.test.js
@@ -1,13 +1,12 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
import bundleSource from '@endo/bundle-source';
import { E } from '@endo/eventual-send';
import { GET_METHOD_NAMES } from '@endo/marshal';
+import path from 'path';
-import { makeZoeForTest } from '../../../tools/setup-zoe.js';
import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
+import { makeZoeForTest } from '../../../tools/setup-zoe.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/unitTests/contracts/priceAggregator.test.js b/packages/zoe/test/unitTests/contracts/priceAggregator.test.js
index dc8282c7754..0e9b62c3de2 100644
--- a/packages/zoe/test/unitTests/contracts/priceAggregator.test.js
+++ b/packages/zoe/test/unitTests/contracts/priceAggregator.test.js
@@ -1,25 +1,18 @@
import { test as unknownTest } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
+import { AmountMath, makeIssuerKit } from '@agoric/ertp';
+import { makeMockChainStorageRoot } from '@agoric/internal/src/storage-test-utils.js';
+import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
+import { makeNotifierKit, subscribeEach } from '@agoric/notifier';
+import { makeFakeMarshaller } from '@agoric/notifier/tools/testSupports.js';
+import { TimeMath } from '@agoric/time';
import bundleSource from '@endo/bundle-source';
-
import { E } from '@endo/eventual-send';
import { Far } from '@endo/far';
-import { makeIssuerKit, AmountMath } from '@agoric/ertp';
import { makePromiseKit } from '@endo/promise-kit';
+import path from 'path';
-import { TimeMath } from '@agoric/time';
-import { makeNotifierKit, subscribeEach } from '@agoric/notifier';
-import { makeFakeMarshaller } from '@agoric/notifier/tools/testSupports.js';
-import { makeMockChainStorageRoot } from '@agoric/internal/src/storage-test-utils.js';
-
-import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
-import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
-import { makeZoeForTest } from '../../../tools/setup-zoe.js';
-import buildManualTimer from '../../../tools/manualTimer.js';
import { start } from '../../../src/contracts/priceAggregator.js';
-
import {
addRatios,
makeRatio,
@@ -27,6 +20,9 @@ import {
multiplyRatios,
parseRatio,
} from '../../../src/contractSupport/ratio.js';
+import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
+import buildManualTimer from '../../../tools/manualTimer.js';
+import { makeZoeForTest } from '../../../tools/setup-zoe.js';
/**
* @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
diff --git a/packages/zoe/test/unitTests/contracts/scaledPriceAuthority.test.js b/packages/zoe/test/unitTests/contracts/scaledPriceAuthority.test.js
index f4e10c86f34..f9f341ff971 100644
--- a/packages/zoe/test/unitTests/contracts/scaledPriceAuthority.test.js
+++ b/packages/zoe/test/unitTests/contracts/scaledPriceAuthority.test.js
@@ -1,17 +1,15 @@
import { test as unknownTest } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
+import { AmountMath, makeIssuerKit } from '@agoric/ertp';
import bundleSource from '@endo/bundle-source';
-
import { E } from '@endo/eventual-send';
-import { makeIssuerKit, AmountMath } from '@agoric/ertp';
+import path from 'path';
-import { makeZoeForTest } from '../../../tools/setup-zoe.js';
import { makeRatio } from '../../../src/contractSupport/ratio.js';
import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
-import buildManualTimer from '../../../tools/manualTimer.js';
import { makeManualPriceAuthority } from '../../../tools/manualPriceAuthority.js';
+import buildManualTimer from '../../../tools/manualTimer.js';
+import { makeZoeForTest } from '../../../tools/setup-zoe.js';
// This contract still uses 'prepare', so this test covers that case.
/**
diff --git a/packages/zoe/test/unitTests/contracts/sellTickets.test.js b/packages/zoe/test/unitTests/contracts/sellTickets.test.js
index 92e86ea357a..4a700671c23 100644
--- a/packages/zoe/test/unitTests/contracts/sellTickets.test.js
+++ b/packages/zoe/test/unitTests/contracts/sellTickets.test.js
@@ -1,18 +1,16 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
-import { assert } from '@endo/errors';
-import bundleSource from '@endo/bundle-source';
-import { makeIssuerKit, AmountMath, isSetValue } from '@agoric/ertp';
+import { AmountMath, isSetValue, makeIssuerKit } from '@agoric/ertp';
import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
+import bundleSource from '@endo/bundle-source';
+import { assert } from '@endo/errors';
import { E } from '@endo/eventual-send';
+import path from 'path';
+import { defaultAcceptanceMsg } from '../../../src/contractSupport/index.js';
import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
import { makeZoeForTest } from '../../../tools/setup-zoe.js';
-import { defaultAcceptanceMsg } from '../../../src/contractSupport/index.js';
-
const dirname = path.dirname(new URL(import.meta.url).pathname);
const mintAndSellNFTRoot = `${dirname}/../../../src/contracts/mintAndSellNFT.js`;
diff --git a/packages/zoe/test/unitTests/contracts/simpleExchange.test.js b/packages/zoe/test/unitTests/contracts/simpleExchange.test.js
index f9da84f6a00..d47185a63d2 100644
--- a/packages/zoe/test/unitTests/contracts/simpleExchange.test.js
+++ b/packages/zoe/test/unitTests/contracts/simpleExchange.test.js
@@ -1,16 +1,14 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
-import { E } from '@endo/eventual-send';
-
import { AmountMath, AssetKind } from '@agoric/ertp';
import { claim } from '@agoric/ertp/src/legacy-payment-helpers.js';
+import { E } from '@endo/eventual-send';
+import path from 'path';
+import { assertOfferResult, assertPayoutAmount } from '../../zoeTestHelpers.js';
+import { installationPFromSource } from '../installFromSource.js';
import { setup } from '../setupBasicMints.js';
import { setupNonFungible } from '../setupNonFungibleMints.js';
-import { installationPFromSource } from '../installFromSource.js';
-import { assertPayoutAmount, assertOfferResult } from '../../zoeTestHelpers.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/unitTests/contracts/throwInOfferHandler.js b/packages/zoe/test/unitTests/contracts/throwInOfferHandler.js
index 1c1686bc58b..111ff14603f 100644
--- a/packages/zoe/test/unitTests/contracts/throwInOfferHandler.js
+++ b/packages/zoe/test/unitTests/contracts/throwInOfferHandler.js
@@ -1,4 +1,4 @@
-import { makeIssuerKit, AmountMath } from '@agoric/ertp';
+import { AmountMath, makeIssuerKit } from '@agoric/ertp';
import { Far } from '@endo/marshal';
import { depositToSeat } from '../../../src/contractSupport/index.js';
diff --git a/packages/zoe/test/unitTests/contracts/throwInOfferHandler.test.js b/packages/zoe/test/unitTests/contracts/throwInOfferHandler.test.js
index 6a1e5ab73f0..c5a755e98be 100644
--- a/packages/zoe/test/unitTests/contracts/throwInOfferHandler.test.js
+++ b/packages/zoe/test/unitTests/contracts/throwInOfferHandler.test.js
@@ -1,12 +1,11 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
import bundleSource from '@endo/bundle-source';
-
import { E } from '@endo/eventual-send';
-import { makeZoeForTest } from '../../../tools/setup-zoe.js';
+import path from 'path';
+
import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
+import { makeZoeForTest } from '../../../tools/setup-zoe.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/unitTests/contracts/two-invitations.js b/packages/zoe/test/unitTests/contracts/two-invitations.js
index 59b1380ac83..f512873ca99 100644
--- a/packages/zoe/test/unitTests/contracts/two-invitations.js
+++ b/packages/zoe/test/unitTests/contracts/two-invitations.js
@@ -1,5 +1,5 @@
-import { M } from '@endo/patterns';
import { makeExo } from '@endo/exo';
+import { M } from '@endo/patterns';
/**
* This contract just provides two invitations to support the test in
diff --git a/packages/zoe/test/unitTests/contracts/useObj.test.js b/packages/zoe/test/unitTests/contracts/useObj.test.js
index 057d028c8c2..ef3ac250cea 100644
--- a/packages/zoe/test/unitTests/contracts/useObj.test.js
+++ b/packages/zoe/test/unitTests/contracts/useObj.test.js
@@ -1,13 +1,12 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
import bundleSource from '@endo/bundle-source';
-
import { E } from '@endo/eventual-send';
+import path from 'path';
+
+import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
import { makeZoeForTest } from '../../../tools/setup-zoe.js';
import { setup } from '../setupBasicMints.js';
-import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/unitTests/contracts/useObjExample.js b/packages/zoe/test/unitTests/contracts/useObjExample.js
index f627d91516f..eeba552a14f 100644
--- a/packages/zoe/test/unitTests/contracts/useObjExample.js
+++ b/packages/zoe/test/unitTests/contracts/useObjExample.js
@@ -1,6 +1,6 @@
+import { AmountMath } from '@agoric/ertp';
import { X } from '@endo/errors';
import { Far } from '@endo/marshal';
-import { AmountMath } from '@agoric/ertp';
// Eventually will be importable from '@agoric/zoe-contract-support'
import {
diff --git a/packages/zoe/test/unitTests/contracts/valueVow.test.js b/packages/zoe/test/unitTests/contracts/valueVow.test.js
index 4a1ca92666f..0ba6033b705 100644
--- a/packages/zoe/test/unitTests/contracts/valueVow.test.js
+++ b/packages/zoe/test/unitTests/contracts/valueVow.test.js
@@ -1,12 +1,11 @@
import { test as anyTest } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
-import { heapVowTools } from '@agoric/vow/vat.js';
-
+import { inspectMapStore } from '@agoric/internal/src/testing-utils.js';
import { unsafeMakeBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js';
+import { heapVowTools } from '@agoric/vow/vat.js';
import { E } from '@endo/eventual-send';
-import { inspectMapStore } from '@agoric/internal/src/testing-utils.js';
+import path from 'path';
+
import { makeZoeForTest, setUpZoeForTest } from '../../../tools/setup-zoe.js';
/**
diff --git a/packages/zoe/test/unitTests/fakePriceAuthority.test.js b/packages/zoe/test/unitTests/fakePriceAuthority.test.js
index 6ebef43ddf7..962ec6e40c4 100644
--- a/packages/zoe/test/unitTests/fakePriceAuthority.test.js
+++ b/packages/zoe/test/unitTests/fakePriceAuthority.test.js
@@ -1,20 +1,20 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
+import { TimeMath } from '@agoric/time';
import { assert } from '@endo/errors';
import { E } from '@endo/eventual-send';
-import { TimeMath } from '@agoric/time';
-import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
-import buildManualTimer from '../../tools/manualTimer.js';
-import { setup } from './setupBasicMints.js';
-import { makeFakePriceAuthority } from '../../tools/fakePriceAuthority.js';
import {
- getAmountOut,
- getTimestamp,
getAmountIn,
+ getAmountOut,
getPriceDescription,
+ getTimestamp,
} from '../../src/contractSupport/index.js';
+import { makeFakePriceAuthority } from '../../tools/fakePriceAuthority.js';
+import buildManualTimer from '../../tools/manualTimer.js';
import { assertAmountsEqual } from '../zoeTestHelpers.js';
+import { setup } from './setupBasicMints.js';
const { coerceTimestampRecord } = TimeMath;
diff --git a/packages/zoe/test/unitTests/instanceStorage.test.js b/packages/zoe/test/unitTests/instanceStorage.test.js
index 63259f83f45..f1d4c849568 100644
--- a/packages/zoe/test/unitTests/instanceStorage.test.js
+++ b/packages/zoe/test/unitTests/instanceStorage.test.js
@@ -2,12 +2,11 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
-import { makeIssuerKit, AssetKind } from '@agoric/ertp';
+import { AssetKind, makeIssuerKit } from '@agoric/ertp';
+import { makeScalarBigMapStore } from '@agoric/vat-data';
import bundleSource from '@endo/bundle-source';
import { Far } from '@endo/marshal';
-import { makeScalarBigMapStore } from '@agoric/vat-data';
+import path from 'path';
import { makeInstanceRecordStorage } from '../../src/instanceRecordStorage.js';
import { makeIssuerRecord } from '../../src/issuerRecord.js';
diff --git a/packages/zoe/test/unitTests/issuerStorage.test.js b/packages/zoe/test/unitTests/issuerStorage.test.js
index 9e97ca69d03..6921d202e0c 100644
--- a/packages/zoe/test/unitTests/issuerStorage.test.js
+++ b/packages/zoe/test/unitTests/issuerStorage.test.js
@@ -1,9 +1,10 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { makeIssuerKit, AssetKind } from '@agoric/ertp';
+
+import { AssetKind, makeIssuerKit } from '@agoric/ertp';
import { makeScalarBigMapStore } from '@agoric/vat-data';
-import { provideIssuerStorage as provideIssuerStorageOrig } from '../../src/issuerStorage.js';
import { makeIssuerRecord } from '../../src/issuerRecord.js';
+import { provideIssuerStorage as provideIssuerStorageOrig } from '../../src/issuerStorage.js';
const provideIssuerStorage = () => {
return provideIssuerStorageOrig(
diff --git a/packages/zoe/test/unitTests/makeKind.test.js b/packages/zoe/test/unitTests/makeKind.test.js
index 5745182c001..c1b83f4cbd1 100644
--- a/packages/zoe/test/unitTests/makeKind.test.js
+++ b/packages/zoe/test/unitTests/makeKind.test.js
@@ -3,13 +3,12 @@ import {
VatData,
} from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
import bundleSource from '@endo/bundle-source';
-
import { E } from '@endo/eventual-send';
-import { makeZoeForTest } from '../../tools/setup-zoe.js';
+import path from 'path';
+
import { makeFakeVatAdmin } from '../../tools/fakeVatAdmin.js';
+import { makeZoeForTest } from '../../tools/setup-zoe.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/unitTests/manualTimer.test.js b/packages/zoe/test/unitTests/manualTimer.test.js
index f40655e825e..fcd7fda6ac4 100644
--- a/packages/zoe/test/unitTests/manualTimer.test.js
+++ b/packages/zoe/test/unitTests/manualTimer.test.js
@@ -1,9 +1,10 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { E } from '@endo/eventual-send';
-import { Far } from '@endo/marshal';
import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
import { TimeMath } from '@agoric/time';
+import { E } from '@endo/eventual-send';
+import { Far } from '@endo/marshal';
+
import buildManualTimer from '../../tools/manualTimer.js';
const { coerceTimestampRecord, coerceRelativeTimeRecord } = TimeMath;
diff --git a/packages/zoe/test/unitTests/rightsConservation.test.js b/packages/zoe/test/unitTests/rightsConservation.test.js
index 7a819f30184..d86fb474682 100644
--- a/packages/zoe/test/unitTests/rightsConservation.test.js
+++ b/packages/zoe/test/unitTests/rightsConservation.test.js
@@ -1,6 +1,7 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
import { AmountMath, makeIssuerKit } from '@agoric/ertp';
+
import { assertRightsConserved } from '../../src/contractFacet/rightsConservation.js';
const setupBrands = () => {
diff --git a/packages/zoe/test/unitTests/scriptedOracle.test.js b/packages/zoe/test/unitTests/scriptedOracle.test.js
index adea4c055ad..eebaf2edb3f 100644
--- a/packages/zoe/test/unitTests/scriptedOracle.test.js
+++ b/packages/zoe/test/unitTests/scriptedOracle.test.js
@@ -1,21 +1,19 @@
// @ts-nocheck
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
-import { assert } from '@endo/errors';
-import bundleSource from '@endo/bundle-source';
-import { E } from '@endo/eventual-send';
import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
import { TimeMath } from '@agoric/time';
+import bundleSource from '@endo/bundle-source';
+import { assert } from '@endo/errors';
+import { E } from '@endo/eventual-send';
+import path from 'path';
import { makeFakeVatAdmin } from '../../tools/fakeVatAdmin.js';
-import { makeZoeForTest } from '../../tools/setup-zoe.js';
-
import buildManualTimer from '../../tools/manualTimer.js';
-import { setup } from './setupBasicMints.js';
-import { assertPayoutAmount } from '../zoeTestHelpers.js';
import { makeScriptedOracle } from '../../tools/scriptedOracle.js';
+import { makeZoeForTest } from '../../tools/setup-zoe.js';
+import { assertPayoutAmount } from '../zoeTestHelpers.js';
+import { setup } from './setupBasicMints.js';
// This test shows how to set up a fake oracle and use it in a contract.
diff --git a/packages/zoe/test/unitTests/setupBasicMints.js b/packages/zoe/test/unitTests/setupBasicMints.js
index 0ca43e22b0e..c290aa46e72 100644
--- a/packages/zoe/test/unitTests/setupBasicMints.js
+++ b/packages/zoe/test/unitTests/setupBasicMints.js
@@ -1,7 +1,8 @@
-import { makeIssuerKit, AmountMath } from '@agoric/ertp';
+import { AmountMath, makeIssuerKit } from '@agoric/ertp';
import { makeScalarMapStore } from '@agoric/store';
-import { makeZoeForTest } from '../../tools/setup-zoe.js';
+
import { makeFakeVatAdmin } from '../../tools/fakeVatAdmin.js';
+import { makeZoeForTest } from '../../tools/setup-zoe.js';
export const setup = () => {
const moolaKit = makeIssuerKit('moola');
diff --git a/packages/zoe/test/unitTests/setupMixedMints.js b/packages/zoe/test/unitTests/setupMixedMints.js
index 61340ac0619..134a8e8fc81 100644
--- a/packages/zoe/test/unitTests/setupMixedMints.js
+++ b/packages/zoe/test/unitTests/setupMixedMints.js
@@ -1,6 +1,7 @@
-import { makeIssuerKit, AmountMath, AssetKind } from '@agoric/ertp';
-import { makeZoeForTest } from '../../tools/setup-zoe.js';
+import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
+
import { makeFakeVatAdmin } from '../../tools/fakeVatAdmin.js';
+import { makeZoeForTest } from '../../tools/setup-zoe.js';
const setupMixed = () => {
const ccBundle = makeIssuerKit('CryptoCats', AssetKind.SET);
diff --git a/packages/zoe/test/unitTests/setupNonFungibleMints.js b/packages/zoe/test/unitTests/setupNonFungibleMints.js
index d8642829b49..978560563f7 100644
--- a/packages/zoe/test/unitTests/setupNonFungibleMints.js
+++ b/packages/zoe/test/unitTests/setupNonFungibleMints.js
@@ -1,6 +1,7 @@
-import { makeIssuerKit, AmountMath, AssetKind } from '@agoric/ertp';
-import { makeZoeForTest } from '../../tools/setup-zoe.js';
+import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
+
import { makeFakeVatAdmin } from '../../tools/fakeVatAdmin.js';
+import { makeZoeForTest } from '../../tools/setup-zoe.js';
const setupNonFungible = () => {
const ccBundle = makeIssuerKit('CryptoCats', AssetKind.SET);
diff --git a/packages/zoe/test/unitTests/zcf/allStagedSeatsUsed.test.js b/packages/zoe/test/unitTests/zcf/allStagedSeatsUsed.test.js
index c2f1d1fa351..9eb91c52dfd 100644
--- a/packages/zoe/test/unitTests/zcf/allStagedSeatsUsed.test.js
+++ b/packages/zoe/test/unitTests/zcf/allStagedSeatsUsed.test.js
@@ -1,10 +1,9 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { AssetKind, AmountMath } from '@agoric/ertp';
-import { makeOffer } from '../makeOffer.js';
+import { AmountMath, AssetKind } from '@agoric/ertp';
+import { makeOffer } from '../makeOffer.js';
import { setup } from '../setupBasicMints.js';
-
import { setupZCFTest } from './setupZcfTest.js';
test(`allStagedSeatsUsed should not be asserted`, async t => {
diff --git a/packages/zoe/test/unitTests/zcf/atomicRearrange.test.js b/packages/zoe/test/unitTests/zcf/atomicRearrange.test.js
index 80de4f34aba..b819f59452e 100644
--- a/packages/zoe/test/unitTests/zcf/atomicRearrange.test.js
+++ b/packages/zoe/test/unitTests/zcf/atomicRearrange.test.js
@@ -2,14 +2,14 @@
import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
import { AmountMath } from '@agoric/ertp';
+
import {
fromOnly,
toOnly,
} from '../../../src/contractSupport/atomicTransfer.js';
-
-import { setupZCFTest } from './setupZcfTest.js';
import { makeOffer } from '../makeOffer.js';
import { setup } from '../setupBasicMints.js';
+import { setupZCFTest } from './setupZcfTest.js';
const zcfMintUtils = async (zcf, name) => {
const mint = await zcf.makeZCFMint(name);
diff --git a/packages/zoe/test/unitTests/zcf/feeMintAccess.test.js b/packages/zoe/test/unitTests/zcf/feeMintAccess.test.js
index 9f3cba56721..52b62bf8c93 100644
--- a/packages/zoe/test/unitTests/zcf/feeMintAccess.test.js
+++ b/packages/zoe/test/unitTests/zcf/feeMintAccess.test.js
@@ -1,14 +1,12 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
-import { E } from '@endo/eventual-send';
import { AmountMath } from '@agoric/ertp';
-
import bundleSource from '@endo/bundle-source';
+import { E } from '@endo/eventual-send';
+import path from 'path';
-import { makeZoeKitForTest } from '../../../tools/setup-zoe.js';
import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
+import { makeZoeKitForTest } from '../../../tools/setup-zoe.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/unitTests/zcf/offerHandlerStorage.test.js b/packages/zoe/test/unitTests/zcf/offerHandlerStorage.test.js
index 48c1319f76d..4a2f2ec06dd 100644
--- a/packages/zoe/test/unitTests/zcf/offerHandlerStorage.test.js
+++ b/packages/zoe/test/unitTests/zcf/offerHandlerStorage.test.js
@@ -1,6 +1,7 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { Far } from '@endo/marshal';
+
import { makeScalarBigMapStore } from '@agoric/vat-data';
+import { Far } from '@endo/marshal';
import { makeOfferHandlerStorage } from '../../../src/contractFacet/offerHandlerStorage.js';
diff --git a/packages/zoe/test/unitTests/zcf/reallocateForZCFMint.test.js b/packages/zoe/test/unitTests/zcf/reallocateForZCFMint.test.js
index d4bc1eba07b..42ab2a48733 100644
--- a/packages/zoe/test/unitTests/zcf/reallocateForZCFMint.test.js
+++ b/packages/zoe/test/unitTests/zcf/reallocateForZCFMint.test.js
@@ -1,10 +1,9 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { AssetKind, AmountMath } from '@agoric/ertp';
-import { makeOffer } from '../makeOffer.js';
+import { AmountMath, AssetKind } from '@agoric/ertp';
+import { makeOffer } from '../makeOffer.js';
import { setup } from '../setupBasicMints.js';
-
import { setupZCFTest } from './setupZcfTest.js';
// Test that `zcfSeat.incrementBy()` and `zcfSeat.decrementBy()` can
diff --git a/packages/zoe/test/unitTests/zcf/setupZcfTest.js b/packages/zoe/test/unitTests/zcf/setupZcfTest.js
index 350dd664e35..f22f1bdebf1 100644
--- a/packages/zoe/test/unitTests/zcf/setupZcfTest.js
+++ b/packages/zoe/test/unitTests/zcf/setupZcfTest.js
@@ -1,11 +1,10 @@
+import bundleSource from '@endo/bundle-source';
import { assert } from '@endo/errors';
import { E } from '@endo/eventual-send';
-import bundleSource from '@endo/bundle-source';
-
import path from 'path';
-import { makeZoeKitForTest } from '../../../tools/setup-zoe.js';
import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
+import { makeZoeKitForTest } from '../../../tools/setup-zoe.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/unitTests/zcf/zcf.test.js b/packages/zoe/test/unitTests/zcf/zcf.test.js
index 828d3757325..68cec2b6638 100644
--- a/packages/zoe/test/unitTests/zcf/zcf.test.js
+++ b/packages/zoe/test/unitTests/zcf/zcf.test.js
@@ -1,16 +1,15 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { Far } from '@endo/marshal';
-import { AssetKind, AmountMath } from '@agoric/ertp';
-import { E } from '@endo/eventual-send';
+import { AmountMath, AssetKind } from '@agoric/ertp';
import { getStringMethodNames } from '@agoric/internal';
-import { makeOffer } from '../makeOffer.js';
+import { E } from '@endo/eventual-send';
+import { Far } from '@endo/marshal';
-import { setup } from '../setupBasicMints.js';
import buildManualTimer from '../../../tools/manualTimer.js';
-
-import { setupZCFTest } from './setupZcfTest.js';
import { assertAmountsEqual } from '../../zoeTestHelpers.js';
+import { makeOffer } from '../makeOffer.js';
+import { setup } from '../setupBasicMints.js';
+import { setupZCFTest } from './setupZcfTest.js';
test(`zcf.getZoeService`, async t => {
const { zoe, zcf } = await setupZCFTest();
diff --git a/packages/zoe/test/unitTests/zcf/zcfSeat-exit.test.js b/packages/zoe/test/unitTests/zcf/zcfSeat-exit.test.js
index 59859f776e4..0db5304f5e1 100644
--- a/packages/zoe/test/unitTests/zcf/zcfSeat-exit.test.js
+++ b/packages/zoe/test/unitTests/zcf/zcfSeat-exit.test.js
@@ -1,13 +1,12 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
-import { E } from '@endo/eventual-send';
import bundleSource from '@endo/bundle-source';
+import { E } from '@endo/eventual-send';
+import path from 'path';
+import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
import { makeZoeForTest } from '../../../tools/setup-zoe.js';
import { setup } from '../setupBasicMints.js';
-import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/unitTests/zcf/zcfSeat.test.js b/packages/zoe/test/unitTests/zcf/zcfSeat.test.js
index 568815a6cb1..6d0839dacae 100644
--- a/packages/zoe/test/unitTests/zcf/zcfSeat.test.js
+++ b/packages/zoe/test/unitTests/zcf/zcfSeat.test.js
@@ -1,13 +1,12 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
-import { E } from '@endo/eventual-send';
import bundleSource from '@endo/bundle-source';
+import { E } from '@endo/eventual-send';
+import path from 'path';
+import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
import { makeZoeForTest } from '../../../tools/setup-zoe.js';
import { setup } from '../setupBasicMints.js';
-import { makeFakeVatAdmin } from '../../../tools/fakeVatAdmin.js';
const dirname = path.dirname(new URL(import.meta.url).pathname);
diff --git a/packages/zoe/test/unitTests/zcf/zoeHelpersWZcf.test.js b/packages/zoe/test/unitTests/zcf/zoeHelpersWZcf.test.js
index 78d5308e124..435af906142 100644
--- a/packages/zoe/test/unitTests/zcf/zoeHelpersWZcf.test.js
+++ b/packages/zoe/test/unitTests/zcf/zoeHelpersWZcf.test.js
@@ -1,19 +1,20 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { M, mustMatch } from '@agoric/store';
import { AssetKind, makeIssuerKit } from '@agoric/ertp';
-import { setup } from '../setupBasicMints.js';
+import { M, mustMatch } from '@agoric/store';
+
import {
- swap,
assertIssuerKeywords,
- assertProposalShape,
- swapExact,
assertNatAssetKind,
+ assertProposalShape,
saveAllIssuers,
+ swap,
+ swapExact,
} from '../../../src/contractSupport/index.js';
import { assertPayoutAmount } from '../../zoeTestHelpers.js';
-import { setupZCFTest } from './setupZcfTest.js';
import { makeOffer } from '../makeOffer.js';
+import { setup } from '../setupBasicMints.js';
+import { setupZCFTest } from './setupZcfTest.js';
test(`zoeHelper with zcf - swap`, async t => {
const {
diff --git a/packages/zoe/test/unitTests/zoe-startInstance.test.js b/packages/zoe/test/unitTests/zoe-startInstance.test.js
index af77e291326..1d1bdef12f1 100644
--- a/packages/zoe/test/unitTests/zoe-startInstance.test.js
+++ b/packages/zoe/test/unitTests/zoe-startInstance.test.js
@@ -6,6 +6,7 @@ import bundleSource from '@endo/bundle-source';
import { E } from '@endo/eventual-send';
import { Far, passStyleOf } from '@endo/marshal';
import path from 'path';
+
import { setup } from './setupBasicMints.js';
import { setupZCFTest } from './zcf/setupZcfTest.js';
diff --git a/packages/zoe/test/unitTests/zoe.test.js b/packages/zoe/test/unitTests/zoe.test.js
index 61d61ad830d..be979c7c389 100644
--- a/packages/zoe/test/unitTests/zoe.test.js
+++ b/packages/zoe/test/unitTests/zoe.test.js
@@ -1,12 +1,10 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import path from 'path';
-
import { AmountMath, makeIssuerKit } from '@agoric/ertp';
+import bundleSource from '@endo/bundle-source';
import { E } from '@endo/eventual-send';
import { passStyleOf } from '@endo/marshal';
-
-import bundleSource from '@endo/bundle-source';
+import path from 'path';
import { setup } from './setupBasicMints.js';
import { setupZCFTest } from './zcf/setupZcfTest.js';
diff --git a/packages/zoe/test/unitTests/zoe/burnInvitation.test.js b/packages/zoe/test/unitTests/zoe/burnInvitation.test.js
index bd4aa29033f..6f58eaafb3c 100644
--- a/packages/zoe/test/unitTests/zoe/burnInvitation.test.js
+++ b/packages/zoe/test/unitTests/zoe/burnInvitation.test.js
@@ -1,7 +1,7 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { Far } from '@endo/marshal';
-import { makeIssuerKit, AssetKind, AmountMath } from '@agoric/ertp';
+import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
+import { Far } from '@endo/marshal';
import { burnInvitation } from '../../../src/zoeService/offer/burnInvitation.js';
diff --git a/packages/zoe/test/unitTests/zoe/escrowStorage.test.js b/packages/zoe/test/unitTests/zoe/escrowStorage.test.js
index 13b4c7d52c1..b322f33e25a 100644
--- a/packages/zoe/test/unitTests/zoe/escrowStorage.test.js
+++ b/packages/zoe/test/unitTests/zoe/escrowStorage.test.js
@@ -1,8 +1,9 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { AmountMath, makeIssuerKit, AssetKind } from '@agoric/ertp';
-import { E } from '@endo/eventual-send';
+import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
import { makeScalarBigMapStore } from '@agoric/vat-data';
+import { E } from '@endo/eventual-send';
+
import { provideEscrowStorage } from '../../../src/zoeService/escrowStorage.js';
import {
assertAmountsEqual,
diff --git a/packages/zoe/test/unitTests/zoe/installationStorage.test.js b/packages/zoe/test/unitTests/zoe/installationStorage.test.js
index 860a6b47177..bd4c3c15038 100644
--- a/packages/zoe/test/unitTests/zoe/installationStorage.test.js
+++ b/packages/zoe/test/unitTests/zoe/installationStorage.test.js
@@ -1,6 +1,7 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
import { makeScalarBigMapStore } from '@agoric/vat-data';
+
import { makeHandle } from '../../../src/makeHandle.js';
import { makeInstallationStorage } from '../../../src/zoeService/installationStorage.js';
diff --git a/packages/zoe/test/unitTests/zoe/instanceAdminStorage.test.js b/packages/zoe/test/unitTests/zoe/instanceAdminStorage.test.js
index 252369b2107..935709e9895 100644
--- a/packages/zoe/test/unitTests/zoe/instanceAdminStorage.test.js
+++ b/packages/zoe/test/unitTests/zoe/instanceAdminStorage.test.js
@@ -1,7 +1,7 @@
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { Far } from '@endo/marshal';
import { makeScalarBigMapStore } from '@agoric/vat-data';
+import { Far } from '@endo/marshal';
import { makeInstanceAdminStorage } from '../../../src/zoeService/instanceAdminStorage.js';
import { setup } from '../setupBasicMints.js';
diff --git a/packages/zoe/test/zoeTestHelpers.js b/packages/zoe/test/zoeTestHelpers.js
index e857d1fecd0..d1d75f38c44 100644
--- a/packages/zoe/test/zoeTestHelpers.js
+++ b/packages/zoe/test/zoeTestHelpers.js
@@ -1,8 +1,7 @@
+import { AmountMath, assertValueGetHelpers } from '@agoric/ertp';
import { q } from '@endo/errors';
import { E } from '@endo/eventual-send';
-import { AmountMath, assertValueGetHelpers } from '@agoric/ertp';
-
export const assertAmountsEqual = (t, amount, expected, label = '') => {
harden(amount);
harden(expected);
diff --git a/packages/zoe/tools/fakePriceAuthority.js b/packages/zoe/tools/fakePriceAuthority.js
index f7b24db3ec6..5b93643b8eb 100644
--- a/packages/zoe/tools/fakePriceAuthority.js
+++ b/packages/zoe/tools/fakePriceAuthority.js
@@ -1,14 +1,13 @@
-import { Fail } from '@endo/errors';
-import { makePromiseKit } from '@endo/promise-kit';
-import { E } from '@endo/eventual-send';
-import { Far } from '@endo/marshal';
-
-import { makeIssuerKit, AssetKind, AmountMath } from '@agoric/ertp';
+import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
import {
- makeNotifierKit,
makeNotifierFromAsyncIterable,
+ makeNotifierKit,
} from '@agoric/notifier';
import { TimeMath } from '@agoric/time';
+import { Fail } from '@endo/errors';
+import { E } from '@endo/eventual-send';
+import { Far } from '@endo/marshal';
+import { makePromiseKit } from '@endo/promise-kit';
import { natSafeMath } from '../src/contractSupport/index.js';
diff --git a/packages/zoe/tools/fakeVatAdmin.js b/packages/zoe/tools/fakeVatAdmin.js
index b174a067309..17fa4787d64 100644
--- a/packages/zoe/tools/fakeVatAdmin.js
+++ b/packages/zoe/tools/fakeVatAdmin.js
@@ -1,16 +1,16 @@
// @jessie-check
+import { makeScalarMapStore } from '@agoric/store';
+import { makeScalarBigMapStore } from '@agoric/vat-data';
import { Fail } from '@endo/errors';
import { E } from '@endo/eventual-send';
-import { makePromiseKit } from '@endo/promise-kit';
import { Far } from '@endo/marshal';
-import { makeScalarMapStore } from '@agoric/store';
-import { makeScalarBigMapStore } from '@agoric/vat-data';
+import { makePromiseKit } from '@endo/promise-kit';
+import zcfBundle from '../bundles/bundle-contractFacet.js';
import { evalContractBundle } from '../src/contractFacet/evalContractCode.js';
import { handlePKitWarning } from '../src/handleWarning.js';
import { makeHandle } from '../src/makeHandle.js';
-import zcfBundle from '../bundles/bundle-contractFacet.js';
/** @typedef { import('@agoric/swingset-vat').BundleID} BundleID */
/** @typedef { import('@agoric/swingset-vat').EndoZipBase64Bundle} EndoZipBase64Bundle */
diff --git a/packages/zoe/tools/manualPriceAuthority.js b/packages/zoe/tools/manualPriceAuthority.js
index 9203130fc7e..a6176a3381e 100644
--- a/packages/zoe/tools/manualPriceAuthority.js
+++ b/packages/zoe/tools/manualPriceAuthority.js
@@ -1,13 +1,14 @@
// @jessie-check
-import { AmountMath, makeIssuerKit, AssetKind } from '@agoric/ertp';
+import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
+import { makeNotifierKit } from '@agoric/notifier';
import { E } from '@endo/eventual-send';
import { Far } from '@endo/marshal';
-import { makeNotifierKit } from '@agoric/notifier';
+
import {
- makeOnewayPriceAuthorityKit,
- floorMultiplyBy,
floorDivideBy,
+ floorMultiplyBy,
+ makeOnewayPriceAuthorityKit,
} from '../src/contractSupport/index.js';
/**
diff --git a/packages/zoe/tools/manualTimer.js b/packages/zoe/tools/manualTimer.js
index f833e2e2e83..08e551abc0d 100644
--- a/packages/zoe/tools/manualTimer.js
+++ b/packages/zoe/tools/manualTimer.js
@@ -1,8 +1,8 @@
-import { Fail } from '@endo/errors';
-import { Far } from '@endo/marshal';
import { bindAllMethods } from '@agoric/internal';
import { buildManualTimer } from '@agoric/swingset-vat/tools/manual-timer.js';
import { TimeMath } from '@agoric/time';
+import { Fail } from '@endo/errors';
+import { Far } from '@endo/marshal';
/**
* @import {TimerServiceI} from '@agoric/time';
diff --git a/packages/zoe/tools/scriptedPriceAuthority.js b/packages/zoe/tools/scriptedPriceAuthority.js
index 1d01dac4b9a..fa6d5117dc1 100644
--- a/packages/zoe/tools/scriptedPriceAuthority.js
+++ b/packages/zoe/tools/scriptedPriceAuthority.js
@@ -1,11 +1,12 @@
-import { AmountMath, makeIssuerKit, AssetKind } from '@agoric/ertp';
-import { E } from '@endo/eventual-send';
-import { Far } from '@endo/marshal';
+import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
import { observeNotifier } from '@agoric/notifier';
import { TimeMath } from '@agoric/time';
+import { E } from '@endo/eventual-send';
+import { Far } from '@endo/marshal';
+
import {
- natSafeMath,
makeOnewayPriceAuthorityKit,
+ natSafeMath,
} from '../src/contractSupport/index.js';
/**
diff --git a/packages/zoe/tools/setup-zoe.js b/packages/zoe/tools/setup-zoe.js
index 03dc1de104e..387221bf694 100644
--- a/packages/zoe/tools/setup-zoe.js
+++ b/packages/zoe/tools/setup-zoe.js
@@ -1,7 +1,7 @@
-import { E, makeLoopback } from '@endo/captp';
-
import { makeScalarBigMapStore } from '@agoric/vat-data';
import bundleSource from '@endo/bundle-source';
+import { E, makeLoopback } from '@endo/captp';
+
import { makeDurableZoeKit } from '../src/zoeService/zoe.js';
import fakeVatAdmin, { makeFakeVatAdmin } from './fakeVatAdmin.js';
diff --git a/packages/zoe/tools/test-utils.js b/packages/zoe/tools/test-utils.js
index 976e5a0fc18..43333e89c09 100644
--- a/packages/zoe/tools/test-utils.js
+++ b/packages/zoe/tools/test-utils.js
@@ -1,4 +1,5 @@
import { AmountMath } from '@agoric/ertp';
+
import { makeRatio } from '../src/contractSupport/ratio.js';
/** @param {Pick, 'brand' | 'issuer' | 'mint'>} kit */
diff --git a/packages/zone/src/durable.js b/packages/zone/src/durable.js
index 8f9461e489b..c7b4b648a78 100644
--- a/packages/zone/src/durable.js
+++ b/packages/zone/src/durable.js
@@ -1,9 +1,7 @@
// @ts-check
// @jessie-check
-import { Fail } from '@endo/errors';
-import { Far, isPassable } from '@endo/pass-style';
-
+import { agoricVatDataKeys as keys, makeOnceKit } from '@agoric/base-zone';
import {
canBeDurable,
makeScalarMapStore,
@@ -16,8 +14,8 @@ import {
provideDurableWeakSetStore,
watchPromise,
} from '@agoric/vat-data';
-
-import { agoricVatDataKeys as keys, makeOnceKit } from '@agoric/base-zone';
+import { Fail } from '@endo/errors';
+import { Far, isPassable } from '@endo/pass-style';
/**
* A variant of `canBeDurable` that returns `false` instead of ever throwing.
diff --git a/packages/zone/src/virtual.js b/packages/zone/src/virtual.js
index 5cba65cc268..694dab74731 100644
--- a/packages/zone/src/virtual.js
+++ b/packages/zone/src/virtual.js
@@ -1,7 +1,11 @@
// @ts-check
// @jessie-check
-import { Far, isPassable } from '@endo/pass-style';
+import {
+ agoricVatDataKeys as keys,
+ makeOnceKit,
+ watchPromise,
+} from '@agoric/base-zone';
import {
defineVirtualExoClass,
defineVirtualExoClassKit,
@@ -10,12 +14,7 @@ import {
makeScalarBigWeakMapStore,
makeScalarBigWeakSetStore,
} from '@agoric/vat-data';
-
-import {
- agoricVatDataKeys as keys,
- makeOnceKit,
- watchPromise,
-} from '@agoric/base-zone';
+import { Far, isPassable } from '@endo/pass-style';
const emptyRecord = harden({});
const initEmpty = harden(() => emptyRecord);
diff --git a/packages/zone/test/exos.test.js b/packages/zone/test/exos.test.js
index 31121190694..15ee49cb2d1 100644
--- a/packages/zone/test/exos.test.js
+++ b/packages/zone/test/exos.test.js
@@ -1,4 +1,3 @@
-// eslint-disable-next-line import/order
import {
annihilate,
getBaggage,
@@ -6,16 +5,15 @@ import {
test,
} from './prepare-test-env-ava.js';
-import * as vatData from '@agoric/vat-data';
-
import { agoricVatDataKeys as keys } from '@agoric/base-zone';
+import * as g from '@agoric/base-zone/tools/greeter.js';
import {
agoricVatDataCompatibleKeys,
testFirstZoneIncarnation,
- testSecondZoneIncarnation,
testGreeter,
+ testSecondZoneIncarnation,
} from '@agoric/base-zone/tools/testers.js';
-import * as g from '@agoric/base-zone/tools/greeter.js';
+import * as vatData from '@agoric/vat-data';
import { makeDurableZone } from '../durable.js';
import { makeHeapZone } from '../heap.js';
diff --git a/packages/zone/test/prepare-test-env-ava.js b/packages/zone/test/prepare-test-env-ava.js
index a3d049993ce..874417364ae 100644
--- a/packages/zone/test/prepare-test-env-ava.js
+++ b/packages/zone/test/prepare-test-env-ava.js
@@ -1,6 +1,6 @@
import '@agoric/swingset-liveslots/tools/prepare-test-env.js';
-import { reincarnate } from '@agoric/swingset-liveslots/tools/setup-vat-data.js';
+import { reincarnate } from '@agoric/swingset-liveslots/tools/setup-vat-data.js';
import test from 'ava';
export { test };