Skip to content

Commit

Permalink
chore: Integrate on top of upgrade-15 (#9436)
Browse files Browse the repository at this point in the history
Fixes #9260

## Description

As of Agoric/agoric-3-proposals#157 ,
`a3p:latest` now includes results of
[upgrade-15](https://github.com/Agoric/agoric-sdk/releases/tag/agoric-upgrade-15).
This removes the duplication from the UNRELEASED upgrade handler and
a3p-integration.

### Security Considerations

n/a

### Scaling Considerations

n/a

### Documentation Considerations

n/a

### Testing Considerations

How much of the [upgrade-15
a3p-integration](https://github.com/Agoric/agoric-sdk/tree/agoric-upgrade-15/a3p-integration/proposals/a%3Aupgrade-15)
should remain in
[a:upgrade-next](https://github.com/Agoric/agoric-sdk/tree/master/a3p-integration/proposals/a%3Aupgrade-next)?
I'm thinking specifically about
[exit-reclaim.test.js](https://github.com/Agoric/agoric-sdk/blob/master/a3p-integration/proposals/a%3Aupgrade-next/exit-reclaim.test.js)
and associated preparation.

### Upgrade Considerations

@Chris-Hibbert Does
[initial.test.js](https://github.com/Agoric/agoric-sdk/blob/master/a3p-integration/proposals/a%3Aupgrade-next/initial.test.js)
needs some extension for the vaultFactory and/or scaledPriceAuthority
upgrades?
  • Loading branch information
mergify[bot] authored Jun 3, 2024
2 parents 8830a6e + 147ee96 commit 440d7a8
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 160 deletions.
2 changes: 1 addition & 1 deletion a3p-integration/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"agoricSyntheticChain": {
"fromTag": "use-upgrade-14"
"fromTag": "latest"
},
"scripts": {
"build": "yarn run build:sdk && yarn run build:submissions && yarn run build:synthetic-chain",
Expand Down
36 changes: 0 additions & 36 deletions a3p-integration/proposals/a:upgrade-next/exit-reclaim.test.js

This file was deleted.

97 changes: 0 additions & 97 deletions a3p-integration/proposals/a:upgrade-next/exitOffer.js

This file was deleted.

20 changes: 0 additions & 20 deletions a3p-integration/proposals/a:upgrade-next/prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,3 @@ set -uxeo pipefail
# actions are executed in the previous chain software, and the effects are
# persisted so they can be used in the steps after the upgrade is complete,
# such as in the "use" or "test" steps, or further proposal layers.

printISTBalance() {
addr=$(agd keys show -a "$1" --keyring-backend=test)
agd query bank balances "$addr" -o json \
| jq -c '.balances[] | select(.denom=="uist")'

}

echo TEST: Offer with bad invitation
printISTBalance gov1

badInvitationOffer=$(mktemp)
cat > "$badInvitationOffer" << 'EOF'
{"body":"#{\"method\":\"executeOffer\",\"offer\":{\"id\":\"bad-invitation-15\",\"invitationSpec\":{\"callPipe\":[[\"badMethodName\"]],\"instancePath\":[\"reserve\"],\"source\":\"agoricContract\"},\"proposal\":{\"give\":{\"Collateral\":{\"brand\":\"$0.Alleged: IST brand\",\"value\":\"+15000\"}}}}}","slots":["board0257"]}
EOF

PATH=/usr/src/agoric-sdk/node_modules/.bin:$PATH
agops perf satisfaction --keyring-backend=test send --executeOffer "$badInvitationOffer" --from gov1 || true

printISTBalance gov1
1 change: 1 addition & 0 deletions a3p-integration/proposals/a:upgrade-next/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"checkJs": true,
"strict": false,
"strictNullChecks": true,
"noEmit": true,
"noImplicitThis": true
}
}
10 changes: 4 additions & 6 deletions golang/cosmos/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -895,11 +895,9 @@ func unreleasedUpgradeHandler(app *GaiaApp, targetUpgrade string) func(sdk.Conte
// Each CoreProposalStep runs sequentially, and can be constructed from
// one or more modules executing in parallel within the step.
CoreProposalSteps = []vm.CoreProposalStep{
/* upgrade-15 evals */
// Upgrade ZCF only
vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/upgrade-zcf.js"),
// Upgrade walletFactory
vm.CoreProposalStepForModules("@agoric/builders/scripts/smart-wallet/build-wallet-factory2-upgrade.js"),

// upgrade the provisioning vat
vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/replace-provisioning.js"),
// Enable low-level Orchestration.
Expand All @@ -916,11 +914,11 @@ func unreleasedUpgradeHandler(app *GaiaApp, targetUpgrade string) func(sdk.Conte
"@agoric/builders/scripts/vats/updateStkAtomPriceFeed.js",
),
// Add new auction contract. The old one will be retired shortly.
vm.CoreProposalStepForModules( "@agoric/builders/scripts/vats/add-auction.js"),
vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/add-auction.js"),
// upgrade vaultFactory.
vm.CoreProposalStepForModules( "@agoric/builders/scripts/vats/upgradeVaults.js"),
vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/upgradeVaults.js"),
// upgrade scaledPriceAuthorities.
vm.CoreProposalStepForModules( "@agoric/builders/scripts/vats/upgradeScaledPriceAuthorities.js"),
vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/upgradeScaledPriceAuthorities.js"),
}
}

Expand Down

0 comments on commit 440d7a8

Please sign in to comment.