From 4e627b22f311e30a1f00c09dd5162bf4b1718e27 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Tue, 29 Oct 2024 15:20:42 -0700 Subject: [PATCH 1/6] build(deps): bump commander to 12.1.0 breaking changes not applicable https://github.com/tj/commander.js/releases/tag/v12.0.0 --- packages/agoric-cli/package.json | 2 +- yarn.lock | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/agoric-cli/package.json b/packages/agoric-cli/package.json index 67ebc7bf629..5c7e8ddbbbc 100644 --- a/packages/agoric-cli/package.json +++ b/packages/agoric-cli/package.json @@ -72,7 +72,7 @@ "@iarna/toml": "^2.2.3", "anylogger": "^0.21.0", "chalk": "^5.2.0", - "commander": "^11.1.0", + "commander": "^12.1.0", "deterministic-json": "^1.0.5", "esm": "agoric-labs/esm#Agoric-built", "inquirer": "^8.2.2", diff --git a/yarn.lock b/yarn.lock index bb8a5ec3a88..bb3642b8da2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5016,11 +5016,6 @@ commander@7.1.0: resolved "https://registry.yarnpkg.com/commander/-/commander-7.1.0.tgz#f2eaecf131f10e36e07d894698226e36ae0eb5ff" integrity sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg== -commander@^11.1.0: - version "11.1.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-11.1.0.tgz#62fdce76006a68e5c1ab3314dc92e800eb83d906" - integrity sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ== - commander@^12.1.0: version "12.1.0" resolved "https://registry.yarnpkg.com/commander/-/commander-12.1.0.tgz#01423b36f501259fdaac4d0e4d60c96c991585d3" From 2f8a1a5c1599afe6aa927f31c368a56b4fefdb45 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Tue, 29 Oct 2024 15:20:56 -0700 Subject: [PATCH 2/6] chore(deps): npx yarn-deduplicate --- yarn.lock | 64 ++----------------------------------------------------- 1 file changed, 2 insertions(+), 62 deletions(-) diff --git a/yarn.lock b/yarn.lock index bb3642b8da2..ce24469095a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1544,13 +1544,6 @@ resolved "https://registry.yarnpkg.com/@endo/env-options/-/env-options-1.1.7.tgz#f8f9186010cff12506fdd8f5c8cd4d9051830fd8" integrity sha512-8twSTbM45rzIP0lHw99ei1EaW98H2BXYKjCTUcq1qgK2OvQWaoiXNcJvUQQo1g7i3oPwbXTQsY69L+nTNeCDyA== -"@endo/errors@^1.2.6": - version "1.2.6" - resolved "https://registry.yarnpkg.com/@endo/errors/-/errors-1.2.6.tgz#d237b08dfb32a1c5474d83b4cbeb6363783a7767" - integrity sha512-Ly8qCgEoc3d23qklib87PPC829KmkpIkPSMnIiEFnTCedVs55LCoXz01bVEanR4lrCB/qkzjx7n21BwWbscc8Q== - dependencies: - ses "^1.9.0" - "@endo/errors@^1.2.7": version "1.2.7" resolved "https://registry.yarnpkg.com/@endo/errors/-/errors-1.2.7.tgz#cd8513a8e5544f4caec3eb47dd2ec101b445ea8f" @@ -1578,13 +1571,6 @@ "@babel/traverse" "^7.23.6" source-map-js "^1.2.0" -"@endo/eventual-send@^1.2.6": - version "1.2.6" - resolved "https://registry.yarnpkg.com/@endo/eventual-send/-/eventual-send-1.2.6.tgz#43d0f4567e3318491b3720bd7d13eef5448f5384" - integrity sha512-wD2OhDDvW8y519q6B8H5jox5mXau6OdTIlYQGzI2lk7xtPasydh2SgdQsX6u1jLAXVcJuNqW7wWgLmvk42ncVA== - dependencies: - "@endo/env-options" "^1.1.7" - "@endo/eventual-send@^1.2.7": version "1.2.7" resolved "https://registry.yarnpkg.com/@endo/eventual-send/-/eventual-send-1.2.7.tgz#b4f5408bba1dd1974f147ecb8c346d443b5a31f5" @@ -1605,16 +1591,7 @@ "@endo/pass-style" "^1.4.6" "@endo/patterns" "^1.4.6" -"@endo/far@^1.0.0": - version "1.1.6" - resolved "https://registry.yarnpkg.com/@endo/far/-/far-1.1.6.tgz#ca5804da58762cf8b7ecbf8bdd902254d898d456" - integrity sha512-rpMzGyyumpk0rXxIh189zimhMJknzfyJX+HCiYHXELk/iuX53HqwqVobP9HWB65lD9M2nwySgXWtxI75Lx4Afw== - dependencies: - "@endo/errors" "^1.2.6" - "@endo/eventual-send" "^1.2.6" - "@endo/pass-style" "^1.4.4" - -"@endo/far@^1.1.8": +"@endo/far@^1.0.0", "@endo/far@^1.1.8": version "1.1.8" resolved "https://registry.yarnpkg.com/@endo/far/-/far-1.1.8.tgz#c8212b8182dd671719dc54e55f6406115f2966de" integrity sha512-xtfKPj1bhefpMouI+6q6zjfwDSSnaCZaSDqjClBrx6SnEO1B3ARdxtmiMEOgCdsw1XakvQwq8HDUWqDWEusJFQ== @@ -1689,17 +1666,6 @@ "@endo/stream" "^1.2.7" ses "^1.9.1" -"@endo/pass-style@^1.4.4": - version "1.4.4" - resolved "https://registry.yarnpkg.com/@endo/pass-style/-/pass-style-1.4.4.tgz#01c1d6ffc4af3e39b7c8cb8b912d9f6b28d02e55" - integrity sha512-RlZMt2kKQUYfrxh9G4RZ8eQs+Bb6DwT7P8TbJZGfgIRYajL5I5zAdByz9PA8P0+aj4PZpKnTUfKwlhNs+tNV0w== - dependencies: - "@endo/env-options" "^1.1.7" - "@endo/errors" "^1.2.6" - "@endo/eventual-send" "^1.2.6" - "@endo/promise-kit" "^1.1.6" - "@fast-check/ava" "^1.1.5" - "@endo/pass-style@^1.4.6": version "1.4.6" resolved "https://registry.yarnpkg.com/@endo/pass-style/-/pass-style-1.4.6.tgz#75092d33ad5183be120fb662361eef44c28f7768" @@ -1722,13 +1688,6 @@ "@endo/marshal" "^1.6.1" "@endo/promise-kit" "^1.1.7" -"@endo/promise-kit@^1.1.6": - version "1.1.6" - resolved "https://registry.yarnpkg.com/@endo/promise-kit/-/promise-kit-1.1.6.tgz#0357c09973fd28be0ef8cb18fbfbb3cfaf1f993b" - integrity sha512-14HtlfeUfm9voakcDF4hK15NlyzHtlPFBjJh42ZmWW3aGXmUJQTI/yIdv0zPXcMkogCdeBNKXpQSqIsYehAowQ== - dependencies: - ses "^1.9.0" - "@endo/promise-kit@^1.1.7": version "1.1.7" resolved "https://registry.yarnpkg.com/@endo/promise-kit/-/promise-kit-1.1.7.tgz#04c84ef2a2047b94925fcc8ad4feb22cb0a7b2a0" @@ -3059,7 +3018,7 @@ resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.3.0.tgz#27c6f776ac3c1c616651e506a89f438a0ed6a055" integrity sha512-YveTnGNsFFixTKJz09Oi4zYkiLT5af3WpZDu4aIUM7xX+2bHAkOJayFTVQd6zB8kkWPpbua4Ha6Ql00grdLlJQ== -"@opentelemetry/core@1.26.0": +"@opentelemetry/core@1.26.0", "@opentelemetry/core@^1.14.0": version "1.26.0" resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.26.0.tgz#7d84265aaa850ed0ca5813f97d831155be42b328" integrity sha512-1iKxXXE8415Cdv0yjG3G6hQnB5eVEsJce3QaawX8SjDn0mAS0ZM8fAbZZJD4ajvhC15cePvosSCut404KrIIvQ== @@ -3073,13 +3032,6 @@ dependencies: "@opentelemetry/semantic-conventions" "1.9.1" -"@opentelemetry/core@^1.14.0": - version "1.15.2" - resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.15.2.tgz#5b170bf223a2333884bbc2d29d95812cdbda7c9f" - integrity sha512-+gBv15ta96WqkHZaPpcDHiaz0utiiHZVfm2YOYSqFGrUaJpPkMoSuLBB58YFQGi6Rsb9EHos84X6X5+9JspmLw== - dependencies: - "@opentelemetry/semantic-conventions" "1.15.2" - "@opentelemetry/exporter-logs-otlp-http@0.53.0": version "0.53.0" resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-logs-otlp-http/-/exporter-logs-otlp-http-0.53.0.tgz#1b4a152ea427ec4581532880fd0d620cc559cb11" @@ -3209,11 +3161,6 @@ "@opentelemetry/resources" "1.9.1" "@opentelemetry/semantic-conventions" "1.9.1" -"@opentelemetry/semantic-conventions@1.15.2": - version "1.15.2" - resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.15.2.tgz#3bafb5de3e20e841dff6cb3c66f4d6e9694c4241" - integrity sha512-CjbOKwk2s+3xPIMcd5UNYQzsf+v94RczbdNix9/kQh38WiQkM90sUOi3if8eyHFgiBjBjhwXrA7W3ydiSQP9mw== - "@opentelemetry/semantic-conventions@1.27.0", "@opentelemetry/semantic-conventions@~1.27.0": version "1.27.0" resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.27.0.tgz#1a857dcc95a5ab30122e04417148211e6f945e6c" @@ -10724,13 +10671,6 @@ serve-static@^2.1.0: parseurl "^1.3.3" send "^1.0.0" -ses@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/ses/-/ses-1.9.0.tgz#ebf2de9759a21b09550aef0645c3f9b817409381" - integrity sha512-ZDAkixRUIPId1oXVxDhj1sIzFUeJ3vzaJCd64Ra1owuVH6Bcd+IOGrJtiFqUTA+YC9w8jTE9XkZTwin+hkbn5Q== - dependencies: - "@endo/env-options" "^1.1.7" - ses@^1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/ses/-/ses-1.9.1.tgz#54991a775cea5f9e27292bbb6706941a8203062a" From 4b924901c698026ec127991b02bcef104c50a08e Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Tue, 29 Oct 2024 15:18:19 -0700 Subject: [PATCH 3/6] chore(deps): drop extraneous 'agoric' dep --- packages/fast-usdc/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/fast-usdc/package.json b/packages/fast-usdc/package.json index b54b1a6bbe7..bbfaf39f7a1 100644 --- a/packages/fast-usdc/package.json +++ b/packages/fast-usdc/package.json @@ -27,7 +27,6 @@ "ts-blank-space": "^0.4.1" }, "dependencies": { - "agoric": "^0.21.1", "commander": "^12.1.0" }, "ava": { From 59e761be490e020fe19024cb77f001fcd1ebf7cf Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Tue, 29 Oct 2024 15:18:50 -0700 Subject: [PATCH 4/6] chore: fix package description --- packages/fast-usdc/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fast-usdc/package.json b/packages/fast-usdc/package.json index bbfaf39f7a1..76c754e2a19 100644 --- a/packages/fast-usdc/package.json +++ b/packages/fast-usdc/package.json @@ -2,7 +2,7 @@ "name": "fast-usdc", "private": true, "version": "0.1.0", - "description": "Create an Agoric Javascript smart contract application", + "description": "CLI and library for Fast USDC product", "type": "module", "files": [ "contract", From 33309e0f2d0aa9f6a8093a0398935b4a98704943 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Tue, 29 Oct 2024 15:17:38 -0700 Subject: [PATCH 5/6] chore: rename fast-usdc pkg to include org --- packages/agoric-cli/src/sdk-package-names.js | 4 ++-- packages/fast-usdc/README.md | 6 ------ packages/fast-usdc/package.json | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/packages/agoric-cli/src/sdk-package-names.js b/packages/agoric-cli/src/sdk-package-names.js index bd78d1387fb..483c22208ad 100644 --- a/packages/agoric-cli/src/sdk-package-names.js +++ b/packages/agoric-cli/src/sdk-package-names.js @@ -17,6 +17,7 @@ export default [ "@agoric/deployment", "@agoric/ertp", "@agoric/eslint-config", + "@agoric/fast-usdc", "@agoric/governance", "@agoric/import-manager", "@agoric/inter-protocol", @@ -49,6 +50,5 @@ export default [ "@agoric/xsnap-lockdown", "@agoric/zoe", "@agoric/zone", - "agoric", - "fast-usdc" + "agoric" ]; diff --git a/packages/fast-usdc/README.md b/packages/fast-usdc/README.md index 76a23f4c329..f606d557657 100644 --- a/packages/fast-usdc/README.md +++ b/packages/fast-usdc/README.md @@ -3,12 +3,6 @@ Development package for the Fast USDC product. Here in agoric-sdk as a convenience for integration testing and iterating on the SDK affordances required for the product. -# Naming - -The package is `fast-usdc`, not `@agoric/fast-usdc`, because it's not part of the SDK. - -It should not appear in the NPM directory. To this end the package is marked as private. - # Factoring This package is meant to contain all the code for the Fast USDC product. However there are some constraints: diff --git a/packages/fast-usdc/package.json b/packages/fast-usdc/package.json index 76c754e2a19..21b669555f4 100644 --- a/packages/fast-usdc/package.json +++ b/packages/fast-usdc/package.json @@ -1,5 +1,5 @@ { - "name": "fast-usdc", + "name": "@agoric/fast-usdc", "private": true, "version": "0.1.0", "description": "CLI and library for Fast USDC product", From 202ba1e1924c30f65edefa7584b484f580ce5386 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Wed, 30 Oct 2024 09:24:50 -0700 Subject: [PATCH 6/6] fix: proposeParamChange options discount-step was defined twice. This picks the more documented one. --- packages/agoric-cli/src/commands/auction.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/agoric-cli/src/commands/auction.js b/packages/agoric-cli/src/commands/auction.js index 99ffd43355c..e07729a56f3 100644 --- a/packages/agoric-cli/src/commands/auction.js +++ b/packages/agoric-cli/src/commands/auction.js @@ -59,11 +59,6 @@ export const makeAuctionCommand = ( 'descending clock step size', BigInt, ) - .option( - '--discount-step ', - 'proposed value (basis points)', - BigInt, - ) .requiredOption( '--charterAcceptOfferId ', 'offer that had continuing invitation result',