Merge branch 'master' into JeancarloBarrios/adding-flake

.github/workflows/golangci-lint.yml

@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '>=1.20'
+          go-version: '1.22'
           cache: false
           check-latest: true
         # https://github.com/golangci/golangci-lint/issues/3862#issuecomment-1572973588

.github/workflows/integration.yml

@@ -131,7 +131,7 @@ jobs:
         working-directory: ./agoric-sdk
       - uses: ./agoric-sdk/.github/actions/restore-golang
         with:
-          go-version: '1.20'
+          go-version: '1.22'
           path: ./agoric-sdk
       - uses: ./agoric-sdk/.github/actions/restore-node
         with:

.github/workflows/proto.yml

@@ -52,7 +52,7 @@ jobs:
           submodules: 'true'
       - uses: ./.github/actions/restore-golang
         with:
-          go-version: '1.20'
+          go-version: '1.22'
       - name: check protobuf definitions are up-to-date
         run: |
           cd packages/cosmic-proto

.github/workflows/test-all-packages.yml

@@ -455,7 +455,7 @@ jobs:
       # END-TEST-BOILERPLATE
       - uses: ./.github/actions/restore-golang
         with:
-          go-version: '1.20'
+          go-version: '1.22'
       - name: yarn test (cosmic-swingset)
         if: (success() || failure())
         run: cd packages/cosmic-swingset && yarn ${{ steps.vars.outputs.test }} | $TEST_COLLECT

.github/workflows/test-golang.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/restore-golang
         with:
-          go-version: '1.20'
+          go-version: '1.22'
       - name: go test
         run: cd golang/cosmos && go test -coverprofile=coverage.txt -covermode=atomic ./...
       - uses: ./.github/actions/post-test

a3p-integration/package.json

@@ -9,16 +9,20 @@
     "build:submissions": "scripts/build-all-submissions.sh",
     "build:synthetic-chain": "yarn synthetic-chain build",
     "lint-fix": "yarn lint:eslint --fix",
-    "lint": "../node_modules/.bin/run-s --continue-on-error 'lint:*'",
+    "lint": "run-s --continue-on-error 'lint:*'",
     "lint:types": "find proposals -maxdepth 2 -name package.json -type f -exec ../node_modules/.bin/tsc -p '{}'/.. ';'",
-    "lint:eslint": "../node_modules/.bin/eslint .",
+    "lint:eslint": "eslint .",
     "test": "yarn synthetic-chain test",
     "doctor": "yarn synthetic-chain doctor"
   },
   "dependencies": {
-    "@agoric/synthetic-chain": "^0.5.1",
+    "@agoric/synthetic-chain": "^0.5.2",
     "@types/better-sqlite3": "^7.6.11"
   },
-  "packageManager": "[email protected]",
+  "devDependencies": {
+    "eslint": "^8.57.1",
+    "npm-run-all": "^4.1.5"
+  },
+  "packageManager": "[email protected]",
   "license": "Apache-2.0"
 }

a3p-integration/proposals/b:beta-fast-usdc/package.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "@agoric/client-utils": "dev",
     "@agoric/fast-usdc": "dev",
-    "@agoric/synthetic-chain": "^0.5.1",
+    "@agoric/synthetic-chain": "^0.5.2",
     "@endo/init": "^1.1.8",
     "agoric": "dev",
     "ava": "^5.3.1"
@@ -28,5 +28,5 @@
   "scripts": {
     "agops": "yarn --cwd /usr/src/agoric-sdk/ --silent agops"
   },
-  "packageManager": "yarn@4.5.3"
+  "packageManager": "yarn@4.6.0"
 }

a3p-integration/proposals/b:beta-fast-usdc/test/test-cli.sh

@@ -14,9 +14,10 @@ yarn agoric wallet send --offer accept.json --from agoric1ee9hr0jyrxhy999y755mp8
 # UNTIL https://github.com/Agoric/agoric-sdk/issues/10891
 # ACCEPT_OFFER_ID=$(agoric wallet extract-id --offer accept.json)
 
-yarn fast-usdc operator attest --previousOfferId="$ACCEPT_OFFER_ID" --forwardingChannel=foo --recipientAddress=agoric1foo --blockHash=0xfoo --blockNumber=1 --chainId=3 --amount=123 --forwardingAddress=noble1foo --sender 0xfoo --txHash=0xtx >| attest.json
-cat attest.json
-yarn agoric wallet send --offer attest.json --from agoric1ee9hr0jyrxhy999y755mp862ljgycmwyp4pl7q --keyring-backend test
+# FIXME restore this test once the latest fast-usdc package is in NPM
+# yarn fast-usdc operator attest --previousOfferId="$ACCEPT_OFFER_ID" --forwardingChannel=foo --recipientAddress=agoric1foo --blockHash=0xfoo --blockNumber=1 --blockTimestamp=1632340000 --chainId=3 --amount=123 --forwardingAddress=noble1foo --sender 0xfoo --txHash=0xtx >| attest.json
+# cat attest.json
+# yarn agoric wallet send --offer attest.json --from agoric1ee9hr0jyrxhy999y755mp862ljgycmwyp4pl7q --keyring-backend test
 
 # The data above are bogus and result in errors in the logs:
 # SwingSet: vat: v72: ----- TxFeed.11  8 publishing evidence { aux: { forwardingChannel: 'foo', recipientAddress: 'agoric1foo' }, blockHash: '0xfoo', blockNumber: 1n, chainId: 3, tx: { amount: 123n, forwardingAddress: 'noble1foo', sender: '0xfoo' }, txHash: '0xtx' } []

