Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: migrate upgrade of v7-board from upgrade 19 to upgrade 18 #10761

Merged
merged 4 commits into from
Dec 21, 2024
Merged

feat: migrate upgrade of v7-board from upgrade 19 to upgrade 18 #10761

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0bb17da
feat: migrate upgrade of v7-board from upgrade 19 to upgrade 18
Chris-Hibbert Dec 20, 2024
75ca89e
chore: add gitignore
Chris-Hibbert Dec 20, 2024
5b402ab
chore: remove vestiges from p:upgrade-19
Chris-Hibbert Dec 21, 2024
c9be393
Merge branch 'master' into 10760-upgrade-board-U18
mergify[bot] Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions a3p-integration/proposals/n:upgrade-next/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
testUpgradedBoard/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we remove the equivalent line from

agoric-sdk/a3p-integration/proposals/p:upgrade-19/.gitignore

Line 2 in 75ca89e

testUpgradedBoard/
?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good idea. I'll add that once CI passes. (I don't want to restart the cycle at this point.)

3 changes: 3 additions & 0 deletions a3p-integration/proposals/n:upgrade-next/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
"upgradeInfo": {
"coreProposals": []
},
"sdk-generate": [
"testing/test-upgraded-board.js testUpgradedBoard"
],
"type": "Software Upgrade Proposal"
},
"type": "module",
Expand Down
0 ...posals/p:upgrade-19/upgradedBoard.test.js → ...sals/n:upgrade-next/upgradedBoard.test.js
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion a3p-integration/proposals/p:upgrade-19/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume this should be deleted too?

Suggested change
"testing/test-upgraded-board.js testUpgradedBoard",

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep. I'll get rid of that. I thought I had done so, but it's still there.

"vats/upgrade-agoricNames.js agoricNamesCoreEvals/upgradeAgoricNames",
"testing/add-USD-OLIVES.js agoricNamesCoreEvals/addUsdOlives",
Expand Down
1 change: 0 additions & 1 deletion a3p-integration/proposals/p:upgrade-19/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 3 additions & 3 deletions golang/cosmos/app/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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(
Expand Down
Loading