From ca92af089f28af317ee984b4d2457c19edabed36 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Thu, 29 Aug 2024 15:19:07 -0700 Subject: [PATCH 1/6] chore: Migrate eventual-send patch from 1.2.4 to 1.2.5 --- ...+eventual-send+1.2.4.patch => @endo+eventual-send+1.2.5.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename patches/{@endo+eventual-send+1.2.4.patch => @endo+eventual-send+1.2.5.patch} (100%) diff --git a/patches/@endo+eventual-send+1.2.4.patch b/patches/@endo+eventual-send+1.2.5.patch similarity index 100% rename from patches/@endo+eventual-send+1.2.4.patch rename to patches/@endo+eventual-send+1.2.5.patch From 0c605c182eceaab555e804d5ff5705e1e3f1954e Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Thu, 29 Aug 2024 16:02:03 -0700 Subject: [PATCH 2/6] chore: Migrate patch compartment-mapper 1.2.1 to 1.2.2 --- ...nt-mapper+1.2.1.patch => @endo+compartment-mapper+1.2.2.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename patches/{@endo+compartment-mapper+1.2.1.patch => @endo+compartment-mapper+1.2.2.patch} (100%) diff --git a/patches/@endo+compartment-mapper+1.2.1.patch b/patches/@endo+compartment-mapper+1.2.2.patch similarity index 100% rename from patches/@endo+compartment-mapper+1.2.1.patch rename to patches/@endo+compartment-mapper+1.2.2.patch From c92830eb79c7f93d1aa89a59632d99352117a5d2 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Tue, 27 Aug 2024 16:19:31 -0700 Subject: [PATCH 3/6] chore: Bump xsnap meter type --- packages/xsnap/api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/xsnap/api.js b/packages/xsnap/api.js index c9a498a150a..627cf7e4465 100644 --- a/packages/xsnap/api.js +++ b/packages/xsnap/api.js @@ -7,7 +7,7 @@ * Also, update golden master test/xs-perf.test.js to reflect new meter * version. */ -export const METER_TYPE = 'xs-meter-29'; +export const METER_TYPE = 'xs-meter-30'; export const ExitCode = { E_UNKNOWN_ERROR: -1, From 17213f6d6c04930def3a4568032fcf7d210aadbc Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 30 Aug 2024 22:01:11 -0700 Subject: [PATCH 4/6] chore: Sync Endo versions --- packages/agoric-cli/package.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/agoric-cli/package.json b/packages/agoric-cli/package.json index bf602136959..ecf932120b3 100644 --- a/packages/agoric-cli/package.json +++ b/packages/agoric-cli/package.json @@ -37,7 +37,7 @@ }, "dependencies": { "@agoric/access-token": "^0.4.21", - "@endo/errors": "^1.2.4", + "@endo/errors": "^1.2.5", "@agoric/cache": "^0.3.2", "@agoric/casting": "^0.4.2", "@agoric/cosmic-proto": "^0.4.0", @@ -59,16 +59,16 @@ "@cosmjs/proto-signing": "^0.32.3", "@cosmjs/stargate": "^0.32.3", "@endo/bundle-source": "^3.4.0", - "@endo/captp": "^4.2.2", - "@endo/compartment-mapper": "^1.2.1", - "@endo/env-options": "^1.1.5", - "@endo/far": "^1.1.4", - "@endo/init": "^1.1.3", - "@endo/marshal": "^1.5.2", - "@endo/nat": "^5.0.9", - "@endo/patterns": "^1.4.2", - "@endo/promise-kit": "^1.1.4", - "@endo/zip": "^1.0.6", + "@endo/captp": "^4.3.0", + "@endo/compartment-mapper": "^1.2.2", + "@endo/env-options": "^1.1.6", + "@endo/far": "^1.1.5", + "@endo/init": "^1.1.4", + "@endo/marshal": "^1.5.3", + "@endo/nat": "^5.0.10", + "@endo/patterns": "^1.4.3", + "@endo/promise-kit": "^1.1.5", + "@endo/zip": "^1.0.7", "@iarna/toml": "^2.2.3", "anylogger": "^0.21.0", "chalk": "^5.2.0", From 13a04f1cfb7651f23d7881b2cda3ca948077ae96 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 30 Aug 2024 22:02:01 -0700 Subject: [PATCH 5/6] chore: Update yarn.lock --- yarn.lock | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/yarn.lock b/yarn.lock index 37610773409..8fa51d60d36 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1509,6 +1509,17 @@ "@endo/nat" "^5.0.9" "@endo/promise-kit" "^1.1.4" +"@endo/captp@^4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@endo/captp/-/captp-4.3.0.tgz#e2a45d7447cb9c8e0a5718b314b3a92e28d29b95" + integrity sha512-tASU0w8KwqgTemzkkIrCRoBdubZZNMBgVnWieouIdnKKLT2tVnlYFZh4hmA+DFvYfBFoifLdhuaHNwI+/kaJdA== + dependencies: + "@endo/errors" "^1.2.5" + "@endo/eventual-send" "^1.2.5" + "@endo/marshal" "^1.5.3" + "@endo/nat" "^5.0.10" + "@endo/promise-kit" "^1.1.5" + "@endo/check-bundle@^1.0.8": version "1.0.8" resolved "https://registry.yarnpkg.com/@endo/check-bundle/-/check-bundle-1.0.8.tgz#804c4ec06123f0989402a4c757c3292d72ed6d94" @@ -1537,6 +1548,15 @@ "@endo/eventual-send" "^1.2.4" "@endo/promise-kit" "^1.1.4" +"@endo/common@^1.2.5": + version "1.2.5" + resolved "https://registry.yarnpkg.com/@endo/common/-/common-1.2.5.tgz#4f7a64d756dbb9a88bf8b0bef942f7943e2cd7e6" + integrity sha512-bl9s95aYe0xCJy5IbuFxhizzFQHa/wiQa5FIZK6Rm8uV5g7iS/wdfCJOdNKicxAsJWTPx96AwAmLlgEV8NdUJg== + dependencies: + "@endo/errors" "^1.2.5" + "@endo/eventual-send" "^1.2.5" + "@endo/promise-kit" "^1.1.5" + "@endo/compartment-mapper@^1.2.0", "@endo/compartment-mapper@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@endo/compartment-mapper/-/compartment-mapper-1.2.1.tgz#19875cb70cecf1a950697412864c5e71f1641725" @@ -1574,6 +1594,13 @@ dependencies: ses "^1.7.0" +"@endo/errors@^1.2.5": + version "1.2.5" + resolved "https://registry.yarnpkg.com/@endo/errors/-/errors-1.2.5.tgz#158bc584b9e648e4ca2978a240b57cb45df05c03" + integrity sha512-iZ8Kv0DoE70Z4GDoXZQK3mS3BzDnA1kSeDdE97I02ESWe9tR30TGCHW++CqbCt/lZ6bG/RBq1a6JNuOae+WKlw== + dependencies: + ses "^1.8.0" + "@endo/eslint-plugin@^2.2.0": version "2.2.0" resolved "https://registry.yarnpkg.com/@endo/eslint-plugin/-/eslint-plugin-2.2.0.tgz#4b743597f235e9355305a83f78347f87cf285a1c" @@ -1631,6 +1658,15 @@ "@endo/eventual-send" "^1.2.4" "@endo/pass-style" "^1.4.2" +"@endo/far@^1.1.5": + version "1.1.5" + resolved "https://registry.yarnpkg.com/@endo/far/-/far-1.1.5.tgz#182530eac9a3dbc129bb6bf60f4dddce1fda4523" + integrity sha512-x4D8OjzHBqMD0mjq09iZE46xbuhGDkqypE6dGGNTJkQNpMp8y6oWxvLj+Be2YQJ7dkXCZMnLfn1CcrQGhI0N2g== + dependencies: + "@endo/errors" "^1.2.5" + "@endo/eventual-send" "^1.2.5" + "@endo/pass-style" "^1.4.3" + "@endo/import-bundle@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@endo/import-bundle/-/import-bundle-1.2.1.tgz#33100eb73c87c7dea4afb62fd5d3258b16f0fc97" @@ -1688,6 +1724,18 @@ "@endo/pass-style" "^1.4.2" "@endo/promise-kit" "^1.1.4" +"@endo/marshal@^1.5.3": + version "1.5.3" + resolved "https://registry.yarnpkg.com/@endo/marshal/-/marshal-1.5.3.tgz#0eadff5442169561ab40748207a0b703b0db2c42" + integrity sha512-gRd3nVebI1CecJcaIaGY0AbDfVe/0E8N7MZ0+dOoOnk1LcqcEY8Cq9vYxIcDRkXm/buAq4cdsfxY5khAVyOr1g== + dependencies: + "@endo/common" "^1.2.5" + "@endo/errors" "^1.2.5" + "@endo/eventual-send" "^1.2.5" + "@endo/nat" "^5.0.10" + "@endo/pass-style" "^1.4.3" + "@endo/promise-kit" "^1.1.5" + "@endo/module-source@^1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@endo/module-source/-/module-source-1.0.1.tgz#c713abf5be96fd18ddb1f597f99dc42f3486f4b3" @@ -1710,6 +1758,11 @@ "@babel/types" "^7.24.0" ses "^1.8.0" +"@endo/nat@^5.0.10": + version "5.0.10" + resolved "https://registry.yarnpkg.com/@endo/nat/-/nat-5.0.10.tgz#2c843bd2ddb1587c5aaf5c489d58e1f946f52bb4" + integrity sha512-yo+wss3Ng8QXHrmjgp5AmlJ5r8nf0AdGMZjpH0C1sOvbvw9RF2v6B/RGkO0i4dANgdAyHGK9WMYTV6w9/IA2eg== + "@endo/nat@^5.0.9": version "5.0.9" resolved "https://registry.yarnpkg.com/@endo/nat/-/nat-5.0.9.tgz#0a59e58e05a5c73958e955e04d1ca6ba32a01d8d" @@ -1736,6 +1789,17 @@ "@endo/promise-kit" "^1.1.4" "@fast-check/ava" "^1.1.5" +"@endo/pass-style@^1.4.3": + version "1.4.3" + resolved "https://registry.yarnpkg.com/@endo/pass-style/-/pass-style-1.4.3.tgz#9449ce2bc297c5bcaf81fe0c4e29692b61586b52" + integrity sha512-3AGJIrflbVkvSGqSK4EAO9H2ihJ58BmzK8pp4Us5e7AJ9MH0yp5JIkYXnYI32vBUE0fJyfe2mRU06NnXJ4SX4A== + dependencies: + "@endo/env-options" "^1.1.6" + "@endo/errors" "^1.2.5" + "@endo/eventual-send" "^1.2.5" + "@endo/promise-kit" "^1.1.5" + "@fast-check/ava" "^1.1.5" + "@endo/patterns@^1.4.2": version "1.4.2" resolved "https://registry.yarnpkg.com/@endo/patterns/-/patterns-1.4.2.tgz#380e4c5563f9b3d236a152970e89c4af890e900b" @@ -1747,6 +1811,17 @@ "@endo/marshal" "^1.5.2" "@endo/promise-kit" "^1.1.4" +"@endo/patterns@^1.4.3": + version "1.4.3" + resolved "https://registry.yarnpkg.com/@endo/patterns/-/patterns-1.4.3.tgz#4f97c789421abc3112ed5535e535ebab24fae705" + integrity sha512-G7jy4YRRuU4ahPGW03mjqqKn7sTy20jXJTTAB/xZonaPxCVPY+4giYT2SVPC125NjvEAo2rcsW/qJtGW2GiC0A== + dependencies: + "@endo/common" "^1.2.5" + "@endo/errors" "^1.2.5" + "@endo/eventual-send" "^1.2.5" + "@endo/marshal" "^1.5.3" + "@endo/promise-kit" "^1.1.5" + "@endo/promise-kit@^1.1.3", "@endo/promise-kit@^1.1.4": version "1.1.4" resolved "https://registry.yarnpkg.com/@endo/promise-kit/-/promise-kit-1.1.4.tgz#1092be0b9c56861c9795475c01a7dc2f3146d6f8" From 538d5cc94725e77438f7e6fa6023ff8236217af0 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Sat, 31 Aug 2024 11:28:10 -0700 Subject: [PATCH 6/6] chore(agoric): Suppress Far crasher type error --- packages/agoric-cli/src/follow.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/agoric-cli/src/follow.js b/packages/agoric-cli/src/follow.js index 745afc5830f..d216fddb1d9 100644 --- a/packages/agoric-cli/src/follow.js +++ b/packages/agoric-cli/src/follow.js @@ -114,6 +114,7 @@ export default async function followerMain(progname, rawArgs, powers, opts) { } if (proof !== 'none') { + // @ts-expect-error followerOptions.crasher = Far('follower crasher', { crash: (...args) => { console.error(...args);