Merge branch 'dev-upgrade-18' into mk/u18-merge

Agoric · Dec 24, 2024 · cc3316d · cc3316d
2 parents e06691f + aaebae4
commit cc3316d
Show file tree

Hide file tree

Showing 133 changed files with 3,549 additions and 701 deletions.
diff --git a/...ation/proposals/n:upgrade-next/.gitignore → ...gration/proposals/a:upgrade-18/.gitignore b/...ation/proposals/n:upgrade-next/.gitignore → ...gration/proposals/a:upgrade-18/.gitignore
diff --git a/.../patches/axios-npm-1.7.7-cfbedc233d.patch → .../patches/axios-npm-1.7.7-cfbedc233d.patch b/.../patches/axios-npm-1.7.7-cfbedc233d.patch → .../patches/axios-npm-1.7.7-cfbedc233d.patch
diff --git a/...es/protobufjs-npm-6.11.4-af11968b80.patch → ...es/protobufjs-npm-6.11.4-af11968b80.patch b/...es/protobufjs-npm-6.11.4-af11968b80.patch → ...es/protobufjs-npm-6.11.4-af11968b80.patch
diff --git a/...tion/proposals/n:upgrade-next/.yarnrc.yml → ...ration/proposals/a:upgrade-18/.yarnrc.yml b/...tion/proposals/n:upgrade-next/.yarnrc.yml → ...ration/proposals/a:upgrade-18/.yarnrc.yml
diff --git a/a3p-integration/proposals/a:upgrade-18/README.md b/a3p-integration/proposals/a:upgrade-18/README.md
@@ -0,0 +1,9 @@
+# Proposal to upgrade the chain software
+
+This holds the draft proposal for agoric-upgrade-18, which will be added to
+[agoric-3-proposals](https://github.com/Agoric/agoric-3-proposals) after it
+passes.
+
+The "binaries" property of `upgradeInfo` is now required since Cosmos SDK 0.46,
+however it cannot be computed for an unreleased upgrade. To disable the check,
+`releaseNotes` is set to `false`.
diff --git a/...proposals/n:upgrade-next/acceptInvites.js → ...n/proposals/a:upgrade-18/acceptInvites.js b/...proposals/n:upgrade-next/acceptInvites.js → ...n/proposals/a:upgrade-18/acceptInvites.js
diff --git a/...ation/proposals/n:upgrade-next/addGov4.js → ...gration/proposals/a:upgrade-18/addGov4.js b/...ation/proposals/n:upgrade-next/addGov4.js → ...gration/proposals/a:upgrade-18/addGov4.js
diff --git a/...ion/proposals/n:upgrade-next/agd-tools.js → ...ation/proposals/a:upgrade-18/agd-tools.js b/...ion/proposals/n:upgrade-next/agd-tools.js → ...ation/proposals/a:upgrade-18/agd-tools.js
diff --git a/.../proposals/n:upgrade-next/agoric-tools.js → ...on/proposals/a:upgrade-18/agoric-tools.js b/.../proposals/n:upgrade-next/agoric-tools.js → ...on/proposals/a:upgrade-18/agoric-tools.js
diff --git a/.../proposals/n:upgrade-next/initial.test.js → ...on/proposals/a:upgrade-18/initial.test.js b/.../proposals/n:upgrade-next/initial.test.js → ...on/proposals/a:upgrade-18/initial.test.js
diff --git a/...ion/proposals/n:upgrade-next/openVault.js → ...ation/proposals/a:upgrade-18/openVault.js b/...ion/proposals/n:upgrade-next/openVault.js → ...ation/proposals/a:upgrade-18/openVault.js
diff --git a/...ion/proposals/n:upgrade-next/package.json → ...ation/proposals/a:upgrade-18/package.json b/...ion/proposals/n:upgrade-next/package.json → ...ation/proposals/a:upgrade-18/package.json
@@ -2,9 +2,10 @@
   "agoricProposal": {
     "releaseNotes": false,
     "sdkImageTag": "unreleased",
-    "planName": "UNRELEASED_A3P_INTEGRATION",
+    "planName": "agoric-upgrade-18-a3p",
     "upgradeInfo": {
-      "coreProposals": []
+      "coreProposals": [],
+      "releaseNotes": false
     },
     "sdk-generate": [
       "testing/test-upgraded-board.js testUpgradedBoard"

diff --git a/...ation/proposals/n:upgrade-next/prepare.sh → ...gration/proposals/a:upgrade-18/prepare.sh b/...ation/proposals/n:upgrade-next/prepare.sh → ...gration/proposals/a:upgrade-18/prepare.sh
diff --git a/...e-next/priceFeed-follower-auction.test.js → ...ade-18/priceFeed-follower-auction.test.js b/...e-next/priceFeed-follower-auction.test.js → ...ade-18/priceFeed-follower-auction.test.js
diff --git a/...ls/n:upgrade-next/priceFeedUpdate.test.js → ...sals/a:upgrade-18/priceFeedUpdate.test.js b/...ls/n:upgrade-next/priceFeedUpdate.test.js → ...sals/a:upgrade-18/priceFeedUpdate.test.js
diff --git a/.../n:upgrade-next/replaceElectorate.test.js → ...ls/a:upgrade-18/replaceElectorate.test.js b/.../n:upgrade-next/replaceElectorate.test.js → ...ls/a:upgrade-18/replaceElectorate.test.js
diff --git a/...n:upgrade-next/synthetic-chain-excerpt.js → ...s/a:upgrade-18/synthetic-chain-excerpt.js b/...n:upgrade-next/synthetic-chain-excerpt.js → ...s/a:upgrade-18/synthetic-chain-excerpt.js
diff --git a/...als/n:upgrade-next/test-lib/price-feed.js → ...osals/a:upgrade-18/test-lib/price-feed.js b/...als/n:upgrade-next/test-lib/price-feed.js → ...osals/a:upgrade-18/test-lib/price-feed.js
diff --git a/...egration/proposals/n:upgrade-next/test.sh → ...ntegration/proposals/a:upgrade-18/test.sh b/...egration/proposals/n:upgrade-next/test.sh → ...ntegration/proposals/a:upgrade-18/test.sh
diff --git a/...on/proposals/n:upgrade-next/tsconfig.json → ...tion/proposals/a:upgrade-18/tsconfig.json b/...on/proposals/n:upgrade-next/tsconfig.json → ...tion/proposals/a:upgrade-18/tsconfig.json
diff --git a/...sals/n:upgrade-next/upgradedBoard.test.js → ...posals/a:upgrade-18/upgradedBoard.test.js b/...sals/n:upgrade-next/upgradedBoard.test.js → ...posals/a:upgrade-18/upgradedBoard.test.js
diff --git a/...tegration/proposals/n:upgrade-next/use.sh → ...integration/proposals/a:upgrade-18/use.sh b/...tegration/proposals/n:upgrade-next/use.sh → ...integration/proposals/a:upgrade-18/use.sh
diff --git a/...on/proposals/n:upgrade-next/vatDetails.js → ...tion/proposals/a:upgrade-18/vatDetails.js b/...on/proposals/n:upgrade-next/vatDetails.js → ...tion/proposals/a:upgrade-18/vatDetails.js
diff --git a/...osals/n:upgrade-next/verifyPushedPrice.js → ...oposals/a:upgrade-18/verifyPushedPrice.js b/...osals/n:upgrade-next/verifyPushedPrice.js → ...oposals/a:upgrade-18/verifyPushedPrice.js
diff --git a/...ration/proposals/n:upgrade-next/yarn.lock → ...egration/proposals/a:upgrade-18/yarn.lock b/...ration/proposals/n:upgrade-next/yarn.lock → ...egration/proposals/a:upgrade-18/yarn.lock
diff --git a/a3p-integration/proposals/n:upgrade-next/README.md b/a3p-integration/proposals/n:upgrade-next/README.md