a3p-integration/proposals/b:beta-fast-usdc/yarn.lock

@@ -459,19 +459,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@agoric/synthetic-chain@npm:^0.5.1":
-  version: 0.5.1
-  resolution: "@agoric/synthetic-chain@npm:0.5.1"
+"@agoric/synthetic-chain@npm:^0.5.2":
+  version: 0.5.2
+  resolution: "@agoric/synthetic-chain@npm:0.5.2"
   dependencies:
-    "@endo/zip": "npm:^1.0.7"
-    better-sqlite3: "npm:^11.8.0"
+    "@endo/zip": "npm:^1.0.9"
+    better-sqlite3: "npm:^11.8.1"
     chalk: "npm:^5.4.1"
     cosmjs-types: "npm:^0.9.0"
     execa: "npm:^9.5.2"
-    glob: "npm:^11.0.0"
+    glob: "npm:^11.0.1"
   bin:
     synthetic-chain: dist/cli/cli.js
-  checksum: 10c0/38d796556a0940d124b750bcf82cbbbd9caee64031feeca4086350c4d05d68256e5b188d418354b511eeb1da0f95160205cc2701ae397bd86c304fc29850bc85
+  checksum: 10c0/190939c33f47a1d71558356f42d4b4b10a4caf3176d31281a250877f97d25d5df5b5d261fd507489fd481e24e6ba5ec12e8dc267a0461b67e9f02a8f8769700c
   languageName: node
   linkType: hard
 
@@ -1260,7 +1260,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@endo/zip@npm:^1.0.7, @endo/zip@npm:^1.0.9":
+"@endo/zip@npm:^1.0.9":
   version: 1.0.9
   resolution: "@endo/zip@npm:1.0.9"
   checksum: 10c0/3fccea31bd5dad938a3b5f531454d3c49513892d6d5aba1f0af1034ff0ae54c3e28a346a9df08bd9e5201354acccd631e45c9c0e68fa2848a876a3919f3830dc
@@ -2003,7 +2003,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"better-sqlite3@npm:^11.8.0":
+"better-sqlite3@npm:^11.8.1":
   version: 11.8.1
   resolution: "better-sqlite3@npm:11.8.1"
   dependencies:
@@ -3173,7 +3173,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:^11.0.0":
+"glob@npm:^11.0.1":
   version: 11.0.1
   resolution: "glob@npm:11.0.1"
   dependencies:
@@ -4829,7 +4829,7 @@ __metadata:
   dependencies:
     "@agoric/client-utils": "npm:dev"
     "@agoric/fast-usdc": "npm:dev"
-    "@agoric/synthetic-chain": "npm:^0.5.1"
+    "@agoric/synthetic-chain": "npm:^0.5.2"
     "@endo/init": "npm:^1.1.8"
     agoric: "npm:dev"
     ava: "npm:^5.3.1"

a3p-integration/proposals/n:upgrade-next/.gitignore

@@ -1,9 +1 @@
-replaceFeeDistributor/
-addUsdLemons/
-addUsdOlives/
-upgradeProvisionPool/
-upgradeAgoricNames/
-publishTestInfo/
-upgrade-mintHolder/
-upgradeAssetReserve/
-upgradePSM/
+test/generated/

a3p-integration/proposals/n:upgrade-next/eval.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -euo pipefail
+
 # evaluate the proposals in the /submission/ directory
 
 echo "UPGRADE-19  Running proposal declared in package.json"

a3p-integration/proposals/n:upgrade-next/package.json

