Skip to content

Commit

Permalink
feat: run test-upgraded-board.js in p:upgrade-19, not upgrade.go
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris-Hibbert committed Nov 26, 2024
1 parent d4640fa commit b194320
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 11 deletions.
2 changes: 2 additions & 0 deletions a3p-integration/proposals/p:upgrade-19/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
replaceFeeDistributor/
testUpgradedBoard/
upgradeBoard/
10 changes: 9 additions & 1 deletion a3p-integration/proposals/p:upgrade-19/eval.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
#!/bin/bash

# Do nothing because this is only testing the state resulting from previous proposals.
# add gov4 address

echo "UPGRADE-19 Running proposal declared in package.json"
# copy to run in the proposal package so the dependencies can be resolved
cp /usr/src/upgrade-test-scripts/eval_submission.js .

#echo RUNNING ./eval_submission.js
#./eval_submission.js
#echo RAN ./eval_submission.js
3 changes: 2 additions & 1 deletion a3p-integration/proposals/p:upgrade-19/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"type": "/agoric.swingset.CoreEvalProposal",
"sdk-generate": [
"testing/replace-feeDistributor-short.js replaceFeeDistributor",
"testing/test-upgraded-board.js"
"vats/upgrade-board.js",
"testing/test-upgraded-board.js testUpgradedBoard"
]
},
"type": "module",
Expand Down
19 changes: 10 additions & 9 deletions golang/cosmos/app/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -214,15 +214,16 @@ func unreleasedUpgradeHandler(app *GaiaApp, targetUpgrade string) func(sdk.Conte
),
)

// CoreProposals for Upgrade 19
CoreProposalSteps = append(CoreProposalSteps,
vm.CoreProposalStepForModules(
"@agoric/builders/scripts/inter-protocol/replace-feeDistributor.js",
),
vm.CoreProposalStepForModules(
"@agoric/builders/scripts/vats/upgrade-board.js",
),
)
// // CoreProposals for Upgrade 19. These should not be introduced
// // before upgrade 18 is done because they would be run in n:upgrade-next
// CoreProposalSteps = append(CoreProposalSteps,
// vm.CoreProposalStepForModules(
// "@agoric/builders/scripts/inter-protocol/replace-feeDistributor.js",
// ),
// vm.CoreProposalStepForModules(
// "@agoric/builders/scripts/vats/upgrade-board.js",
// ),
// )
}

app.upgradeDetails = &upgradeDetails{
Expand Down

0 comments on commit b194320

Please sign in to comment.