@agoric/builders 0.1.1-other-dev-3eb1a1d.0 → 0.1.1-other-dev-d15096d.0.d15096d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/builders",
-  "version": "0.1.1-other-dev-3eb1a1d.0+3eb1a1d",
+  "version": "0.1.1-other-dev-d15096d.0.d15096d",
   "description": "Build scripts for proposals to an Agoric chain",
   "type": "module",
   "main": "./index.js",
@@ -10,50 +10,51 @@
     "build:add-STARS-proposal": "echo This command has been deprecated. Please run this instead: agoric run scripts/inter-protocol/add-STARS.js",
     "build:restart-vats-proposal": "echo This command has been deprecated. Please run this instead: agoric run scripts/vats/restart-vats.js",
     "build:zcf-proposal": "echo This command has been deprecated. Please run this instead: agoric run scripts/vats/replace-zoe.js",
-    "prepack": "tsc --build tsconfig.build.json",
-    "postpack": "git clean -f '*.d.ts*' '*.tsbuildinfo'",
+    "prepack": "yarn run -T tsc --build tsconfig.build.json",
+    "postpack": "git clean -f '*.d.*ts*' '*.tsbuildinfo'",
     "test": "ava",
     "test:xs": "exit 0",
     "lint-fix": "yarn lint:eslint --fix",
-    "lint": "run-s --continue-on-error lint:*",
-    "lint:types": "tsc",
-    "lint:eslint": "eslint ."
+    "lint": "yarn run -T run-s --continue-on-error 'lint:*'",
+    "lint:types": "yarn run -T tsc",
+    "lint:eslint": "yarn run -T eslint ."
   },
   "keywords": [],
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/ertp": "0.16.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/fast-usdc": "0.1.1-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/internal": "0.3.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/notifier": "0.6.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/smart-wallet": "0.5.4-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/vat-data": "0.5.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/vats": "0.15.2-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/zoe": "0.26.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@endo/bundle-source": "^3.5.0",
-    "@endo/captp": "^4.4.3",
-    "@endo/eventual-send": "^1.2.8",
-    "@endo/far": "^1.1.9",
-    "@endo/init": "^1.1.7",
-    "@endo/marshal": "^1.6.2",
-    "@endo/patterns": "^1.4.7",
-    "@endo/promise-kit": "^1.1.8",
-    "@endo/stream": "^1.2.8",
-    "import-meta-resolve": "^2.2.1"
+    "@agoric/client-utils": "0.1.1-other-dev-d15096d.0.d15096d",
+    "@agoric/ertp": "0.16.3-other-dev-d15096d.0.d15096d",
+    "@agoric/internal": "0.3.3-other-dev-d15096d.0.d15096d",
+    "@agoric/notifier": "0.6.3-other-dev-d15096d.0.d15096d",
+    "@agoric/smart-wallet": "0.5.4-other-dev-d15096d.0.d15096d",
+    "@agoric/vat-data": "0.5.3-other-dev-d15096d.0.d15096d",
+    "@agoric/vats": "0.15.2-other-dev-d15096d.0.d15096d",
+    "@agoric/zoe": "0.26.3-other-dev-d15096d.0.d15096d",
+    "@endo/bundle-source": "^4.1.2",
+    "@endo/captp": "^4.4.8",
+    "@endo/eventual-send": "^1.3.4",
+    "@endo/far": "^1.1.14",
+    "@endo/init": "^1.1.12",
+    "@endo/marshal": "^1.8.0",
+    "@endo/nat": "^5.1.3",
+    "@endo/patterns": "^1.7.0",
+    "@endo/promise-kit": "^1.1.13",
+    "@endo/stream": "^1.2.13",
+    "import-meta-resolve": "^4.1.0"
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.10.4-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/governance": "0.10.4-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/inter-protocol": "0.16.2-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/orchestration": "0.1.1-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/store": "0.9.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/swing-store": "0.9.2-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/swingset-liveslots": "0.10.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/time": "0.3.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@endo/errors": "^1.2.8",
+    "@agoric/deploy-script-support": "0.10.4-other-dev-d15096d.0.d15096d",
+    "@agoric/governance": "0.10.4-other-dev-d15096d.0.d15096d",
+    "@agoric/inter-protocol": "0.16.2-other-dev-d15096d.0.d15096d",
+    "@agoric/orchestration": "0.1.1-other-dev-d15096d.0.d15096d",
+    "@agoric/store": "0.9.3-other-dev-d15096d.0.d15096d",
+    "@agoric/swing-store": "0.9.2-other-dev-d15096d.0.d15096d",
+    "@agoric/swingset-liveslots": "0.10.3-other-dev-d15096d.0.d15096d",
+    "@agoric/time": "0.3.3-other-dev-d15096d.0.d15096d",
+    "@endo/errors": "^1.2.13",
     "ava": "^5.3.0",
