From 0bb17da101fb0e8a38ac90dc3210d8abec06ced2 Mon Sep 17 00:00:00 2001 From: Chris Hibbert Date: Fri, 20 Dec 2024 15:27:49 -0800 Subject: [PATCH 1/3] feat: migrate upgrade of v7-board from upgrade 19 to upgrade 18 --- a3p-integration/proposals/n:upgrade-next/package.json | 3 +++ .../{p:upgrade-19 => n:upgrade-next}/upgradedBoard.test.js | 0 a3p-integration/proposals/p:upgrade-19/package.json | 1 - a3p-integration/proposals/p:upgrade-19/test.sh | 1 - golang/cosmos/app/upgrade.go | 6 +++--- 5 files changed, 6 insertions(+), 5 deletions(-) rename a3p-integration/proposals/{p:upgrade-19 => n:upgrade-next}/upgradedBoard.test.js (100%) diff --git a/a3p-integration/proposals/n:upgrade-next/package.json b/a3p-integration/proposals/n:upgrade-next/package.json index 7a3510e8791..472b052658f 100644 --- a/a3p-integration/proposals/n:upgrade-next/package.json +++ b/a3p-integration/proposals/n:upgrade-next/package.json @@ -6,6 +6,9 @@ "upgradeInfo": { "coreProposals": [] }, + "sdk-generate": [ + "testing/test-upgraded-board.js testUpgradedBoard" + ], "type": "Software Upgrade Proposal" }, "type": "module", diff --git a/a3p-integration/proposals/p:upgrade-19/upgradedBoard.test.js b/a3p-integration/proposals/n:upgrade-next/upgradedBoard.test.js similarity index 100% rename from a3p-integration/proposals/p:upgrade-19/upgradedBoard.test.js rename to a3p-integration/proposals/n:upgrade-next/upgradedBoard.test.js diff --git a/a3p-integration/proposals/p:upgrade-19/package.json b/a3p-integration/proposals/p:upgrade-19/package.json index 666230406a8..5c32c83fc47 100644 --- a/a3p-integration/proposals/p:upgrade-19/package.json +++ b/a3p-integration/proposals/p:upgrade-19/package.json @@ -7,7 +7,6 @@ "vats/upgrade-provisionPool.js upgradeProvisionPool", "vats/upgrade-asset-reserve.js upgradeAssetReserve", "vats/upgrade-paRegistry.js", - "vats/upgrade-board.js", "testing/test-upgraded-board.js testUpgradedBoard", "vats/upgrade-agoricNames.js agoricNamesCoreEvals/upgradeAgoricNames", "testing/add-USD-OLIVES.js agoricNamesCoreEvals/addUsdOlives", diff --git a/a3p-integration/proposals/p:upgrade-19/test.sh b/a3p-integration/proposals/p:upgrade-19/test.sh index 25cd9bde21f..cc1611e9017 100644 --- a/a3p-integration/proposals/p:upgrade-19/test.sh +++ b/a3p-integration/proposals/p:upgrade-19/test.sh @@ -1,7 +1,6 @@ #!/bin/bash yarn ava replaceFeeDistributor.test.js -yarn ava upgradedBoard.test.js yarn ava mintHolder.test.js yarn ava provisionPool.test.js diff --git a/golang/cosmos/app/upgrade.go b/golang/cosmos/app/upgrade.go index 89857e26166..0634bae8e5a 100644 --- a/golang/cosmos/app/upgrade.go +++ b/golang/cosmos/app/upgrade.go @@ -228,6 +228,9 @@ func unreleasedUpgradeHandler(app *GaiaApp, targetUpgrade string) func(sdk.Conte // Upgrade to include a cleanup from https://github.com/Agoric/agoric-sdk/pull/10319 "@agoric/builders/scripts/smart-wallet/build-wallet-factory2-upgrade.js", ), + vm.CoreProposalStepForModules( + "@agoric/builders/scripts/vats/upgrade-board.js", + ), ) // CoreProposals for Upgrade 19. These should not be introduced @@ -248,9 +251,6 @@ func unreleasedUpgradeHandler(app *GaiaApp, targetUpgrade string) func(sdk.Conte // "@agoric/builders/scripts/vats/upgrade-paRegistry.js", // ), // vm.CoreProposalStepForModules( - // "@agoric/builders/scripts/vats/upgrade-board.js", - // ), - // vm.CoreProposalStepForModules( // "@agoric/builders/scripts/vats/upgrade-provisionPool.js", // ), // vm.CoreProposalStepForModules( From 75ca89e583ebfc05ca00fd215c0d78a055087162 Mon Sep 17 00:00:00 2001 From: Chris Hibbert Date: Fri, 20 Dec 2024 15:46:41 -0800 Subject: [PATCH 2/3] chore: add gitignore --- a3p-integration/proposals/n:upgrade-next/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 a3p-integration/proposals/n:upgrade-next/.gitignore diff --git a/a3p-integration/proposals/n:upgrade-next/.gitignore b/a3p-integration/proposals/n:upgrade-next/.gitignore new file mode 100644 index 00000000000..ba5cba542e2 --- /dev/null +++ b/a3p-integration/proposals/n:upgrade-next/.gitignore @@ -0,0 +1 @@ +testUpgradedBoard/ From 5b402aba5b822253a4e82cfc2edcff248bca4e8e Mon Sep 17 00:00:00 2001 From: Chris Hibbert Date: Fri, 20 Dec 2024 16:40:05 -0800 Subject: [PATCH 3/3] chore: remove vestiges from p:upgrade-19 --- a3p-integration/proposals/p:upgrade-19/.gitignore | 1 - a3p-integration/proposals/p:upgrade-19/package.json | 1 - 2 files changed, 2 deletions(-) diff --git a/a3p-integration/proposals/p:upgrade-19/.gitignore b/a3p-integration/proposals/p:upgrade-19/.gitignore index b1f2bfa095d..29940cd1eb4 100644 --- a/a3p-integration/proposals/p:upgrade-19/.gitignore +++ b/a3p-integration/proposals/p:upgrade-19/.gitignore @@ -1,5 +1,4 @@ replaceFeeDistributor/ -testUpgradedBoard/ addUsdLemons/ addUsdOlives/ upgradeProvisionPool/ diff --git a/a3p-integration/proposals/p:upgrade-19/package.json b/a3p-integration/proposals/p:upgrade-19/package.json index 5c32c83fc47..97ec3e2679d 100644 --- a/a3p-integration/proposals/p:upgrade-19/package.json +++ b/a3p-integration/proposals/p:upgrade-19/package.json @@ -7,7 +7,6 @@ "vats/upgrade-provisionPool.js upgradeProvisionPool", "vats/upgrade-asset-reserve.js upgradeAssetReserve", "vats/upgrade-paRegistry.js", - "testing/test-upgraded-board.js testUpgradedBoard", "vats/upgrade-agoricNames.js agoricNamesCoreEvals/upgradeAgoricNames", "testing/add-USD-OLIVES.js agoricNamesCoreEvals/addUsdOlives", "testing/publish-test-info.js agoricNamesCoreEvals/publishTestInfo",