@@ -8,16 +8,9 @@
     },
     "type": "Software Upgrade Proposal",
     "sdk-generate": [
-      "testing/replace-feeDistributor-short.js replaceFeeDistributor",
-      "testing/add-USD-LEMONS.js addUsdLemons",
-      "vats/upgrade-provisionPool.js upgradeProvisionPool",
-      "vats/upgrade-asset-reserve.js upgradeAssetReserve",
-      "vats/upgrade-psm.js upgradePSM",
-      "vats/upgrade-paRegistry.js",
-      "vats/upgrade-agoricNames.js agoricNamesCoreEvals/upgradeAgoricNames",
-      "testing/add-USD-OLIVES.js agoricNamesCoreEvals/addUsdOlives",
-      "testing/publish-test-info.js agoricNamesCoreEvals/publishTestInfo",
-      "vats/upgrade-mintHolder.js upgrade-mintHolder A3P_INTEGRATION"
+      "testing/add-USD-LEMONS.js test/generated/addUsdLemons",
+      "testing/add-USD-OLIVES.js test/generated/agoricNamesCoreEvals/addUsdOlives",
+      "testing/publish-test-info.js test/generated/agoricNamesCoreEvals/publishTestInfo"
     ]
   },
   "type": "module",
@@ -26,7 +19,7 @@
     "@agoric/client-utils": "dev",
     "@agoric/ertp": "dev",
     "@agoric/internal": "dev",
-    "@agoric/synthetic-chain": "^0.5.1",
+    "@agoric/synthetic-chain": "^0.5.2",
     "@agoric/zoe": "dev",
     "@endo/errors": "^1.2.9",
     "@endo/init": "^1.1.8",
@@ -46,7 +39,7 @@
   "scripts": {
     "agops": "yarn --cwd /usr/src/agoric-sdk/ --silent agops"
   },
-  "packageManager": "yarn@4.5.3",
+  "packageManager": "yarn@4.6.0",
   "devDependencies": {
     "eslint": "^8.57.0",
     "npm-run-all": "^4.1.5",

a3p-integration/proposals/n:upgrade-next/test-lib/mintHolder-helpers.js

@@ -1,12 +1,7 @@
 /* eslint-env node */
 
-import {
-  agoric,
-  evalBundles,
-  getDetailsMatchingVats,
-  getISTBalance,
-} from '@agoric/synthetic-chain';
-import { makeVstorageKit, retryUntilCondition } from '@agoric/client-utils';
+import { agoric, evalBundles, getISTBalance } from '@agoric/synthetic-chain';
+import { makeVstorageKit } from '@agoric/client-utils';
 import { readFile, writeFile } from 'node:fs/promises';
 import { psmSwap, snapshotAgoricNames, tryISTBalances } from './psm-lib.js';
 
@@ -41,7 +36,10 @@ export const getAssetList = async labelList => {
 
   // Determine the assets to consider based on labelList
   const assetsToConsider =
-    labelList || Object.values(vbankAssets).map(asset => asset.issuerName);
+    labelList ||
+    Object.values(vbankAssets)
+      .map(asset => asset.issuerName)
+      .filter(Boolean); // testvbankAsset can be malformed.
 
   for (const label of assetsToConsider) {
     if (label === 'IST') {
@@ -67,6 +65,7 @@ export const mintPayment = async (t, address, assetList, value) => {
 
   for (const asset of assetList) {
     const { label, denom } = asset;
+
     const scaled = BigInt(parseInt(value, 10) * 1_000_000).toString();
 
     await replaceTemplateValuesInFile(`${SUBMISSION_DIR}/send-script`, {
@@ -137,40 +136,3 @@ export const swap = async (t, address, assetList, want) => {
     t.is(anchorBalanceAfter, anchorBalanceBefore - want);
   }
 };
-
-const getIncarnationForAllVats = async assetList => {
-  const vatsIncarnation = {};
-
-  for (const asset of assetList) {
-    const { label, mintHolderVat } = asset;
-    const matchingVats = await getDetailsMatchingVats(label);
-    const expectedVat = matchingVats.find(vat => vat.vatName === mintHolderVat);
-    vatsIncarnation[label] = expectedVat.incarnation;
-  }
-  assert(Object.keys(vatsIncarnation).length === assetList.length);
-
-  return vatsIncarnation;
-};
-
-const checkVatsUpgraded = (before, current) => {
-  for (const vatLabel in before) {
-    if (current[vatLabel] !== before[vatLabel] + 1) {
-      console.log(`${vatLabel} upgrade failed. `);
-      return false;
-    }
-  }
-  return true;
-};
-
-export const upgradeMintHolder = async (submissionPath, assetList) => {
-  const before = await getIncarnationForAllVats(assetList);
-
-  await evalBundles(submissionPath);
-
-  return retryUntilCondition(
-    async () => getIncarnationForAllVats(assetList),
-    current => checkVatsUpgraded(before, current),
-    `mintHolder upgrade not processed yet`,
-    { setTimeout, retryIntervalMs: 5000, maxRetries: 15 },
-  );
-};

a3p-integration/proposals/n:upgrade-next/test-lib/psm-lib.js

@@ -1,5 +1,5 @@
 /* eslint-env node */
-// from z:acceptance/test-lib/psm-lib.js
+// from z:acceptance/lib/psm-lib.js
 
 import { execa } from 'execa';
 import { getNetworkConfig } from 'agoric/src/helpers.js';