Skip to content

Commit

Permalink
chore(proposals): Replace use of @agoric/synthetic-chain <0.4 (merge #…
Browse files Browse the repository at this point in the history
  • Loading branch information
gibson042 authored Nov 21, 2024
2 parents fe9d05a + 9fe2d6e commit 574b2b1
Show file tree
Hide file tree
Showing 48 changed files with 871 additions and 3,873 deletions.
2 changes: 1 addition & 1 deletion proposals/16:upgrade-8/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"type": "module",
"devDependencies": {
"@agoric/synthetic-chain": "^0.0.8",
"@agoric/synthetic-chain": "~0.4.5",
"ava": "^5.3.1"
},
"scripts": {
Expand Down
42 changes: 25 additions & 17 deletions proposals/16:upgrade-8/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,25 @@ __metadata:
version: 8
cacheKey: 10c0

"@agoric/synthetic-chain@npm:^0.0.8":
version: 0.0.8
resolution: "@agoric/synthetic-chain@npm:0.0.8"
"@agoric/synthetic-chain@npm:~0.4.5":
version: 0.4.5
resolution: "@agoric/synthetic-chain@npm:0.4.5"
dependencies:
"@endo/zip": "npm:^1.0.1"
better-sqlite3: "npm:^9.4.0"
"@endo/zip": "npm:^1.0.7"
better-sqlite3: "npm:^9.6.0"
chalk: "npm:^5.3.0"
execa: "npm:^8.0.1"
cosmjs-types: "npm:^0.9.0"
execa: "npm:8.x"
bin:
synthetic-chain: dist/cli/cli.js
checksum: 10c0/6126a0c876b07235a69cfc9c6ef8dc47d1027c9e97695c28b9c1365d07aeb2736958677c90ae05f5a066d00849b50a5b510fa3df2bb8c06c8dcd771893cc084f
checksum: 10c0/f693b52550fc54faa1e04450d9e4b399c929cdd4b5a177c20790465308a66407695ef0d19ac8d69298aba8cb32a912a2b06427b012e170a7ce2f1cf6b149abd2
languageName: node
linkType: hard

"@endo/zip@npm:^1.0.1":
version: 1.0.3
resolution: "@endo/zip@npm:1.0.3"
checksum: 10c0/915e96d332b61046b59584e4f40c87db5c81a460c96d1a94da5ce90049cacb8dc86012df9008e6683dfe9f9ded6244bf53ff5a7f76270d144faf6954f479066b
"@endo/zip@npm:^1.0.7":
version: 1.0.9
resolution: "@endo/zip@npm:1.0.9"
checksum: 10c0/3fccea31bd5dad938a3b5f531454d3c49513892d6d5aba1f0af1034ff0ae54c3e28a346a9df08bd9e5201354acccd631e45c9c0e68fa2848a876a3919f3830dc
languageName: node
linkType: hard

Expand Down Expand Up @@ -290,14 +291,14 @@ __metadata:
languageName: node
linkType: hard

"better-sqlite3@npm:^9.4.0":
version: 9.4.3
resolution: "better-sqlite3@npm:9.4.3"
"better-sqlite3@npm:^9.6.0":
version: 9.6.0
resolution: "better-sqlite3@npm:9.6.0"
dependencies:
bindings: "npm:^1.5.0"
node-gyp: "npm:latest"
prebuild-install: "npm:^7.1.1"
checksum: 10c0/efc8b1440388ff0ada7bd1d41021dd5a5a9cfa440d3e66a661e3f89c8d72229de939887aa0a9b24695843f88710ff79b34c5990aaf951b55a00858801a3b134c
checksum: 10c0/8db9b38f414e26a56d4c40fc16e94a253118491dae0e2c054338a9e470f1a883c7eb4cb330f2f5737db30f704d4f2e697c59071ca04e03364ee9fe04375aa9c8
languageName: node
linkType: hard

Expand Down Expand Up @@ -559,6 +560,13 @@ __metadata:
languageName: node
linkType: hard

"cosmjs-types@npm:^0.9.0":
version: 0.9.0
resolution: "cosmjs-types@npm:0.9.0"
checksum: 10c0/bc20f4293fb34629d7c5f96bafe533987f753df957ff68eb078d0128ae5a418320cb945024441769a07bb9bc5dde9d22b972fd40d485933e5706ea191c43727b
languageName: node
linkType: hard

"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.3":
version: 7.0.3
resolution: "cross-spawn@npm:7.0.3"
Expand Down Expand Up @@ -730,7 +738,7 @@ __metadata:
languageName: node
linkType: hard

"execa@npm:^8.0.1":
"execa@npm:8.x":
version: 8.0.1
resolution: "execa@npm:8.0.1"
dependencies:
Expand Down Expand Up @@ -1830,7 +1838,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "root-workspace-0b6124@workspace:."
dependencies:
"@agoric/synthetic-chain": "npm:^0.0.8"
"@agoric/synthetic-chain": "npm:~0.4.5"
ava: "npm:^5.3.1"
languageName: unknown
linkType: soft
Expand Down
2 changes: 1 addition & 1 deletion proposals/29:upgrade-9/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"type": "module",
"devDependencies": {
"@agoric/synthetic-chain": "^0.0.7",
"@agoric/synthetic-chain": "~0.4.5",
"ava": "^5.3.1"
},
"scripts": {
Expand Down
42 changes: 25 additions & 17 deletions proposals/29:upgrade-9/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,25 @@ __metadata:
version: 8
cacheKey: 10c0

"@agoric/synthetic-chain@npm:^0.0.7":
version: 0.0.7
resolution: "@agoric/synthetic-chain@npm:0.0.7"
"@agoric/synthetic-chain@npm:~0.4.5":
version: 0.4.5
resolution: "@agoric/synthetic-chain@npm:0.4.5"
dependencies:
"@endo/zip": "npm:^1.0.1"
better-sqlite3: "npm:^9.4.0"
"@endo/zip": "npm:^1.0.7"
better-sqlite3: "npm:^9.6.0"
chalk: "npm:^5.3.0"
execa: "npm:^8.0.1"
cosmjs-types: "npm:^0.9.0"
execa: "npm:8.x"
bin:
synthetic-chain: dist/cli/cli.js
checksum: 10c0/ae53a9c4837eecc7db5020c8e0ac46f02a5a8ae6679adfe5e32365d6895f8ca8eb1da2dad3b3dc7a545ec801275b1a53d68bb0737db462ec9ea82bbcffe37374
checksum: 10c0/f693b52550fc54faa1e04450d9e4b399c929cdd4b5a177c20790465308a66407695ef0d19ac8d69298aba8cb32a912a2b06427b012e170a7ce2f1cf6b149abd2
languageName: node
linkType: hard

"@endo/zip@npm:^1.0.1":
version: 1.0.3
resolution: "@endo/zip@npm:1.0.3"
checksum: 10c0/915e96d332b61046b59584e4f40c87db5c81a460c96d1a94da5ce90049cacb8dc86012df9008e6683dfe9f9ded6244bf53ff5a7f76270d144faf6954f479066b
"@endo/zip@npm:^1.0.7":
version: 1.0.9
resolution: "@endo/zip@npm:1.0.9"
checksum: 10c0/3fccea31bd5dad938a3b5f531454d3c49513892d6d5aba1f0af1034ff0ae54c3e28a346a9df08bd9e5201354acccd631e45c9c0e68fa2848a876a3919f3830dc
languageName: node
linkType: hard

Expand Down Expand Up @@ -290,14 +291,14 @@ __metadata:
languageName: node
linkType: hard

"better-sqlite3@npm:^9.4.0":
version: 9.4.4
resolution: "better-sqlite3@npm:9.4.4"
"better-sqlite3@npm:^9.6.0":
version: 9.6.0
resolution: "better-sqlite3@npm:9.6.0"
dependencies:
bindings: "npm:^1.5.0"
node-gyp: "npm:latest"
prebuild-install: "npm:^7.1.1"
checksum: 10c0/fb1142f2b85f4f347371f0c77ae6d7f7114d7c2ba3c13ba9c2dcad36a52106b437a398f13f7bd982bf01f6ab364dcd620bbe947878c537c10fb3e07bc9ba6c47
checksum: 10c0/8db9b38f414e26a56d4c40fc16e94a253118491dae0e2c054338a9e470f1a883c7eb4cb330f2f5737db30f704d4f2e697c59071ca04e03364ee9fe04375aa9c8
languageName: node
linkType: hard

Expand Down Expand Up @@ -559,6 +560,13 @@ __metadata:
languageName: node
linkType: hard

"cosmjs-types@npm:^0.9.0":
version: 0.9.0
resolution: "cosmjs-types@npm:0.9.0"
checksum: 10c0/bc20f4293fb34629d7c5f96bafe533987f753df957ff68eb078d0128ae5a418320cb945024441769a07bb9bc5dde9d22b972fd40d485933e5706ea191c43727b
languageName: node
linkType: hard

"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.3":
version: 7.0.3
resolution: "cross-spawn@npm:7.0.3"
Expand Down Expand Up @@ -730,7 +738,7 @@ __metadata:
languageName: node
linkType: hard

"execa@npm:^8.0.1":
"execa@npm:8.x":
version: 8.0.1
resolution: "execa@npm:8.0.1"
dependencies:
Expand Down Expand Up @@ -1820,7 +1828,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "root-workspace-0b6124@workspace:."
dependencies:
"@agoric/synthetic-chain": "npm:^0.0.7"
"@agoric/synthetic-chain": "npm:~0.4.5"
ava: "npm:^5.3.1"
languageName: unknown
linkType: soft
Expand Down
16 changes: 6 additions & 10 deletions proposals/34:upgrade-10/actions.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
import assert from 'node:assert';

import {
ATOM_DENOM,
GOV1ADDR,
GOV2ADDR,
GOV3ADDR,
addUser,
agops,
agopsLocation,
agoric,
executeCommand,
} from '@agoric/synthetic-chain/src/lib/cliHelper.js';
import {
addUser,
executeOffer,
provisionSmartWallet,
waitForBlock,
} from '@agoric/synthetic-chain/src/lib/commonUpgradeHelpers.js';
import {
ATOM_DENOM,
GOV1ADDR,
GOV2ADDR,
GOV3ADDR,
} from '@agoric/synthetic-chain/src/lib/constants.js';
} from '@agoric/synthetic-chain';

const govAccounts = [GOV1ADDR, GOV2ADDR, GOV3ADDR];

Expand Down
2 changes: 1 addition & 1 deletion proposals/34:upgrade-10/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"type": "module",
"license": "Apache-2.0",
"dependencies": {
"@agoric/synthetic-chain": "^0.0.1-rc0",
"@agoric/synthetic-chain": "~0.4.5",
"ava": "^5.3.1",
"better-sqlite3": "^8.5.1",
"execa": "8.x"
Expand Down
27 changes: 11 additions & 16 deletions proposals/34:upgrade-10/performActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,26 @@

import assert from 'node:assert/strict';
import {
provisionWallet,
implementNewAuctionParams,
raiseDebtCeiling,
pushPrice,
} from './actions.js';
import {
GOV1ADDR,
GOV2ADDR,
agd,
agoric,
agops,
} from '@agoric/synthetic-chain/src/lib/cliHelper.js';
import {
GOV1ADDR,
GOV2ADDR,
} from '@agoric/synthetic-chain/src/lib/constants.js';
import {
getUser,
newOfferId,
waitForBlock,
} from '@agoric/synthetic-chain/src/lib/commonUpgradeHelpers.js';
import { submitDeliverInbound } from './upgradeHelpers.js';
import {

openVault,
adjustVault,
closeVault,
} from '@agoric/synthetic-chain/src/lib/econHelpers.js';
} from '@agoric/synthetic-chain';
import {
provisionWallet,
implementNewAuctionParams,
raiseDebtCeiling,
pushPrice,
} from './actions.js';
import { submitDeliverInbound } from './upgradeHelpers.js';

const START_FREQUENCY = 600; // StartFrequency: 600s (auction runs every 10m)
const CLOCK_STEP = 20; // ClockStep: 20s (ensures auction completes in time)
Expand Down
8 changes: 5 additions & 3 deletions proposals/34:upgrade-10/post.test.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import test from 'ava';

import { agd, agoric } from '@agoric/synthetic-chain/src/lib/cliHelper.js';
import {
GOV1ADDR,
GOV2ADDR,
GOV3ADDR,
USER1ADDR,
} from '@agoric/synthetic-chain/src/lib/constants.js';
import { calculateWalletState } from '@agoric/synthetic-chain/src/lib/commonUpgradeHelpers.js';

agd,
agoric,
calculateWalletState,
} from '@agoric/synthetic-chain';

test('DeliverInbound from un-provisioned account is discarded', async t => {
const result = await agd.query('swingset', 'mailbox', USER1ADDR);
Expand Down
15 changes: 6 additions & 9 deletions proposals/34:upgrade-10/pre.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,16 @@ import test from 'ava';

import fsp from 'node:fs/promises';

import {
agd,
agops,
agoric,
} from '@agoric/synthetic-chain/src/lib/cliHelper.js';

import { getUser } from '@agoric/synthetic-chain/src/lib/commonUpgradeHelpers.js';
import {
GOV1ADDR,
GOV2ADDR,
GOV3ADDR,
} from '@agoric/synthetic-chain/src/lib/constants.js';
import { openVault } from '@agoric/synthetic-chain/src/lib/econHelpers.js';
agd,
agops,
agoric,
getUser,
openVault,
} from '@agoric/synthetic-chain';

const PSM_PAIR = process.env.PSM_PAIR;

Expand Down
4 changes: 1 addition & 3 deletions proposals/34:upgrade-10/upgradeHelpers.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import { CHAINID } from '@agoric/synthetic-chain/src/lib/constants.js';

import { agd } from '@agoric/synthetic-chain/src/lib/cliHelper.js';
import { CHAINID, agd } from '@agoric/synthetic-chain';

// submit a DeliverInbound transaction
//
Expand Down
Loading

0 comments on commit 574b2b1

Please sign in to comment.