Upgrade 13 (#47)

Agoric · Jan 5, 2024 · ab2422a · ab2422a
2 parents 2007e7a + 51a9306
commit ab2422a
Show file tree

Hide file tree

Showing 13 changed files with 2,047 additions and 50 deletions.
diff --git a/proposals/34:upgrade-10/actions.js b/proposals/34:upgrade-10/actions.js
@@ -9,7 +9,6 @@ import {
   executeCommand,
 } from '../../upgrade-test-scripts/lib/cliHelper.js';
 import {
-  HOME,
   ATOM_DENOM,
   GOV1ADDR,
   GOV2ADDR,
@@ -18,7 +17,7 @@ import {
 import {
   waitForBlock,
   executeOffer,
-  getUser,
+  addUser,
   provisionSmartWallet,
 } from '../../upgrade-test-scripts/lib/commonUpgradeHelpers.js';
 
@@ -200,12 +199,8 @@ const paramChangeOfferGeneration = async (
   const capData = { body: `#${JSON.stringify(body)}`, slots };
   return JSON.stringify(capData);
 };
-
 export const provisionWallet = async user => {
-  const userKeyData = await agd.keys('add', user, '--keyring-backend=test');
-  await fs.writeFile(`${HOME}/.agoric/${user}.key`, userKeyData.mnemonic);
-
-  const userAddress = await getUser(user);
+  const userAddress = await addUser(user);
 
   await provisionSmartWallet(
     userAddress,

diff --git a/proposals/49:smart-wallet-nft/core-eval-support.js b/proposals/49:smart-wallet-nft/core-eval-support.js
@@ -8,7 +8,10 @@ import { Fail, NonNullish } from '../../upgrade-test-scripts/lib/assert.js';
 
 // TODO: factor out ambient authority from these
 // or at least allow caller to supply authority.
-import { mintIST } from '../../upgrade-test-scripts/lib/econHelpers.js';
+import {
+  getISTBalance,
+  mintIST,
+} from '../../upgrade-test-scripts/lib/econHelpers.js';
 import { agoric } from '../../upgrade-test-scripts/lib/cliHelper.js';
 
 // move to unmarshal.js?
@@ -94,12 +97,6 @@ const importBundleCost = (bytes, price = 0.002) => {
  * }} ProposalInfo
  */
 
-const myISTBalance = async (agd, addr, denom = 'uist', unit = 1_000_000) => {
-  const coins = await agd.query(['bank', 'balances', addr]);
-  const coin = coins.balances.find(a => a.denom === denom);
-  return Number(coin.amount) / unit;
-};
-
 /**
  * @param {number} myIST
  * @param {number} cost
@@ -136,7 +133,7 @@ export const ensureISTForInstall = async (agd, config, bytes, { log }) => {
   log({ totalSize: bytes, cost });
   const { installer } = config;
   const addr = agd.lookup(installer);
-  const istBalance = await myISTBalance(agd, addr);
+  const istBalance = await getISTBalance(addr);
 
   if (istBalance > cost) {
     log('balance sufficient', { istBalance, cost });

diff --git a/proposals/53:kread-start/core-eval-support.js b/proposals/53:kread-start/core-eval-support.js
@@ -8,7 +8,10 @@ import { Fail, NonNullish } from '../../upgrade-test-scripts/lib/assert.js';
 
 // TODO: factor out ambient authority from these
 // or at least allow caller to supply authority.
-import { mintIST } from '../../upgrade-test-scripts/lib/econHelpers.js';
+import {
+  getISTBalance,
+  mintIST,
+} from '../../upgrade-test-scripts/lib/econHelpers.js';
 import { agoric } from '../../upgrade-test-scripts/lib/cliHelper.js';
 
 // move to unmarshal.js?
@@ -93,12 +96,6 @@ const importBundleCost = (bytes, price = 0.002) => {
  * }} ProposalInfo
  */
 
-const myISTBalance = async (agd, addr, denom = 'uist', unit = 1_000_000) => {
-  const coins = await agd.query(['bank', 'balances', addr]);
-  const coin = coins.balances.find(a => a.denom === denom);
-  return Number(coin.amount) / unit;
-};
-
 /**
  * @param {number} myIST
  * @param {number} cost
@@ -135,7 +132,7 @@ export const ensureISTForInstall = async (agd, config, bytes, { log }) => {
   log({ totalSize: bytes, cost });
   const { installer } = config;
   const addr = agd.lookup(installer);
-  const istBalance = await myISTBalance(agd, addr);
+  const istBalance = await getISTBalance(addr);
 
   if (istBalance > cost) {
     log('balance sufficient', { istBalance, cost });

diff --git a/proposals/55:statom-vaults/core-eval-support.js b/proposals/55:statom-vaults/core-eval-support.js
@@ -8,7 +8,10 @@ import { Fail, NonNullish } from '../../upgrade-test-scripts/lib/assert.js';
 
 // TODO: factor out ambient authority from these
 // or at least allow caller to supply authority.
-import { mintIST } from '../../upgrade-test-scripts/lib/econHelpers.js';
+import {
+  getISTBalance,
+  mintIST,
+} from '../../upgrade-test-scripts/lib/econHelpers.js';
 import { agoric } from '../../upgrade-test-scripts/lib/cliHelper.js';
 
 // move to unmarshal.js?
@@ -94,12 +97,6 @@ const importBundleCost = (bytes, price = 0.002) => {
  * }} ProposalInfo
  */
 
-const myISTBalance = async (agd, addr, denom = 'uist', unit = 1_000_000) => {
-  const coins = await agd.query(['bank', 'balances', addr]);
-  const coin = coins.balances.find(a => a.denom === denom);
-  return Number(coin.amount) / unit;
-};
-
 /**
  * @param {number} myIST
  * @param {number} cost
@@ -136,7 +133,7 @@ export const ensureISTForInstall = async (agd, config, bytes, { log }) => {
   log({ totalSize: bytes, cost });
   const { installer } = config;
   const addr = agd.lookup(installer);
-  const istBalance = await myISTBalance(agd, addr);
+  const istBalance = await getISTBalance(addr);
 
   if (istBalance > cost) {
     log('balance sufficient', { istBalance, cost });

diff --git a/proposals/65:upgrade-13/.yarnrc.yml b/proposals/65:upgrade-13/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/proposals/65:upgrade-13/package.json b/proposals/65:upgrade-13/package.json
@@ -0,0 +1,18 @@
+{
+  "agoricProposal": {
+    "releaseNotes": "https://github.com/Agoric/agoric-sdk/releases/tag/agoric-upgrade-13",
+    "sdkImageTag": "39",
+    "planName": "agoric-upgrade-13",
+    "type": "Software Upgrade Proposal"
+  },
+  "type": "module",
+  "license": "Apache-2.0",
+  "dependencies": {
+    "ava": "^5.3.1",
+    "execa": "^7.2.0"
+  },
+  "scripts": {
+    "agops": "yarn --cwd /usr/src/agoric-sdk/ --silent agops"
+  },
+  "packageManager": "yarn@4.0.2"
+}
diff --git a/proposals/65:upgrade-13/post.test.js b/proposals/65:upgrade-13/post.test.js
@@ -0,0 +1,55 @@
+import test from 'ava';
+
+import { agd } from '../../upgrade-test-scripts/lib/cliHelper.js';
+import {
+  ATOM_DENOM,
+  CHAINID,
+  GOV1ADDR,
+} from '../../upgrade-test-scripts/lib/constants.js';
+import {
+  mintIST,
+  getISTBalance,
+  openVault,
+} from '../../upgrade-test-scripts/lib/econHelpers.js';
+import {
+  waitForBlock,
+  addUser,
+} from '../../upgrade-test-scripts/lib/commonUpgradeHelpers.js';
+
+test.before(async t => {
+  await mintIST(GOV1ADDR, 12340000000, 10000, 2000);
+
+  await waitForBlock(2);
+  const userAddress = await addUser('user-auto');
+  await agd.tx(
+    'bank',
+    'send',
+    'gov1',
+    userAddress,
+    `1000000uist,2100000000${ATOM_DENOM}`,
+    '--from',
+    GOV1ADDR,
+    '--chain-id',
+    CHAINID,
+    '--keyring-backend',
+    'test',
+    '--yes',
+  );
+  t.context = { userAddress };
+  await waitForBlock(2);
+});
+
+test('Open Vaults with auto-provisioned wallet', async t => {
+  const { userAddress } = /** @type {{userAddress: string}} */ (t.context);
+  t.is(await getISTBalance(userAddress), 1);
+
+  const ATOMGiven = 2000;
+  const ISTWanted = 400;
+  await openVault(userAddress, ISTWanted, ATOMGiven);
+
+  await waitForBlock(2);
+
+  const newISTBalance = await getISTBalance(userAddress);
+  t.log('New IST Balance in user-auto account:', newISTBalance);
+  t.true(newISTBalance >= ISTWanted, 'Got the wanted IST');
+});
diff --git a/proposals/65:upgrade-13/test.sh b/proposals/65:upgrade-13/test.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+source /usr/src/upgrade-test-scripts/env_setup.sh
+
+yarn ava post.test.js