From 50eedf7fbe4f548ee1fa142452c73a13bb2d7e0a Mon Sep 17 00:00:00 2001 From: Daniel Dimitrov Date: Thu, 11 Jan 2024 15:25:13 +0100 Subject: [PATCH] fix typechain ethers-v6 generate wrong types MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Unfortunately there is a bug in typechain and we get some name clashes in the generated code. There is a PR that fixes this, but until it gets merged I’ve added a patch. More info on the name clash: https://github.com/dethcrypto/TypeChain/pull/887 Once this PR is merged the patch could be removed. --- package.json | 6 +- patches/@typechain+ethers-v6+0.5.1.patch | 61 +++++++++++++++ sdk/factory/moduleDeployer.ts | 2 +- yarn.lock | 94 ++++++++++++++++++++++-- 4 files changed, 152 insertions(+), 11 deletions(-) create mode 100644 patches/@typechain+ethers-v6+0.5.1.patch diff --git a/package.json b/package.json index 4159895a..753a58ba 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,8 @@ "prepare": "yarn generate:types && yarn build", "prerelease": "yarn clean && yarn build && yarn build:sdk", "release": "yarn publish --access public", - "verify": "yarn hardhat verify --network" + "verify": "yarn hardhat verify --network", + "postinstall": "patch-package" }, "directories": { "test": "test" @@ -76,6 +77,7 @@ "hardhat-deploy": "^0.11.28", "hardhat-gas-reporter": "^1.0.9", "husky": "^8.0.1", + "patch-package": "^8.0.0", "prettier": "^3.0.3", "prettier-plugin-solidity": "^1.1.3", "rimraf": "^5.0.1", @@ -83,7 +85,7 @@ "solhint-plugin-prettier": "^0.1.0", "solidity-coverage": "^0.8.4", "ts-node": "^10.9.1", - "typechain": "^8.3.0", + "typechain": "^8.3.2", "typescript": "^5.2.2", "yargs": "^17.6.0" }, diff --git a/patches/@typechain+ethers-v6+0.5.1.patch b/patches/@typechain+ethers-v6+0.5.1.patch new file mode 100644 index 00000000..acc8302e --- /dev/null +++ b/patches/@typechain+ethers-v6+0.5.1.patch @@ -0,0 +1,61 @@ +diff --git a/node_modules/@typechain/ethers-v6/dist/codegen/index.js b/node_modules/@typechain/ethers-v6/dist/codegen/index.js +index 604775c..0275a0e 100644 +--- a/node_modules/@typechain/ethers-v6/dist/codegen/index.js ++++ b/node_modules/@typechain/ethers-v6/dist/codegen/index.js +@@ -40,8 +40,9 @@ function codegenContractTypings(contract, codegenConfig) { + + ${events_1.EVENT_METHOD_OVERRIDES} + ++ + ${(0, lodash_1.values)(contract.functions) +- .filter((f) => !reserved_keywords_1.reservedKeywords.has(f[0].name)) ++ .filter((f) => !reserved_keywords_1.ethersPassProperties.has(f[0].name) && !reserved_keywords_1.baseContractProperties.has(f[0].name)) + .map(functions_1.codegenFunctions.bind(null, { codegenConfig })) + .join('\n')} + +diff --git a/node_modules/@typechain/ethers-v6/dist/codegen/index.js.map b/node_modules/@typechain/ethers-v6/dist/codegen/index.js.map +index b67af83..ddc2cbc 100644 +--- a/node_modules/@typechain/ethers-v6/dist/codegen/index.js.map ++++ b/node_modules/@typechain/ethers-v6/dist/codegen/index.js.map +@@ -1 +1 @@ +-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/codegen/index.ts"],"names":[],"mappings":"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"} +\ No newline at end of file ++{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/codegen/index.ts"],"names":[],"mappings":"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"} +\ No newline at end of file +diff --git a/node_modules/@typechain/ethers-v6/dist/codegen/reserved-keywords.d.ts b/node_modules/@typechain/ethers-v6/dist/codegen/reserved-keywords.d.ts +index d3da299..78d7ede 100644 +--- a/node_modules/@typechain/ethers-v6/dist/codegen/reserved-keywords.d.ts ++++ b/node_modules/@typechain/ethers-v6/dist/codegen/reserved-keywords.d.ts +@@ -1,2 +1,3 @@ +-export declare const reservedKeywords: Set; ++export declare const ethersPassProperties: Set; ++export declare const baseContractProperties: Set; + export declare const reservedKeywordsLabels: Set; +diff --git a/node_modules/@typechain/ethers-v6/dist/codegen/reserved-keywords.js b/node_modules/@typechain/ethers-v6/dist/codegen/reserved-keywords.js +index f5a47b1..f8f0994 100644 +--- a/node_modules/@typechain/ethers-v6/dist/codegen/reserved-keywords.js ++++ b/node_modules/@typechain/ethers-v6/dist/codegen/reserved-keywords.js +@@ -1,7 +1,12 @@ + "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); +-exports.reservedKeywordsLabels = exports.reservedKeywords = void 0; +-exports.reservedKeywords = new Set(['signer', 'provider', 'deployTransaction', 'deployed', 'fallback', 'connect']); ++exports.reservedKeywordsLabels = exports.baseContractProperties = exports.ethersPassProperties = void 0; ++const ethers_1 = require("ethers"); ++exports.ethersPassProperties = new Set(['then']); ++exports.baseContractProperties = new Set([ ++ ...Object.getOwnPropertyNames(ethers_1.BaseContract.prototype), ++ ...Object.keys(new ethers_1.BaseContract('0x', [])), // for readOnly properties ++]); + exports.reservedKeywordsLabels = new Set([ + 'class', + 'function', +diff --git a/node_modules/@typechain/ethers-v6/dist/codegen/reserved-keywords.js.map b/node_modules/@typechain/ethers-v6/dist/codegen/reserved-keywords.js.map +index 8c70249..c3bf0f1 100644 +--- a/node_modules/@typechain/ethers-v6/dist/codegen/reserved-keywords.js.map ++++ b/node_modules/@typechain/ethers-v6/dist/codegen/reserved-keywords.js.map +@@ -1 +1 @@ +-{"version":3,"file":"reserved-keywords.js","sourceRoot":"","sources":["../../src/codegen/reserved-keywords.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,UAAU,EAAE,mBAAmB,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,CAAA;AAE1G,QAAA,sBAAsB,GAAG,IAAI,GAAG,CAAC;IAC5C,OAAO;IACP,UAAU;IACV,WAAW;IACX,SAAS;IACT,YAAY;IACZ,aAAa;IACb,OAAO;IACP,MAAM;IACN,KAAK;IACL,KAAK;IACL,OAAO;IACP,IAAI;IACJ,MAAM;IACN,KAAK;IACL,OAAO;IACP,IAAI;IACJ,QAAQ;IACR,MAAM;IACN,SAAS;IACT,OAAO;IACP,UAAU;IACV,KAAK;IACL,QAAQ;IACR,QAAQ;IACR,IAAI;IACJ,YAAY;IACZ,QAAQ;IACR,MAAM;IACN,OAAO;IACP,QAAQ;IACR,QAAQ;IACR,IAAI;IACJ,KAAK;IACL,KAAK;IACL,IAAI;IACJ,WAAW;IACX,MAAM;IACN,UAAU;IACV,OAAO;IACP,OAAO;IACP,IAAI;CACL,CAAC,CAAA"} +\ No newline at end of file ++{"version":3,"file":"reserved-keywords.js","sourceRoot":"","sources":["../../src/codegen/reserved-keywords.ts"],"names":[],"mappings":";;;AAAA,mCAAqC;AAExB,QAAA,oBAAoB,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;AACxC,QAAA,sBAAsB,GAAG,IAAI,GAAG,CAAC;IAC5C,GAAG,MAAM,CAAC,mBAAmB,CAAC,qBAAY,CAAC,SAAS,CAAC;IACrD,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,qBAAY,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,0BAA0B;CACvE,CAAC,CAAA;AAEW,QAAA,sBAAsB,GAAG,IAAI,GAAG,CAAC;IAC5C,OAAO;IACP,UAAU;IACV,WAAW;IACX,SAAS;IACT,YAAY;IACZ,aAAa;IACb,OAAO;IACP,MAAM;IACN,KAAK;IACL,KAAK;IACL,OAAO;IACP,IAAI;IACJ,MAAM;IACN,KAAK;IACL,OAAO;IACP,IAAI;IACJ,QAAQ;IACR,MAAM;IACN,SAAS;IACT,OAAO;IACP,UAAU;IACV,KAAK;IACL,QAAQ;IACR,QAAQ;IACR,IAAI;IACJ,YAAY;IACZ,QAAQ;IACR,MAAM;IACN,OAAO;IACP,QAAQ;IACR,QAAQ;IACR,IAAI;IACJ,KAAK;IACL,KAAK;IACL,IAAI;IACJ,WAAW;IACX,MAAM;IACN,UAAU;IACV,OAAO;IACP,OAAO;IACP,IAAI;CACL,CAAC,CAAA"} +\ No newline at end of file diff --git a/sdk/factory/moduleDeployer.ts b/sdk/factory/moduleDeployer.ts index 5101a4c0..8f8e3b9e 100644 --- a/sdk/factory/moduleDeployer.ts +++ b/sdk/factory/moduleDeployer.ts @@ -142,7 +142,7 @@ const getDeployAndSetupTx = async ( const transaction = { data: deployData, to: await moduleFactory.getAddress(), - value: 0n, + value: BigInt(0), }; return { transaction, diff --git a/yarn.lock b/yarn.lock index 49ebf1c7..22c3c819 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1328,6 +1328,11 @@ resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== +"@yarnpkg/lockfile@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" + integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== + abbrev@1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" @@ -1943,6 +1948,11 @@ ci-info@^2.0.0: resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== +ci-info@^3.7.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4" + integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ== + cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" @@ -2899,6 +2909,13 @@ find-up@^2.1.0: dependencies: locate-path "^2.0.0" +find-yarn-workspace-root@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd" + integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ== + dependencies: + micromatch "^4.0.2" + flat-cache@^3.0.4: version "3.1.1" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.1.1.tgz#a02a15fdec25a8f844ff7cc658f03dd99eb4609b" @@ -3016,7 +3033,7 @@ fs-extra@^8.1.0: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^9.1.0: +fs-extra@^9.0.0, fs-extra@^9.1.0: version "9.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== @@ -3280,7 +3297,7 @@ graceful-fs@4.2.10: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0: +graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -3824,7 +3841,7 @@ is-weakref@^1.0.2: dependencies: call-bind "^1.0.2" -is-wsl@^2.2.0: +is-wsl@^2.1.1, is-wsl@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== @@ -3910,6 +3927,16 @@ json-stable-stringify-without-jsonify@^1.0.1: resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== +json-stable-stringify@^1.0.2: + version "1.1.0" + resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.1.0.tgz#43d39c7c8da34bfaf785a61a56808b0def9f747d" + integrity sha512-zfA+5SuwYN2VWqN1/5HZaDzQKLJHaBVMZIIM+wuYjdptkaQsqzDdqjqf+lZZJUuJq1aanHiY8LhH8LmH+qBYJA== + dependencies: + call-bind "^1.0.5" + isarray "^2.0.5" + jsonify "^0.0.1" + object-keys "^1.1.1" + json5@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" @@ -3940,6 +3967,11 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" +jsonify@^0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.1.tgz#2aa3111dae3d34a0f151c63f3a45d995d9420978" + integrity sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg== + jsonschema@^1.2.4: version "1.4.1" resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.1.tgz#cc4c3f0077fb4542982973d8a083b6b34f482dab" @@ -3966,6 +3998,13 @@ kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== +klaw-sync@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c" + integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ== + dependencies: + graceful-fs "^4.1.11" + klaw@^1.0.0: version "1.3.1" resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439" @@ -4169,7 +4208,7 @@ micro-ftch@^0.3.1: resolved "https://registry.yarnpkg.com/micro-ftch/-/micro-ftch-0.3.1.tgz#6cb83388de4c1f279a034fb0cf96dfc050853c5f" integrity sha512-/0LLxhzP0tfiR5hcQebtudP56gUurs2CLkGarnCiB/OqEyUFQ6U3paQi/tgLv0hBJYt2rnr9MNpxz4fiiugstg== -micromatch@^4.0.4: +micromatch@^4.0.2, micromatch@^4.0.4: version "4.0.5" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== @@ -4487,6 +4526,14 @@ onetime@^6.0.0: dependencies: mimic-fn "^4.0.0" +open@^7.4.2: + version "7.4.2" + resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" + integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q== + dependencies: + is-docker "^2.0.0" + is-wsl "^2.1.1" + open@^9.1.0: version "9.1.0" resolved "https://registry.yarnpkg.com/open/-/open-9.1.0.tgz#684934359c90ad25742f5a26151970ff8c6c80b6" @@ -4608,6 +4655,27 @@ parse-json@^5.2.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" +patch-package@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-8.0.0.tgz#d191e2f1b6e06a4624a0116bcb88edd6714ede61" + integrity sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA== + dependencies: + "@yarnpkg/lockfile" "^1.1.0" + chalk "^4.1.2" + ci-info "^3.7.0" + cross-spawn "^7.0.3" + find-yarn-workspace-root "^2.0.0" + fs-extra "^9.0.0" + json-stable-stringify "^1.0.2" + klaw-sync "^6.0.0" + minimist "^1.2.6" + open "^7.4.2" + rimraf "^2.6.3" + semver "^7.5.3" + slash "^2.0.0" + tmp "^0.0.33" + yaml "^2.2.2" + path-exists@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" @@ -4937,7 +5005,7 @@ reusify@^1.0.4: resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -rimraf@^2.2.8: +rimraf@^2.2.8, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -5077,7 +5145,7 @@ semver@^6.3.0, semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.3.4, semver@^7.3.7, semver@^7.3.8, semver@^7.5.2, semver@^7.5.4: +semver@^7.3.4, semver@^7.3.7, semver@^7.3.8, semver@^7.5.2, semver@^7.5.3, semver@^7.5.4: version "7.5.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== @@ -5176,6 +5244,11 @@ signal-exit@^4.0.1: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== +slash@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" + integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A== + slash@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" @@ -5537,7 +5610,7 @@ titleize@^3.0.0: resolved "https://registry.yarnpkg.com/titleize/-/titleize-3.0.0.tgz#71c12eb7fdd2558aa8a44b0be83b8a76694acd53" integrity sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ== -tmp@0.0.33: +tmp@0.0.33, tmp@^0.0.33: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== @@ -5669,7 +5742,7 @@ type-fest@^0.7.1: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.7.1.tgz#8dda65feaf03ed78f0a3f9678f1869147f7c5c48" integrity sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg== -typechain@^8.3.0: +typechain@^8.3.2: version "8.3.2" resolved "https://registry.yarnpkg.com/typechain/-/typechain-8.3.2.tgz#1090dd8d9c57b6ef2aed3640a516bdbf01b00d73" integrity sha512-x/sQYr5w9K7yv3es7jo4KTX05CLxOf7TRWwoHlrjRh8H82G64g+k7VuWPJlgMo6qrjfCulOdfBjiaDtmhFYD/Q== @@ -5944,6 +6017,11 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== +yaml@^2.2.2: + version "2.3.4" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.4.tgz#53fc1d514be80aabf386dc6001eb29bf3b7523b2" + integrity sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA== + yargs-parser@20.2.4: version "20.2.4" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"