-    "c8": "^10.1.2"
+    "c8": "^10.1.3"
   },
   "files": [
     "CHANGELOG.md",
@@ -68,7 +69,7 @@
     "access": "public"
   },
   "engines": {
-    "node": "^18.12 || ^20.9"
+    "node": "^20.9 || ^22.11"
   },
   "ava": {
     "files": [
@@ -81,7 +82,7 @@
     "workerThreads": false
   },
   "typeCoverage": {
-    "atLeast": 89.69
+    "atLeast": 90.26
   },
-  "gitHead": "3eb1a1d2d75b2b4a94807cd3bf759bc9fc531f05"
+  "gitHead": "d15096dc4ff8b96e9b6cd11954c20d3a9efbb393"
 }

package/scripts/inter-protocol/add-STARS.js

@@ -2,7 +2,12 @@ import { makeHelpers } from '@agoric/deploy-script-support';
 import { defaultProposalBuilder as vaultProposalBuilder } from './add-collateral-core.js';
 import { defaultProposalBuilder as oraclesProposalBuilder } from './price-feed-core.js';
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @type {CoreEvalBuilder} */
 const starsVaultProposalBuilder = async powers => {
   return vaultProposalBuilder(powers, {
     interchainAssetOptions: {
@@ -17,7 +22,7 @@ const starsVaultProposalBuilder = async powers => {
   });
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/** @type {CoreEvalBuilder} */
 const starsOraclesProposalBuilder = async powers => {
   return oraclesProposalBuilder(powers, {
     AGORIC_INSTANCE_NAME: `STARS-USD price feed`,
@@ -36,7 +41,7 @@ const starsOraclesProposalBuilder = async powers => {
   });
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
   await writeCoreEval('add-STARS', starsVaultProposalBuilder);

package/scripts/inter-protocol/add-collateral-core.js

@@ -5,7 +5,13 @@ import { getManifestForAddAssetToVault } from '@agoric/inter-protocol/src/propos
 import { getManifestForPsm } from '@agoric/inter-protocol/src/proposals/startPSM.js';
 import { makeInstallCache } from '@agoric/inter-protocol/src/proposals/utils.js';
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {InterchainAssetOptions} from '@agoric/inter-protocol/src/proposals/addAssetToVault.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async (
   { publishRef, install: install0, wrapInstall },
   {
@@ -15,7 +21,7 @@ export const defaultProposalBuilder = async (
   } = {},
   { env = process.env } = {},
 ) => {
-  /** @type {import('@agoric/inter-protocol/src/proposals/addAssetToVault.js').InterchainAssetOptions} */
+  /** @type {InterchainAssetOptions} */
   const {
     issuerBoardId = env.INTERCHAIN_ISSUER_BOARD_ID,
     denom = env.INTERCHAIN_DENOM,
@@ -62,7 +68,7 @@ export const defaultProposalBuilder = async (
   });
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/** @type {CoreEvalBuilder} */
 export const psmProposalBuilder = async (
   { publishRef, install: install0, wrapInstall },
   { anchorOptions = /** @type {object} */ ({}) } = {},
@@ -103,7 +109,7 @@ export const psmProposalBuilder = async (
   });
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
 

package/scripts/inter-protocol/init-core.js

@@ -14,6 +14,11 @@ import {
 } from '@agoric/inter-protocol/src/proposals/core-proposal.js';
 import { makeInstallCache } from '@agoric/inter-protocol/src/proposals/utils.js';
 
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
 // TODO end inter-package filesystem references https://github.com/Agoric/agoric-sdk/issues/8178
 
 /** @type {Record<string, Record<string, [string, string]>>} */
@@ -125,7 +130,7 @@ export const mainProposalBuilder = async ({
 };
 
 // Build proposal for sim-chain etc.
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async (
   { publishRef, install },
   options = {},
@@ -184,7 +189,7 @@ export const defaultProposalBuilder = async (
   });
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
 

package/scripts/inter-protocol/invite-committee-core.js

@@ -3,8 +3,13 @@ import { makeHelpers } from '@agoric/deploy-script-support';
 
 import { getManifestForInviteCommittee } from '@agoric/inter-protocol/src/proposals/committee-proposal.js';
 
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
 // Build proposal for sim-chain etc.
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async (
   { publishRef, install },
   options = {},
@@ -36,7 +41,7 @@ export const defaultProposalBuilder = async (
   });
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
   await writeCoreEval('gov-invite-committee', defaultProposalBuilder);

package/scripts/inter-protocol/manual-price-feed.js

@@ -4,6 +4,10 @@ import { makeNotifierFromAsyncIterable } from '@agoric/notifier';
 
 import process from 'process';
 
+/**
+ * @import {Board} from '@agoric/vats';
+ */
+
 /**
  * After extracting the oracleAdmins to entries in home.scratch, you can use one
  * from the REPL like:
@@ -22,7 +26,7 @@ import process from 'process';
  *     E(qn).getUpdateSince()
  *
  * @typedef {{
- *   board: import('@agoric/vats').Board;
+ *   board: Board;
  *   chainTimerService;
  *   scratch;
  *   zoe;

package/scripts/inter-protocol/price-feed-core.js

@@ -1,6 +1,10 @@
 /* eslint-env node */
 import { makeHelpers } from '@agoric/deploy-script-support';
 
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
 export const DEFAULT_CONTRACT_TERMS = {
   POLL_INTERVAL: 30n,
   maxSubmissionCount: 1000,
@@ -11,7 +15,7 @@ export const DEFAULT_CONTRACT_TERMS = {
   maxSubmissionValue: 2n ** 256n,
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async (
   { publishRef, install },
   options = {},

package/scripts/inter-protocol/replace-electorate-core.js

@@ -16,7 +16,13 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 import { getManifestForReplaceAllElectorates } from '@agoric/inter-protocol/src/proposals/replaceElectorate.js';
 
-/** @typedef {Parameters<typeof import('@agoric/inter-protocol/src/proposals/replaceElectorate.js').replaceAllElectorates>[1]['options']} ReplaceElectorateOptions */
+/**
+ * @import {replaceAllElectorates} from '@agoric/inter-protocol/src/proposals/replaceElectorate.js';
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @typedef {Parameters<typeof replaceAllElectorates>[1]['options']} ReplaceElectorateOptions */
 
 /** @type {Record<string, ReplaceElectorateOptions>} */
 const configurations = {
@@ -93,7 +99,7 @@ const configurations = {
 const { keys } = Object;
 const knownVariants = keys(configurations);
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async ({ publishRef, install }, opts) => {
   const config = opts.config || configurations[opts.variant];
   if (!config) {
@@ -131,7 +137,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }, opts) => {
 
 const Usage = `agoric run replace-electorate-core.js ${[...knownVariants, '<json-config>'].join(' | ')}`;
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { scriptArgs } = endowments;
   const variantOrConfig = scriptArgs?.[0];

package/scripts/inter-protocol/replace-feeDistributor-combo.js

@@ -0,0 +1,87 @@
+import { parseScriptArgs, makeHelpers } from '@agoric/deploy-script-support';
+import { getManifestForReplaceFeeDistributor } from '@agoric/inter-protocol/src/proposals/replace-fee-distributor.js';
+import { SECONDS_PER_HOUR } from '@agoric/inter-protocol/src/proposals/econ-behaviors.js';
+
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+const configurations = {
+  A3P_INTEGRATION: {
+    params: {
+      collectionInterval: 30n,
+      keywordShares: {
+        RewardDistributor: 0n,
+        Reserve: 1n,
+      },
+    },
+  },
+  MAINNET: {
+    params: {
+      collectionInterval: 1n * SECONDS_PER_HOUR,
+      keywordShares: {
+        RewardDistributor: 0n,
+        Reserve: 1n,
+      },
+    },
+  },
+  DEVNET: {
+    params: {
+      collectionInterval: 1n * SECONDS_PER_HOUR,
+      keywordShares: {
+        RewardDistributor: 0n,
+        Reserve: 1n,
+      },
+    },
+  },
+  EMERYNET: {
+    params: {
+      collectionInterval: 1n * SECONDS_PER_HOUR,
+      keywordShares: {
+        RewardDistributor: 0n,
+        Reserve: 1n,
+      },
+    },
+  },
+};
+
+const { keys } = Object;
+const knownVariants = keys(configurations);
+
+/** @type {CoreEvalBuilder} */
+export const defaultProposalBuilder = async ({ publishRef, install }, opts) => {
+  const config = opts.config || configurations[opts.variant];
+  console.log('feeDist OPTS', opts, config);
+  if (!config) {
+    const error = `Unknown variant "${opts.variant}". Expected one of ${knownVariants.join(', ')}`;
+    console.error(error);
+    throw Error(error);
+  }
+  const { params } = config;
+
+  return harden({
+    sourceSpec:
+      '@agoric/inter-protocol/src/proposals/replace-fee-distributor.js',
+    getManifestCall: [
+      getManifestForReplaceFeeDistributor.name,
+      {
+        feeDistributorRef: publishRef(
+          install('@agoric/inter-protocol/src/feeDistributor.js'),
+        ),
+        ...params,
+      },
+    ],
+  });
+};
+
+/** @type {DeployScriptFunction} */
+export default async (homeP, endowments) => {
+  const name = 'replace-feeDistributor-combo';
+  const opts = parseScriptArgs(endowments, name, knownVariants);
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+
+  await writeCoreEval('replace-feeDistributor', utils =>
+    defaultProposalBuilder(utils, opts),
+  );
+};

package/scripts/inter-protocol/replace-feeDistributor.js

@@ -2,21 +2,34 @@ import { makeHelpers } from '@agoric/deploy-script-support';
 import { getManifestForReplaceFeeDistributor } from '@agoric/inter-protocol/src/proposals/replace-fee-distributor.js';
 import { SECONDS_PER_HOUR } from '@agoric/inter-protocol/src/proposals/econ-behaviors.js';
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
-export const defaultProposalBuilder = async (_, opts) => {
-  console.log('OPTS', opts);
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @type {CoreEvalBuilder} */
+export const defaultProposalBuilder = async ({ publishRef, install }, opts) => {
+  console.log('feeDist OPTS', opts);
   return harden({
     sourceSpec:
       '@agoric/inter-protocol/src/proposals/replace-fee-distributor.js',
-    getManifestCall: [getManifestForReplaceFeeDistributor.name, { ...opts }],
+    getManifestCall: [
+      getManifestForReplaceFeeDistributor.name,
+      {
+        feeDistributorRef: publishRef(
+          install('@agoric/inter-protocol/src/feeDistributor.js'),
+        ),
+        ...opts,
+      },
+    ],
   });
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
 
-  await writeCoreEval('replace-feeDistributor-testing', utils =>
+  await writeCoreEval('replace-feeDistributor', utils =>
     defaultProposalBuilder(utils, {
       collectionInterval: 1n * SECONDS_PER_HOUR,
       keywordShares: {

package/scripts/inter-protocol/updatePriceFeeds.js

@@ -1,7 +1,11 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 import { getManifestForPriceFeeds } from '@agoric/inter-protocol/src/proposals/deploy-price-feeds.js';
 
-/** @import {PriceFeedConfig} from '@agoric/inter-protocol/src/proposals/deploy-price-feeds.js'; */
+/**
+ * @import {PriceFeedConfig} from '@agoric/inter-protocol/src/proposals/deploy-price-feeds.js';
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
 
 /** @type {Record<string, PriceFeedConfig>} */
 const configurations = {
@@ -32,7 +36,7 @@ const configurations = {
       'agoric1qj07c7vfk3knqdral0sej7fa6eavkdn8vd8etf', // Simply Staking
       'agoric10vjkvkmpp9e356xeh6qqlhrny2htyzp8hf88fk', // P2P
     ],
-    inBrandNames: ['ATOM', 'stTIA', 'stkATOM'],
+    inBrandNames: ['ATOM', 'stTIA', 'stkATOM', 'dATOM'],
   },
   EMERYNET: {
     oracleAddresses: [
@@ -41,12 +45,22 @@ const configurations = {
     ],
     inBrandNames: ['ATOM', 'stATOM', 'stOSMO', 'stTIA', 'stkATOM'],
   },
+  BOOT_TEST: {
+    oracleAddresses: [
+      'agoric144rrhh4m09mh7aaffhm6xy223ym76gve2x7y78', // DSRV
+      'agoric19d6gnr9fyp6hev4tlrg87zjrzsd5gzr5qlfq2p', // Stakin
+      'agoric19uscwxdac6cf6z7d5e26e0jm0lgwstc47cpll8', // 01node
+      'agoric1krunjcqfrf7la48zrvdfeeqtls5r00ep68mzkr', // Simply Staking
+      'agoric1n4fcxsnkxe4gj6e24naec99hzmc4pjfdccy5nj', // P2P
+    ],
+    inBrandNames: ['ATOM'],
+  },
 };
 
 const { keys } = Object;
 const knownVariants = keys(configurations);
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async ({ publishRef, install }, opts) => {
   const config = opts.config || configurations[opts.variant];
   if (!config) {
@@ -86,7 +100,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }, opts) => {
 
 const Usage = `agoric run updatePriceFeeds.js ${[...knownVariants, '<json-config>'].join(' | ')}`;
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { scriptArgs } = endowments;
   const variantOrConfig = scriptArgs?.[0];

package/scripts/inter-protocol/withdraw-reserve.build.js

@@ -0,0 +1,73 @@
+/* eslint-env node */
+import { parseArgs } from 'node:util';
+import { isNat } from '@endo/nat';
+import { makeHelpers } from '@agoric/deploy-script-support';
+import { getManifestForInviteWithdrawer } from '@agoric/inter-protocol/src/proposals/withdraw-reserve-proposal.js';
+
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/**
+ * @template {{ type: string }} T
+ * @typedef { T['type'] extends 'string' ? string : T['type'] extends 'boolean' ? boolean : (string | boolean) } TypeFromParseArgsOptionDescriptor
+ */
+
+/**
+ * @template {Record<string, { type: string, multiple?: boolean }>} T
+ * @typedef {{
+ *   [K in keyof T]: (
+ *     T[K]['multiple'] extends true
+ *       ? TypeFromParseArgsOptionDescriptor<T[K]>[]
+ *     : T[K]['multiple'] extends (false | unknown)
+ *       ? TypeFromParseArgsOptionDescriptor<T[K]>
+ *     : (TypeFromParseArgsOptionDescriptor<T[K]>[] | TypeFromParseArgsOptionDescriptor<T[K]>)
+ *   )
+ * }} CliOptions
+ */
+
+const { Fail } = assert;
+
+const cliOptions = /** @type {const} */ ({
+  address: { type: 'string', multiple: false },
+  count: { type: 'string', multiple: false },
+});
+
+/** @type {CoreEvalBuilder} */
+export const defaultProposalBuilder = async (
+  { publishRef: _publishRef, install: _install },
+  namedArgs = {},
+) => {
+  const { address, count } = namedArgs;
+
+  typeof address === 'string' || Fail`string address is required`;
+  if (count !== undefined) {
+    isNat(count) || Fail`count must be a safe natural number`;
+  }
+
+  return harden({
+    sourceSpec:
+      '@agoric/inter-protocol/src/proposals/withdraw-reserve-proposal.js',
+    getManifestCall: [getManifestForInviteWithdrawer.name, { address, count }],
+  });
+};
+
+/** @type {DeployScriptFunction} */
+export default async (homeP, endowments) => {
+  const { scriptArgs: argv } = endowments;
+  /** @type {{ values: Partial<CliOptions<typeof cliOptions>> }} */
+  const { values: rawArgs } = parseArgs({ args: argv, options: cliOptions });
+  const { address, count: rawCount } = rawArgs;
+  const count = (() => {
+    if (rawCount === undefined) return undefined;
+    /[0-9]/.test(rawCount) || Fail`--count value must be numeric`;
+    return +rawCount;
+  })();
+  const namedArgs = { address, count };
+
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+  await writeCoreEval('withdraw-reserve', utils =>
+    defaultProposalBuilder(utils, namedArgs),
+  );
+};

package/scripts/inter-protocol/withdraw-vbank-reserve-permit.json

@@ -0,0 +1,6 @@
+{
+  "consume": {
+    "agoricNames": "lookupBrands",
+    "bankManager": "getBankForAddress"
+  }
+}

package/scripts/inter-protocol/withdraw-vbank-reserve.js

@@ -0,0 +1,67 @@
+/* global E */
+/// <reference types="@agoric/vats/src/core/core-eval-env.js" />
+// @ts-check
+
+// FIXME: we need to hardcode these values because the vbank reserve purse
+// balance is not synced.
+const DEFAULT_BLD_VALUE = 1_998n;
+const DEFAULT_IST_VALUE = 202_020n;
+
+const vbankReserveAddress = 'agoric1ae0lmtzlgrcnla9xjkpaarq5d5dfez63h3nucl';
+const beneficiaryAddress = 'agoric18lfz3w97u72p4jq58gdn05ftdcv9rwz0ft5l2m';
+
+/** @param {ChainBootstrapSpace & BootstrapPowers} powers */
+const coreEval = async powers => {
+  console.warn('Core eval to transfer vbank/reserve to a beneficiary');
+  const {
+    consume: { agoricNames, bankManager },
+  } = powers;
+
+  console.warn('Looking up brands');
+  const BLD = await E(agoricNames).lookup('brand', 'BLD');
+  const IST = await E(agoricNames).lookup('brand', 'IST');
+
+  console.warn('Getting banks');
+  const reserveBank =
+    await E(bankManager).getBankForAddress(vbankReserveAddress);
+  const beneficiaryBank =
+    await E(bankManager).getBankForAddress(beneficiaryAddress);
+
+  console.warn('Getting reserve purses');
+  const reserveBLDPurse = await E(reserveBank).getPurse(BLD);
+  const reserveISTPurse = await E(reserveBank).getPurse(IST);
+
+  console.warn('Getting reserve balances');
+  const BLDAmount = await E(reserveBLDPurse).getCurrentAmount();
+  const reserveBLDBalance = harden({
+    ...BLDAmount,
+    value: BLDAmount.value || DEFAULT_BLD_VALUE,
+  });
+  const ISTAmount = await E(reserveISTPurse).getCurrentAmount();
+  const reserveISTBalance = harden({
+    ...ISTAmount,
+    value: ISTAmount.value || DEFAULT_IST_VALUE,
+  });
+  console.warn('reserve BLD balance', reserveBLDBalance);
+  console.warn('reserve IST balance', reserveISTBalance);
+
+  console.warn('Getting beneficiary purses');
+  const beneficiaryBLDPurse = await E(beneficiaryBank).getPurse(BLD);
+  const beneficiaryISTPurse = await E(beneficiaryBank).getPurse(IST);
+
+  console.warn('Withdrawing from reserve purses');
+  const BLDPayment = await E(reserveBLDPurse).withdraw(reserveBLDBalance);
+  const ISTPayment = await E(reserveISTPurse).withdraw(reserveISTBalance);
+
+  console.warn('Depositing into beneficiary purses');
+  const BLDTransferAmount = await E(beneficiaryBLDPurse).deposit(BLDPayment);
+  const ISTTransferAmount = await E(beneficiaryISTPurse).deposit(ISTPayment);
+
+  console.warn(
+    'Done withdrawing reserve!',
+    BLDTransferAmount,
+    ISTTransferAmount,
+  );
+};
+
+coreEval;