From bce49e3cb61d0fc11edeb7a63ec466c7fa9925d3 Mon Sep 17 00:00:00 2001 From: Chris Hibbert Date: Tue, 25 Jun 2024 17:36:48 -0700 Subject: [PATCH 1/2] test: add test during upgradeVaults; vaults detect new prices This test fails, and will be fixed in the subsequent commit --- .../proposals/a:upgrade-next/agd-tools.js | 6 ++++++ .../proposals/a:upgrade-next/upgradeVaults.test.js | 13 +++++++++++++ 2 files changed, 19 insertions(+) diff --git a/a3p-integration/proposals/a:upgrade-next/agd-tools.js b/a3p-integration/proposals/a:upgrade-next/agd-tools.js index 2c3fd01ad1a..67cc2d4880e 100644 --- a/a3p-integration/proposals/a:upgrade-next/agd-tools.js +++ b/a3p-integration/proposals/a:upgrade-next/agd-tools.js @@ -162,6 +162,12 @@ export const getAuctionCollateral = async index => { return body.collateralAvailable.value; }; +export const getVaultPrices = async index => { + const path = `published.vaultFactory.managers.manager${index}.quotes`; + const body = await getQuoteBody(path); + return body.quoteAmount; +}; + export const bankSend = (addr, wanted) => { const chain = ['--chain-id', CHAINID]; const from = ['--from', VALIDATORADDR]; diff --git a/a3p-integration/proposals/a:upgrade-next/upgradeVaults.test.js b/a3p-integration/proposals/a:upgrade-next/upgradeVaults.test.js index d53bed02e5b..8ede7583fe9 100644 --- a/a3p-integration/proposals/a:upgrade-next/upgradeVaults.test.js +++ b/a3p-integration/proposals/a:upgrade-next/upgradeVaults.test.js @@ -17,6 +17,7 @@ import { generateOracleMap, getLiveOffers, getPriceQuote, + getVaultPrices, pushPrices, } from './agd-tools.js'; import { getDetailsMatchingVats } from './vatDetails.js'; @@ -95,6 +96,15 @@ const checkAuctionVat = async t => { t.true(Object.keys(details).length > 2); }; +const verifyVaultPriceUpdate = async t => { + const quote = await getVaultPrices(0); + + t.true(quote.value[0].amountIn.brand.includes(' ATOM ')); + + // FAIL, should be +5200000 + t.is(quote.value[0].amountOut.value, '12010000'); +}; + // test.serial() isn't guaranteed to run tests in order, so we run the intended tests here test('liquidation post upgrade', async t => { t.log('starting upgrade vaults test'); @@ -114,4 +124,7 @@ test('liquidation post upgrade', async t => { t.log('make new auction'); await checkAuctionVat(t); + + t.log('vault price updated'); + await verifyVaultPriceUpdate(t); }); From 88f6500c051012a9d16936f07075fdfe1e3a857b Mon Sep 17 00:00:00 2001 From: Chris Hibbert Date: Tue, 25 Jun 2024 18:09:49 -0700 Subject: [PATCH 2/2] test: repair test by dropping upgrade of scaledPriceAuthorities --- .../proposals/a:upgrade-next/upgradeVaults.test.js | 4 +--- golang/cosmos/app/app.go | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/a3p-integration/proposals/a:upgrade-next/upgradeVaults.test.js b/a3p-integration/proposals/a:upgrade-next/upgradeVaults.test.js index 8ede7583fe9..1670cdd2e92 100644 --- a/a3p-integration/proposals/a:upgrade-next/upgradeVaults.test.js +++ b/a3p-integration/proposals/a:upgrade-next/upgradeVaults.test.js @@ -100,9 +100,7 @@ const verifyVaultPriceUpdate = async t => { const quote = await getVaultPrices(0); t.true(quote.value[0].amountIn.brand.includes(' ATOM ')); - - // FAIL, should be +5200000 - t.is(quote.value[0].amountOut.value, '12010000'); + t.is(quote.value[0].amountOut.value, '+5200000'); }; // test.serial() isn't guaranteed to run tests in order, so we run the intended tests here diff --git a/golang/cosmos/app/app.go b/golang/cosmos/app/app.go index 6ba478544c2..997634dd926 100644 --- a/golang/cosmos/app/app.go +++ b/golang/cosmos/app/app.go @@ -959,8 +959,6 @@ func unreleasedUpgradeHandler(app *GaiaApp, targetUpgrade string) func(sdk.Conte vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/add-auction.js"), // upgrade vaultFactory. vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/upgradeVaults.js"), - // upgrade scaledPriceAuthorities. - vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/upgradeScaledPriceAuthorities.js"), } }