From 381cdcf0d81f70fcc4d224294fca4aa831375c69 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Fri, 20 Sep 2024 14:56:49 -0700 Subject: [PATCH 1/4] chore(deps): bump typescript-eslint to 7.18 --- package.json | 4 +- yarn.lock | 115 +++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 96 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 6631745c99a..628a28fd66b 100644 --- a/package.json +++ b/package.json @@ -35,12 +35,12 @@ "typedoc": "^0.26.7", "typedoc-plugin-markdown": "^4.2.1", "typescript": "^5.6.2", - "typescript-eslint": "^7.15.0" + "typescript-eslint": "^7.18.0" }, "resolutions": { "**/protobufjs": "^7.2.6", "**/@types/estree": "^1.0.0", - "**/@typescript-eslint/typescript-estree": "^7.15.0" + "@endo/eslint-plugin/typescript-eslint": "^7.18.0" }, "engines": { "node": "^18.12 || ^20.9" diff --git a/yarn.lock b/yarn.lock index bcf533c01d3..afb3d6081c8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3715,7 +3715,22 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@7.15.0", "@typescript-eslint/eslint-plugin@^7.0.1": +"@typescript-eslint/eslint-plugin@7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz#b16d3cf3ee76bf572fdf511e79c248bdec619ea3" + integrity sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw== + dependencies: + "@eslint-community/regexpp" "^4.10.0" + "@typescript-eslint/scope-manager" "7.18.0" + "@typescript-eslint/type-utils" "7.18.0" + "@typescript-eslint/utils" "7.18.0" + "@typescript-eslint/visitor-keys" "7.18.0" + graphemer "^1.4.0" + ignore "^5.3.1" + natural-compare "^1.4.0" + ts-api-utils "^1.3.0" + +"@typescript-eslint/eslint-plugin@^7.0.1": version "7.15.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.15.0.tgz#8eaf396ac2992d2b8f874b68eb3fcd6b179cb7f3" integrity sha512-uiNHpyjZtFrLwLDpHnzaDlP3Tt6sGMqTCiqmxaN4n4RP0EfYZDODJyddiFDF44Hjwxr5xAcaYxVKm9QKQFJFLA== @@ -3730,7 +3745,18 @@ natural-compare "^1.4.0" ts-api-utils "^1.3.0" -"@typescript-eslint/parser@7.15.0", "@typescript-eslint/parser@^7.0.1": +"@typescript-eslint/parser@7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.18.0.tgz#83928d0f1b7f4afa974098c64b5ce6f9051f96a0" + integrity sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg== + dependencies: + "@typescript-eslint/scope-manager" "7.18.0" + "@typescript-eslint/types" "7.18.0" + "@typescript-eslint/typescript-estree" "7.18.0" + "@typescript-eslint/visitor-keys" "7.18.0" + debug "^4.3.4" + +"@typescript-eslint/parser@^7.0.1": version "7.15.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.15.0.tgz#f4a536e5fc6a1c05c82c4d263a2bfad2da235c80" integrity sha512-k9fYuQNnypLFcqORNClRykkGOMOj+pV6V91R4GO/l1FDGwpqmSwoOQrOHo3cGaH63e+D3ZiCAOsuS/D2c99j/A== @@ -3749,6 +3775,14 @@ "@typescript-eslint/types" "7.15.0" "@typescript-eslint/visitor-keys" "7.15.0" +"@typescript-eslint/scope-manager@7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz#c928e7a9fc2c0b3ed92ab3112c614d6bd9951c83" + integrity sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA== + dependencies: + "@typescript-eslint/types" "7.18.0" + "@typescript-eslint/visitor-keys" "7.18.0" + "@typescript-eslint/type-utils@7.15.0": version "7.15.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.15.0.tgz#5b83c904c6de91802fb399305a50a56d10472c39" @@ -3759,23 +3793,52 @@ debug "^4.3.4" ts-api-utils "^1.3.0" +"@typescript-eslint/type-utils@7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz#2165ffaee00b1fbbdd2d40aa85232dab6998f53b" + integrity sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA== + dependencies: + "@typescript-eslint/typescript-estree" "7.18.0" + "@typescript-eslint/utils" "7.18.0" + debug "^4.3.4" + ts-api-utils "^1.3.0" + "@typescript-eslint/types@7.15.0": version "7.15.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.15.0.tgz#fb894373a6e3882cbb37671ffddce44f934f62fc" integrity sha512-aV1+B1+ySXbQH0pLK0rx66I3IkiZNidYobyfn0WFsdGhSXw+P3YOqeTq5GED458SfB24tg+ux3S+9g118hjlTw== -"@typescript-eslint/types@7.16.0", "@typescript-eslint/types@^7.2.0": +"@typescript-eslint/types@7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.18.0.tgz#b90a57ccdea71797ffffa0321e744f379ec838c9" + integrity sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ== + +"@typescript-eslint/types@^7.2.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.16.0.tgz#60a19d7e7a6b1caa2c06fac860829d162a036ed2" integrity sha512-fecuH15Y+TzlUutvUl9Cc2XJxqdLr7+93SQIbcZfd4XRGGKoxyljK27b+kxKamjRkU7FYC6RrbSCg0ALcZn/xw== -"@typescript-eslint/typescript-estree@7.15.0", "@typescript-eslint/typescript-estree@^7.15.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.16.0.tgz#98ac779d526fab2a781e5619c9250f3e33867c09" - integrity sha512-a5NTvk51ZndFuOLCh5OaJBELYc2O3Zqxfl3Js78VFE1zE46J2AaVuW+rEbVkQznjkmlzWsUI15BG5tQMixzZLw== +"@typescript-eslint/typescript-estree@7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.15.0.tgz#e323bfa3966e1485b638ce751f219fc1f31eba37" + integrity sha512-gjyB/rHAopL/XxfmYThQbXbzRMGhZzGw6KpcMbfe8Q3nNQKStpxnUKeXb0KiN/fFDR42Z43szs6rY7eHk0zdGQ== dependencies: - "@typescript-eslint/types" "7.16.0" - "@typescript-eslint/visitor-keys" "7.16.0" + "@typescript-eslint/types" "7.15.0" + "@typescript-eslint/visitor-keys" "7.15.0" + debug "^4.3.4" + globby "^11.1.0" + is-glob "^4.0.3" + minimatch "^9.0.4" + semver "^7.6.0" + ts-api-utils "^1.3.0" + +"@typescript-eslint/typescript-estree@7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz#b5868d486c51ce8f312309ba79bdb9f331b37931" + integrity sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA== + dependencies: + "@typescript-eslint/types" "7.18.0" + "@typescript-eslint/visitor-keys" "7.18.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" @@ -3793,6 +3856,16 @@ "@typescript-eslint/types" "7.15.0" "@typescript-eslint/typescript-estree" "7.15.0" +"@typescript-eslint/utils@7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.18.0.tgz#bca01cde77f95fc6a8d5b0dbcbfb3d6ca4be451f" + integrity sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw== + dependencies: + "@eslint-community/eslint-utils" "^4.4.0" + "@typescript-eslint/scope-manager" "7.18.0" + "@typescript-eslint/types" "7.18.0" + "@typescript-eslint/typescript-estree" "7.18.0" + "@typescript-eslint/visitor-keys@7.15.0": version "7.15.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.15.0.tgz#1da0726201a859343fe6a05742a7c1792fff5b66" @@ -3801,12 +3874,12 @@ "@typescript-eslint/types" "7.15.0" eslint-visitor-keys "^3.4.3" -"@typescript-eslint/visitor-keys@7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.16.0.tgz#a1d99fa7a3787962d6e0efd436575ef840e23b06" - integrity sha512-rMo01uPy9C7XxG7AFsxa8zLnWXTF8N3PYclekWSrurvhwiw1eW88mrKiAYe6s53AUY57nTRz8dJsuuXdkAhzCg== +"@typescript-eslint/visitor-keys@7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz#0564629b6124d67607378d0f0332a0495b25e7d7" + integrity sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg== dependencies: - "@typescript-eslint/types" "7.16.0" + "@typescript-eslint/types" "7.18.0" eslint-visitor-keys "^3.4.3" "@ungap/structured-clone@^1.2.0": @@ -11662,14 +11735,14 @@ typedoc@^0.26.7: shiki "^1.16.2" yaml "^2.5.1" -typescript-eslint@^7.15.0, typescript-eslint@^7.3.1: - version "7.15.0" - resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-7.15.0.tgz#44caca31461cc8afa829c4e5ab11aa9e0f7e175d" - integrity sha512-Ta40FhMXBCwHura4X4fncaCVkVcnJ9jnOq5+Lp4lN8F4DzHZtOwZdRvVBiNUGznUDHPwdGnrnwxmUOU2fFQqFA== +typescript-eslint@^7.18.0, typescript-eslint@^7.3.1: + version "7.18.0" + resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-7.18.0.tgz#e90d57649b2ad37a7475875fa3e834a6d9f61eb2" + integrity sha512-PonBkP603E3tt05lDkbOMyaxJjvKqQrXsnow72sVeOFINDE/qNmnnd+f9b4N+U7W6MXnnYyrhtmF2t08QWwUbA== dependencies: - "@typescript-eslint/eslint-plugin" "7.15.0" - "@typescript-eslint/parser" "7.15.0" - "@typescript-eslint/utils" "7.15.0" + "@typescript-eslint/eslint-plugin" "7.18.0" + "@typescript-eslint/parser" "7.18.0" + "@typescript-eslint/utils" "7.18.0" "typescript@^3 || ^4": version "4.9.5" From f88f50793d8641107478cc4f0a5eb9a619651706 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Fri, 20 Sep 2024 14:57:09 -0700 Subject: [PATCH 2/4] chore(deps): yarn-deduplicate --- yarn.lock | 113 +++--------------------------------------------------- 1 file changed, 5 insertions(+), 108 deletions(-) diff --git a/yarn.lock b/yarn.lock index afb3d6081c8..2dc7dd17b95 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3609,14 +3609,7 @@ dependencies: "@types/node" "*" -"@types/node@*", "@types/node@>=13.7.0": - version "18.19.24" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.24.tgz#707d8a4907e55901466e60e8f7a62bc6197ace95" - integrity sha512-eghAz3gnbQbvnHqB+mgB2ZR3aH6RhdEmHGS48BnV75KceQPHqabkxKI0BbUSsqhqy2Ddhc2xD/VAR9ySZd57Lw== - dependencies: - undici-types "~5.26.4" - -"@types/node@^22.0.0": +"@types/node@*", "@types/node@>=13.7.0", "@types/node@^22.0.0": version "22.0.0" resolved "https://registry.yarnpkg.com/@types/node/-/node-22.0.0.tgz#04862a2a71e62264426083abe1e27e87cac05a30" integrity sha512-VT7KSYudcPOzP5Q0wfbowyNLaVR8QWUdw+088uFWwfvpY6uCWaXpqV6ieLAu9WBcnTa7H4Z5RLK8I5t2FuOcqw== @@ -3715,7 +3708,7 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@7.18.0": +"@typescript-eslint/eslint-plugin@7.18.0", "@typescript-eslint/eslint-plugin@^7.0.1": version "7.18.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz#b16d3cf3ee76bf572fdf511e79c248bdec619ea3" integrity sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw== @@ -3730,22 +3723,7 @@ natural-compare "^1.4.0" ts-api-utils "^1.3.0" -"@typescript-eslint/eslint-plugin@^7.0.1": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.15.0.tgz#8eaf396ac2992d2b8f874b68eb3fcd6b179cb7f3" - integrity sha512-uiNHpyjZtFrLwLDpHnzaDlP3Tt6sGMqTCiqmxaN4n4RP0EfYZDODJyddiFDF44Hjwxr5xAcaYxVKm9QKQFJFLA== - dependencies: - "@eslint-community/regexpp" "^4.10.0" - "@typescript-eslint/scope-manager" "7.15.0" - "@typescript-eslint/type-utils" "7.15.0" - "@typescript-eslint/utils" "7.15.0" - "@typescript-eslint/visitor-keys" "7.15.0" - graphemer "^1.4.0" - ignore "^5.3.1" - natural-compare "^1.4.0" - ts-api-utils "^1.3.0" - -"@typescript-eslint/parser@7.18.0": +"@typescript-eslint/parser@7.18.0", "@typescript-eslint/parser@^7.0.1": version "7.18.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.18.0.tgz#83928d0f1b7f4afa974098c64b5ce6f9051f96a0" integrity sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg== @@ -3756,25 +3734,6 @@ "@typescript-eslint/visitor-keys" "7.18.0" debug "^4.3.4" -"@typescript-eslint/parser@^7.0.1": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.15.0.tgz#f4a536e5fc6a1c05c82c4d263a2bfad2da235c80" - integrity sha512-k9fYuQNnypLFcqORNClRykkGOMOj+pV6V91R4GO/l1FDGwpqmSwoOQrOHo3cGaH63e+D3ZiCAOsuS/D2c99j/A== - dependencies: - "@typescript-eslint/scope-manager" "7.15.0" - "@typescript-eslint/types" "7.15.0" - "@typescript-eslint/typescript-estree" "7.15.0" - "@typescript-eslint/visitor-keys" "7.15.0" - debug "^4.3.4" - -"@typescript-eslint/scope-manager@7.15.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.15.0.tgz#201b34b0720be8b1447df17b963941bf044999b2" - integrity sha512-Q/1yrF/XbxOTvttNVPihxh1b9fxamjEoz2Os/Pe38OHwxC24CyCqXxGTOdpb4lt6HYtqw9HetA/Rf6gDGaMPlw== - dependencies: - "@typescript-eslint/types" "7.15.0" - "@typescript-eslint/visitor-keys" "7.15.0" - "@typescript-eslint/scope-manager@7.18.0": version "7.18.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz#c928e7a9fc2c0b3ed92ab3112c614d6bd9951c83" @@ -3783,16 +3742,6 @@ "@typescript-eslint/types" "7.18.0" "@typescript-eslint/visitor-keys" "7.18.0" -"@typescript-eslint/type-utils@7.15.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.15.0.tgz#5b83c904c6de91802fb399305a50a56d10472c39" - integrity sha512-SkgriaeV6PDvpA6253PDVep0qCqgbO1IOBiycjnXsszNTVQe5flN5wR5jiczoEoDEnAqYFSFFc9al9BSGVltkg== - dependencies: - "@typescript-eslint/typescript-estree" "7.15.0" - "@typescript-eslint/utils" "7.15.0" - debug "^4.3.4" - ts-api-utils "^1.3.0" - "@typescript-eslint/type-utils@7.18.0": version "7.18.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz#2165ffaee00b1fbbdd2d40aa85232dab6998f53b" @@ -3803,35 +3752,11 @@ debug "^4.3.4" ts-api-utils "^1.3.0" -"@typescript-eslint/types@7.15.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.15.0.tgz#fb894373a6e3882cbb37671ffddce44f934f62fc" - integrity sha512-aV1+B1+ySXbQH0pLK0rx66I3IkiZNidYobyfn0WFsdGhSXw+P3YOqeTq5GED458SfB24tg+ux3S+9g118hjlTw== - -"@typescript-eslint/types@7.18.0": +"@typescript-eslint/types@7.18.0", "@typescript-eslint/types@^7.2.0": version "7.18.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.18.0.tgz#b90a57ccdea71797ffffa0321e744f379ec838c9" integrity sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ== -"@typescript-eslint/types@^7.2.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.16.0.tgz#60a19d7e7a6b1caa2c06fac860829d162a036ed2" - integrity sha512-fecuH15Y+TzlUutvUl9Cc2XJxqdLr7+93SQIbcZfd4XRGGKoxyljK27b+kxKamjRkU7FYC6RrbSCg0ALcZn/xw== - -"@typescript-eslint/typescript-estree@7.15.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.15.0.tgz#e323bfa3966e1485b638ce751f219fc1f31eba37" - integrity sha512-gjyB/rHAopL/XxfmYThQbXbzRMGhZzGw6KpcMbfe8Q3nNQKStpxnUKeXb0KiN/fFDR42Z43szs6rY7eHk0zdGQ== - dependencies: - "@typescript-eslint/types" "7.15.0" - "@typescript-eslint/visitor-keys" "7.15.0" - debug "^4.3.4" - globby "^11.1.0" - is-glob "^4.0.3" - minimatch "^9.0.4" - semver "^7.6.0" - ts-api-utils "^1.3.0" - "@typescript-eslint/typescript-estree@7.18.0": version "7.18.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz#b5868d486c51ce8f312309ba79bdb9f331b37931" @@ -3846,16 +3771,6 @@ semver "^7.6.0" ts-api-utils "^1.3.0" -"@typescript-eslint/utils@7.15.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.15.0.tgz#9e6253c4599b6e7da2fb64ba3f549c73eb8c1960" - integrity sha512-hfDMDqaqOqsUVGiEPSMLR/AjTSCsmJwjpKkYQRo1FNbmW4tBwBspYDwO9eh7sKSTwMQgBw9/T4DHudPaqshRWA== - dependencies: - "@eslint-community/eslint-utils" "^4.4.0" - "@typescript-eslint/scope-manager" "7.15.0" - "@typescript-eslint/types" "7.15.0" - "@typescript-eslint/typescript-estree" "7.15.0" - "@typescript-eslint/utils@7.18.0": version "7.18.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.18.0.tgz#bca01cde77f95fc6a8d5b0dbcbfb3d6ca4be451f" @@ -3866,14 +3781,6 @@ "@typescript-eslint/types" "7.18.0" "@typescript-eslint/typescript-estree" "7.18.0" -"@typescript-eslint/visitor-keys@7.15.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.15.0.tgz#1da0726201a859343fe6a05742a7c1792fff5b66" - integrity sha512-Hqgy/ETgpt2L5xueA/zHHIl4fJI2O4XUE9l4+OIfbJIRSnTJb/QscncdqqZzofQegIJugRIF57OJea1khw2SDw== - dependencies: - "@typescript-eslint/types" "7.15.0" - eslint-visitor-keys "^3.4.3" - "@typescript-eslint/visitor-keys@7.18.0": version "7.18.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz#0564629b6124d67607378d0f0332a0495b25e7d7" @@ -11749,16 +11656,11 @@ typescript-eslint@^7.18.0, typescript-eslint@^7.3.1: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== -typescript@^5.6.2, typescript@~5.6.2: +typescript@^5.6.2, typescript@~5.6.1-rc, typescript@~5.6.2: version "5.6.2" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.2.tgz#d1de67b6bef77c41823f822df8f0b3bcff60a5a0" integrity sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw== -typescript@~5.6.1-rc: - version "5.6.1-rc" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.1-rc.tgz#d5e4d7d8170174fed607b74cc32aba3d77018e02" - integrity sha512-E3b2+1zEFu84jB0YQi9BORDjz9+jGbwwy1Zi3G0LUNw7a7cePUrHMRNy8aPh53nXpkFGVHSxIZo5vKTfYaFiBQ== - uc.micro@^2.0.0, uc.micro@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-2.1.0.tgz#f8d3f7d0ec4c3dea35a7e3c8efa4cb8b45c9e7ee" @@ -11779,11 +11681,6 @@ unbox-primitive@^1.0.2: has-symbols "^1.0.3" which-boxed-primitive "^1.0.2" -undici-types@~5.26.4: - version "5.26.5" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" - integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== - undici-types@~6.11.1: version "6.11.1" resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.11.1.tgz#432ea6e8efd54a48569705a699e62d8f4981b197" From cdbecf8e92155635255ab54d9e33f532e418b58b Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Fri, 20 Sep 2024 14:58:24 -0700 Subject: [PATCH 3/4] docs: unbond contract status --- packages/orchestration/src/examples/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/orchestration/src/examples/README.md b/packages/orchestration/src/examples/README.md index 590ce2e6939..8153f6739bb 100644 --- a/packages/orchestration/src/examples/README.md +++ b/packages/orchestration/src/examples/README.md @@ -5,13 +5,13 @@ This directory contains sample contracts showcasing the Orchestration API. Each - **basic-flows.contract.js**: Account creation and query sending - **send-anywhere.contract.js**: Token sending across supported blockchains - **auto-stake-it.contract.js**: Automatic remote staking of received tokens +- **unbond.contract.js**: Cross-chain unbonding and transfer ## In Progress The following contracts are a work in progress as they contain bindings that need to be promptly updated. - **stakeIca.contract.js**: Interchain account creation for remote staking -- **unbond.contract.js**: Cross-chain unbonding and liquid staking - **swap.contract.js**: Token swapping and remote staking - **stakeBld.contract.js**: BLD token staking on Agoric From af6f97efd752df5808807b82c305691ed76f7551 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Fri, 20 Sep 2024 15:00:57 -0700 Subject: [PATCH 4/4] refactor: consistent example contract filenames --- packages/boot/test/bootstrapTests/lca.test.ts | 2 +- packages/boot/test/bootstrapTests/orchestration.test.ts | 2 +- packages/builders/scripts/orchestration/init-stakeAtom.js | 2 +- packages/builders/scripts/orchestration/init-stakeBld.js | 2 +- packages/builders/scripts/orchestration/init-stakeOsmo.js | 2 +- packages/builders/scripts/testing/restart-stakeAtom.js | 2 +- packages/orchestration/USAGE.md | 8 ++++---- packages/orchestration/src/examples/README.md | 5 ++--- .../{stakeBld.contract.js => stake-bld.contract.js} | 0 .../{stakeIca.contract.js => stake-ica.contract.js} | 0 packages/orchestration/src/proposals/start-stakeAtom.js | 4 ++-- packages/orchestration/src/proposals/start-stakeBld.js | 4 ++-- packages/orchestration/src/proposals/start-stakeOsmo.js | 4 ++-- .../test/examples/stake-bld.contract.test.ts | 4 ++-- .../test/examples/stake-ica.contract.test.ts | 6 +++--- 15 files changed, 23 insertions(+), 24 deletions(-) rename packages/orchestration/src/examples/{stakeBld.contract.js => stake-bld.contract.js} (100%) rename packages/orchestration/src/examples/{stakeIca.contract.js => stake-ica.contract.js} (100%) diff --git a/packages/boot/test/bootstrapTests/lca.test.ts b/packages/boot/test/bootstrapTests/lca.test.ts index 7603cced8ea..df475d8a484 100644 --- a/packages/boot/test/bootstrapTests/lca.test.ts +++ b/packages/boot/test/bootstrapTests/lca.test.ts @@ -3,7 +3,7 @@ import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import type { TestFn } from 'ava'; import { Fail } from '@endo/errors'; -import type { start as stakeBldStart } from '@agoric/orchestration/src/examples/stakeBld.contract.js'; +import type { start as stakeBldStart } from '@agoric/orchestration/src/examples/stake-bld.contract.js'; import type { Instance } from '@agoric/zoe/src/zoeService/utils.js'; import { SIMULATED_ERRORS } from '@agoric/vats/tools/fake-bridge.js'; import { diff --git a/packages/boot/test/bootstrapTests/orchestration.test.ts b/packages/boot/test/bootstrapTests/orchestration.test.ts index b022278b3b9..ba56accaabe 100644 --- a/packages/boot/test/bootstrapTests/orchestration.test.ts +++ b/packages/boot/test/bootstrapTests/orchestration.test.ts @@ -3,7 +3,7 @@ import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { Fail } from '@endo/errors'; import { documentStorageSchema } from '@agoric/internal/src/storage-test-utils.js'; import type { CosmosValidatorAddress } from '@agoric/orchestration'; -import type { start as startStakeIca } from '@agoric/orchestration/src/examples/stakeIca.contract.js'; +import type { start as startStakeIca } from '@agoric/orchestration/src/examples/stake-ica.contract.js'; import type { Instance } from '@agoric/zoe/src/zoeService/utils.js'; import type { TestFn } from 'ava'; import { SIMULATED_ERRORS } from '@agoric/vats/tools/fake-bridge.js'; diff --git a/packages/builders/scripts/orchestration/init-stakeAtom.js b/packages/builders/scripts/orchestration/init-stakeAtom.js index da1ea661073..3d5f6e1454d 100644 --- a/packages/builders/scripts/orchestration/init-stakeAtom.js +++ b/packages/builders/scripts/orchestration/init-stakeAtom.js @@ -9,7 +9,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => { { installKeys: { stakeIca: publishRef( - install('@agoric/orchestration/src/examples/stakeIca.contract.js'), + install('@agoric/orchestration/src/examples/stake-ica.contract.js'), ), }, }, diff --git a/packages/builders/scripts/orchestration/init-stakeBld.js b/packages/builders/scripts/orchestration/init-stakeBld.js index 992c10d0a91..f3db614e777 100644 --- a/packages/builders/scripts/orchestration/init-stakeBld.js +++ b/packages/builders/scripts/orchestration/init-stakeBld.js @@ -10,7 +10,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => { installKeys: { stakeBld: publishRef( - install('@agoric/orchestration/src/examples/stakeBld.contract.js'), + install('@agoric/orchestration/src/examples/stake-bld.contract.js'), ), }, }, diff --git a/packages/builders/scripts/orchestration/init-stakeOsmo.js b/packages/builders/scripts/orchestration/init-stakeOsmo.js index 7374d3d59a6..a0cb295364e 100644 --- a/packages/builders/scripts/orchestration/init-stakeOsmo.js +++ b/packages/builders/scripts/orchestration/init-stakeOsmo.js @@ -9,7 +9,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => { { installKeys: { stakeIca: publishRef( - install('@agoric/orchestration/src/examples/stakeIca.contract.js'), + install('@agoric/orchestration/src/examples/stake-ica.contract.js'), ), }, }, diff --git a/packages/builders/scripts/testing/restart-stakeAtom.js b/packages/builders/scripts/testing/restart-stakeAtom.js index 8379434eb9e..7568d0048e2 100644 --- a/packages/builders/scripts/testing/restart-stakeAtom.js +++ b/packages/builders/scripts/testing/restart-stakeAtom.js @@ -11,7 +11,7 @@ import { E } from '@endo/far'; const trace = makeTracer('RestartSA', true); /** - * @import {start as StartFn} from '@agoric/orchestration/src/examples/stakeIca.contract.js'; + * @import {start as StartFn} from '@agoric/orchestration/src/examples/stake-ica.contract.js'; */ /** diff --git a/packages/orchestration/USAGE.md b/packages/orchestration/USAGE.md index 472e39acbfe..6236876ad04 100644 --- a/packages/orchestration/USAGE.md +++ b/packages/orchestration/USAGE.md @@ -15,8 +15,8 @@ See [`src/examples`](src/examples) | [basic-flows](/packages/orchestration/src/examples/basic-flows.contract.js) | Ready 🟢 | Creates an account on a remote chain and returns a continuing offer with all platform-provided invitationMakers. | - `CosmosOrchestrationAccount`
- `LocalOrchestrationAccount`| | [query-flows](/packages/orchestration/src/fixtures/query-flows.contract.js) | Ready 🟢 | Test fixture that enables querying account balances on local and remote chains. | - `Chain`
- `LocalOrchestrationAccount`
- `CosmosOrchestrationAccount`
- Interchain Queries | | [send-anywhere](/packages/orchestration/src/examples/send-anywhere.contract.js) | Ready 🟢 | Allows sending payments (tokens) over IBC to another chain. | - `LocalOrchestrationAccoun`t
- `Vtransfer` (IBC Hooks) | -| [stakeBld](/packages/orchestration/src/examples/stakeBld.contract.js) | Ready 🟢 | Returns a `LocalOrchestrationAccount` that can perform staking actions. | - `LocalOrchestrationAccount` | Ready 🟢 | -| [stakeIca](/packages/orchestration/src/examples/stakeIca.contract.js) | Ready 🟢 | Returns a `CosmosOrchestrationAccount` that can perform staking actions. | - `CosmosOrchestrationAccount` | Ready 🟢 | +| [stake-bld](/packages/orchestration/src/examples/stake-bld.contract.js) | Ready 🟢 | Returns a `LocalOrchestrationAccount` that can perform staking actions. | - `LocalOrchestrationAccount` | Ready 🟢 | +| [stake-ica](/packages/orchestration/src/examples/stake-ica.contract.js) | Ready 🟢 | Returns a `CosmosOrchestrationAccount` that can perform staking actions. | - `CosmosOrchestrationAccount` | Ready 🟢 | | [staking-combinations](/packages/orchestration/src/examples/staking-combinations.contract.js) | Ready 🟢 | Combines actions into a single offer flow and demonstrates writing continuing offers. | - `CosmosOrchestrationAccount`
- `CombineInvitationMakers`
- Continuing Offers | | [swap](/packages/orchestration/src/examples/swap.contract.js) | Under Construction 🚧 | Demonstrates asset swapping on an external chain. | - `CosmosOrchestrationAccount`
- `ChainHub` | | [unbond](/packages/orchestration/src/examples/unbond.contract.js) | Under Construction 🚧 | Undelegates tokens for an ICA and liquid stakes them. | - `CosmosOrchestrationAccount` | @@ -39,8 +39,8 @@ See [`src/examples`](src/examples) |---------------|--------------------------| | [basic-flows](/packages/orchestration/src/examples/basic-flows.contract.js) | - `.send()`, `sendAll()` methods and `Send`, `SendAll` invitations ([#9193](https://github.com/Agoric/agoric-sdk/issues/9193))
- `CosmosOrchAccount.transfer()`, `Transfer` invitation ([#9193](https://github.com/Agoric/agoric-sdk/issues/9193)) | | [send-anywhere](/packages/orchestration/src/examples/send-anywhere.contract.js) | - Multi-hop (PFM) transfers (not implemented in contract) ([#10006](https://github.com/Agoric/agoric-sdk/issues/10006)) | -| [stakeIca](/packages/orchestration/src/examples/stakeIca.contract.js) | - Redelegate
- WithdrawRewards (plural) (not implemented)
- StakingQueries (not implemented) ([#10016](https://github.com/Agoric/agoric-sdk/issues/10016))
- Staking Flows for LocalOrchAccount
- Written as async-flow ([#9838](https://github.com/Agoric/agoric-sdk/issues/9838)) | -| [stakeBld](/packages/orchestration/src/examples/stakeBld.contract.js) | - Everything*, created before e2e test suite
- Consider folding under generic "stake" contract, once [interfaces are the same](https://github.com/Agoric/agoric-sdk/blob/1976c502bcaac2e7d21f42b30447671a61053236/packages/orchestration/src/exos/local-orchestration-account.js#L487)| +| [stakeIca](/packages/orchestration/src/examples/stake-ica.contract.js) | - Redelegate
- WithdrawRewards (plural) (not implemented)
- StakingQueries (not implemented) ([#10016](https://github.com/Agoric/agoric-sdk/issues/10016))
- Staking Flows for LocalOrchAccount
- Written as async-flow ([#9838](https://github.com/Agoric/agoric-sdk/issues/9838)) | +| [stakeBld](/packages/orchestration/src/examples/stake-bld.contract.js) | - Everything*, created before e2e test suite
- Consider folding under generic "stake" contract, once [interfaces are the same](https://github.com/Agoric/agoric-sdk/blob/1976c502bcaac2e7d21f42b30447671a61053236/packages/orchestration/src/exos/local-orchestration-account.js#L487)| | [swap](/packages/orchestration/src/examples/swap.contract.js) | - Everything - contract incomplete ([#8863](https://github.com/Agoric/agoric-sdk/issues/8863)) | | [unbond](/packages/orchestration/src/examples/unbond.contract.js) | - Everything - contract incomplete ([#9782](https://github.com/Agoric/agoric-sdk/issues/9782)) | | [staking-combinations](/packages/orchestration/src/examples/staking-combinations.contract.js) | Only tested via [unit tests](/packages/orchestration/src/examples/staking-combinations.contract.js) | diff --git a/packages/orchestration/src/examples/README.md b/packages/orchestration/src/examples/README.md index 8153f6739bb..d847fdba45a 100644 --- a/packages/orchestration/src/examples/README.md +++ b/packages/orchestration/src/examples/README.md @@ -11,7 +11,6 @@ This directory contains sample contracts showcasing the Orchestration API. Each The following contracts are a work in progress as they contain bindings that need to be promptly updated. -- **stakeIca.contract.js**: Interchain account creation for remote staking +- **stake-bld.contract.js**: BLD token staking on Agoric +- **stake-ica.contract.js**: Interchain account creation for remote staking - **swap.contract.js**: Token swapping and remote staking -- **stakeBld.contract.js**: BLD token staking on Agoric - diff --git a/packages/orchestration/src/examples/stakeBld.contract.js b/packages/orchestration/src/examples/stake-bld.contract.js similarity index 100% rename from packages/orchestration/src/examples/stakeBld.contract.js rename to packages/orchestration/src/examples/stake-bld.contract.js diff --git a/packages/orchestration/src/examples/stakeIca.contract.js b/packages/orchestration/src/examples/stake-ica.contract.js similarity index 100% rename from packages/orchestration/src/examples/stakeIca.contract.js rename to packages/orchestration/src/examples/stake-ica.contract.js diff --git a/packages/orchestration/src/proposals/start-stakeAtom.js b/packages/orchestration/src/proposals/start-stakeAtom.js index 838bacfd832..c759790a8d4 100644 --- a/packages/orchestration/src/proposals/start-stakeAtom.js +++ b/packages/orchestration/src/proposals/start-stakeAtom.js @@ -7,7 +7,7 @@ import { makeChainHub } from '../exos/chain-hub.js'; /** * @import {IBCConnectionID} from '@agoric/vats'; - * @import {StakeIcaSF, StakeIcaTerms} from '../examples/stakeIca.contract'; + * @import {StakeIcaSF, StakeIcaTerms} from '../examples/stake-ica.contract'; */ const trace = makeTracer('StartStakeAtom', true); @@ -17,7 +17,7 @@ const trace = makeTracer('StartStakeAtom', true); * installation: { * consume: { * stakeIca: Installation< - * import('../examples/stakeIca.contract.js').start + * import('../examples/stake-ica.contract.js').start * >; * }; * }; diff --git a/packages/orchestration/src/proposals/start-stakeBld.js b/packages/orchestration/src/proposals/start-stakeBld.js index cb809bc7b7b..b2de1c3f1c4 100644 --- a/packages/orchestration/src/proposals/start-stakeBld.js +++ b/packages/orchestration/src/proposals/start-stakeBld.js @@ -10,7 +10,7 @@ const trace = makeTracer('StartStakeBld', true); * installation: { * consume: { * stakeBld: Installation< - * import('../../src/examples/stakeBld.contract.js').start + * import('../../src/examples/stake-bld.contract.js').start * >; * }; * }; @@ -50,7 +50,7 @@ export const startStakeBld = async ({ /** * @type {StartUpgradableOpts< - * import('../../src/examples/stakeBld.contract.js').start + * import('../../src/examples/stake-bld.contract.js').start * >} */ const startOpts = { diff --git a/packages/orchestration/src/proposals/start-stakeOsmo.js b/packages/orchestration/src/proposals/start-stakeOsmo.js index 84dfadb1337..0f020a62a89 100644 --- a/packages/orchestration/src/proposals/start-stakeOsmo.js +++ b/packages/orchestration/src/proposals/start-stakeOsmo.js @@ -7,7 +7,7 @@ import { makeChainHub } from '../exos/chain-hub.js'; /** * @import {IBCConnectionID} from '@agoric/vats'; - * @import {StakeIcaSF} from '../examples/stakeIca.contract'; + * @import {StakeIcaSF} from '../examples/stake-ica.contract'; */ const trace = makeTracer('StartStakeOsmo', true); @@ -17,7 +17,7 @@ const trace = makeTracer('StartStakeOsmo', true); * installation: { * consume: { * stakeIca: Installation< - * import('../examples/stakeIca.contract.js').start + * import('../examples/stake-ica.contract.js').start * >; * }; * }; diff --git a/packages/orchestration/test/examples/stake-bld.contract.test.ts b/packages/orchestration/test/examples/stake-bld.contract.test.ts index 736e9781fad..556e4da7d56 100644 --- a/packages/orchestration/test/examples/stake-bld.contract.test.ts +++ b/packages/orchestration/test/examples/stake-bld.contract.test.ts @@ -10,9 +10,9 @@ import { commonSetup } from '../supports.js'; const dirname = path.dirname(new URL(import.meta.url).pathname); -const contractFile = `${dirname}/../../src/examples/stakeBld.contract.js`; +const contractFile = `${dirname}/../../src/examples/stake-bld.contract.js`; type StartFn = - typeof import('@agoric/orchestration/src/examples/stakeBld.contract.js').start; + typeof import('@agoric/orchestration/src/examples/stake-bld.contract.js').start; const startContract = async ({ agoricNames, diff --git a/packages/orchestration/test/examples/stake-ica.contract.test.ts b/packages/orchestration/test/examples/stake-ica.contract.test.ts index 24698de61e2..e6d00da45e9 100644 --- a/packages/orchestration/test/examples/stake-ica.contract.test.ts +++ b/packages/orchestration/test/examples/stake-ica.contract.test.ts @@ -10,7 +10,7 @@ import { QueryBalanceResponse, } from '@agoric/cosmic-proto/cosmos/bank/v1beta1/query.js'; import { commonSetup } from '../supports.js'; -import { type StakeIcaTerms } from '../../src/examples/stakeIca.contract.js'; +import { type StakeIcaTerms } from '../../src/examples/stake-ica.contract.js'; import fetchedChainInfo from '../../src/fetched-chain-info.js'; import { buildQueryPacketString, @@ -24,9 +24,9 @@ import { makeChainHub } from '../../src/exos/chain-hub.js'; const dirname = path.dirname(new URL(import.meta.url).pathname); -const contractFile = `${dirname}/../../src/examples/stakeIca.contract.js`; +const contractFile = `${dirname}/../../src/examples/stake-ica.contract.js`; type StartFn = - typeof import('@agoric/orchestration/src/examples/stakeIca.contract.js').start; + typeof import('@agoric/orchestration/src/examples/stake-ica.contract.js').start; const getChainTerms = ( chainName: keyof typeof fetchedChainInfo,