Merge branch 'master' into mhofman/10089-fix-maintainers-upgrade

.gitignore

@@ -77,4 +77,5 @@ _testoutput.txt
 
 
 junit.xml
-endo-sha.txt
+endo-sha.txt
+.aider*

a3p-integration/proposals/s:stake-bld/package.json

@@ -18,8 +18,7 @@
     "@endo/init": "^1.0.4",
     "agoric": "0.21.2-dev-5676146.0",
     "ava": "^5.3.1",
-    "execa": "^8.0.1",
-    "node-fetch": "^3.3.2"
+    "execa": "^8.0.1"
   },
   "ava": {
     "concurrency": 1

a3p-integration/proposals/s:stake-bld/test-lib/index.js

@@ -1,5 +1,4 @@
-/* global setTimeout */
-import fetch from 'node-fetch';
+/* eslint-env node */
 import { execFileSync } from 'child_process';
 import { makeWalletUtils } from './wallet.js';
 

a3p-integration/proposals/s:stake-bld/yarn.lock

@@ -2394,13 +2394,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"data-uri-to-buffer@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "data-uri-to-buffer@npm:4.0.1"
-  checksum: 10c0/20a6b93107597530d71d4cb285acee17f66bcdfc03fd81040921a81252f19db27588d87fc8fc69e1950c55cfb0bf8ae40d0e5e21d907230813eb5d5a7f9eb45b
-  languageName: node
-  linkType: hard
-
 "date-time@npm:^3.1.0":
   version: 3.1.0
   resolution: "date-time@npm:3.1.0"
@@ -2773,16 +2766,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fetch-blob@npm:^3.1.2, fetch-blob@npm:^3.1.4":
-  version: 3.2.0
-  resolution: "fetch-blob@npm:3.2.0"
-  dependencies:
-    node-domexception: "npm:^1.0.0"
-    web-streams-polyfill: "npm:^3.0.3"
-  checksum: 10c0/60054bf47bfa10fb0ba6cb7742acec2f37c1f56344f79a70bb8b1c48d77675927c720ff3191fa546410a0442c998d27ab05e9144c32d530d8a52fbe68f843b69
-  languageName: node
-  linkType: hard
-
 "figures@npm:^3.0.0":
   version: 3.2.0
   resolution: "figures@npm:3.2.0"
@@ -2866,15 +2849,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"formdata-polyfill@npm:^4.0.10":
-  version: 4.0.10
-  resolution: "formdata-polyfill@npm:4.0.10"
-  dependencies:
-    fetch-blob: "npm:^3.1.2"
-  checksum: 10c0/5392ec484f9ce0d5e0d52fb5a78e7486637d516179b0eb84d81389d7eccf9ca2f663079da56f761355c0a65792810e3b345dc24db9a8bbbcf24ef3c8c88570c6
-  languageName: node
-  linkType: hard
-
 "fs-constants@npm:^1.0.0":
   version: 1.0.0
   resolution: "fs-constants@npm:1.0.0"
@@ -3989,13 +3963,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-domexception@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "node-domexception@npm:1.0.0"
-  checksum: 10c0/5e5d63cda29856402df9472335af4bb13875e1927ad3be861dc5ebde38917aecbf9ae337923777af52a48c426b70148815e890a5d72760f1b4d758cc671b1a2b
-  languageName: node
-  linkType: hard
-
 "node-fetch@npm:^2.6.0":
   version: 2.7.0
   resolution: "node-fetch@npm:2.7.0"
@@ -4010,17 +3977,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-fetch@npm:^3.3.2":
-  version: 3.3.2
-  resolution: "node-fetch@npm:3.3.2"
-  dependencies:
-    data-uri-to-buffer: "npm:^4.0.0"
-    fetch-blob: "npm:^3.1.4"
-    formdata-polyfill: "npm:^4.0.10"
-  checksum: 10c0/f3d5e56190562221398c9f5750198b34cf6113aa304e34ee97c94fd300ec578b25b2c2906edba922050fce983338fde0d5d34fcb0fc3336ade5bd0e429ad7538
-  languageName: node
-  linkType: hard
-
 "node-gyp-build@npm:^4.4.0":
   version: 4.8.0
   resolution: "node-gyp-build@npm:4.8.0"
@@ -4592,7 +4548,6 @@ __metadata:
     agoric: "npm:0.21.2-dev-5676146.0"
     ava: "npm:^5.3.1"
     execa: "npm:^8.0.1"
-    node-fetch: "npm:^3.3.2"
   languageName: unknown
   linkType: soft
 
@@ -5207,13 +5162,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"web-streams-polyfill@npm:^3.0.3":
-  version: 3.3.3
-  resolution: "web-streams-polyfill@npm:3.3.3"
-  checksum: 10c0/64e855c47f6c8330b5436147db1c75cb7e7474d924166800e8e2aab5eb6c76aac4981a84261dd2982b3e754490900b99791c80ae1407a9fa0dcff74f82ea3a7f
-  languageName: node
-  linkType: hard
-
 "webidl-conversions@npm:^3.0.0":
   version: 3.0.1
   resolution: "webidl-conversions@npm:3.0.1"

multichain-testing/package.json

@@ -42,7 +42,6 @@
     "typescript": "^5.3.3"
   },
   "resolutions": {
-    "node-fetch": "2.6.12",
     "axios": "1.6.7"
   },
   "ava": {

multichain-testing/scripts/fetch-starship-chain-info.ts

@@ -1,15 +1,13 @@
 #!/usr/bin/env tsx
+/* eslint-env node */
 
-import nodeFetch from 'node-fetch';
 import fsp from 'node:fs/promises';
 import prettier from 'prettier';
 
 import { convertChainInfo } from '@agoric/orchestration/src/utils/registry.js';
 
 import type { IBCInfo, Chains } from '@chain-registry/types';
 
-const fetch = nodeFetch.default;
-
 /**
  * Chain registry running in Starship
  *

multichain-testing/yarn.lock

@@ -3312,17 +3312,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-fetch@npm:2.6.12":
-  version: 2.6.12
-  resolution: "node-fetch@npm:2.6.12"
+"node-fetch@npm:^2.6.12, node-fetch@npm:^2.6.7, node-fetch@npm:^2.6.9":
+  version: 2.7.0
+  resolution: "node-fetch@npm:2.7.0"
   dependencies:
     whatwg-url: "npm:^5.0.0"
   peerDependencies:
     encoding: ^0.1.0
   peerDependenciesMeta:
     encoding:
       optional: true
-  checksum: 10c0/10372e4b5ee07acadc15e6b2bc6fd8940582eea7b9b2a331f4e3665fdcd968498c1656f79f2fa572080ebb37ea80e1474a6478b3b36057ef901b63f4be8fd899
+  checksum: 10c0/b55786b6028208e6fbe594ccccc213cab67a72899c9234eb59dba51062a299ea853210fcf526998eaa2867b0963ad72338824450905679ff0fa304b8c5093ae8
   languageName: node
   linkType: hard
 

packages/SwingSet/test/gc-kernel.test.js

@@ -1031,7 +1031,7 @@ test('terminated vat', async t => {
       bootstrap: {
         sourceSpec: new URL('gc-dead-vat/bootstrap.js', import.meta.url)
           .pathname,
-        creationOptions: { managerType: 'local' },
+        creationOptions: { managerType: 'xs-worker' },
       },
     },
     bootstrap: 'bootstrap',

packages/agoric-cli/src/bin-agops.js

@@ -6,7 +6,6 @@
 
 import '@endo/init/pre.js';
 
-import '@agoric/casting/node-fetch-shim.js';
 import '@endo/init';
 
 import { E } from '@endo/far';

packages/agoric-cli/src/entrypoint.js

@@ -5,7 +5,6 @@
 
 import '@endo/init/pre.js';
 import 'esm';
-import '@agoric/casting/node-fetch-shim.js';
 import '@endo/init/legacy.js';
 
 import path from 'path';

packages/agoric-cli/test/main.test.js

@@ -1,5 +1,4 @@
 /* global globalThis */
-import '@agoric/casting/node-fetch-shim.js';
 import '@endo/init/pre.js';
 import 'esm';
 import '@endo/init/debug.js';

packages/casting/README.md

@@ -13,7 +13,6 @@ An example of following an on-chain mailbox in code (using this package) is:
 ```js
 // First, obtain a Hardened JS environment via Endo.
 import '@endo/init/pre-remoting.js'; // needed only for the next line
-import '@agoric/casting/node-fetch-shim.js'; // needed for Node.js
 import '@endo/init';
 
 import {

packages/casting/package.json

@@ -34,13 +34,11 @@
     "@endo/init": "^1.1.4",
     "@endo/lockdown": "^1.0.10",
     "@endo/marshal": "^1.5.3",
-    "@endo/promise-kit": "^1.1.5",
-    "node-fetch": "^2.6.0"
+    "@endo/promise-kit": "^1.1.5"
   },
   "devDependencies": {
     "@agoric/cosmic-proto": "^0.4.0",
     "@endo/ses-ava": "^1.2.5",
-    "@types/node-fetch": "^2.6.2",
     "ava": "^5.3.0",
     "c8": "^9.1.0",
     "express": "^4.17.1",

packages/casting/test/lockdown.js

@@ -1,3 +1,2 @@
 import '@endo/init/pre-remoting.js';
-import '../node-fetch-shim.js';
 import '@endo/init';

packages/casting/test/mvp.test.js

@@ -155,7 +155,7 @@ test('missing rpc server', async t => {
         jitter: null,
       }),
     {
-      message: /^invalid json response body/,
+      message: /^Unexpected token/,
     },
   );
 });

packages/cosmic-proto/package.json

@@ -36,10 +36,18 @@
       "types": "./dist/codegen/cosmos/bank/v1beta1/tx.d.ts",
       "default": "./dist/codegen/cosmos/bank/v1beta1/tx.js"
     },
+    "./cosmos/distribution/v1beta1/query.js": {
+      "types": "./dist/codegen/cosmos/distribution/v1beta1/query.d.ts",
+      "default": "./dist/codegen/cosmos/distribution/v1beta1/query.js"
+    },
     "./cosmos/distribution/v1beta1/tx.js": {
       "types": "./dist/codegen/cosmos/distribution/v1beta1/tx.d.ts",
       "default": "./dist/codegen/cosmos/distribution/v1beta1/tx.js"
     },
+    "./cosmos/staking/v1beta1/query.js": {
+      "types": "./dist/codegen/cosmos/staking/v1beta1/query.d.ts",
+      "default": "./dist/codegen/cosmos/staking/v1beta1/query.js"
+    },
     "./cosmos/staking/v1beta1/tx.js": {
       "types": "./dist/codegen/cosmos/staking/v1beta1/tx.d.ts",
       "default": "./dist/codegen/cosmos/staking/v1beta1/tx.js"
@@ -136,7 +144,7 @@
   "devDependencies": {
     "@agoric/cosmos": "^0.34.1",
     "@ava/typescript": "^4.1.0",
-    "@cosmology/telescope": "^1.7.1",
+    "@cosmology/telescope": "https://gitpkg.vercel.app/agoric-labs/telescope/packages/telescope?8d2c2f6ba637a5578eead09a7368dc41c262a9d0",
     "@endo/bundle-source": "^3.4.0",
     "@endo/import-bundle": "^1.2.2",
     "ava": "^5.3.1",

packages/cosmic-proto/src/codegen/binary.ts

@@ -1,6 +1,6 @@
 //@ts-nocheck
 /**
- * This file and any referenced files were automatically generated by @cosmology/telescope@1.7.1
+ * This file and any referenced files were automatically generated by @cosmology/telescope@1.8.3
  * DO NOT MODIFY BY HAND. Instead, download the latest proto files for your chain
  * and run the transpile command or npm scripts command that is used to regenerate this bundle.
  */
@@ -100,7 +100,7 @@ export class BinaryReader implements IBinaryReader {
   len: number;
 
   assertBounds(): void {
-    if (this.pos > this.len) throw RangeError('premature EOF');
+    if (this.pos > this.len) throw new RangeError('premature EOF');
   }
 
   constructor(buf?: ArrayLike<number>) {
@@ -115,7 +115,7 @@ export class BinaryReader implements IBinaryReader {
       fieldNo = tag >>> 3,
       wireType = tag & 7;
     if (fieldNo <= 0 || wireType < 0 || wireType > 5)
-      throw Error(
+      throw new Error(
         'illegal tag: field no ' + fieldNo + ' wire type ' + wireType,
       );
     return [fieldNo, wireType, tag];
@@ -214,11 +214,11 @@ export class BinaryReader implements IBinaryReader {
   }
 
   float(): number {
-    throw Error('float not supported');
+    throw new Error('float not supported');
   }
 
   double(): number {
-    throw Error('double not supported');
+    throw new Error('double not supported');
   }
 
   bool(): boolean {
@@ -466,11 +466,11 @@ export class BinaryWriter implements IBinaryWriter {
   sfixed32 = BinaryWriter.prototype.fixed32;
 
   float(value: number): BinaryWriter {
-    throw Error('float not supported' + value);
+    throw new Error('float not supported' + value);
   }
 
   double(value: number): BinaryWriter {
-    throw Error('double not supported' + value);
+    throw new Error('double not supported' + value);
   }
 
   bytes(value: Uint8Array): BinaryWriter {

packages/cosmic-proto/src/codegen/google/protobuf/descriptor.ts

@@ -31,6 +31,7 @@ export enum FieldDescriptorProto_Type {
    * treat group fields as unknown fields.
    */
   TYPE_GROUP = 10,
+  /** TYPE_MESSAGE - Length-delimited aggregate. */
   TYPE_MESSAGE = 11,
   /** TYPE_BYTES - New in version 2. */
   TYPE_BYTES = 12,
@@ -198,12 +199,9 @@ export function fieldDescriptorProto_LabelToJSON(
 }
 /** Generated classes can be optimized for speed or code size. */
 export enum FileOptions_OptimizeMode {
-  /**
-   * SPEED - Generate complete code for parsing, serialization,
-   * etc.
-   */
+  /** SPEED - Generate complete code for parsing, serialization, */
   SPEED = 1,
-  /** CODE_SIZE - Use ReflectionOps to implement these methods. */
+  /** CODE_SIZE - etc. */
   CODE_SIZE = 2,
   /** LITE_RUNTIME - Generate code using MessageLite and the lite runtime. */
   LITE_RUNTIME = 3,
@@ -393,6 +391,7 @@ export interface FileDescriptorSetSDKType {
 export interface FileDescriptorProto {
   /** file name, relative to root of source tree */
   name: string;
+  /** e.g. "foo", "foo.bar", etc. */
   package: string;
   /** Names of files imported by this file. */
   dependency: string[];