From abdfcca2d241947aade65003a6db43eb704840e4 Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Sun, 4 Jun 2023 22:00:49 -0600 Subject: [PATCH 01/20] ci(local-npm): resume integration testing of NPM canary --- .github/workflows/integration.yml | 21 +++++++++++++++------ .github/workflows/test-all-packages.yml | 15 --------------- packages/xsnap/package.json | 1 + packages/zoe/package.json | 2 +- 4 files changed, 17 insertions(+), 22 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index ce542ff8173..70055ce1941 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -29,9 +29,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - # FIXME: Use this to enable NPM deploys... - # cli: [link-cli, local-npm] - cli: [link-cli] + cli: [link-cli, local-npm] steps: - uses: actions/checkout@v3 with: @@ -89,6 +87,8 @@ jobs: if: ${{ matrix.cli == 'local-npm' }} run: | tmp_registry_log=`mktemp` + dist_tag=agblah + nohup npx verdaccio@^5.4.0 &>$tmp_registry_log & # Wait for `verdaccio` to boot grep -q 'http address' <(tail -f $tmp_registry_log) @@ -103,14 +103,23 @@ jobs: npm whoami + # Publish the packages to our local service. yarn lerna publish --conventional-prerelease --canary --exact \ - --dist-tag=blah --preid=dev-$(git rev-parse --short=7 HEAD) \ + --dist-tag=$dist_tag --preid=dev-$(git rev-parse --short=7 HEAD) \ --no-push --no-verify-access --yes - yarn global add agoric@blah > $GITHUB_ENV + echo "AGORIC_INSTALL_OPTIONS=[\"$dist_tag\"]" >> $GITHUB_ENV echo 'AGORIC_START_OPTIONS=["--rebuild"]' >> $GITHUB_ENV echo 'AGORIC_CMD=["agoric"]' >> $GITHUB_ENV diff --git a/.github/workflows/test-all-packages.yml b/.github/workflows/test-all-packages.yml index a1a6c167974..3725573dc7a 100644 --- a/.github/workflows/test-all-packages.yml +++ b/.github/workflows/test-all-packages.yml @@ -37,21 +37,6 @@ jobs: with: node-version: ${{ matrix.node-version }} - ################## - # NPM pack tests - # Check that all the packages can be packed to publish - npm-pack: - needs: build - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: ./.github/actions/restore-node - with: - node-version: '18.x' - - - name: npm pack - run: yarn lerna exec yarn pack - ################## # Lint tests # We run per package bc of https://github.com/typescript-eslint/typescript-eslint/issues/1192 diff --git a/packages/xsnap/package.json b/packages/xsnap/package.json index e096aba4afa..cd4970edd2a 100644 --- a/packages/xsnap/package.json +++ b/packages/xsnap/package.json @@ -48,6 +48,7 @@ "files": [ "LICENSE*", "api.js", + "build.env", "src" ], "publishConfig": { diff --git a/packages/zoe/package.json b/packages/zoe/package.json index 3174efff973..c4d2030f5db 100644 --- a/packages/zoe/package.json +++ b/packages/zoe/package.json @@ -11,7 +11,7 @@ "build": "yarn build:bundles", "build:bundles": "node scripts/build-bundles.js", "prepack": "echo \"export {}; \" | cat - tools/types-ambient.js > tools/types.js && tsc --build jsconfig.build.json", - "postpack": "git clean -f '*.d.ts*'", + "postpack": "git clean -f '*.d.ts*' tools/types.js", "test": "ava --verbose", "test:c8": "c8 $C8_OPTIONS ava --config=ava-nesm.config.js", "test:unit": "ava 'test/unitTests/**/test-*.js' -T 1m --verbose", From 21300095bcea3045e08847de6e21254b19c478b1 Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Mon, 5 Jun 2023 20:30:00 -0600 Subject: [PATCH 02/20] build(deps): tweak `package.json`s --- packages/SwingSet/package.json | 2 +- packages/store/package.json | 8 ++------ packages/swingset-liveslots/package.json | 5 ++--- packages/time/package.json | 3 ++- packages/vats/package.json | 2 ++ 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/packages/SwingSet/package.json b/packages/SwingSet/package.json index 6621d9b4ce1..90661979664 100644 --- a/packages/SwingSet/package.json +++ b/packages/SwingSet/package.json @@ -50,6 +50,7 @@ "@endo/marshal": "^0.8.5", "@endo/nat": "^4.1.27", "@endo/promise-kit": "^0.2.56", + "@endo/ses-ava": "^0.2.40", "@endo/zip": "^0.2.31", "ansi-styles": "^6.2.1", "anylogger": "^0.21.0", @@ -59,7 +60,6 @@ "tmp": "^0.2.1" }, "peerDependencies": { - "@endo/ses-ava": "^0.2.40", "ava": "^5.2.0" }, "files": [ diff --git a/packages/store/package.json b/packages/store/package.json index ff3db474d3d..324a29299bc 100644 --- a/packages/store/package.json +++ b/packages/store/package.json @@ -31,19 +31,15 @@ "homepage": "https://github.com/Agoric/agoric-sdk#readme", "dependencies": { "@agoric/assert": "^0.6.0", - "@agoric/internal": "^0.3.3-u11.0", - "@endo/eventual-send": "^0.17.2", "@endo/exo": "^0.2.2", - "@endo/far": "^0.2.18", "@endo/marshal": "^0.8.5", "@endo/pass-style": "^0.1.3", - "@endo/patterns": "^0.2.2", - "@endo/promise-kit": "^0.2.56", - "@fast-check/ava": "^1.1.3" + "@endo/patterns": "^0.2.2" }, "devDependencies": { "@agoric/swingset-vat": "^0.32.3-u11.0", "@agoric/time": "^0.3.3-u11.0", + "@endo/ses-ava": "^0.2.40", "ava": "^5.2.0" }, "files": [ diff --git a/packages/swingset-liveslots/package.json b/packages/swingset-liveslots/package.json index 589a0ed0d6d..3e3baa970cf 100644 --- a/packages/swingset-liveslots/package.json +++ b/packages/swingset-liveslots/package.json @@ -23,6 +23,7 @@ "@agoric/vat-data": "^0.5.3-u11.0", "@endo/eventual-send": "^0.17.2", "@endo/exo": "^0.2.2", + "@endo/far": "^0.2.18", "@endo/init": "^0.5.56", "@endo/marshal": "^0.8.5", "@endo/nat": "^4.1.27", @@ -30,9 +31,7 @@ "@endo/patterns": "^0.2.2", "@endo/promise-kit": "^0.2.56" }, - "peerDependencies": { - "@endo/far": "^0.2.18", - "@endo/ses-ava": "^0.2.40", + "devDependencies": { "ava": "^5.2.0" }, "files": [ diff --git a/packages/time/package.json b/packages/time/package.json index 1e865531b12..30d1a9cba93 100644 --- a/packages/time/package.json +++ b/packages/time/package.json @@ -41,7 +41,8 @@ }, "files": [ "*.js", - "NEWS.md" + "NEWS.md", + "src" ], "publishConfig": { "access": "public" diff --git a/packages/vats/package.json b/packages/vats/package.json index b568b05847e..c994cd152fe 100644 --- a/packages/vats/package.json +++ b/packages/vats/package.json @@ -65,6 +65,8 @@ "files": [ "CHANGELOG.md", "src/", + "scripts/", + "tools/", "*.json", "globals.d.ts", "exported.js" From 71a575d12ada9bab1116641a5538d556bc34d020 Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Mon, 5 Jun 2023 20:31:37 -0600 Subject: [PATCH 03/20] chore(telemetry): use newer `@opentelemetry` with matching versions --- packages/cosmic-swingset/package.json | 3 ++- packages/cosmic-swingset/src/kernel-stats.js | 12 ++++++------ packages/telemetry/package.json | 14 +++++++------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/packages/cosmic-swingset/package.json b/packages/cosmic-swingset/package.json index 2b82512652e..49d0bcc1aec 100644 --- a/packages/cosmic-swingset/package.json +++ b/packages/cosmic-swingset/package.json @@ -37,7 +37,8 @@ "@endo/nat": "^4.1.27", "@endo/promise-kit": "^0.2.56", "@iarna/toml": "^2.2.3", - "@opentelemetry/sdk-metrics": "^0.32.0", + "@opentelemetry/sdk-metrics": "~1.9.0", + "@opentelemetry/api": "~1.3.0", "anylogger": "^0.21.0", "deterministic-json": "^1.0.5", "import-meta-resolve": "^2.2.1", diff --git a/packages/cosmic-swingset/src/kernel-stats.js b/packages/cosmic-swingset/src/kernel-stats.js index 3c4d927dbac..728ecb29f9b 100644 --- a/packages/cosmic-swingset/src/kernel-stats.js +++ b/packages/cosmic-swingset/src/kernel-stats.js @@ -16,8 +16,8 @@ import { // diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.VERBOSE); -/** @typedef {import('@opentelemetry/api-metrics').MetricAttributes} Attributes */ -/** @typedef {import('@opentelemetry/api-metrics').Histogram} Histogram */ +/** @typedef {import('@opentelemetry/api').MetricAttributes} Attributes */ +/** @typedef {import('@opentelemetry/api').Histogram} Histogram */ import { getTelemetryProviders as getTelemetryProvidersOriginal } from '@agoric/telemetry'; @@ -111,7 +111,7 @@ export function getTelemetryProviders(powers = {}) { } /** - * @param {import('@opentelemetry/api-metrics').Meter} metricMeter + * @param {import('@opentelemetry/api').Meter} metricMeter * @param {string} name */ function createHistogram(metricMeter, name) { @@ -121,8 +121,8 @@ function createHistogram(metricMeter, name) { /** * @param {{ - * metricMeter: import('@opentelemetry/api-metrics').Meter, - * attributes?: import('@opentelemetry/api-metrics').MetricAttributes, + * metricMeter: import('@opentelemetry/api').Meter, + * attributes?: import('@opentelemetry/api').MetricAttributes, * }} param0 */ export function makeSlogCallbacks({ metricMeter, attributes = {} }) { @@ -284,7 +284,7 @@ export function makeInboundQueueMetrics(initialLength) { /** * @param {object} param0 * @param {any} param0.controller - * @param {import('@opentelemetry/api-metrics').Meter} param0.metricMeter + * @param {import('@opentelemetry/api').Meter} param0.metricMeter * @param {Console} param0.log * @param {Attributes} [param0.attributes] * @param {any} [param0.inboundQueueMetrics] diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index 00a633c005a..69f3172ca9f 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -28,13 +28,13 @@ "@endo/init": "^0.5.56", "@endo/marshal": "^0.8.5", "@endo/stream": "^0.3.25", - "@opentelemetry/api": "^1.1.0", - "@opentelemetry/exporter-prometheus": "^0.32.0", - "@opentelemetry/exporter-trace-otlp-http": "^0.32.0", - "@opentelemetry/resources": "^1.6.0", - "@opentelemetry/sdk-metrics": "^0.32.0", - "@opentelemetry/sdk-trace-base": "^1.6.0", - "@opentelemetry/semantic-conventions": "^1.6.0", + "@opentelemetry/api": "~1.3.0", + "@opentelemetry/exporter-prometheus": "~0.35.0", + "@opentelemetry/exporter-trace-otlp-http": "~0.35.0", + "@opentelemetry/resources": "~1.9.0", + "@opentelemetry/sdk-metrics": "~1.9.0", + "@opentelemetry/sdk-trace-base": "~1.9.0", + "@opentelemetry/semantic-conventions": "~1.9.0", "anylogger": "^0.21.0", "better-sqlite3": "^8.2.0", "bufferfromfile": "agoric-labs/BufferFromFile#Agoric-built", From f4a2e7184cedbe209c886e398fbfc745a28126fe Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Mon, 5 Jun 2023 00:56:42 -0600 Subject: [PATCH 04/20] build(deps): refresh `yarn.lock` --- yarn.lock | 147 +++++++++++++++++++++++++----------------------------- 1 file changed, 69 insertions(+), 78 deletions(-) diff --git a/yarn.lock b/yarn.lock index 4bdb1166ef6..bfb4eb1615b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2761,94 +2761,85 @@ "@types/sinon-chai" "^3.2.3" chai-a11y-axe "^1.3.2" -"@opentelemetry/api-metrics@0.32.0": - version "0.32.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/api-metrics/-/api-metrics-0.32.0.tgz#0f09f78491a4b301ddf54a8b8a38ffa99981f645" - integrity sha512-g1WLhpG8B6iuDyZJFRGsR+JKyZ94m5LEmY2f+duEJ9Xb4XRlLHrZvh6G34OH6GJ8iDHxfHb/sWjJ1ZpkI9yGMQ== +"@opentelemetry/api@~1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.3.0.tgz#27c6f776ac3c1c616651e506a89f438a0ed6a055" + integrity sha512-YveTnGNsFFixTKJz09Oi4zYkiLT5af3WpZDu4aIUM7xX+2bHAkOJayFTVQd6zB8kkWPpbua4Ha6Ql00grdLlJQ== + +"@opentelemetry/core@1.9.1": + version "1.9.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.9.1.tgz#e343337e1a7bf30e9a6aef3ef659b9b76379762a" + integrity sha512-6/qon6tw2I8ZaJnHAQUUn4BqhTbTNRS0WP8/bA0ynaX+Uzp/DDbd0NS0Cq6TMlh8+mrlsyqDE7mO50nmv2Yvlg== dependencies: - "@opentelemetry/api" "^1.0.0" + "@opentelemetry/semantic-conventions" "1.9.1" -"@opentelemetry/api@^1.0.0", "@opentelemetry/api@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.1.0.tgz#563539048255bbe1a5f4f586a4a10a1bb737f44a" - integrity sha512-hf+3bwuBwtXsugA2ULBc95qxrOqP2pOekLz34BJhcAKawt94vfeNyUKpYc0lZQ/3sCP6LqRa7UAdHA7i5UODzQ== +"@opentelemetry/exporter-prometheus@~0.35.0": + version "0.35.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-prometheus/-/exporter-prometheus-0.35.1.tgz#c2fd5fcd17dac8106b33e5d354d98c47ebaa8804" + integrity sha512-HeCM+1C19Ccj1D3lz450HaPZSxHvd9nGalRKMYUWc4ipga6rJIUHDAaIm4uanRaEgesrRnullkO4/G0dJsYKsg== + dependencies: + "@opentelemetry/core" "1.9.1" + "@opentelemetry/resources" "1.9.1" + "@opentelemetry/sdk-metrics" "1.9.1" -"@opentelemetry/core@1.6.0": - version "1.6.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.6.0.tgz#c55f8ab7496acef7dbd8c4eedef6a4d4a0143c95" - integrity sha512-MsEhsyCTfYme6frK8/AqEWwbS9SB3Ta5bjgz4jPQJjL7ijUM3JiLVvqh/kHo1UlUjbUbLmGG7jA5Nw4d7SMcLQ== - dependencies: - "@opentelemetry/semantic-conventions" "1.6.0" - -"@opentelemetry/exporter-prometheus@^0.32.0": - version "0.32.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-prometheus/-/exporter-prometheus-0.32.0.tgz#59c50a4fa5a441187185d6e365c4f2d538804b60" - integrity sha512-hStiju3e+jjecS4nA6r4c+pX0MQiTm5J8vVMwxfEe98oYVks1xMut7NZqtUweFcQ0bcUnLQGJ/ROwAsU4OHDDw== - dependencies: - "@opentelemetry/api-metrics" "0.32.0" - "@opentelemetry/core" "1.6.0" - "@opentelemetry/sdk-metrics" "0.32.0" - -"@opentelemetry/exporter-trace-otlp-http@^0.32.0": - version "0.32.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.32.0.tgz#55773290a221855c4e8c422e8fb5e7ff4aa5f04e" - integrity sha512-8n44NDoEFoYG3mMToZxNyUKkHSGfzSShw6I2V5FApcH7rid20LmKiNuzc7lACneDIZBld+GGpLRuFhWniW8JhA== - dependencies: - "@opentelemetry/core" "1.6.0" - "@opentelemetry/otlp-exporter-base" "0.32.0" - "@opentelemetry/otlp-transformer" "0.32.0" - "@opentelemetry/resources" "1.6.0" - "@opentelemetry/sdk-trace-base" "1.6.0" - -"@opentelemetry/otlp-exporter-base@0.32.0": - version "0.32.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.32.0.tgz#37dde162835a8fd23fa040f07e2938deb335fc4b" - integrity sha512-Dscxu4VNKrkD1SwGKdc7bAtLViGFJC8ah6Dr/vZn22NFHXSa53lSzDdTKeSTNNWH9sCGu/65LS45VMd4PsRvwQ== - dependencies: - "@opentelemetry/core" "1.6.0" - -"@opentelemetry/otlp-transformer@0.32.0": - version "0.32.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-transformer/-/otlp-transformer-0.32.0.tgz#652c8f4c56c95f7d7ec39e20573b885d27ca13f1" - integrity sha512-PFAqfKgJpTOZryPe1UMm7R578PLxsK0wCAuKSt6m8v1bN/4DO8DX4HD7k3mYGZVU5jNg8tVZSwyIpY6ryrHDMQ== - dependencies: - "@opentelemetry/api-metrics" "0.32.0" - "@opentelemetry/core" "1.6.0" - "@opentelemetry/resources" "1.6.0" - "@opentelemetry/sdk-metrics" "0.32.0" - "@opentelemetry/sdk-trace-base" "1.6.0" - -"@opentelemetry/resources@1.6.0", "@opentelemetry/resources@^1.6.0": - version "1.6.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.6.0.tgz#9756894131b9b0dfbcc0cecb5d4bd040d9c1b09d" - integrity sha512-07GlHuq72r2rnJugYVdGumviQvfrl8kEPidkZSVoseLVfIjV7nzxxt5/vqs9pK7JItWOrvjRdr/jTBVayFBr/w== +"@opentelemetry/exporter-trace-otlp-http@~0.35.0": + version "0.35.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.35.1.tgz#9bf988f91fb145b29a051bce8ff5ef85029ca575" + integrity sha512-EJgAsrvscKsqb/GzF1zS74vM+Z/aQRhrFE7hs/1GK1M9bLixaVyMGwg2pxz1wdYdjxS1mqpHMhXU+VvMvFCw1w== dependencies: - "@opentelemetry/core" "1.6.0" - "@opentelemetry/semantic-conventions" "1.6.0" + "@opentelemetry/core" "1.9.1" + "@opentelemetry/otlp-exporter-base" "0.35.1" + "@opentelemetry/otlp-transformer" "0.35.1" + "@opentelemetry/resources" "1.9.1" + "@opentelemetry/sdk-trace-base" "1.9.1" -"@opentelemetry/sdk-metrics@0.32.0", "@opentelemetry/sdk-metrics@^0.32.0": - version "0.32.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-metrics/-/sdk-metrics-0.32.0.tgz#463cd3a2b267f044db9aaab85887a171710345a0" - integrity sha512-zC9RCOIsXRqOHWmWfcxArtDHbip2/jaIH1yu/OKau/shDZYFluAxY6zAEYIb4YEAzKKEF+fpaoRgpodDWNGVGA== +"@opentelemetry/otlp-exporter-base@0.35.1": + version "0.35.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.35.1.tgz#535166608d5d36e6c959b2857d01245ee3a916b1" + integrity sha512-Sc0buJIs8CfUeQCL/12vDDjBREgsqHdjboBa/kPQDgMf008OBJSM02Ijj6T1TH+QVHl/VHBBEVJF+FTf0EH9Vg== dependencies: - "@opentelemetry/api-metrics" "0.32.0" - "@opentelemetry/core" "1.6.0" - "@opentelemetry/resources" "1.6.0" + "@opentelemetry/core" "1.9.1" + +"@opentelemetry/otlp-transformer@0.35.1": + version "0.35.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-transformer/-/otlp-transformer-0.35.1.tgz#d4333b71324b83dbb1b0b3a4cfd769b3e214c6f9" + integrity sha512-c0HXcJ49MKoWSaA49J8PXlVx48CeEFpL0odP6KBkVT+Bw6kAe8JlI3mIezyN05VCDJGtS2I5E6WEsE+DJL1t9A== + dependencies: + "@opentelemetry/core" "1.9.1" + "@opentelemetry/resources" "1.9.1" + "@opentelemetry/sdk-metrics" "1.9.1" + "@opentelemetry/sdk-trace-base" "1.9.1" + +"@opentelemetry/resources@1.9.1", "@opentelemetry/resources@~1.9.0": + version "1.9.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.9.1.tgz#5ad3d80ba968a3a0e56498ce4bc82a6a01f2682f" + integrity sha512-VqBGbnAfubI+l+yrtYxeLyOoL358JK57btPMJDd3TCOV3mV5TNBmzvOfmesM4NeTyXuGJByd3XvOHvFezLn3rQ== + dependencies: + "@opentelemetry/core" "1.9.1" + "@opentelemetry/semantic-conventions" "1.9.1" + +"@opentelemetry/sdk-metrics@1.9.1", "@opentelemetry/sdk-metrics@~1.9.0": + version "1.9.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-metrics/-/sdk-metrics-1.9.1.tgz#babc162a81df9884c16b1e67c2dd26ab478f3080" + integrity sha512-AyhKDcA8NuV7o1+9KvzRMxNbATJ8AcrutKilJ6hWSo9R5utnzxgffV4y+Hp4mJn84iXxkv+CBb99GOJ2A5OMzA== + dependencies: + "@opentelemetry/core" "1.9.1" + "@opentelemetry/resources" "1.9.1" lodash.merge "4.6.2" -"@opentelemetry/sdk-trace-base@1.6.0", "@opentelemetry/sdk-trace-base@^1.6.0": - version "1.6.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.6.0.tgz#8b1511c0b0f3e6015e345f5ed4a683adf03e3e3c" - integrity sha512-yx/uuzHdT0QNRSEbCgXHc0GONk90uvaFcPGaNowIFSl85rTp4or4uIIMkG7R8ckj8xWjDSjsaztH6yQxoZrl5g== +"@opentelemetry/sdk-trace-base@1.9.1", "@opentelemetry/sdk-trace-base@~1.9.0": + version "1.9.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.9.1.tgz#c349491b432a7e0ae7316f0b48b2d454d79d2b84" + integrity sha512-Y9gC5M1efhDLYHeeo2MWcDDMmR40z6QpqcWnPCm4Dmh+RHAMf4dnEBBntIe1dDpor686kyU6JV1D29ih1lZpsQ== dependencies: - "@opentelemetry/core" "1.6.0" - "@opentelemetry/resources" "1.6.0" - "@opentelemetry/semantic-conventions" "1.6.0" + "@opentelemetry/core" "1.9.1" + "@opentelemetry/resources" "1.9.1" + "@opentelemetry/semantic-conventions" "1.9.1" -"@opentelemetry/semantic-conventions@1.6.0", "@opentelemetry/semantic-conventions@^1.6.0": - version "1.6.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.6.0.tgz#ed410c9eb0070491cff9fe914246ce41f88d6f74" - integrity sha512-aPfcBeLErM/PPiAuAbNFLN5sNbZLc3KZlar27uohllN8Zs6jJbHyJU1y7cMA6W/zuq+thkaG8mujiS+3iD/FWQ== +"@opentelemetry/semantic-conventions@1.9.1", "@opentelemetry/semantic-conventions@~1.9.0": + version "1.9.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.9.1.tgz#ad3367684a57879392513479e0a436cb2ac46dad" + integrity sha512-oPQdbFDmZvjXk5ZDoBGXG8B4tSB/qW5vQunJWQMFUBp7Xe8O1ByPANueJ+Jzg58esEBegyyxZ7LRmfJr7kFcFg== "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": version "1.1.2" From f1e710937cd25fc261ca34c670c206fbaed583d3 Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Mon, 5 Jun 2023 00:57:17 -0600 Subject: [PATCH 05/20] fix(deploy-scripts-support): correct bare module resolution --- packages/deploy-script-support/src/extract-proposal.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/deploy-script-support/src/extract-proposal.js b/packages/deploy-script-support/src/extract-proposal.js index 5cd2bba1a0f..ea539b145b0 100644 --- a/packages/deploy-script-support/src/extract-proposal.js +++ b/packages/deploy-script-support/src/extract-proposal.js @@ -35,6 +35,11 @@ const pathResolve = (...paths) => { } }; +const findModule = (initDir, srcSpec) => + srcSpec.match(/^(\.\.?)?\//) + ? pathResolve(initDir, srcSpec) + : req.resolve(srcSpec); + /** * Format core proposals to be run at bootstrap: * SwingSet `bundles` configuration @@ -99,12 +104,12 @@ export const extractCoreProposalBundles = async ( const thisProposalBundleHandles = new Set(); assert(getSequenceForProposal); const thisProposalSequence = getSequenceForProposal(i); - const initPath = pathResolve(dirname, module); + const initPath = findModule(dirname, module); const initDir = path.dirname(initPath); /** @type {Record} */ const ns = await import(initPath); const install = (srcSpec, bundlePath) => { - const absoluteSrc = pathResolve(initDir, srcSpec); + const absoluteSrc = findModule(initDir, srcSpec); const bundleHandle = {}; const absolutePaths = { source: absoluteSrc }; if (bundlePath) { From 790e35352070de57ba17fe6f1ebf6463a016f163 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Thu, 3 Aug 2023 16:50:41 -0400 Subject: [PATCH 06/20] ci: timeout agoric-cli integration-test often takes 20min in production. allow 40 for future cases (e.g. Endo) --- .github/workflows/integration.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 70055ce1941..75690436cdd 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -30,6 +30,7 @@ jobs: strategy: matrix: cli: [link-cli, local-npm] + timeout-minutes: 40 steps: - uses: actions/checkout@v3 with: From 6c7f54ccbf3866a9623c76995ccd3bf8afe61d73 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Tue, 25 Jul 2023 09:59:18 -0700 Subject: [PATCH 07/20] ci: lerna publish sequentially workaround for #8091 --- .github/workflows/after-merge.yml | 3 ++- .github/workflows/integration.yml | 3 ++- MAINTAINERS.md | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/after-merge.yml b/.github/workflows/after-merge.yml index 6e12ce1919e..31c8ef4d31a 100644 --- a/.github/workflows/after-merge.yml +++ b/.github/workflows/after-merge.yml @@ -61,7 +61,8 @@ jobs: # Just a dev release. TAG=dev fi - yarn lerna publish --conventional-prerelease --canary --exact \ + # without concurrency until https://github.com/Agoric/agoric-sdk/issues/8091 + yarn lerna publish --concurrency 1 --conventional-prerelease --canary --exact \ --dist-tag=$TAG --preid=$TAG-$(git rev-parse --short=7 HEAD) \ --no-push --no-verify-access --yes - name: notify on failure diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 75690436cdd..6c8ee19c6f8 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -105,7 +105,8 @@ jobs: npm whoami # Publish the packages to our local service. - yarn lerna publish --conventional-prerelease --canary --exact \ + # without concurrency until https://github.com/Agoric/agoric-sdk/issues/8091 + yarn lerna publish --concurrency 1 --conventional-prerelease --canary --exact \ --dist-tag=$dist_tag --preid=dev-$(git rev-parse --short=7 HEAD) \ --no-push --no-verify-access --yes diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 7dc7baba75d..86f89600357 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -158,7 +158,8 @@ to pass. ```sh # Publish to NPM. NOTE: You may have to repeat this several times if there are failures. -yarn lerna publish from-package +# without concurrency until https://github.com/Agoric/agoric-sdk/issues/8091 +yarn lerna publish --concurrency 1 from-package ``` - [ ] Merge the release PR into the base branch. DO NOT REBASE OR SQUASH OR YOU WILL LOSE From c7e08e18b4899c2275cef4bcf7cbfd784ab265d2 Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Thu, 24 Aug 2023 12:51:34 -0600 Subject: [PATCH 08/20] ci(getting-started): run (but ignore) checks with `npm` and `npx` --- .github/workflows/integration.yml | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 6c8ee19c6f8..dfcb20b2fa8 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - cli: [link-cli, local-npm] + cli: [link-cli, local-npm/npm, local-npm/npx, local-npm/yarn] timeout-minutes: 40 steps: - uses: actions/checkout@v3 @@ -85,7 +85,7 @@ jobs: echo "AGORIC_CMD=[\"$HOME/bin/agoric\"]" >> $GITHUB_ENV - name: Start local NPM registry - if: ${{ matrix.cli == 'local-npm' }} + if: ${{ startsWith(matrix.cli, 'local-npm') }} run: | tmp_registry_log=`mktemp` dist_tag=agblah @@ -118,16 +118,31 @@ jobs: fi # Install the Agoric CLI on this machine's $PATH. - yarn global add agoric@$dist_tag > $GITHUB_ENV echo 'AGORIC_START_OPTIONS=["--rebuild"]' >> $GITHUB_ENV - echo 'AGORIC_CMD=["agoric"]' >> $GITHUB_ENV + echo "AGORIC_CMD=$AGORIC_CMD" >> $GITHUB_ENV - name: run agoric-cli integration-test working-directory: ./packages/agoric-cli run: yarn integration-test + # TODO(mfig): remove this `continue` line when the next Endo release + # (after 2023-08-23) is incorporated in Agoric SDK. + continue-on-error: ${{ startsWith(matrix.cli, 'local-npm/np') }} env: AGORIC_INIT_OPTIONS: '["--dapp-branch=${{steps.get-branch.outputs.result}}"]' # Try to avoid hitting a pessimal Actions output rate-limitation. From 2636f4e0741e1ad1075644f50624c6d5245c2525 Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Fri, 25 Aug 2023 13:52:46 -0600 Subject: [PATCH 09/20] chore(deployment): properly set `packageJson.name` --- packages/agoric-cli/src/sdk-package-names.js | 2 +- packages/deployment/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/agoric-cli/src/sdk-package-names.js b/packages/agoric-cli/src/sdk-package-names.js index d9582d25f0e..06a0f9c5ac4 100644 --- a/packages/agoric-cli/src/sdk-package-names.js +++ b/packages/agoric-cli/src/sdk-package-names.js @@ -10,6 +10,7 @@ export default [ "@agoric/cosmic-swingset", "@agoric/cosmos", "@agoric/deploy-script-support", + "@agoric/deployment", "@agoric/ertp", "@agoric/eslint-config", "@agoric/governance", @@ -24,7 +25,6 @@ export default [ "@agoric/solo", "@agoric/sparse-ints", "@agoric/spawner", - "@agoric/ssh-node", "@agoric/stat-logger", "@agoric/store", "@agoric/swing-store", diff --git a/packages/deployment/package.json b/packages/deployment/package.json index d69ead1c80b..5540008acb0 100644 --- a/packages/deployment/package.json +++ b/packages/deployment/package.json @@ -1,5 +1,5 @@ { - "name": "@agoric/ssh-node", + "name": "@agoric/deployment", "version": "4.0.0-u11.0", "description": "Set up Agoric public chain nodes", "type": "module", From 2a4dcd15cc1efc719fde0b9a940260721dea9ee3 Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Fri, 25 Aug 2023 13:54:32 -0600 Subject: [PATCH 10/20] ci(getting-started): break out `registry.sh` --- .github/workflows/integration.yml | 69 +------------ scripts/registry.sh | 154 ++++++++++++++++++++++++++++++ 2 files changed, 159 insertions(+), 64 deletions(-) create mode 100755 scripts/registry.sh diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index dfcb20b2fa8..38231a72e44 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - cli: [link-cli, local-npm/npm, local-npm/npx, local-npm/yarn] + cli: [link-cli/yarn, registry/yarn, registry/npm, registry/npx] timeout-minutes: 40 steps: - uses: actions/checkout@v3 @@ -78,75 +78,16 @@ jobs: - run: yarn install --frozen-lockfile - run: yarn build - - name: Link Agoric CLI from SDK - if: ${{ matrix.cli == 'link-cli' }} - run: | - yarn link-cli "$HOME/bin/agoric" - echo "AGORIC_CMD=[\"$HOME/bin/agoric\"]" >> $GITHUB_ENV - - name: Start local NPM registry - if: ${{ startsWith(matrix.cli, 'local-npm') }} + if: ${{ startsWith(matrix.cli, 'registry') }} run: | - tmp_registry_log=`mktemp` - dist_tag=agblah - - nohup npx verdaccio@^5.4.0 &>$tmp_registry_log & - # Wait for `verdaccio` to boot - grep -q 'http address' <(tail -f $tmp_registry_log) - - # Set registry to local registry - npm set registry http://localhost:4873 - yarn config set registry http://localhost:4873 - - # Login so we can publish packages - npx npm-cli-login@^1.0.0 -u user -p password -e user@example.com \ - -r http://localhost:4873 --quotes - - npm whoami - - # Publish the packages to our local service. - # without concurrency until https://github.com/Agoric/agoric-sdk/issues/8091 - yarn lerna publish --concurrency 1 --conventional-prerelease --canary --exact \ - --dist-tag=$dist_tag --preid=dev-$(git rev-parse --short=7 HEAD) \ - --no-push --no-verify-access --yes - - # Git dirty check. - if [[ -n "$(git status --porcelain)" ]]; then - echo "Git status is dirty, aborting." - git status - exit 1 - fi - - # Install the Agoric CLI on this machine's $PATH. - AGORIC_CMD='["agoric"]' - case "${{ matrix.cli }}" in - */npm) - npm install -g agoric@$dist_tag > $GITHUB_ENV - echo 'AGORIC_START_OPTIONS=["--rebuild"]' >> $GITHUB_ENV - echo "AGORIC_CMD=$AGORIC_CMD" >> $GITHUB_ENV + scripts/registry.sh bg-publish ${{ matrix.cli }} - name: run agoric-cli integration-test - working-directory: ./packages/agoric-cli - run: yarn integration-test + run: scripts/registry.sh test ${{ matrix.cli }} ${{steps.get-branch.outputs.result}} # TODO(mfig): remove this `continue` line when the next Endo release # (after 2023-08-23) is incorporated in Agoric SDK. - continue-on-error: ${{ startsWith(matrix.cli, 'local-npm/np') }} - env: - AGORIC_INIT_OPTIONS: '["--dapp-branch=${{steps.get-branch.outputs.result}}"]' - # Try to avoid hitting a pessimal Actions output rate-limitation. - SOLO_MAX_DEBUG_LENGTH: '1024' + continue-on-error: ${{ startsWith(matrix.cli, 'registry/np') }} - name: notify on failure if: > diff --git a/scripts/registry.sh b/scripts/registry.sh new file mode 100755 index 00000000000..eede424205e --- /dev/null +++ b/scripts/registry.sh @@ -0,0 +1,154 @@ +#! /bin/bash + +thisdir=$(cd -- "$(dirname "$0")" >/dev/null && pwd) + +set -ueo pipefail + +# Report, export, and write an environment variable into "$GITHUB_ENV" if set. +persistVar() { + echo "$1=$2" + eval "export $1=\$2" + test -z "${GITHUB_ENV-}" || { + echo "$1=$2" >> "$GITHUB_ENV" + } +} + +runRegistry() { + # shellcheck disable=SC2155 + export HOME="$(mktemp -d -t registry-home.XXXXX)" + export PATH="$thisdir:$PATH" + + # Kill `verdaccio` when the script exits + trap 'kill $(cat "$HOME/verdaccio.pid")' EXIT + + ( + cd "$HOME" + echo "Starting Verdaccio in background..." + : > verdaccio.log + nohup npx verdaccio@^5.4.0 &>verdaccio.log & + echo $! > verdaccio.pid + + # Wait for `verdaccio` to boot + grep -q 'http address' <(tail -f verdaccio.log) + + # Set registry to local registry + npm set registry http://localhost:4873 + yarn config set registry http://localhost:4873 + + # Login so we can publish packages + npx npm-cli-login@^1.0.0 -u user -p password -e user@example.com \ + -r http://localhost:4873 --quotes + + npm whoami + ) 1>&2 +} + +publish() { + export DISTTAG=agblah + case $1 in + manual*) + flags=--no-git-tag-version + ;; + *) + flags=--canary + ;; + esac + + # Publish the packages to our local service. + # without concurrency until https://github.com/Agoric/agoric-sdk/issues/8091 + yarn lerna publish --concurrency 1 --conventional-prerelease $flags --exact \ + --dist-tag="$DISTTAG" --preid=dev"-$(git rev-parse --short=7 HEAD)" \ + --no-push --no-verify-access --yes + + # Use the locally-installed dist-tag. + persistVar REGISTRY_HOME "$HOME" + persistVar REGISTRY_DISTTAG "$DISTTAG" +} + +integrationTest() { + # Install the Agoric CLI on this machine's $PATH. + case $1 in + link-cli | link-cli/*) + yarn link-cli "$HOME/bin/agoric" + persistVar AGORIC_CMD "[\"$HOME/bin/agoric\"]" + ;; + */npm) + npm install -g "agoric@$DISTTAG" + persistVar AGORIC_CMD '["agoric"]' + ;; + */npx) + # Install on demand. + persistVar AGORIC_CMD "[\"npx\",\"agoric@$DISTTAG\"]" + ;; + *) + yarn global add "agoric@$DISTTAG" + persistVar AGORIC_CMD '["agoric"]' + ;; + esac + + test -z "${DISTTAG-}" || { + persistVar AGORIC_INSTALL_OPTIONS "[\"$DISTTAG\"]" + } + persistVar AGORIC_START_OPTIONS '["--rebuild"]' + persistVar AGORIC_INIT_OPTIONS "[\"--dapp-branch=$2\"]" + + ( + cd "$thisdir/../packages/agoric-cli" + + # Try to avoid hitting a pessimal Actions output rate-limitation. + SOLO_MAX_DEBUG_LENGTH=1024 \ + yarn integration-test + ) +} + +export CI=true +case ${1-} in +ci) + runRegistry + publish "${2-manual}" + integrationTest "${2-manual}" "${3-main}" + ;; + +bg) + runRegistry + echo "Publish packages using '$0 publish'" + trap - EXIT + echo "HOME=$HOME" + echo "pid=$(cat "$HOME/verdaccio.pid")" + ;; + +bg-publish) + runRegistry + trap - EXIT + publish "${2-registry}" + + # Git dirty check. + if [[ -n "$(git status --porcelain)" ]]; then + echo "Git status is dirty, aborting." + git status + exit 1 + fi + ;; + +publish) + publish "${2-manual}" + echo "Run getting-started integration test with '$0 test'" + ;; + +test) + test -z "${REGISTRY_HOME-}" || export HOME="$REGISTRY_HOME" + test -z "${REGISTRY_DISTTAG-}" || export DISTTAG="$REGISTRY_DISTTAG" + integrationTest "${2-manual}" "${3-main}" + ;; + +*) + runRegistry + echo "Publish packages using '$0 publish'" + # Kill `verdaccio` and remove HOME when the command shell exits + trap 'kill "$(cat "$HOME/verdaccio.pid")"; rm -rf "$HOME"' EXIT + if test $# -eq 0; then + set -- bash + fi + "$@" + ;; +esac From 9b6a2f841082f59c5fe4bc7443d4309d617b87d7 Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Fri, 25 Aug 2023 12:13:10 -0600 Subject: [PATCH 11/20] chore(inter-protocol): do not publish bundles to NPM --- packages/inter-protocol/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/inter-protocol/package.json b/packages/inter-protocol/package.json index 0f775657599..09fd0e00ef6 100644 --- a/packages/inter-protocol/package.json +++ b/packages/inter-protocol/package.json @@ -62,7 +62,6 @@ "import-meta-resolve": "^2.2.1" }, "files": [ - "bundles/", "scripts/", "src/", "exported.js", From 5e9e87da13fd414f40b3878af3f27f369f7c714b Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Sat, 2 Sep 2023 18:09:10 -0600 Subject: [PATCH 12/20] ci(integration): update for `restore-node` --- .github/actions/restore-node/action.yml | 2 +- .github/workflows/integration.yml | 24 ++++++------------------ 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/.github/actions/restore-node/action.yml b/.github/actions/restore-node/action.yml index 7ba4a992ed7..d20e3a5db63 100644 --- a/.github/actions/restore-node/action.yml +++ b/.github/actions/restore-node/action.yml @@ -75,7 +75,7 @@ runs: - uses: actions/setup-node@v3 with: node-version: ${{ inputs.node-version }} - cache: 'yarn' + cache: yarn cache-dependency-path: ${{ inputs.path }}/yarn.lock - uses: kenchan0130/actions-system-info@master id: system-info diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 38231a72e44..931154624f1 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -40,17 +40,9 @@ jobs: shell: bash # Prerequisites - - - uses: actions/setup-node@v3 - with: - node-version: '16.x' - - name: cache node modules - uses: actions/cache@v3 + - uses: ./.github/actions/restore-node with: - path: ~/.cache/yarn - key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }} - restore-keys: | - ${{ runner.os }}-yarn- + node-version: 16.x # Select a branch on dapp to test against by adding text to the body of the # pull request. For example: #dapp-encouragement-branch: zoe-release-0.7.0 @@ -73,21 +65,17 @@ jobs: console.log(branch); return branch; - # 'yarn install' must be done at the top level, to build all the - # cross-package symlinks - - run: yarn install --frozen-lockfile - - run: yarn build - - name: Start local NPM registry if: ${{ startsWith(matrix.cli, 'registry') }} run: | + set -e + git config user.name "Agoric CI" + git config user.email "noreply@agoric.com" + git diff --stat HEAD --exit-code || git commit -m 'chore: prepare for publishing' scripts/registry.sh bg-publish ${{ matrix.cli }} - name: run agoric-cli integration-test run: scripts/registry.sh test ${{ matrix.cli }} ${{steps.get-branch.outputs.result}} - # TODO(mfig): remove this `continue` line when the next Endo release - # (after 2023-08-23) is incorporated in Agoric SDK. - continue-on-error: ${{ startsWith(matrix.cli, 'registry/np') }} - name: notify on failure if: > From f46e27978bf46180f8bda784829dc62b43301140 Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Mon, 4 Sep 2023 19:28:39 -0600 Subject: [PATCH 13/20] fix(agoric): relax override mistake using `@endo/init/legacy.js` --- packages/agoric-cli/src/entrypoint.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/agoric-cli/src/entrypoint.js b/packages/agoric-cli/src/entrypoint.js index 942a040d1bf..c90ac5f0406 100755 --- a/packages/agoric-cli/src/entrypoint.js +++ b/packages/agoric-cli/src/entrypoint.js @@ -6,7 +6,7 @@ import '@endo/init/pre.js'; import 'esm'; import '@agoric/casting/node-fetch-shim.js'; -import '@endo/init'; +import '@endo/init/legacy.js'; import path from 'path'; import WebSocket from 'ws'; From 3b229d89b57c1afcca9bea59b24d3e0226926656 Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Mon, 4 Sep 2023 19:29:28 -0600 Subject: [PATCH 14/20] ci(registry): publish Endo in CI registry, update versions --- .github/actions/restore-node/action.yml | 6 +++- .github/workflows/integration.yml | 8 ++--- scripts/registry.sh | 45 +++++++++++++++++-------- scripts/set-versions.sh | 4 +-- 4 files changed, 42 insertions(+), 21 deletions(-) diff --git a/.github/actions/restore-node/action.yml b/.github/actions/restore-node/action.yml index d20e3a5db63..7763cee3042 100644 --- a/.github/actions/restore-node/action.yml +++ b/.github/actions/restore-node/action.yml @@ -9,6 +9,10 @@ inputs: description: 'The relative path to the agoric-sdk directory' required: false default: '.' + keep-endo: + description: 'Keep Endo repository after installing from it' + required: false + default: 'false' xsnap-random-init: description: Build xsnap binary with random memory init required: false @@ -100,7 +104,7 @@ runs: # Replace the Endo packages with the ones built from the checked-out branch. if test -e ~/endo; then scripts/replace-packages.sh ~/endo - rm -rf ~/endo + ${{ inputs.keep-endo }} || rm -rf ~/endo fi mkdir -p node_modules/.cache/agoric date > node_modules/.cache/agoric/yarn-installed diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 931154624f1..b765a136ec4 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -43,6 +43,7 @@ jobs: - uses: ./.github/actions/restore-node with: node-version: 16.x + keep-endo: 'true' # Select a branch on dapp to test against by adding text to the body of the # pull request. For example: #dapp-encouragement-branch: zoe-release-0.7.0 @@ -68,11 +69,10 @@ jobs: - name: Start local NPM registry if: ${{ startsWith(matrix.cli, 'registry') }} run: | - set -e - git config user.name "Agoric CI" + set -xe + git reset --hard HEAD git config user.email "noreply@agoric.com" - git diff --stat HEAD --exit-code || git commit -m 'chore: prepare for publishing' - scripts/registry.sh bg-publish ${{ matrix.cli }} + REGISTRY_PUBLISH_WORKSPACES="$HOME/endo" scripts/registry.sh bg-publish ${{ matrix.cli }} - name: run agoric-cli integration-test run: scripts/registry.sh test ${{ matrix.cli }} ${{steps.get-branch.outputs.result}} diff --git a/scripts/registry.sh b/scripts/registry.sh index eede424205e..b5f0e3ddc82 100755 --- a/scripts/registry.sh +++ b/scripts/registry.sh @@ -44,21 +44,38 @@ runRegistry() { } publish() { - export DISTTAG=agblah - case $1 in - manual*) - flags=--no-git-tag-version - ;; - *) - flags=--canary - ;; - esac + export DISTTAG=ci-test + + git config --global user.name "Agoric CI" + git config --global user.email "noreply@agoric.com" + + versions='{}' + for d in ${REGISTRY_PUBLISH_WORKSPACES-} "$thisdir/.."; do + test -d "$d" || continue + + pushd "$d" + prior=$(git branch --show-current) + test -n "$prior" || prior=$(git rev-parse HEAD) + git checkout -B lerna-publish + + echo "$versions" | "$thisdir/set-versions.sh" "$d" + + yarn install + yarn build + git commit --allow-empty -am "chore: prepare for publishing" + + # Publish the packages to our local service. + # without concurrency until https://github.com/Agoric/agoric-sdk/issues/8091 + yarn lerna publish --concurrency 1 prerelease --exact \ + --dist-tag="$DISTTAG" --preid=dev"-$(git rev-parse --short=7 HEAD)" \ + --no-push --no-git-reset --no-git-tag-version --no-verify-access --yes + + versions=$("$thisdir/get-versions.sh" . | jq "$versions + .") - # Publish the packages to our local service. - # without concurrency until https://github.com/Agoric/agoric-sdk/issues/8091 - yarn lerna publish --concurrency 1 --conventional-prerelease $flags --exact \ - --dist-tag="$DISTTAG" --preid=dev"-$(git rev-parse --short=7 HEAD)" \ - --no-push --no-verify-access --yes + git commit -am "chore: update versions" + git checkout "$prior" + popd + done # Use the locally-installed dist-tag. persistVar REGISTRY_HOME "$HOME" diff --git a/scripts/set-versions.sh b/scripts/set-versions.sh index 2ea4c030725..e1b47836c66 100755 --- a/scripts/set-versions.sh +++ b/scripts/set-versions.sh @@ -7,9 +7,9 @@ set -ueo pipefail # This is useful for consistent bulk updates over all packages. DIR=$(dirname -- "${BASH_SOURCE[0]}") -VERSIONSHASH=$(git hash-object -w --stdin) +cd -- "${1-"$DIR/.."}" -cd -- "$DIR/.." +VERSIONSHASH=$(git hash-object -w --stdin) yarn workspaces --json info | jq -r '.data | fromjson | .[].location | "\(.)/package.json"' | From 7ec59c5413f80dbaabbbbad09f355729d24da869 Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Thu, 21 Sep 2023 13:08:57 -0600 Subject: [PATCH 15/20] build(cosmos): prevent macOS `filesize exceeds vmsize` --- golang/cosmos/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/golang/cosmos/Makefile b/golang/cosmos/Makefile index 02696a0284b..3b1aee787f3 100644 --- a/golang/cosmos/Makefile +++ b/golang/cosmos/Makefile @@ -32,13 +32,18 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=$(VersionName) \ -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" gcflags = +shared_ldflags = $(ldflags) ifneq ($(GO_DEBUG),) ldflags += -compressdwarf=false gcflags += -N -l +else ifeq ($(shell uname -s 2>/dev/null),Darwin) +# Darwin's latest ld crashes with https://github.com/Agoric/agoric-sdk/issues/8367 +shared_ldflags += -w endif BUILD_FLAGS := -tags "$(build_tags)" -gcflags '$(gcflags)' -ldflags '$(ldflags)' +SHARED_BUILD_FLAGS := -tags "$(build_tags)" -gcflags '$(gcflags)' -ldflags '$(shared_ldflags)' all: compile-chain @@ -69,7 +74,8 @@ compile-gyp: rm -f binding.gyp compile-libdaemon: go-mod-cache - go build -v $(MOD_READONLY) $(BUILD_FLAGS) -buildmode=c-shared -o build/libagcosmosdaemon.so ./cmd/libdaemon/main.go + go build -v $(MOD_READONLY) $(SHARED_BUILD_FLAGS) -buildmode=c-shared \ + -o build/libagcosmosdaemon.so ./cmd/libdaemon/main.go go-mod-cache: go.sum @echo "--> Download go modules to local cache" From f59cbf33bea70499c3a5faf5bbe385d1948ed322 Mon Sep 17 00:00:00 2001 From: Mathieu Hofman Date: Thu, 21 Sep 2023 01:00:53 +0000 Subject: [PATCH 16/20] ci: jobs compatibility with release branch (#8369) --- .github/workflows/after-merge.yml | 26 ++++++++++++++------- .github/workflows/ag-solo-xs.yml.DISABLED | 2 +- .github/workflows/deployment-test.yml | 2 +- .github/workflows/docker.yml | 25 +++++++++++++------- .github/workflows/golangci-lint.yml | 2 +- .github/workflows/integration.yml | 2 +- .github/workflows/pre-check-integration.yml | 2 +- 7 files changed, 38 insertions(+), 23 deletions(-) diff --git a/.github/workflows/after-merge.yml b/.github/workflows/after-merge.yml index 31c8ef4d31a..c9a3b86d644 100644 --- a/.github/workflows/after-merge.yml +++ b/.github/workflows/after-merge.yml @@ -6,7 +6,8 @@ on: branches: # $default-branch - master - - release-pismo + - 'release-*' + workflow_dispatch: jobs: build: @@ -54,13 +55,20 @@ jobs: run: npm whoami - name: publish to NPM tag run: | - if [ "${{ github.ref_name }}" = "release-pismo" ]; then - # A pismo dev release. - TAG=pismo-dev - else - # Just a dev release. - TAG=dev - fi + case $GITHUB_REF_NAME in + release-*) + # A pre-release. + TAG=${GITHUB_REF_NAME#release-}-dev + ;; + master) + # A trunk dev release. + TAG=dev + ;; + *) + # Some other dev release. + TAG=other-dev + ;; + esac # without concurrency until https://github.com/Agoric/agoric-sdk/issues/8091 yarn lerna publish --concurrency 1 --conventional-prerelease --canary --exact \ --dist-tag=$TAG --preid=$TAG-$(git rev-parse --short=7 HEAD) \ @@ -102,7 +110,7 @@ jobs: - uses: nwtgck/actions-netlify@v1.1 with: # Production deployment if a push or merged PR. - production-deploy: ${{github.event_name == 'push'}} + production-deploy: ${{ github.event_name == 'push' && github.ref_name == 'master' }} publish-dir: coverage/html # SECURITY: we don't want to hand out the Github token to this action. # github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/ag-solo-xs.yml.DISABLED b/.github/workflows/ag-solo-xs.yml.DISABLED index 368d0f724ef..e832dd99453 100644 --- a/.github/workflows/ag-solo-xs.yml.DISABLED +++ b/.github/workflows/ag-solo-xs.yml.DISABLED @@ -8,7 +8,7 @@ on: branches: # $default-branch - master - - release-pismo + - 'release-*' jobs: xs-build: diff --git a/.github/workflows/deployment-test.yml b/.github/workflows/deployment-test.yml index c32253ee49e..5f97ecfa019 100644 --- a/.github/workflows/deployment-test.yml +++ b/.github/workflows/deployment-test.yml @@ -7,7 +7,7 @@ on: push: branches: - master - - release-pismo + - 'release-*' - beta tags: - '@agoric/sdk@*' diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d5c4cc2aa3e..bdfb8ab54e8 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -5,7 +5,7 @@ on: branches: # $default-branch - master - - release-pismo + - 'release-*' tags: - '@agoric/sdk@*' workflow_dispatch: @@ -139,16 +139,23 @@ jobs: id: docker-tags run: | set -ex - SDK_TAG=$(echo "${{ github.ref_name }}" | sed -ne 's!^@agoric/sdk@!!p') + SDK_TAG=$(echo "$GITHUB_REF_NAME" | sed -ne 's!^@agoric/sdk@!!p') case $SDK_TAG in "") - if [ "${{ github.ref_name }}" = "release-pismo" ]; then - # A pismo dev release. - DOCKER_TAGS=pismo-dev - else - # Just a dev release. - DOCKER_TAGS=dev - fi + case $GITHUB_REF_NAME in + release-*) + # A pre-release. + DOCKER_TAGS=${GITHUB_REF_NAME#release-}-dev + ;; + master) + # A trunk dev release. + DOCKER_TAGS=dev + ;; + *) + # Some other dev release. + DOCKER_TAGS=other-dev + ;; + esac ;; *) # A tagged SDK release. diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 7d1e387affe..993e5bb4f7a 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -6,7 +6,7 @@ on: branches: # $default-branch - master - - release-pismo + - 'release-*' pull_request: merge_group: permissions: diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index b765a136ec4..f46760f19e7 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -5,7 +5,7 @@ on: push: branches: - master - - release-pismo + - 'release-*' - beta pull_request: types: diff --git a/.github/workflows/pre-check-integration.yml b/.github/workflows/pre-check-integration.yml index bb886ab9258..b110d5c033e 100644 --- a/.github/workflows/pre-check-integration.yml +++ b/.github/workflows/pre-check-integration.yml @@ -15,7 +15,7 @@ jobs: contains(github.event.pull_request.labels.*.name, 'force:integration') || ( ( github.event.pull_request.base.ref == 'master' || - github.event.pull_request.base.ref == 'release-pismo' || + startsWith(github.event.pull_request.base.ref, 'release-') || github.event.pull_request.base.ref == 'beta' ) && github.event.pull_request.draft == false && From 3a461eb726f498379ea93fe2b762e67b7b7069e5 Mon Sep 17 00:00:00 2001 From: Mathieu Hofman <86499+mhofman@users.noreply.github.com> Date: Fri, 22 Sep 2023 13:20:01 -0700 Subject: [PATCH 17/20] deps(agoric): cleanup deps (#8372) --- packages/agoric-cli/package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/agoric-cli/package.json b/packages/agoric-cli/package.json index 61de6949194..1295a9c1258 100644 --- a/packages/agoric-cli/package.json +++ b/packages/agoric-cli/package.json @@ -26,7 +26,8 @@ "devDependencies": { "@agoric/deploy-script-support": "^0.10.4-u11.0", "ava": "^5.2.0", - "c8": "^7.13.0" + "c8": "^7.13.0", + "dd-trace": "^3.3.0" }, "dependencies": { "@agoric/access-token": "^0.4.21", @@ -49,7 +50,6 @@ "@cosmjs/math": "^0.30.1", "@cosmjs/proto-signing": "^0.30.1", "@cosmjs/stargate": "^0.30.1", - "@cosmjs/tendermint-rpc": "^0.30.1", "@endo/bundle-source": "^2.5.1", "@endo/captp": "^3.1.1", "@endo/compartment-mapper": "^0.8.4", @@ -62,7 +62,6 @@ "anylogger": "^0.21.0", "chalk": "^5.2.0", "commander": "^10.0.0", - "dd-trace": "^3.3.0", "deterministic-json": "^1.0.5", "esm": "agoric-labs/esm#Agoric-built", "inquirer": "^8.2.2", From 875341d0b199b1b3a6bfe9a66d85f2cd3fb80822 Mon Sep 17 00:00:00 2001 From: Mathieu Hofman Date: Wed, 20 Sep 2023 23:13:04 +0000 Subject: [PATCH 18/20] build(deps): pin endo package versions --- package.json | 2 +- packages/ERTP/package.json | 12 ++--- packages/SwingSet/package.json | 28 ++++++------ packages/agoric-cli/package.json | 16 +++---- packages/assert/package.json | 2 +- packages/cache/package.json | 4 +- packages/casting/package.json | 12 ++--- packages/cosmic-swingset/package.json | 12 ++--- packages/deploy-script-support/package.json | 16 +++---- packages/deployment/package.json | 4 +- packages/eslint-config/package.json | 2 +- packages/governance/package.json | 16 +++---- packages/inter-protocol/package.json | 16 +++---- packages/internal/package.json | 12 ++--- packages/notifier/package.json | 10 ++--- packages/pegasus/package.json | 12 ++--- packages/same-structure/package.json | 2 +- packages/sharing-service/package.json | 4 +- packages/smart-wallet/package.json | 16 +++---- packages/solo/package.json | 14 +++--- packages/spawner/package.json | 10 ++--- packages/store/package.json | 10 ++--- packages/swing-store/package.json | 10 ++--- packages/swingset-liveslots/package.json | 18 ++++---- packages/swingset-runner/package.json | 10 ++--- .../swingset-xsnap-supervisor/package.json | 8 ++-- packages/telemetry/package.json | 10 ++--- packages/time/package.json | 6 +-- packages/ui-components/package.json | 6 +-- packages/vats/package.json | 18 ++++---- packages/wallet/api/package.json | 12 ++--- packages/web-components/package.json | 10 ++--- packages/xsnap-lockdown/package.json | 4 +- packages/xsnap/package.json | 16 +++---- packages/zoe/package.json | 20 ++++----- packages/zone/package.json | 2 +- yarn.lock | 44 +++++++++---------- 37 files changed, 213 insertions(+), 213 deletions(-) diff --git a/package.json b/package.json index 3ac162d48fc..d035b41a613 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "type": "module", "packageManager": "yarn@1.22.19", "devDependencies": { - "@endo/eslint-plugin": "^0.4.3", + "@endo/eslint-plugin": "0.4.3", "@jessie.js/eslint-plugin": "^0.3.0", "@types/node": "^16.13.0", "@typescript-eslint/parser": "^5.55.0", diff --git a/packages/ERTP/package.json b/packages/ERTP/package.json index 8c0e551f797..57c60aa7267 100644 --- a/packages/ERTP/package.json +++ b/packages/ERTP/package.json @@ -44,14 +44,14 @@ "@agoric/store": "^0.9.3-u11.0", "@agoric/swingset-vat": "^0.32.3-u11.0", "@agoric/vat-data": "^0.5.3-u11.0", - "@endo/eventual-send": "^0.17.2", - "@endo/far": "^0.2.18", - "@endo/marshal": "^0.8.5", - "@endo/nat": "^4.1.27", - "@endo/promise-kit": "^0.2.56" + "@endo/eventual-send": "0.17.2", + "@endo/far": "0.2.18", + "@endo/marshal": "0.8.5", + "@endo/nat": "4.1.27", + "@endo/promise-kit": "0.2.56" }, "devDependencies": { - "@endo/bundle-source": "^2.5.1", + "@endo/bundle-source": "2.5.1", "@fast-check/ava": "^1.1.3", "ava": "^5.2.0", "tsd": "^0.28.1" diff --git a/packages/SwingSet/package.json b/packages/SwingSet/package.json index 90661979664..5ac3d2d087a 100644 --- a/packages/SwingSet/package.json +++ b/packages/SwingSet/package.json @@ -38,20 +38,20 @@ "@agoric/vat-data": "^0.5.3-u11.0", "@agoric/xsnap": "^0.14.3-u11.0", "@agoric/xsnap-lockdown": "^0.14.0", - "@endo/base64": "^0.2.31", - "@endo/bundle-source": "^2.5.1", - "@endo/captp": "^3.1.1", - "@endo/check-bundle": "^0.2.18", - "@endo/compartment-mapper": "^0.8.4", - "@endo/eventual-send": "^0.17.2", - "@endo/far": "^0.2.18", - "@endo/import-bundle": "^0.3.4", - "@endo/init": "^0.5.56", - "@endo/marshal": "^0.8.5", - "@endo/nat": "^4.1.27", - "@endo/promise-kit": "^0.2.56", - "@endo/ses-ava": "^0.2.40", - "@endo/zip": "^0.2.31", + "@endo/base64": "0.2.31", + "@endo/bundle-source": "2.5.1", + "@endo/captp": "3.1.1", + "@endo/check-bundle": "0.2.18", + "@endo/compartment-mapper": "0.8.4", + "@endo/eventual-send": "0.17.2", + "@endo/far": "0.2.18", + "@endo/import-bundle": "0.3.4", + "@endo/init": "0.5.56", + "@endo/marshal": "0.8.5", + "@endo/nat": "4.1.27", + "@endo/promise-kit": "0.2.56", + "@endo/ses-ava": "0.2.40", + "@endo/zip": "0.2.31", "ansi-styles": "^6.2.1", "anylogger": "^0.21.0", "import-meta-resolve": "^2.2.1", diff --git a/packages/agoric-cli/package.json b/packages/agoric-cli/package.json index 1295a9c1258..9472c16328f 100644 --- a/packages/agoric-cli/package.json +++ b/packages/agoric-cli/package.json @@ -50,14 +50,14 @@ "@cosmjs/math": "^0.30.1", "@cosmjs/proto-signing": "^0.30.1", "@cosmjs/stargate": "^0.30.1", - "@endo/bundle-source": "^2.5.1", - "@endo/captp": "^3.1.1", - "@endo/compartment-mapper": "^0.8.4", - "@endo/far": "^0.2.18", - "@endo/init": "^0.5.56", - "@endo/marshal": "^0.8.5", - "@endo/nat": "^4.1.27", - "@endo/promise-kit": "^0.2.56", + "@endo/bundle-source": "2.5.1", + "@endo/captp": "3.1.1", + "@endo/compartment-mapper": "0.8.4", + "@endo/far": "0.2.18", + "@endo/init": "0.5.56", + "@endo/marshal": "0.8.5", + "@endo/nat": "4.1.27", + "@endo/promise-kit": "0.2.56", "@iarna/toml": "^2.2.3", "anylogger": "^0.21.0", "chalk": "^5.2.0", diff --git a/packages/assert/package.json b/packages/assert/package.json index e55e91dd908..97438917183 100755 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -18,7 +18,7 @@ "lint:types": "tsc -p jsconfig.json" }, "devDependencies": { - "@endo/init": "^0.5.56", + "@endo/init": "0.5.56", "ava": "^5.2.0" }, "repository": { diff --git a/packages/cache/package.json b/packages/cache/package.json index 54a68e2c4ca..6725a003487 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -23,8 +23,8 @@ "@agoric/notifier": "^0.6.3-u11.0", "@agoric/store": "^0.9.3-u11.0", "@agoric/vat-data": "^0.5.3-u11.0", - "@endo/far": "^0.2.18", - "@endo/marshal": "^0.8.5" + "@endo/far": "0.2.18", + "@endo/marshal": "0.8.5" }, "devDependencies": { "@agoric/zoe": "^0.26.3-u11.0", diff --git a/packages/casting/package.json b/packages/casting/package.json index df422173bd2..535d1957269 100644 --- a/packages/casting/package.json +++ b/packages/casting/package.json @@ -30,15 +30,15 @@ "@cosmjs/proto-signing": "^0.30.1", "@cosmjs/stargate": "^0.30.1", "@cosmjs/tendermint-rpc": "^0.30.1", - "@endo/far": "^0.2.18", - "@endo/init": "^0.5.56", - "@endo/lockdown": "^0.1.28", - "@endo/marshal": "^0.8.5", - "@endo/promise-kit": "^0.2.56", + "@endo/far": "0.2.18", + "@endo/init": "0.5.56", + "@endo/lockdown": "0.1.28", + "@endo/marshal": "0.8.5", + "@endo/promise-kit": "0.2.56", "node-fetch": "^2.6.0" }, "devDependencies": { - "@endo/ses-ava": "^0.2.40", + "@endo/ses-ava": "0.2.40", "@types/node-fetch": "^2.6.2", "ava": "^5.2.0", "c8": "^7.13.0", diff --git a/packages/cosmic-swingset/package.json b/packages/cosmic-swingset/package.json index 49d0bcc1aec..c65eb20179d 100644 --- a/packages/cosmic-swingset/package.json +++ b/packages/cosmic-swingset/package.json @@ -30,12 +30,12 @@ "@agoric/swing-store": "^0.9.2-u11.0", "@agoric/swingset-vat": "^0.32.3-u11.0", "@agoric/telemetry": "^0.6.3-u11.0", - "@endo/far": "^0.2.18", - "@endo/import-bundle": "^0.3.4", - "@endo/init": "^0.5.56", - "@endo/marshal": "^0.8.5", - "@endo/nat": "^4.1.27", - "@endo/promise-kit": "^0.2.56", + "@endo/far": "0.2.18", + "@endo/import-bundle": "0.3.4", + "@endo/init": "0.5.56", + "@endo/marshal": "0.8.5", + "@endo/nat": "4.1.27", + "@endo/promise-kit": "0.2.56", "@iarna/toml": "^2.2.3", "@opentelemetry/sdk-metrics": "~1.9.0", "@opentelemetry/api": "~1.3.0", diff --git a/packages/deploy-script-support/package.json b/packages/deploy-script-support/package.json index ce6ca9cd6b4..05aa979d02b 100644 --- a/packages/deploy-script-support/package.json +++ b/packages/deploy-script-support/package.json @@ -41,17 +41,17 @@ "@agoric/notifier": "^0.6.3-u11.0", "@agoric/store": "^0.9.3-u11.0", "@agoric/zoe": "^0.26.3-u11.0", - "@endo/base64": "^0.2.31", - "@endo/bundle-source": "^2.5.1", - "@endo/far": "^0.2.18", - "@endo/marshal": "^0.8.5", - "@endo/nat": "^4.1.27", - "@endo/promise-kit": "^0.2.56", - "@endo/zip": "^0.2.31" + "@endo/base64": "0.2.31", + "@endo/bundle-source": "2.5.1", + "@endo/far": "0.2.18", + "@endo/marshal": "0.8.5", + "@endo/nat": "4.1.27", + "@endo/promise-kit": "0.2.56", + "@endo/zip": "0.2.31" }, "devDependencies": { "@agoric/vats": "^0.15.2-u11.0", - "@endo/init": "^0.5.56", + "@endo/init": "0.5.56", "ava": "^5.2.0", "import-meta-resolve": "^2.2.1" }, diff --git a/packages/deployment/package.json b/packages/deployment/package.json index 5540008acb0..cb04590b98f 100644 --- a/packages/deployment/package.json +++ b/packages/deployment/package.json @@ -20,8 +20,8 @@ "license": "Apache-2.0", "dependencies": { "@agoric/assert": "^0.6.0", - "@endo/init": "^0.5.56", - "@endo/marshal": "^0.8.5", + "@endo/init": "0.5.56", + "@endo/marshal": "0.8.5", "chalk": "^5.2.0", "deterministic-json": "^1.0.5", "inquirer": "^8.2.2", diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index da537273b34..eae6c53382a 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -25,7 +25,7 @@ "eslint-config.json" ], "peerDependencies": { - "@endo/eslint-plugin": "^0.4.4", + "@endo/eslint-plugin": "0.4.4", "@jessie.js/eslint-plugin": "^0.3.0", "@typescript-eslint/parser": "^5.55.0", "eslint": "^8.36.0", diff --git a/packages/governance/package.json b/packages/governance/package.json index 077941314bc..90994dc946d 100644 --- a/packages/governance/package.json +++ b/packages/governance/package.json @@ -41,17 +41,17 @@ "@agoric/vat-data": "^0.5.3-u11.0", "@agoric/vats": "^0.15.2-u11.0", "@agoric/zoe": "^0.26.3-u11.0", - "@endo/captp": "^3.1.1", - "@endo/eventual-send": "^0.17.2", - "@endo/far": "^0.2.18", - "@endo/marshal": "^0.8.5", - "@endo/nat": "^4.1.27", - "@endo/promise-kit": "^0.2.56" + "@endo/captp": "3.1.1", + "@endo/eventual-send": "0.17.2", + "@endo/far": "0.2.18", + "@endo/marshal": "0.8.5", + "@endo/nat": "4.1.27", + "@endo/promise-kit": "0.2.56" }, "devDependencies": { "@agoric/deploy-script-support": "^0.10.4-u11.0", - "@endo/bundle-source": "^2.5.1", - "@endo/init": "^0.5.56", + "@endo/bundle-source": "2.5.1", + "@endo/init": "0.5.56", "ava": "^5.2.0", "c8": "^7.13.0", "import-meta-resolve": "^2.2.1" diff --git a/packages/inter-protocol/package.json b/packages/inter-protocol/package.json index 09fd0e00ef6..6c0fe25d45c 100644 --- a/packages/inter-protocol/package.json +++ b/packages/inter-protocol/package.json @@ -39,11 +39,11 @@ "@agoric/vat-data": "^0.5.3-u11.0", "@agoric/vats": "^0.15.2-u11.0", "@agoric/zoe": "^0.26.3-u11.0", - "@endo/captp": "^3.1.1", - "@endo/eventual-send": "^0.17.2", - "@endo/far": "^0.2.18", - "@endo/marshal": "^0.8.5", - "@endo/nat": "^4.1.27", + "@endo/captp": "3.1.1", + "@endo/eventual-send": "0.17.2", + "@endo/far": "0.2.18", + "@endo/marshal": "0.8.5", + "@endo/nat": "4.1.27", "agoric": "^0.21.2-u11.0", "jessie.js": "^0.3.2" }, @@ -52,9 +52,9 @@ "@agoric/smart-wallet": "^0.5.4-u11.0", "@agoric/swingset-liveslots": "^0.10.3-u11.0", "@agoric/swingset-vat": "^0.32.3-u11.0", - "@endo/bundle-source": "^2.5.1", - "@endo/init": "^0.5.56", - "@endo/promise-kit": "^0.2.56", + "@endo/bundle-source": "2.5.1", + "@endo/init": "0.5.56", + "@endo/promise-kit": "0.2.56", "@fast-check/ava": "^1.1.3", "ava": "^5.2.0", "c8": "^7.13.0", diff --git a/packages/internal/package.json b/packages/internal/package.json index 30df2de7232..e7c73ce2f3a 100755 --- a/packages/internal/package.json +++ b/packages/internal/package.json @@ -21,16 +21,16 @@ }, "dependencies": { "@agoric/zone": "^0.2.3-u11.0", - "@endo/far": "^0.2.18", - "@endo/marshal": "^0.8.5", - "@endo/patterns": "^0.2.2", - "@endo/promise-kit": "^0.2.56", - "@endo/stream": "^0.3.25", + "@endo/far": "0.2.18", + "@endo/marshal": "0.8.5", + "@endo/patterns": "0.2.2", + "@endo/promise-kit": "0.2.56", + "@endo/stream": "0.3.25", "anylogger": "^0.21.0", "jessie.js": "^0.3.2" }, "devDependencies": { - "@endo/init": "^0.5.56", + "@endo/init": "0.5.56", "ava": "^5.2.0", "tsd": "^0.28.1" }, diff --git a/packages/notifier/package.json b/packages/notifier/package.json index 3cf8c72003e..f05348b6dba 100644 --- a/packages/notifier/package.json +++ b/packages/notifier/package.json @@ -39,13 +39,13 @@ "@agoric/swing-store": "^0.9.2-u11.0", "@agoric/swingset-vat": "^0.32.3-u11.0", "@agoric/vat-data": "^0.5.3-u11.0", - "@endo/far": "^0.2.18", - "@endo/marshal": "^0.8.5", - "@endo/promise-kit": "^0.2.56" + "@endo/far": "0.2.18", + "@endo/marshal": "0.8.5", + "@endo/promise-kit": "0.2.56" }, "devDependencies": { - "@endo/init": "^0.5.56", - "@endo/ses-ava": "^0.2.40", + "@endo/init": "0.5.56", + "@endo/ses-ava": "0.2.40", "ava": "^5.2.0", "c8": "^7.13.0" }, diff --git a/packages/pegasus/package.json b/packages/pegasus/package.json index 4db294fd940..1e808d7808a 100644 --- a/packages/pegasus/package.json +++ b/packages/pegasus/package.json @@ -37,12 +37,12 @@ "@agoric/swingset-vat": "^0.32.3-u11.0", "@agoric/vats": "^0.15.2-u11.0", "@agoric/zoe": "^0.26.3-u11.0", - "@endo/bundle-source": "^2.5.1", - "@endo/captp": "^3.1.1", - "@endo/far": "^0.2.18", - "@endo/init": "^0.5.56", - "@endo/nat": "^4.1.27", - "@endo/promise-kit": "^0.2.56" + "@endo/bundle-source": "2.5.1", + "@endo/captp": "3.1.1", + "@endo/far": "0.2.18", + "@endo/init": "0.5.56", + "@endo/nat": "4.1.27", + "@endo/promise-kit": "0.2.56" }, "devDependencies": { "@agoric/deploy-script-support": "^0.10.4-u11.0", diff --git a/packages/same-structure/package.json b/packages/same-structure/package.json index 0b85dbf3a3d..09090c5807c 100644 --- a/packages/same-structure/package.json +++ b/packages/same-structure/package.json @@ -31,7 +31,7 @@ "dependencies": { "@agoric/assert": "^0.6.0", "@agoric/store": "^0.9.3-u11.0", - "@endo/marshal": "^0.8.5" + "@endo/marshal": "0.8.5" }, "files": [ "*.js", diff --git a/packages/sharing-service/package.json b/packages/sharing-service/package.json index eac4bb3aa52..490e6fa84b0 100644 --- a/packages/sharing-service/package.json +++ b/packages/sharing-service/package.json @@ -28,11 +28,11 @@ "homepage": "https://github.com/Agoric/agoric-sdk#readme", "dependencies": { "@agoric/assert": "^0.6.0", - "@endo/marshal": "^0.8.5" + "@endo/marshal": "0.8.5" }, "devDependencies": { "@agoric/swingset-vat": "^0.32.3-u11.0", - "@endo/eventual-send": "^0.17.2", + "@endo/eventual-send": "0.17.2", "ava": "^5.2.0", "c8": "^7.13.0" }, diff --git a/packages/smart-wallet/package.json b/packages/smart-wallet/package.json index e25328c84a1..5b242479f24 100644 --- a/packages/smart-wallet/package.json +++ b/packages/smart-wallet/package.json @@ -17,9 +17,9 @@ }, "devDependencies": { "@agoric/cosmic-proto": "^0.3.0", - "@endo/bundle-source": "^2.5.1", - "@endo/captp": "^3.1.1", - "@endo/init": "^0.5.56", + "@endo/bundle-source": "2.5.1", + "@endo/captp": "3.1.1", + "@endo/init": "0.5.56", "ava": "^5.2.0", "import-meta-resolve": "^2.2.1" }, @@ -34,11 +34,11 @@ "@agoric/vat-data": "^0.5.3-u11.0", "@agoric/vats": "^0.15.2-u11.0", "@agoric/zoe": "^0.26.3-u11.0", - "@endo/eventual-send": "^0.17.2", - "@endo/far": "^0.2.18", - "@endo/marshal": "^0.8.5", - "@endo/nat": "^4.1.27", - "@endo/promise-kit": "^0.2.56" + "@endo/eventual-send": "0.17.2", + "@endo/far": "0.2.18", + "@endo/marshal": "0.8.5", + "@endo/nat": "4.1.27", + "@endo/promise-kit": "0.2.56" }, "files": [ "src/" diff --git a/packages/solo/package.json b/packages/solo/package.json index cfb2201e74a..5d63f86a1be 100644 --- a/packages/solo/package.json +++ b/packages/solo/package.json @@ -36,12 +36,12 @@ "@agoric/time": "^0.3.3-u11.0", "@agoric/vats": "^0.15.2-u11.0", "@agoric/wallet": "^0.18.4-u11.0", - "@endo/captp": "^3.1.1", - "@endo/eventual-send": "^0.17.2", - "@endo/import-bundle": "^0.3.4", - "@endo/init": "^0.5.56", - "@endo/marshal": "^0.8.5", - "@endo/promise-kit": "^0.2.56", + "@endo/captp": "3.1.1", + "@endo/eventual-send": "0.17.2", + "@endo/import-bundle": "0.3.4", + "@endo/init": "0.5.56", + "@endo/marshal": "0.8.5", + "@endo/promise-kit": "0.2.56", "agoric": "^0.21.2-u11.0", "anylogger": "^0.21.0", "deterministic-json": "^1.0.5", @@ -58,7 +58,7 @@ }, "devDependencies": { "@agoric/ertp": "^0.16.3-u11.0", - "@endo/bundle-source": "^2.5.1", + "@endo/bundle-source": "2.5.1", "ava": "^5.2.0", "c8": "^7.13.0" }, diff --git a/packages/spawner/package.json b/packages/spawner/package.json index 0957fd52e65..38c34eaa14d 100644 --- a/packages/spawner/package.json +++ b/packages/spawner/package.json @@ -31,15 +31,15 @@ "homepage": "https://github.com/Agoric/agoric-sdk#readme", "dependencies": { "@agoric/assert": "^0.6.0", - "@endo/eventual-send": "^0.17.2", - "@endo/import-bundle": "^0.3.4", - "@endo/marshal": "^0.8.5" + "@endo/eventual-send": "0.17.2", + "@endo/import-bundle": "0.3.4", + "@endo/marshal": "0.8.5" }, "devDependencies": { "@agoric/internal": "^0.3.3-u11.0", "@agoric/swingset-vat": "^0.32.3-u11.0", - "@endo/bundle-source": "^2.5.1", - "@endo/init": "^0.5.56", + "@endo/bundle-source": "2.5.1", + "@endo/init": "0.5.56", "ava": "^5.2.0", "c8": "^7.13.0" }, diff --git a/packages/store/package.json b/packages/store/package.json index 324a29299bc..7e852ea420b 100644 --- a/packages/store/package.json +++ b/packages/store/package.json @@ -31,15 +31,15 @@ "homepage": "https://github.com/Agoric/agoric-sdk#readme", "dependencies": { "@agoric/assert": "^0.6.0", - "@endo/exo": "^0.2.2", - "@endo/marshal": "^0.8.5", - "@endo/pass-style": "^0.1.3", - "@endo/patterns": "^0.2.2" + "@endo/exo": "0.2.2", + "@endo/marshal": "0.8.5", + "@endo/pass-style": "0.1.3", + "@endo/patterns": "0.2.2" }, "devDependencies": { "@agoric/swingset-vat": "^0.32.3-u11.0", "@agoric/time": "^0.3.3-u11.0", - "@endo/ses-ava": "^0.2.40", + "@endo/ses-ava": "0.2.40", "ava": "^5.2.0" }, "files": [ diff --git a/packages/swing-store/package.json b/packages/swing-store/package.json index 243e7b03e37..a4fcb3e068c 100644 --- a/packages/swing-store/package.json +++ b/packages/swing-store/package.json @@ -23,14 +23,14 @@ "dependencies": { "@agoric/assert": "^0.6.0", "@agoric/internal": "^0.3.3-u11.0", - "@endo/base64": "^0.2.31", - "@endo/bundle-source": "^2.5.1", - "@endo/check-bundle": "^0.2.18", - "@endo/nat": "^4.1.27", + "@endo/base64": "0.2.31", + "@endo/bundle-source": "2.5.1", + "@endo/check-bundle": "0.2.18", + "@endo/nat": "4.1.27", "better-sqlite3": "^8.2.0" }, "devDependencies": { - "@endo/init": "^0.5.56", + "@endo/init": "0.5.56", "@types/better-sqlite3": "^7.5.0", "ava": "^5.2.0", "c8": "^7.13.0", diff --git a/packages/swingset-liveslots/package.json b/packages/swingset-liveslots/package.json index 3e3baa970cf..9a48747b6f9 100644 --- a/packages/swingset-liveslots/package.json +++ b/packages/swingset-liveslots/package.json @@ -21,15 +21,15 @@ "@agoric/internal": "^0.3.3-u11.0", "@agoric/store": "^0.9.3-u11.0", "@agoric/vat-data": "^0.5.3-u11.0", - "@endo/eventual-send": "^0.17.2", - "@endo/exo": "^0.2.2", - "@endo/far": "^0.2.18", - "@endo/init": "^0.5.56", - "@endo/marshal": "^0.8.5", - "@endo/nat": "^4.1.27", - "@endo/pass-style": "^0.1.3", - "@endo/patterns": "^0.2.2", - "@endo/promise-kit": "^0.2.56" + "@endo/eventual-send": "0.17.2", + "@endo/exo": "0.2.2", + "@endo/far": "0.2.18", + "@endo/init": "0.5.56", + "@endo/marshal": "0.8.5", + "@endo/nat": "4.1.27", + "@endo/pass-style": "0.1.3", + "@endo/patterns": "0.2.2", + "@endo/promise-kit": "0.2.56" }, "devDependencies": { "ava": "^5.2.0" diff --git a/packages/swingset-runner/package.json b/packages/swingset-runner/package.json index 2924220c095..44be5b1a546 100644 --- a/packages/swingset-runner/package.json +++ b/packages/swingset-runner/package.json @@ -28,11 +28,11 @@ "@agoric/telemetry": "^0.6.3-u11.0", "@agoric/vat-data": "^0.5.3-u11.0", "@agoric/zoe": "^0.26.3-u11.0", - "@endo/bundle-source": "^2.5.1", - "@endo/eventual-send": "^0.17.2", - "@endo/init": "^0.5.56", - "@endo/marshal": "^0.8.5", - "@endo/nat": "^4.1.27", + "@endo/bundle-source": "2.5.1", + "@endo/eventual-send": "0.17.2", + "@endo/init": "0.5.56", + "@endo/marshal": "0.8.5", + "@endo/nat": "4.1.27", "expose-gc": "^1.0.0", "n-readlines": "^1.0.1", "yargs": "^16.1.0" diff --git a/packages/swingset-xsnap-supervisor/package.json b/packages/swingset-xsnap-supervisor/package.json index 9f6a582b903..a9c803eafcb 100644 --- a/packages/swingset-xsnap-supervisor/package.json +++ b/packages/swingset-xsnap-supervisor/package.json @@ -25,10 +25,10 @@ "devDependencies": { "@agoric/assert": "^0.6.0", "@agoric/swingset-liveslots": "^0.10.3-u11.0", - "@endo/bundle-source": "^2.5.1", - "@endo/import-bundle": "^0.3.4", - "@endo/init": "^0.5.56", - "@endo/marshal": "^0.8.5", + "@endo/bundle-source": "2.5.1", + "@endo/import-bundle": "0.3.4", + "@endo/init": "0.5.56", + "@endo/marshal": "0.8.5", "ava": "^5.2.0", "c8": "^7.13.0" }, diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index 69f3172ca9f..7dda4409783 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -25,9 +25,9 @@ "@agoric/assert": "^0.6.0", "@agoric/internal": "^0.3.3-u11.0", "@agoric/store": "^0.9.3-u11.0", - "@endo/init": "^0.5.56", - "@endo/marshal": "^0.8.5", - "@endo/stream": "^0.3.25", + "@endo/init": "0.5.56", + "@endo/marshal": "0.8.5", + "@endo/stream": "0.3.25", "@opentelemetry/api": "~1.3.0", "@opentelemetry/exporter-prometheus": "~0.35.0", "@opentelemetry/exporter-trace-otlp-http": "~0.35.0", @@ -41,8 +41,8 @@ "tmp": "^0.2.1" }, "devDependencies": { - "@endo/lockdown": "^0.1.28", - "@endo/ses-ava": "^0.2.40", + "@endo/lockdown": "0.1.28", + "@endo/ses-ava": "0.2.40", "ava": "^5.2.0", "c8": "^7.13.0", "tmp": "^0.2.1" diff --git a/packages/time/package.json b/packages/time/package.json index 30d1a9cba93..05e9d7a1370 100644 --- a/packages/time/package.json +++ b/packages/time/package.json @@ -32,11 +32,11 @@ "dependencies": { "@agoric/assert": "^0.6.0", "@agoric/store": "^0.9.3-u11.0", - "@endo/nat": "^4.1.27" + "@endo/nat": "4.1.27" }, "devDependencies": { - "@endo/far": "^0.2.18", - "@endo/init": "^0.5.56", + "@endo/far": "0.2.18", + "@endo/init": "0.5.56", "ava": "^5.2.0" }, "files": [ diff --git a/packages/ui-components/package.json b/packages/ui-components/package.json index 64e0589d451..76cef072ea0 100644 --- a/packages/ui-components/package.json +++ b/packages/ui-components/package.json @@ -7,9 +7,9 @@ "dependencies": { "@agoric/assert": "^0.6.0", "@agoric/ertp": "^0.16.3-u11.0", - "@endo/eventual-send": "^0.17.2", - "@endo/init": "^0.5.56", - "@endo/nat": "^4.1.27", + "@endo/eventual-send": "0.17.2", + "@endo/init": "0.5.56", + "@endo/nat": "4.1.27", "clsx": "^1.1.1" }, "peerDependencies": { diff --git a/packages/vats/package.json b/packages/vats/package.json index c994cd152fe..80680e9f08b 100644 --- a/packages/vats/package.json +++ b/packages/vats/package.json @@ -41,12 +41,12 @@ "@agoric/vat-data": "^0.5.3-u11.0", "@agoric/zoe": "^0.26.3-u11.0", "@agoric/zone": "^0.2.3-u11.0", - "@endo/far": "^0.2.18", - "@endo/import-bundle": "^0.3.4", - "@endo/init": "^0.5.56", - "@endo/marshal": "^0.8.5", - "@endo/nat": "^4.1.27", - "@endo/promise-kit": "^0.2.56", + "@endo/far": "0.2.18", + "@endo/import-bundle": "0.3.4", + "@endo/init": "0.5.56", + "@endo/marshal": "0.8.5", + "@endo/nat": "4.1.27", + "@endo/promise-kit": "0.2.56", "jessie.js": "^0.3.2" }, "devDependencies": { @@ -55,9 +55,9 @@ "@agoric/smart-wallet": "^0.5.4-u11.0", "@agoric/swing-store": "^0.9.2-u11.0", "@agoric/swingset-liveslots": "^0.10.3-u11.0", - "@endo/bundle-source": "^2.5.1", - "@endo/captp": "^3.1.1", - "@endo/stream": "^0.3.25", + "@endo/bundle-source": "2.5.1", + "@endo/captp": "3.1.1", + "@endo/stream": "0.3.25", "ava": "^5.2.0", "c8": "^7.13.0", "import-meta-resolve": "^2.2.1" diff --git a/packages/wallet/api/package.json b/packages/wallet/api/package.json index 6547f5002c9..530883218ea 100644 --- a/packages/wallet/api/package.json +++ b/packages/wallet/api/package.json @@ -15,8 +15,8 @@ }, "devDependencies": { "@agoric/vats": "^0.15.2-u11.0", - "@endo/bundle-source": "^2.5.1", - "@endo/init": "^0.5.56", + "@endo/bundle-source": "2.5.1", + "@endo/init": "0.5.56", "ava": "^5.2.0" }, "dependencies": { @@ -30,10 +30,10 @@ "@agoric/time": "^0.3.3-u11.0", "@agoric/vat-data": "^0.5.3-u11.0", "@agoric/zoe": "^0.26.3-u11.0", - "@endo/eventual-send": "^0.17.2", - "@endo/marshal": "^0.8.5", - "@endo/nat": "^4.1.27", - "@endo/promise-kit": "^0.2.56", + "@endo/eventual-send": "0.17.2", + "@endo/marshal": "0.8.5", + "@endo/nat": "4.1.27", + "@endo/promise-kit": "0.2.56", "import-meta-resolve": "^2.2.1" }, "keywords": [], diff --git a/packages/web-components/package.json b/packages/web-components/package.json index 25291fa1c03..24c838c398e 100644 --- a/packages/web-components/package.json +++ b/packages/web-components/package.json @@ -27,10 +27,10 @@ "@agoric/notifier": "^0.6.3-u11.0", "@agoric/smart-wallet": "^0.5.4-u11.0", "@agoric/wallet": "^0.18.4-u11.0", - "@endo/captp": "^3.1.1", - "@endo/eventual-send": "^0.17.2", - "@endo/marshal": "^0.8.5", - "@endo/promise-kit": "^0.2.56", + "@endo/captp": "3.1.1", + "@endo/eventual-send": "0.17.2", + "@endo/marshal": "0.8.5", + "@endo/promise-kit": "0.2.56", "@lit-labs/react": "^1.0.1", "lit": "2.0.2", "robot3": "^0.2.19", @@ -38,7 +38,7 @@ }, "devDependencies": { "@custom-elements-manifest/analyzer": "^0.4.17", - "@endo/init": "^0.5.56", + "@endo/init": "0.5.56", "@keplr-wallet/types": "^0.11.37", "@open-wc/eslint-config": "^10.0.0", "@open-wc/testing": "^3.1.7", diff --git a/packages/xsnap-lockdown/package.json b/packages/xsnap-lockdown/package.json index 5e415b5b62b..5dd06475446 100644 --- a/packages/xsnap-lockdown/package.json +++ b/packages/xsnap-lockdown/package.json @@ -20,8 +20,8 @@ "test:xs": "exit 0" }, "devDependencies": { - "@endo/bundle-source": "^2.5.1", - "@endo/init": "^0.5.56", + "@endo/bundle-source": "2.5.1", + "@endo/init": "0.5.56", "ava": "^5.2.0", "c8": "^7.13.0", "rollup": "^2.58.0", diff --git a/packages/xsnap/package.json b/packages/xsnap/package.json index cd4970edd2a..61f4248bbae 100644 --- a/packages/xsnap/package.json +++ b/packages/xsnap/package.json @@ -30,18 +30,18 @@ "@agoric/assert": "^0.6.0", "@agoric/internal": "^0.3.3-u11.0", "@agoric/xsnap-lockdown": "^0.14.0", - "@endo/bundle-source": "^2.5.1", - "@endo/eventual-send": "^0.17.2", - "@endo/init": "^0.5.56", - "@endo/netstring": "^0.3.26", - "@endo/promise-kit": "^0.2.56", - "@endo/stream": "^0.3.25", - "@endo/stream-node": "^0.2.26", + "@endo/bundle-source": "2.5.1", + "@endo/eventual-send": "0.17.2", + "@endo/init": "0.5.56", + "@endo/netstring": "0.3.26", + "@endo/promise-kit": "0.2.56", + "@endo/stream": "0.3.25", + "@endo/stream-node": "0.2.26", "glob": "^7.1.6", "tmp": "^0.2.1" }, "devDependencies": { - "@endo/base64": "^0.2.31", + "@endo/base64": "0.2.31", "ava": "^5.2.0", "c8": "^7.13.0" }, diff --git a/packages/zoe/package.json b/packages/zoe/package.json index c4d2030f5db..cc30c385203 100644 --- a/packages/zoe/package.json +++ b/packages/zoe/package.json @@ -51,18 +51,18 @@ "@agoric/swingset-vat": "^0.32.3-u11.0", "@agoric/time": "^0.3.3-u11.0", "@agoric/vat-data": "^0.5.3-u11.0", - "@endo/bundle-source": "^2.5.1", - "@endo/captp": "^3.1.1", - "@endo/eventual-send": "^0.17.2", - "@endo/far": "^0.2.18", - "@endo/import-bundle": "^0.3.4", - "@endo/marshal": "^0.8.5", - "@endo/nat": "^4.1.27", - "@endo/patterns": "^0.2.2", - "@endo/promise-kit": "^0.2.56" + "@endo/bundle-source": "2.5.1", + "@endo/captp": "3.1.1", + "@endo/eventual-send": "0.17.2", + "@endo/far": "0.2.18", + "@endo/import-bundle": "0.3.4", + "@endo/marshal": "0.8.5", + "@endo/nat": "4.1.27", + "@endo/patterns": "0.2.2", + "@endo/promise-kit": "0.2.56" }, "devDependencies": { - "@endo/init": "^0.5.56", + "@endo/init": "0.5.56", "ava": "^5.2.0", "c8": "^7.13.0", "import-meta-resolve": "^2.2.1", diff --git a/packages/zone/package.json b/packages/zone/package.json index 46a6760dc64..02e795e8da7 100644 --- a/packages/zone/package.json +++ b/packages/zone/package.json @@ -27,7 +27,7 @@ "dependencies": { "@agoric/store": "^0.9.3-u11.0", "@agoric/vat-data": "^0.5.3-u11.0", - "@endo/far": "^0.2.18" + "@endo/far": "0.2.18" }, "publishConfig": { "access": "public" diff --git a/yarn.lock b/yarn.lock index bfb4eb1615b..5b0c3e00da0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1320,12 +1320,12 @@ resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413" integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow== -"@endo/base64@^0.2.31": +"@endo/base64@0.2.31", "@endo/base64@^0.2.31": version "0.2.31" resolved "https://registry.yarnpkg.com/@endo/base64/-/base64-0.2.31.tgz#92378462cd791e0258a2291d44d2cfd15415cf32" integrity sha512-7IndkaZ7buIuFw8oBovNZV7epuyFWs0gdusSJ/zrx6fMXRqX0ycSTtxr6M5xADQGss1I9fqP3vteVLiNFlyIbw== -"@endo/bundle-source@^2.5.1": +"@endo/bundle-source@2.5.1": version "2.5.1" resolved "https://registry.yarnpkg.com/@endo/bundle-source/-/bundle-source-2.5.1.tgz#6ec870335bd88ee561e6c2a323080c3b4a1894b4" integrity sha512-O8aEiOF3GmMbXjmz47CYNfvT6c16CNGT1ups2Spt29noejCoklmF5L7mEbeS8w7XUGA0Cs1IrZDfkiyTZ+ckmA== @@ -1344,7 +1344,7 @@ rollup endojs/endo#rollup-2.7.1-patch-1 source-map "^0.7.3" -"@endo/captp@^3.1.1": +"@endo/captp@3.1.1": version "3.1.1" resolved "https://registry.yarnpkg.com/@endo/captp/-/captp-3.1.1.tgz#538cdb7deec694cfce1015e1ccb387270172642d" integrity sha512-M+EiRxtm5xzKmZtOQmTtk5IfscPUKGSDGhmcxGTm4g4WvukFKSAB8hLHAbeurLaWVQG/ZcqZBffAZL/SGUZbmw== @@ -1354,7 +1354,7 @@ "@endo/nat" "^4.1.27" "@endo/promise-kit" "^0.2.56" -"@endo/check-bundle@^0.2.18": +"@endo/check-bundle@0.2.18": version "0.2.18" resolved "https://registry.yarnpkg.com/@endo/check-bundle/-/check-bundle-0.2.18.tgz#0880f4237dbc1c72c292aab3eccd7b1c20506a97" integrity sha512-PQB8ACM6ukv8dihzvqyfnHaKNr/+pKdJKmtZSxBvPmyBR4VnmLRSeTWMgMKnnmd27AyYN7vxdvKrL+qZDMA4RQ== @@ -1367,7 +1367,7 @@ resolved "https://registry.yarnpkg.com/@endo/cjs-module-analyzer/-/cjs-module-analyzer-0.2.31.tgz#baf37a8f7eb6781a0c5780da5d1375e0fe6ad3f1" integrity sha512-0/BHR1UWN0FpKDUnmuCBd6UQV8QkQ97809iZQ4VIs1faxtAx/z2iZCNnkC3qFOPrurYSp31YbmHDfWsTDYrQ3A== -"@endo/compartment-mapper@^0.8.4": +"@endo/compartment-mapper@0.8.4", "@endo/compartment-mapper@^0.8.4": version "0.8.4" resolved "https://registry.yarnpkg.com/@endo/compartment-mapper/-/compartment-mapper-0.8.4.tgz#afae6a4dfc64dff7082e90d7f215a072fb0a9b85" integrity sha512-OXK3pfsFWa+k6I1sA4UH+XBsXyCd1G8YEJo0PYsHyzErDSnVYQZ8Ka+M+8Jq8jJtE4SFqZqp1KwihCvMJSA6oA== @@ -1377,7 +1377,7 @@ "@endo/zip" "^0.2.31" ses "^0.18.4" -"@endo/eslint-plugin@^0.4.3": +"@endo/eslint-plugin@0.4.3": version "0.4.3" resolved "https://registry.yarnpkg.com/@endo/eslint-plugin/-/eslint-plugin-0.4.3.tgz#aa53784b9f2f45a4384cb59efeabc33e2709ec75" integrity sha512-VNQHwdGtdJokQshjWwJsd2xAZb8KDHd/kO7/yF+i214CukF4ODOH/k3UFR14MHCTiTisVwvAOSrhPbyUVN7Rew== @@ -1387,12 +1387,12 @@ tsutils "~3.21.0" typescript "~4.9.5" -"@endo/eventual-send@^0.17.2": +"@endo/eventual-send@0.17.2", "@endo/eventual-send@^0.17.2": version "0.17.2" resolved "https://registry.yarnpkg.com/@endo/eventual-send/-/eventual-send-0.17.2.tgz#c8710d557c2f57723be05fe99e941cd893acc5d2" integrity sha512-nux02l2yYXXUeUA2PigOO1K0gbVVMYx3prfYrW/G7Ny6PiDLtOyaeMWwKQwFTgJV2yAkOfvycr4LC1+tm7hu/Q== -"@endo/exo@^0.2.2": +"@endo/exo@0.2.2": version "0.2.2" resolved "https://registry.yarnpkg.com/@endo/exo/-/exo-0.2.2.tgz#eeebe3eeb40dcf9b409fddf8d5ff73821b470515" integrity sha512-4787jRJe7nQLV02mCCd1fQ8Ai25ParaIzLBUrxl7UKtsP98LcTlQKAON+OQmnSbV6jjXINa/wHdUeoi8/0xZDA== @@ -1400,7 +1400,7 @@ "@endo/far" "^0.2.18" "@endo/patterns" "^0.2.2" -"@endo/far@^0.2.18", "@endo/far@^0.2.3": +"@endo/far@0.2.18", "@endo/far@^0.2.18", "@endo/far@^0.2.3": version "0.2.18" resolved "https://registry.yarnpkg.com/@endo/far/-/far-0.2.18.tgz#8d8ca8ac1f7c4b57871e55c2c2f06c8e4fcf3839" integrity sha512-NJPz5x11AOsFgxZNSIW4+llQtSUNQtcYCrvxpMwhofti3hncMjhIiUUrMVggw99pdHNmXEBr0gl16H3n/1X0sw== @@ -1408,7 +1408,7 @@ "@endo/eventual-send" "^0.17.2" "@endo/pass-style" "^0.1.3" -"@endo/import-bundle@^0.3.4": +"@endo/import-bundle@0.3.4": version "0.3.4" resolved "https://registry.yarnpkg.com/@endo/import-bundle/-/import-bundle-0.3.4.tgz#dd93dca2aa595f669365f05d03affd4465837919" integrity sha512-MjB7VBJYFgcUhelMddJQf9uMwxqXV1McjVGqoJ3ZJ/OIQZ5BTYqR+uyZOI8CaUqpVmhNbsg3qMw8/wXW304YlA== @@ -1416,7 +1416,7 @@ "@endo/base64" "^0.2.31" "@endo/compartment-mapper" "^0.8.4" -"@endo/init@^0.5.56": +"@endo/init@0.5.56", "@endo/init@^0.5.56": version "0.5.56" resolved "https://registry.yarnpkg.com/@endo/init/-/init-0.5.56.tgz#c241de519434309f362dc676e76ee36c93240151" integrity sha512-BKA7O2uy9uaGw9dB9X515SIaTumaO58HD30AXkJllW6bmLM/BxxFM3GCgS127x0Wot1ni32Y0DxkwxdEXFXJEQ== @@ -1426,14 +1426,14 @@ "@endo/lockdown" "^0.1.28" "@endo/promise-kit" "^0.2.56" -"@endo/lockdown@^0.1.28": +"@endo/lockdown@0.1.28", "@endo/lockdown@^0.1.28": version "0.1.28" resolved "https://registry.yarnpkg.com/@endo/lockdown/-/lockdown-0.1.28.tgz#43f23dcbb12b6ebd3ad2a3dc8c6bb3609dd9e95f" integrity sha512-YqurtDU23+0kuWq4J2c94HyRB1aqSB8xEwrx5xTZA9IY/anrtppEiTFGU8tQXqZFhE6bfRzSGWDIVKaXCcm4Lw== dependencies: ses "^0.18.4" -"@endo/marshal@^0.8.5": +"@endo/marshal@0.8.5", "@endo/marshal@^0.8.5": version "0.8.5" resolved "https://registry.yarnpkg.com/@endo/marshal/-/marshal-0.8.5.tgz#c1a10ed4d9b37ee7444d314d8dec9a9a96728d64" integrity sha512-oj2Ag/TlkoMPv8m00fjoa1uWPgDwm5w8nYUU0DPqaCLfTNGRe8a8s7kYDPbv+sQdiQbkZ1RgUQjdyr/O2Mvs+A== @@ -1443,12 +1443,12 @@ "@endo/pass-style" "^0.1.3" "@endo/promise-kit" "^0.2.56" -"@endo/nat@^4.1.27": +"@endo/nat@4.1.27", "@endo/nat@^4.1.27": version "4.1.27" resolved "https://registry.yarnpkg.com/@endo/nat/-/nat-4.1.27.tgz#8f1a398b39f994b0769070a3fb36d3397bf86794" integrity sha512-mKRdIc4NvrxZ1qPBcYZH6zaj0RsRwADaCcfPNRnGWcHC9dY8DmZDDcgqNdSBFLiEto1RnXeoKAEGxk6hn253Ow== -"@endo/netstring@^0.3.26": +"@endo/netstring@0.3.26": version "0.3.26" resolved "https://registry.yarnpkg.com/@endo/netstring/-/netstring-0.3.26.tgz#7da8338cb372772894e1ebcc0728b23666fa2c89" integrity sha512-IT3epH32/jLiNBwKhM+7BRjm0OwFjRooeQyymfGZUKGN95fm+hKHEbm8pDmWT8bnwSzHB++wsaQJTpi39U+obg== @@ -1457,7 +1457,7 @@ "@endo/stream" "^0.3.25" ses "^0.18.4" -"@endo/pass-style@^0.1.3": +"@endo/pass-style@0.1.3", "@endo/pass-style@^0.1.3": version "0.1.3" resolved "https://registry.yarnpkg.com/@endo/pass-style/-/pass-style-0.1.3.tgz#951056a2869b04f2aab0928b61a91ae7252ddbe4" integrity sha512-V2FLPBUJXsJYWjMSoZW2IopOuggEX14pm8AHfOVXUceF3uvHbdJj7qwKAuIIOhPApZ/TV+6nWYi86eb393Ic2w== @@ -1465,7 +1465,7 @@ "@endo/promise-kit" "^0.2.56" "@fast-check/ava" "^1.1.3" -"@endo/patterns@^0.2.2": +"@endo/patterns@0.2.2", "@endo/patterns@^0.2.2": version "0.2.2" resolved "https://registry.yarnpkg.com/@endo/patterns/-/patterns-0.2.2.tgz#d4c4d63bf450477ed9a9cf194b4a8daa56fcb4f4" integrity sha512-rbS4BLRohZQhB+0aEPBoxmzOfOie9nAu8Qx55Fxe8xFQKS4k9acafeIYmKh9nvslEJISYQmogy5Lewm5mgdSjg== @@ -1474,14 +1474,14 @@ "@endo/marshal" "^0.8.5" "@endo/promise-kit" "^0.2.56" -"@endo/promise-kit@^0.2.56": +"@endo/promise-kit@0.2.56", "@endo/promise-kit@^0.2.56": version "0.2.56" resolved "https://registry.yarnpkg.com/@endo/promise-kit/-/promise-kit-0.2.56.tgz#24ed3cf87af1eec65f4635643b7e67617b909e71" integrity sha512-eKlOg353jJCHwDAwXCajtcAiTTjGkd7oWBXniEEc97gZHK83MeB3pnGT2lhoeq3xzdNw3Xv2DDsowBI194AXeA== dependencies: ses "^0.18.4" -"@endo/ses-ava@^0.2.40": +"@endo/ses-ava@0.2.40": version "0.2.40" resolved "https://registry.yarnpkg.com/@endo/ses-ava/-/ses-ava-0.2.40.tgz#8a6c1f668131ecbe4d06339cac2a8346253089b8" integrity sha512-YIiAPuUfjS5dzyqeiV36FASv4YiSdkRzdxXbntNTBdOvdDymbT37SMkG0mUxD5YZRQuKMTu9xQyaGYSRqf8zaw== @@ -1499,7 +1499,7 @@ "@babel/types" "^7.17.0" ses "^0.18.4" -"@endo/stream-node@^0.2.26": +"@endo/stream-node@0.2.26": version "0.2.26" resolved "https://registry.yarnpkg.com/@endo/stream-node/-/stream-node-0.2.26.tgz#bf3c6ce6c506cde4468a64d220b8df4224638e16" integrity sha512-+UUr1/wZZIWz3KhuAwQr9HPsZv5P8zykw+z1aVFDckTMcdKRyK8yxSg35iEcntvyZoP40LEdnArCXuuEWjm0qw== @@ -1508,7 +1508,7 @@ "@endo/stream" "^0.3.25" ses "^0.18.4" -"@endo/stream@^0.3.25": +"@endo/stream@0.3.25", "@endo/stream@^0.3.25": version "0.3.25" resolved "https://registry.yarnpkg.com/@endo/stream/-/stream-0.3.25.tgz#a49b012b62f345e3de6b360dc30ec27cc32a455f" integrity sha512-qSl9Q9o20/4nKdXlXYCs6KJfeANMKBLrsi7JIxWV1jP9YzIDdq/PkEJsMNq89Z/HWXtPRfEQ4JEMd3O1WBYU5Q== @@ -1517,7 +1517,7 @@ "@endo/promise-kit" "^0.2.56" ses "^0.18.4" -"@endo/zip@^0.2.31": +"@endo/zip@0.2.31", "@endo/zip@^0.2.31": version "0.2.31" resolved "https://registry.yarnpkg.com/@endo/zip/-/zip-0.2.31.tgz#371b1a9ca8b3216ad8a3564e97e3d747be42a657" integrity sha512-rNCZtQzPm6Q8kW69gyeU0hUwKZtwuR8cX1+URgpDuUuaMUbKWBaqURKOmrqKVtE5fkqCE7pSrHvGH02DMDbDHQ== From f01767409daccc3c772628af9301bc0cb825df98 Mon Sep 17 00:00:00 2001 From: Mathieu Hofman Date: Thu, 21 Sep 2023 19:56:39 +0000 Subject: [PATCH 19/20] build(deps): bump @endo/bundle-source --- packages/ERTP/package.json | 2 +- packages/SwingSet/package.json | 2 +- packages/agoric-cli/package.json | 2 +- packages/deploy-script-support/package.json | 2 +- packages/governance/package.json | 2 +- packages/inter-protocol/package.json | 2 +- packages/pegasus/package.json | 2 +- packages/smart-wallet/package.json | 2 +- packages/solo/package.json | 2 +- packages/spawner/package.json | 2 +- packages/swing-store/package.json | 2 +- packages/swingset-runner/package.json | 2 +- packages/swingset-xsnap-supervisor/package.json | 2 +- packages/vats/package.json | 2 +- packages/wallet/api/package.json | 2 +- packages/xsnap-lockdown/package.json | 2 +- packages/xsnap/package.json | 2 +- packages/zoe/package.json | 2 +- yarn.lock | 17 +++++++++-------- 19 files changed, 27 insertions(+), 26 deletions(-) diff --git a/packages/ERTP/package.json b/packages/ERTP/package.json index 57c60aa7267..e5ee37141cf 100644 --- a/packages/ERTP/package.json +++ b/packages/ERTP/package.json @@ -51,7 +51,7 @@ "@endo/promise-kit": "0.2.56" }, "devDependencies": { - "@endo/bundle-source": "2.5.1", + "@endo/bundle-source": "2.5.2-upstream-rollup", "@fast-check/ava": "^1.1.3", "ava": "^5.2.0", "tsd": "^0.28.1" diff --git a/packages/SwingSet/package.json b/packages/SwingSet/package.json index 5ac3d2d087a..a17aa324d87 100644 --- a/packages/SwingSet/package.json +++ b/packages/SwingSet/package.json @@ -39,7 +39,7 @@ "@agoric/xsnap": "^0.14.3-u11.0", "@agoric/xsnap-lockdown": "^0.14.0", "@endo/base64": "0.2.31", - "@endo/bundle-source": "2.5.1", + "@endo/bundle-source": "2.5.2-upstream-rollup", "@endo/captp": "3.1.1", "@endo/check-bundle": "0.2.18", "@endo/compartment-mapper": "0.8.4", diff --git a/packages/agoric-cli/package.json b/packages/agoric-cli/package.json index 9472c16328f..8def0229819 100644 --- a/packages/agoric-cli/package.json +++ b/packages/agoric-cli/package.json @@ -50,7 +50,7 @@ "@cosmjs/math": "^0.30.1", "@cosmjs/proto-signing": "^0.30.1", "@cosmjs/stargate": "^0.30.1", - "@endo/bundle-source": "2.5.1", + "@endo/bundle-source": "2.5.2-upstream-rollup", "@endo/captp": "3.1.1", "@endo/compartment-mapper": "0.8.4", "@endo/far": "0.2.18", diff --git a/packages/deploy-script-support/package.json b/packages/deploy-script-support/package.json index 05aa979d02b..c37958762f7 100644 --- a/packages/deploy-script-support/package.json +++ b/packages/deploy-script-support/package.json @@ -42,7 +42,7 @@ "@agoric/store": "^0.9.3-u11.0", "@agoric/zoe": "^0.26.3-u11.0", "@endo/base64": "0.2.31", - "@endo/bundle-source": "2.5.1", + "@endo/bundle-source": "2.5.2-upstream-rollup", "@endo/far": "0.2.18", "@endo/marshal": "0.8.5", "@endo/nat": "4.1.27", diff --git a/packages/governance/package.json b/packages/governance/package.json index 90994dc946d..ee4f9ca9152 100644 --- a/packages/governance/package.json +++ b/packages/governance/package.json @@ -50,7 +50,7 @@ }, "devDependencies": { "@agoric/deploy-script-support": "^0.10.4-u11.0", - "@endo/bundle-source": "2.5.1", + "@endo/bundle-source": "2.5.2-upstream-rollup", "@endo/init": "0.5.56", "ava": "^5.2.0", "c8": "^7.13.0", diff --git a/packages/inter-protocol/package.json b/packages/inter-protocol/package.json index 6c0fe25d45c..7004bc3aad5 100644 --- a/packages/inter-protocol/package.json +++ b/packages/inter-protocol/package.json @@ -52,7 +52,7 @@ "@agoric/smart-wallet": "^0.5.4-u11.0", "@agoric/swingset-liveslots": "^0.10.3-u11.0", "@agoric/swingset-vat": "^0.32.3-u11.0", - "@endo/bundle-source": "2.5.1", + "@endo/bundle-source": "2.5.2-upstream-rollup", "@endo/init": "0.5.56", "@endo/promise-kit": "0.2.56", "@fast-check/ava": "^1.1.3", diff --git a/packages/pegasus/package.json b/packages/pegasus/package.json index 1e808d7808a..298cc1de723 100644 --- a/packages/pegasus/package.json +++ b/packages/pegasus/package.json @@ -37,7 +37,7 @@ "@agoric/swingset-vat": "^0.32.3-u11.0", "@agoric/vats": "^0.15.2-u11.0", "@agoric/zoe": "^0.26.3-u11.0", - "@endo/bundle-source": "2.5.1", + "@endo/bundle-source": "2.5.2-upstream-rollup", "@endo/captp": "3.1.1", "@endo/far": "0.2.18", "@endo/init": "0.5.56", diff --git a/packages/smart-wallet/package.json b/packages/smart-wallet/package.json index 5b242479f24..7c8184784f3 100644 --- a/packages/smart-wallet/package.json +++ b/packages/smart-wallet/package.json @@ -17,7 +17,7 @@ }, "devDependencies": { "@agoric/cosmic-proto": "^0.3.0", - "@endo/bundle-source": "2.5.1", + "@endo/bundle-source": "2.5.2-upstream-rollup", "@endo/captp": "3.1.1", "@endo/init": "0.5.56", "ava": "^5.2.0", diff --git a/packages/solo/package.json b/packages/solo/package.json index 5d63f86a1be..a069282b89c 100644 --- a/packages/solo/package.json +++ b/packages/solo/package.json @@ -58,7 +58,7 @@ }, "devDependencies": { "@agoric/ertp": "^0.16.3-u11.0", - "@endo/bundle-source": "2.5.1", + "@endo/bundle-source": "2.5.2-upstream-rollup", "ava": "^5.2.0", "c8": "^7.13.0" }, diff --git a/packages/spawner/package.json b/packages/spawner/package.json index 38c34eaa14d..fd099c2b1d4 100644 --- a/packages/spawner/package.json +++ b/packages/spawner/package.json @@ -38,7 +38,7 @@ "devDependencies": { "@agoric/internal": "^0.3.3-u11.0", "@agoric/swingset-vat": "^0.32.3-u11.0", - "@endo/bundle-source": "2.5.1", + "@endo/bundle-source": "2.5.2-upstream-rollup", "@endo/init": "0.5.56", "ava": "^5.2.0", "c8": "^7.13.0" diff --git a/packages/swing-store/package.json b/packages/swing-store/package.json index a4fcb3e068c..24ef1dfcef4 100644 --- a/packages/swing-store/package.json +++ b/packages/swing-store/package.json @@ -24,7 +24,7 @@ "@agoric/assert": "^0.6.0", "@agoric/internal": "^0.3.3-u11.0", "@endo/base64": "0.2.31", - "@endo/bundle-source": "2.5.1", + "@endo/bundle-source": "2.5.2-upstream-rollup", "@endo/check-bundle": "0.2.18", "@endo/nat": "4.1.27", "better-sqlite3": "^8.2.0" diff --git a/packages/swingset-runner/package.json b/packages/swingset-runner/package.json index 44be5b1a546..ccf09566c55 100644 --- a/packages/swingset-runner/package.json +++ b/packages/swingset-runner/package.json @@ -28,7 +28,7 @@ "@agoric/telemetry": "^0.6.3-u11.0", "@agoric/vat-data": "^0.5.3-u11.0", "@agoric/zoe": "^0.26.3-u11.0", - "@endo/bundle-source": "2.5.1", + "@endo/bundle-source": "2.5.2-upstream-rollup", "@endo/eventual-send": "0.17.2", "@endo/init": "0.5.56", "@endo/marshal": "0.8.5", diff --git a/packages/swingset-xsnap-supervisor/package.json b/packages/swingset-xsnap-supervisor/package.json index a9c803eafcb..f06f6a9106b 100644 --- a/packages/swingset-xsnap-supervisor/package.json +++ b/packages/swingset-xsnap-supervisor/package.json @@ -25,7 +25,7 @@ "devDependencies": { "@agoric/assert": "^0.6.0", "@agoric/swingset-liveslots": "^0.10.3-u11.0", - "@endo/bundle-source": "2.5.1", + "@endo/bundle-source": "2.5.2-upstream-rollup", "@endo/import-bundle": "0.3.4", "@endo/init": "0.5.56", "@endo/marshal": "0.8.5", diff --git a/packages/vats/package.json b/packages/vats/package.json index 80680e9f08b..7332f41ca5d 100644 --- a/packages/vats/package.json +++ b/packages/vats/package.json @@ -55,7 +55,7 @@ "@agoric/smart-wallet": "^0.5.4-u11.0", "@agoric/swing-store": "^0.9.2-u11.0", "@agoric/swingset-liveslots": "^0.10.3-u11.0", - "@endo/bundle-source": "2.5.1", + "@endo/bundle-source": "2.5.2-upstream-rollup", "@endo/captp": "3.1.1", "@endo/stream": "0.3.25", "ava": "^5.2.0", diff --git a/packages/wallet/api/package.json b/packages/wallet/api/package.json index 530883218ea..960b3302c4a 100644 --- a/packages/wallet/api/package.json +++ b/packages/wallet/api/package.json @@ -15,7 +15,7 @@ }, "devDependencies": { "@agoric/vats": "^0.15.2-u11.0", - "@endo/bundle-source": "2.5.1", + "@endo/bundle-source": "2.5.2-upstream-rollup", "@endo/init": "0.5.56", "ava": "^5.2.0" }, diff --git a/packages/xsnap-lockdown/package.json b/packages/xsnap-lockdown/package.json index 5dd06475446..b7ca19a9385 100644 --- a/packages/xsnap-lockdown/package.json +++ b/packages/xsnap-lockdown/package.json @@ -20,7 +20,7 @@ "test:xs": "exit 0" }, "devDependencies": { - "@endo/bundle-source": "2.5.1", + "@endo/bundle-source": "2.5.2-upstream-rollup", "@endo/init": "0.5.56", "ava": "^5.2.0", "c8": "^7.13.0", diff --git a/packages/xsnap/package.json b/packages/xsnap/package.json index 61f4248bbae..50581fe6043 100644 --- a/packages/xsnap/package.json +++ b/packages/xsnap/package.json @@ -30,7 +30,7 @@ "@agoric/assert": "^0.6.0", "@agoric/internal": "^0.3.3-u11.0", "@agoric/xsnap-lockdown": "^0.14.0", - "@endo/bundle-source": "2.5.1", + "@endo/bundle-source": "2.5.2-upstream-rollup", "@endo/eventual-send": "0.17.2", "@endo/init": "0.5.56", "@endo/netstring": "0.3.26", diff --git a/packages/zoe/package.json b/packages/zoe/package.json index cc30c385203..d479fab980e 100644 --- a/packages/zoe/package.json +++ b/packages/zoe/package.json @@ -51,7 +51,7 @@ "@agoric/swingset-vat": "^0.32.3-u11.0", "@agoric/time": "^0.3.3-u11.0", "@agoric/vat-data": "^0.5.3-u11.0", - "@endo/bundle-source": "2.5.1", + "@endo/bundle-source": "2.5.2-upstream-rollup", "@endo/captp": "3.1.1", "@endo/eventual-send": "0.17.2", "@endo/far": "0.2.18", diff --git a/yarn.lock b/yarn.lock index 5b0c3e00da0..f79cbb868d8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1325,10 +1325,10 @@ resolved "https://registry.yarnpkg.com/@endo/base64/-/base64-0.2.31.tgz#92378462cd791e0258a2291d44d2cfd15415cf32" integrity sha512-7IndkaZ7buIuFw8oBovNZV7epuyFWs0gdusSJ/zrx6fMXRqX0ycSTtxr6M5xADQGss1I9fqP3vteVLiNFlyIbw== -"@endo/bundle-source@2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@endo/bundle-source/-/bundle-source-2.5.1.tgz#6ec870335bd88ee561e6c2a323080c3b4a1894b4" - integrity sha512-O8aEiOF3GmMbXjmz47CYNfvT6c16CNGT1ups2Spt29noejCoklmF5L7mEbeS8w7XUGA0Cs1IrZDfkiyTZ+ckmA== +"@endo/bundle-source@2.5.2-upstream-rollup": + version "2.5.2-upstream-rollup" + resolved "https://registry.yarnpkg.com/@endo/bundle-source/-/bundle-source-2.5.2-upstream-rollup.tgz#89fdc6b1b6625ca8c484c12e7762f04cd711ca9f" + integrity sha512-UoQlCMZ8jnQA6ulKYII+plWdyK0/XAj1clHPnAW1ILEthQWN1h9WeQT26mIWowGp+sX8CIyiRSVRQN/0pC35Fw== dependencies: "@agoric/babel-generator" "^7.17.4" "@babel/parser" "^7.17.3" @@ -1341,7 +1341,7 @@ "@rollup/plugin-node-resolve" "^13.0.0" acorn "^8.2.4" jessie.js "^0.3.2" - rollup endojs/endo#rollup-2.7.1-patch-1 + rollup "^2.79.1" source-map "^0.7.3" "@endo/captp@3.1.1": @@ -11891,9 +11891,10 @@ rollup@^2.58.0: optionalDependencies: fsevents "~2.3.2" -rollup@endojs/endo#rollup-2.7.1-patch-1: - version "2.70.1-endo.1" - resolved "https://codeload.github.com/endojs/endo/tar.gz/54060e784a4dbe77b6692f17344f4d84a198530d" +rollup@^2.79.1: + version "2.79.1" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7" + integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw== optionalDependencies: fsevents "~2.3.2" From 8f8782bc52393e9d4fc82523ecf31cab429b11b3 Mon Sep 17 00:00:00 2001 From: Mathieu Hofman Date: Thu, 21 Sep 2023 22:18:57 +0000 Subject: [PATCH 20/20] ci: tweak integration checks --- .github/workflows/integration.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index f46760f19e7..4a445a2206c 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -7,6 +7,8 @@ on: - master - 'release-*' - beta + tags: + - '@agoric/sdk@*' pull_request: types: - opened @@ -28,6 +30,7 @@ jobs: if: needs.pre_check.outputs.should_run == 'true' runs-on: ubuntu-latest strategy: + fail-fast: false matrix: cli: [link-cli/yarn, registry/yarn, registry/npm, registry/npx] timeout-minutes: 40