From 70dbce8ef2712347cb92bcddc9ed7a5f662d29c1 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Mon, 11 Mar 2024 06:59:08 -0700 Subject: [PATCH 1/6] chore(deps): bump TypeScript to 5.4 --- package.json | 2 +- packages/cosmic-proto/package.json | 2 +- yarn.lock | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index a3d57f0f7f6..3f10fd0933f 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "prettier-plugin-jsdoc": "^1.0.0", "type-coverage": "^2.27.1", "typedoc": "^0.25.7", - "typescript": "^5.3.3" + "typescript": "^5.4.2" }, "resolutions": { "**/protobufjs": "^7.2.4" diff --git a/packages/cosmic-proto/package.json b/packages/cosmic-proto/package.json index 0b2de11ede9..65b140b253c 100644 --- a/packages/cosmic-proto/package.json +++ b/packages/cosmic-proto/package.json @@ -70,7 +70,7 @@ "publish-scripts": "0.1.0", "rimraf": "^5.0.0", "tsimp": "^2.0.11", - "typescript": "^5.3.3" + "typescript": "^5.4.2" }, "dependencies": { "@cosmjs/amino": "^0.32.2", diff --git a/yarn.lock b/yarn.lock index 7bbb89a1514..e444b470656 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11626,7 +11626,12 @@ typedoc@^0.25.7: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== -typescript@^5.3.3, typescript@~5.3.3: +typescript@^5.4.2: + version "5.4.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.2.tgz#0ae9cebcfae970718474fe0da2c090cad6577372" + integrity sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ== + +typescript@~5.3.3: version "5.3.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37" integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw== From 146c83ff42a082bbcd54c5ae8e5b13abb4aa1aff Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Mon, 11 Mar 2024 06:59:51 -0700 Subject: [PATCH 2/6] chore(deps): bump typedoc to 0.25.12 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 3f10fd0933f..1e690dbc43b 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "prettier": "^3.0.3", "prettier-plugin-jsdoc": "^1.0.0", "type-coverage": "^2.27.1", - "typedoc": "^0.25.7", + "typedoc": "^0.25.12", "typescript": "^5.4.2" }, "resolutions": { diff --git a/yarn.lock b/yarn.lock index e444b470656..dde5da61c38 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11611,10 +11611,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -typedoc@^0.25.7: - version "0.25.8" - resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.25.8.tgz#7d0e1bf12d23bf1c459fd4893c82cb855911ff12" - integrity sha512-mh8oLW66nwmeB9uTa0Bdcjfis+48bAjSH3uqdzSuSawfduROQLlXw//WSNZLYDdhmMVB7YcYZicq6e8T0d271A== +typedoc@^0.25.12: + version "0.25.12" + resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.25.12.tgz#f73f0a8d3731d418cc604d4230f95a857799e27a" + integrity sha512-F+qhkK2VoTweDXd1c42GS/By2DvI2uDF4/EpG424dTexSHdtCH52C6IcAvMA6jR3DzAWZjHpUOW+E02kyPNUNw== dependencies: lunr "^2.3.9" marked "^4.3.0" From 42f51ffdbc8cddcd962ed44a43d6bbbc5280803d Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Mon, 11 Mar 2024 07:13:02 -0700 Subject: [PATCH 3/6] chore(deps): bump cosmjs/* to 0.32.3 --- packages/agoric-cli/package.json | 10 +- packages/casting/package.json | 8 +- packages/cosmic-proto/package.json | 8 +- yarn.lock | 146 ++++++++++++++--------------- 4 files changed, 86 insertions(+), 86 deletions(-) diff --git a/packages/agoric-cli/package.json b/packages/agoric-cli/package.json index f1d1bf57714..efe243ee62b 100644 --- a/packages/agoric-cli/package.json +++ b/packages/agoric-cli/package.json @@ -53,11 +53,11 @@ "@agoric/zoe": "^0.26.2", "@agoric/zone": "^0.2.2", "@confio/relayer": "^0.11.3", - "@cosmjs/crypto": "^0.32.2", - "@cosmjs/encoding": "^0.32.2", - "@cosmjs/math": "^0.32.2", - "@cosmjs/proto-signing": "^0.32.2", - "@cosmjs/stargate": "^0.32.2", + "@cosmjs/crypto": "^0.32.3", + "@cosmjs/encoding": "^0.32.3", + "@cosmjs/math": "^0.32.3", + "@cosmjs/proto-signing": "^0.32.3", + "@cosmjs/stargate": "^0.32.3", "@endo/bundle-source": "^3.1.0", "@endo/captp": "^4.0.4", "@endo/compartment-mapper": "^1.1.2", diff --git a/packages/casting/package.json b/packages/casting/package.json index e7359ec7a20..aa04afbec82 100644 --- a/packages/casting/package.json +++ b/packages/casting/package.json @@ -26,10 +26,10 @@ "@agoric/notifier": "^0.6.2", "@agoric/spawner": "^0.6.8", "@agoric/store": "^0.9.2", - "@cosmjs/encoding": "^0.32.2", - "@cosmjs/proto-signing": "^0.32.2", - "@cosmjs/stargate": "^0.32.2", - "@cosmjs/tendermint-rpc": "^0.32.2", + "@cosmjs/encoding": "^0.32.3", + "@cosmjs/proto-signing": "^0.32.3", + "@cosmjs/stargate": "^0.32.3", + "@cosmjs/tendermint-rpc": "^0.32.3", "@endo/far": "^1.0.4", "@endo/init": "^1.0.4", "@endo/lockdown": "^1.0.4", diff --git a/packages/cosmic-proto/package.json b/packages/cosmic-proto/package.json index 65b140b253c..a318e6dc962 100644 --- a/packages/cosmic-proto/package.json +++ b/packages/cosmic-proto/package.json @@ -73,10 +73,10 @@ "typescript": "^5.4.2" }, "dependencies": { - "@cosmjs/amino": "^0.32.2", - "@cosmjs/proto-signing": "^0.32.2", - "@cosmjs/stargate": "^0.32.2", - "@cosmjs/tendermint-rpc": "^0.32.2", + "@cosmjs/amino": "^0.32.3", + "@cosmjs/proto-signing": "^0.32.3", + "@cosmjs/stargate": "^0.32.3", + "@cosmjs/tendermint-rpc": "^0.32.3", "@endo/init": "^1.0.3", "axios": "^1.6.7" }, diff --git a/yarn.lock b/yarn.lock index dde5da61c38..3d9942ab629 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1136,15 +1136,15 @@ triple-beam "1.3.0" winston "3.3.3" -"@cosmjs/amino@^0.32.2": - version "0.32.2" - resolved "https://registry.yarnpkg.com/@cosmjs/amino/-/amino-0.32.2.tgz#ba3cf255e4e6b1ba67461f1ef7b0b8ad3f895da7" - integrity sha512-lcK5RCVm4OfdAooxKcF2+NwaDVVpghOq6o/A40c2mHXDUzUoRZ33VAHjVJ9Me6vOFxshrw/XEFn1f4KObntjYA== +"@cosmjs/amino@^0.32.2", "@cosmjs/amino@^0.32.3": + version "0.32.3" + resolved "https://registry.yarnpkg.com/@cosmjs/amino/-/amino-0.32.3.tgz#b81d4a2b8d61568431a1afcd871e1344a19d97ff" + integrity sha512-G4zXl+dJbqrz1sSJ56H/25l5NJEk/pAPIr8piAHgbXYw88OdAOlpA26PQvk2IbSN/rRgVbvlLTNgX2tzz1dyUA== dependencies: - "@cosmjs/crypto" "^0.32.2" - "@cosmjs/encoding" "^0.32.2" - "@cosmjs/math" "^0.32.2" - "@cosmjs/utils" "^0.32.2" + "@cosmjs/crypto" "^0.32.3" + "@cosmjs/encoding" "^0.32.3" + "@cosmjs/math" "^0.32.3" + "@cosmjs/utils" "^0.32.3" "@cosmjs/cosmwasm-stargate@^0.32.1": version "0.32.2" @@ -1162,23 +1162,23 @@ cosmjs-types "^0.9.0" pako "^2.0.2" -"@cosmjs/crypto@^0.32.1", "@cosmjs/crypto@^0.32.2": - version "0.32.2" - resolved "https://registry.yarnpkg.com/@cosmjs/crypto/-/crypto-0.32.2.tgz#8ed255d3d1c1c4d916a1586f8cbc33eaab82f511" - integrity sha512-RuxrYKzhrPF9g6NmU7VEq++Hn1vZJjqqJpZ9Tmw9lOYOV8BUsv+j/0BE86kmWi7xVJ7EwxiuxYsKuM8IR18CIA== +"@cosmjs/crypto@^0.32.1", "@cosmjs/crypto@^0.32.2", "@cosmjs/crypto@^0.32.3": + version "0.32.3" + resolved "https://registry.yarnpkg.com/@cosmjs/crypto/-/crypto-0.32.3.tgz#787f8e659709678722068ee1ddf379f65051a25e" + integrity sha512-niQOWJHUtlJm2GG4F00yGT7sGPKxfUwz+2qQ30uO/E3p58gOusTcH2qjiJNVxb8vScYJhFYFqpm/OA/mVqoUGQ== dependencies: - "@cosmjs/encoding" "^0.32.2" - "@cosmjs/math" "^0.32.2" - "@cosmjs/utils" "^0.32.2" + "@cosmjs/encoding" "^0.32.3" + "@cosmjs/math" "^0.32.3" + "@cosmjs/utils" "^0.32.3" "@noble/hashes" "^1" bn.js "^5.2.0" elliptic "^6.5.4" libsodium-wrappers-sumo "^0.7.11" -"@cosmjs/encoding@^0.32.1", "@cosmjs/encoding@^0.32.2": - version "0.32.2" - resolved "https://registry.yarnpkg.com/@cosmjs/encoding/-/encoding-0.32.2.tgz#8c5c64481a85cd570740c34dccce69d024a29805" - integrity sha512-WX7m1wLpA9V/zH0zRcz4EmgZdAv1F44g4dbXOgNj1eXZw1PIGR12p58OEkLN51Ha3S4DKRtCv5CkhK1KHEvQtg== +"@cosmjs/encoding@^0.32.1", "@cosmjs/encoding@^0.32.2", "@cosmjs/encoding@^0.32.3": + version "0.32.3" + resolved "https://registry.yarnpkg.com/@cosmjs/encoding/-/encoding-0.32.3.tgz#e245ff511fe4a0df7ba427b5187aab69e3468e5b" + integrity sha512-p4KF7hhv8jBQX3MkB3Defuhz/W0l3PwWVYU2vkVuBJ13bJcXyhU9nJjiMkaIv+XP+W2QgRceqNNgFUC5chNR7w== dependencies: base64-js "^1.3.0" bech32 "^1.1.4" @@ -1191,86 +1191,86 @@ dependencies: axios "^1.6.0" -"@cosmjs/json-rpc@^0.32.2": - version "0.32.2" - resolved "https://registry.yarnpkg.com/@cosmjs/json-rpc/-/json-rpc-0.32.2.tgz#f87fab0d6975ed1d1c7daafcf6f1f81e5e296912" - integrity sha512-lan2lOgmz4yVE/HR8eCOSiII/1OudIulk8836koyIDCsPEpt6eKBuctnAD168vABGArKccLAo7Mr2gy9nrKrOQ== +"@cosmjs/json-rpc@^0.32.3": + version "0.32.3" + resolved "https://registry.yarnpkg.com/@cosmjs/json-rpc/-/json-rpc-0.32.3.tgz#ccffdd7f722cecfab6daaa7463843b92f5d25355" + integrity sha512-JwFRWZa+Y95KrAG8CuEbPVOSnXO2uMSEBcaAB/FBU3Mo4jQnDoUjXvt3vwtFWxfAytrWCn1I4YDFaOAinnEG/Q== dependencies: - "@cosmjs/stream" "^0.32.2" + "@cosmjs/stream" "^0.32.3" xstream "^11.14.0" -"@cosmjs/math@^0.32.1", "@cosmjs/math@^0.32.2": - version "0.32.2" - resolved "https://registry.yarnpkg.com/@cosmjs/math/-/math-0.32.2.tgz#4522312769197e132679e4960862bcec0eed4cb8" - integrity sha512-b8+ruAAY8aKtVKWSft2IvtCVCUH1LigIlf9ALIiY8n9jtM4kMASiaRbQ/27etnSAInV88IaezKK9rQZrtxTjcw== +"@cosmjs/math@^0.32.1", "@cosmjs/math@^0.32.2", "@cosmjs/math@^0.32.3": + version "0.32.3" + resolved "https://registry.yarnpkg.com/@cosmjs/math/-/math-0.32.3.tgz#16e4256f4da507b9352327da12ae64056a2ba6c9" + integrity sha512-amumUtZs8hCCnV+lSBaJIiZkGabQm22QGg/IotYrhcmoOEOjt82n7hMNlNXRs7V6WLMidGrGYcswB5zcmp0Meg== dependencies: bn.js "^5.2.0" -"@cosmjs/proto-signing@^0.32.1", "@cosmjs/proto-signing@^0.32.2": - version "0.32.2" - resolved "https://registry.yarnpkg.com/@cosmjs/proto-signing/-/proto-signing-0.32.2.tgz#26ed2675978ce24078981f4c15a06c5d6b808f44" - integrity sha512-UV4WwkE3W3G3s7wwU9rizNcUEz2g0W8jQZS5J6/3fiN0mRPwtPKQ6EinPN9ASqcAJ7/VQH4/9EPOw7d6XQGnqw== +"@cosmjs/proto-signing@^0.32.1", "@cosmjs/proto-signing@^0.32.2", "@cosmjs/proto-signing@^0.32.3": + version "0.32.3" + resolved "https://registry.yarnpkg.com/@cosmjs/proto-signing/-/proto-signing-0.32.3.tgz#91ae149b747d18666a6ccc924165b306431f7c0d" + integrity sha512-kSZ0ZUY0DwcRT0NcIn2HkadH4NKlwjfZgbLj1ABwh/4l0RgeT84QCscZCu63tJYq3K6auwqTiZSZERwlO4/nbg== dependencies: - "@cosmjs/amino" "^0.32.2" - "@cosmjs/crypto" "^0.32.2" - "@cosmjs/encoding" "^0.32.2" - "@cosmjs/math" "^0.32.2" - "@cosmjs/utils" "^0.32.2" + "@cosmjs/amino" "^0.32.3" + "@cosmjs/crypto" "^0.32.3" + "@cosmjs/encoding" "^0.32.3" + "@cosmjs/math" "^0.32.3" + "@cosmjs/utils" "^0.32.3" cosmjs-types "^0.9.0" -"@cosmjs/socket@^0.32.2": - version "0.32.2" - resolved "https://registry.yarnpkg.com/@cosmjs/socket/-/socket-0.32.2.tgz#a66be3863d03bf2d8df0433af476df010ff10e8c" - integrity sha512-Qc8jaw4uSBJm09UwPgkqe3g9TBFx4ZR9HkXpwT6Z9I+6kbLerXPR0Gy3NSJFSUgxIfTpO8O1yqoWAyf0Ay17Mw== +"@cosmjs/socket@^0.32.3": + version "0.32.3" + resolved "https://registry.yarnpkg.com/@cosmjs/socket/-/socket-0.32.3.tgz#fa5c36bf58e87c0ad865d6318ecb0f8d9c89a28a" + integrity sha512-F2WwNmaUPdZ4SsH6Uyreq3wQk7jpaEkb3wfOP951f5Jt6HCW/PxbxhKzHkAAf6+Sqks6SPhkbWoE8XaZpjL2KA== dependencies: - "@cosmjs/stream" "^0.32.2" + "@cosmjs/stream" "^0.32.3" isomorphic-ws "^4.0.1" ws "^7" xstream "^11.14.0" -"@cosmjs/stargate@^0.32.1", "@cosmjs/stargate@^0.32.2": - version "0.32.2" - resolved "https://registry.yarnpkg.com/@cosmjs/stargate/-/stargate-0.32.2.tgz#73718c5c6a3ae138682ee9987333d911eca22a13" - integrity sha512-AsJa29fT7Jd4xt9Ai+HMqhyj7UQu7fyYKdXj/8+/9PD74xe6lZSYhQPcitUmMLJ1ckKPgXSk5Dd2LbsQT0IhZg== +"@cosmjs/stargate@^0.32.1", "@cosmjs/stargate@^0.32.2", "@cosmjs/stargate@^0.32.3": + version "0.32.3" + resolved "https://registry.yarnpkg.com/@cosmjs/stargate/-/stargate-0.32.3.tgz#5a92b222ada960ebecea72cc9f366370763f4b66" + integrity sha512-OQWzO9YWKerUinPIxrO1MARbe84XkeXJAW0lyMIjXIEikajuXZ+PwftiKA5yA+8OyditVmHVLtPud6Pjna2s5w== dependencies: "@confio/ics23" "^0.6.8" - "@cosmjs/amino" "^0.32.2" - "@cosmjs/encoding" "^0.32.2" - "@cosmjs/math" "^0.32.2" - "@cosmjs/proto-signing" "^0.32.2" - "@cosmjs/stream" "^0.32.2" - "@cosmjs/tendermint-rpc" "^0.32.2" - "@cosmjs/utils" "^0.32.2" + "@cosmjs/amino" "^0.32.3" + "@cosmjs/encoding" "^0.32.3" + "@cosmjs/math" "^0.32.3" + "@cosmjs/proto-signing" "^0.32.3" + "@cosmjs/stream" "^0.32.3" + "@cosmjs/tendermint-rpc" "^0.32.3" + "@cosmjs/utils" "^0.32.3" cosmjs-types "^0.9.0" xstream "^11.14.0" -"@cosmjs/stream@^0.32.1", "@cosmjs/stream@^0.32.2": - version "0.32.2" - resolved "https://registry.yarnpkg.com/@cosmjs/stream/-/stream-0.32.2.tgz#b1e8f977d25313d659f1aa89ad21614b5391cd93" - integrity sha512-gpCufLfHAD8Zp1ZKge7AHbDf4RA0TZp66wZY6JaQR5bSiEF2Drjtp4mwXZPGejtaUMnaAgff3LrUzPJfKYdQwg== +"@cosmjs/stream@^0.32.1", "@cosmjs/stream@^0.32.3": + version "0.32.3" + resolved "https://registry.yarnpkg.com/@cosmjs/stream/-/stream-0.32.3.tgz#7522579aaf18025d322c2f33d6fb7573220395d6" + integrity sha512-J2zVWDojkynYifAUcRmVczzmp6STEpyiAARq0rSsviqjreGIfspfuws/8rmkPa6qQBZvpQOBQCm2HyZZwYplIw== dependencies: xstream "^11.14.0" -"@cosmjs/tendermint-rpc@^0.32.1", "@cosmjs/tendermint-rpc@^0.32.2": - version "0.32.2" - resolved "https://registry.yarnpkg.com/@cosmjs/tendermint-rpc/-/tendermint-rpc-0.32.2.tgz#c5607b8d472e5bf9fd58d5453db7194f500ccc62" - integrity sha512-DXyJHDmcAfCix4H/7/dKR0UMdshP01KxJOXHdHxBCbLIpck94BsWD3B2ZTXwfA6sv98so9wOzhp7qGQa5malxg== - dependencies: - "@cosmjs/crypto" "^0.32.2" - "@cosmjs/encoding" "^0.32.2" - "@cosmjs/json-rpc" "^0.32.2" - "@cosmjs/math" "^0.32.2" - "@cosmjs/socket" "^0.32.2" - "@cosmjs/stream" "^0.32.2" - "@cosmjs/utils" "^0.32.2" +"@cosmjs/tendermint-rpc@^0.32.1", "@cosmjs/tendermint-rpc@^0.32.2", "@cosmjs/tendermint-rpc@^0.32.3": + version "0.32.3" + resolved "https://registry.yarnpkg.com/@cosmjs/tendermint-rpc/-/tendermint-rpc-0.32.3.tgz#f0406b9f0233e588fb924dca8c614972f9038aff" + integrity sha512-xeprW+VR9xKGstqZg0H/KBZoUp8/FfFyS9ljIUTLM/UINjP2MhiwncANPS2KScfJVepGufUKk0/phHUeIBSEkw== + dependencies: + "@cosmjs/crypto" "^0.32.3" + "@cosmjs/encoding" "^0.32.3" + "@cosmjs/json-rpc" "^0.32.3" + "@cosmjs/math" "^0.32.3" + "@cosmjs/socket" "^0.32.3" + "@cosmjs/stream" "^0.32.3" + "@cosmjs/utils" "^0.32.3" axios "^1.6.0" readonly-date "^1.0.0" xstream "^11.14.0" -"@cosmjs/utils@^0.32.1", "@cosmjs/utils@^0.32.2": - version "0.32.2" - resolved "https://registry.yarnpkg.com/@cosmjs/utils/-/utils-0.32.2.tgz#324304aa85bfa6f10561cc17781d824d02130897" - integrity sha512-Gg5t+eR7vPJMAmhkFt6CZrzPd0EKpAslWwk5rFVYZpJsM8JG5KT9XQ99hgNM3Ov6ScNoIWbXkpX27F6A9cXR4Q== +"@cosmjs/utils@^0.32.1", "@cosmjs/utils@^0.32.2", "@cosmjs/utils@^0.32.3": + version "0.32.3" + resolved "https://registry.yarnpkg.com/@cosmjs/utils/-/utils-0.32.3.tgz#5dcaee6dd7cc846cdc073e9a7a7f63242f5f7e31" + integrity sha512-WCZK4yksj2hBDz4w7xFZQTRZQ/RJhBX26uFHmmQFIcNUUVAihrLO+RerqJgk0dZqC42wstM9pEUQGtPmLcIYvg== "@cosmology/ast@^1.4.8": version "1.4.8" From 4a01c9731a89cc9f8a0f979ddc453d9a98a65172 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Mon, 11 Mar 2024 12:37:17 -0700 Subject: [PATCH 4/6] chore(deps): patch @endo/nat for typedefs https://github.com/endojs/endo/pull/2132 --- patches/@endo+nat+5.0.4.patch | 45 +++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 patches/@endo+nat+5.0.4.patch diff --git a/patches/@endo+nat+5.0.4.patch b/patches/@endo+nat+5.0.4.patch new file mode 100644 index 00000000000..a5ac837f6dc --- /dev/null +++ b/patches/@endo+nat+5.0.4.patch @@ -0,0 +1,45 @@ +diff --git a/node_modules/@endo/nat/src/index.d.ts b/node_modules/@endo/nat/src/index.d.ts +new file mode 100644 +index 0000000..20bc78c +--- /dev/null ++++ b/node_modules/@endo/nat/src/index.d.ts +@@ -0,0 +1,30 @@ ++/** ++ * Is `allegedNum` a number in the [contiguous range of exactly and ++ * unambiguously ++ * representable](https://esdiscuss.org/topic/more-numeric-constants-please-especially-epsilon#content-14) ++ * natural numbers (non-negative integers)? ++ * ++ * To qualify `allegedNum` must either be a ++ * non-negative `bigint`, or a non-negative `number` representing an integer ++ * within range of [integers safely representable in ++ * floating point](https://tc39.es/ecma262/#sec-number.issafeinteger). ++ * ++ * @param {unknown} allegedNum ++ * @returns {boolean} ++ */ ++export function isNat(allegedNum: unknown): boolean; ++/** ++ * If `allegedNumber` passes the `isNat` test, then return it as a bigint. ++ * Otherwise throw an appropriate error. ++ * ++ * If `allegedNum` is neither a bigint nor a number, `Nat` throws a `TypeError`. ++ * Otherwise, if it is not a [safely ++ * representable](https://esdiscuss.org/topic/more-numeric-constants-please-especially-epsilon#content-14) ++ * non-negative integer, `Nat` throws a `RangeError`. ++ * Otherwise, it is converted to a bigint if necessary and returned. ++ * ++ * @param {unknown} allegedNum ++ * @returns {bigint} ++ */ ++export function Nat(allegedNum: unknown): bigint; ++//# sourceMappingURL=index.d.ts.map +\ No newline at end of file +diff --git a/node_modules/@endo/nat/src/index.d.ts.map b/node_modules/@endo/nat/src/index.d.ts.map +new file mode 100644 +index 0000000..a663f87 +--- /dev/null ++++ b/node_modules/@endo/nat/src/index.d.ts.map +@@ -0,0 +1 @@ ++{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.js"],"names":[],"mappings":"AAiBA;;;;;;;;;;;;;GAaG;AACH,kCAHW,OAAO,GACL,OAAO,CAWnB;AAED;;;;;;;;;;;;GAYG;AACH,gCAHW,OAAO,GACL,MAAM,CAuBlB"} +\ No newline at end of file From 37efb5a99a90d8be5f2b98279f25f4fe965a6fba Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Mon, 11 Mar 2024 07:05:30 -0700 Subject: [PATCH 5/6] chore(types): misc fix for TS 5.4 --- packages/pegasus/src/contract.js | 4 ++-- packages/vats/src/core/types-ambient.d.ts | 2 +- packages/wallet/api/src/lib-wallet.js | 2 ++ packages/zoe/src/contractFacet/types-ambient.d.ts | 6 +++--- packages/zoe/test/privateArgsUsageContract.js | 1 - .../swingsetTests/brokenContracts/crashingAutoRefund.js | 1 - 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/pegasus/src/contract.js b/packages/pegasus/src/contract.js index 2bd951f38db..e378b30c104 100644 --- a/packages/pegasus/src/contract.js +++ b/packages/pegasus/src/contract.js @@ -7,10 +7,10 @@ import '@agoric/zoe/exported.js'; import '../exported.js'; /** - * @type {ContractStartFn, * namesByAddress: ERef - * }} + * }>} */ export const start = (zcf, privateArgs, baggage) => { const zone = makeDurableZone(baggage); diff --git a/packages/vats/src/core/types-ambient.d.ts b/packages/vats/src/core/types-ambient.d.ts index 19a29a571a7..324c184c363 100644 --- a/packages/vats/src/core/types-ambient.d.ts +++ b/packages/vats/src/core/types-ambient.d.ts @@ -283,7 +283,7 @@ type StartUpgradableOpts< import('@agoric/zoe/src/zoeService/utils').StartParams['terms'], 'brands' | 'issuers' >; - privateArgs?: import('@agoric/zoe/src/zoeService/utils').StartParams['privateArgs']; + privateArgs?: Parameters[1]; label: string; }; diff --git a/packages/wallet/api/src/lib-wallet.js b/packages/wallet/api/src/lib-wallet.js index 6da348d70d4..250e411974f 100644 --- a/packages/wallet/api/src/lib-wallet.js +++ b/packages/wallet/api/src/lib-wallet.js @@ -1408,11 +1408,13 @@ export function makeWalletRoot({ boardId, dappOrigin = undefined, ) { + /** @type {Petname} */ let petname; if (dappOrigin === undefined) { petname = suggestedPetname; } else { const edgename = edgeMapping.valToPetname.get(dappOrigin); + // @ts-expect-error if suggestedPetname is itself an array, this nests petname = [edgename, suggestedPetname]; } diff --git a/packages/zoe/src/contractFacet/types-ambient.d.ts b/packages/zoe/src/contractFacet/types-ambient.d.ts index d0d0fcaaaac..5cfeedda345 100644 --- a/packages/zoe/src/contractFacet/types-ambient.d.ts +++ b/packages/zoe/src/contractFacet/types-ambient.d.ts @@ -237,11 +237,11 @@ type ContractStartFn< > = ( zcf: ZCF, privateArgs: PA, - baggage?: MapStore | undefined, + baggage: import('@agoric/vat-data').Baggage, ) => ContractStartFnResult; type ContractStartFnResult = { - publicFacet: PF; - creatorFacet: CF; + publicFacet?: PF; + creatorFacet?: CF; creatorInvitation?: Promise> | undefined; }; type ContractOf = import('../zoeService/utils').ContractOf; diff --git a/packages/zoe/test/privateArgsUsageContract.js b/packages/zoe/test/privateArgsUsageContract.js index b3be8fa8d2b..8f479791373 100644 --- a/packages/zoe/test/privateArgsUsageContract.js +++ b/packages/zoe/test/privateArgsUsageContract.js @@ -6,7 +6,6 @@ const start = (_zcf, privateArgs) => { const creatorFacet = Far('creatorFacet', { usePrivateArgs: () => E(privateArgs.myArg).doTest(), }); - // @ts-expect-error missing publicFacet for ContractStartFn return harden({ creatorFacet }); }; harden(start); diff --git a/packages/zoe/test/swingsetTests/brokenContracts/crashingAutoRefund.js b/packages/zoe/test/swingsetTests/brokenContracts/crashingAutoRefund.js index a6eb29bdd0e..93cae2157f4 100644 --- a/packages/zoe/test/swingsetTests/brokenContracts/crashingAutoRefund.js +++ b/packages/zoe/test/swingsetTests/brokenContracts/crashingAutoRefund.js @@ -83,7 +83,6 @@ const start = zcf => { const creatorInvitation = makeSafeInvitation(); - // @ts-expect-error missing creatorFacet of ContractStartFn return harden({ creatorInvitation, publicFacet }); }; From a033f2638f9f11e19d94d7931e4e0614773b1f60 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Mon, 11 Mar 2024 12:04:30 -0700 Subject: [PATCH 6/6] fix: misc runtime robustness found by typecheck --- packages/pegasus/tsconfig.json | 1 + packages/solo/src/start.js | 2 +- packages/swing-store/src/swingStore.js | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/pegasus/tsconfig.json b/packages/pegasus/tsconfig.json index b3bd6700aba..5617fa0229a 100644 --- a/packages/pegasus/tsconfig.json +++ b/packages/pegasus/tsconfig.json @@ -2,6 +2,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { + "allowSyntheticDefaultImports": true, "checkJs": false, "maxNodeModuleJsDepth": 2, }, diff --git a/packages/solo/src/start.js b/packages/solo/src/start.js index 84fa01e8a14..cf2237c2662 100644 --- a/packages/solo/src/start.js +++ b/packages/solo/src/start.js @@ -474,7 +474,7 @@ const start = async (basedir, argv) => { // Start timer here! startTimer(800); - resetOutdatedState(); + await resetOutdatedState(); // Remove wallet traces. await unlink('html/wallet').catch(_ => {}); diff --git a/packages/swing-store/src/swingStore.js b/packages/swing-store/src/swingStore.js index 5fc7c1a4cfe..8201d75b441 100644 --- a/packages/swing-store/src/swingStore.js +++ b/packages/swing-store/src/swingStore.js @@ -1,7 +1,7 @@ // @ts-check /* global Buffer */ -import fs from 'fs'; -import path from 'path'; +import * as fs from 'fs'; +import * as path from 'path'; import sqlite3 from 'better-sqlite3';