diff --git a/package-lock.json b/package-lock.json index c971758..f063fd0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "name": "d4a-contract-v2", "version": "1.0.0", "dependencies": { - "ethers": "^6.8.1", + "ethers": "^6.13.4", "solady": "^0.0.230" }, "devDependencies": { @@ -21,7 +21,6 @@ "@uniswap/v2-periphery": "^1.1.0-beta.0", "prettier": "^3.3.3", "solhint-community": "^3.5.0" - } }, "node_modules/@adraffy/ens-normalize": { @@ -1599,9 +1598,12 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.15.13", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.13.tgz", - "integrity": "sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==" + "version": "22.7.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz", + "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==", + "dependencies": { + "undici-types": "~6.19.2" + } }, "node_modules/@types/semver": { "version": "7.5.8", @@ -2062,9 +2064,9 @@ } }, "node_modules/ethers": { - "version": "6.13.1", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.13.1.tgz", - "integrity": "sha512-hdJ2HOxg/xx97Lm9HdCWk949BfYqYWpyw4//78SiwOLgASyfrNszfMUNB2joKjvGUdwhHfaiMMFFwacVVoLR9A==", + "version": "6.13.4", + "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.13.4.tgz", + "integrity": "sha512-21YtnZVg4/zKkCQPjrDj38B1r4nQvTZLopUGMLQ1ePU2zV/joCfDC3t3iKQjWRzjjjbzR+mdAIoikeBRNkdllA==", "funding": [ { "type": "individual", @@ -2079,9 +2081,9 @@ "@adraffy/ens-normalize": "1.10.1", "@noble/curves": "1.2.0", "@noble/hashes": "1.3.2", - "@types/node": "18.15.13", + "@types/node": "22.7.5", "aes-js": "4.0.0-beta.5", - "tslib": "2.4.0", + "tslib": "2.7.0", "ws": "8.17.1" }, "engines": { @@ -3145,9 +3147,9 @@ "integrity": "sha512-6a1bR6YuWdwMnnsD0lSWj2HtJ86OVKVN1S3mab6PXfNobzSGC9Sf+ObDPrsLtaC6epOw77luEc1GXC55E71bHw==" }, "node_modules/solhint-community": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/solhint-community/-/solhint-community-4.0.0.tgz", - "integrity": "sha512-BERw3qYzkJE64EwvYrp2+iiTN8yAZOJ74FCiL4bTBp7v0JFUvRYCEGZKAqfHcfi/koKkzM6qThsJUceKm9vvfg==", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/solhint-community/-/solhint-community-3.7.0.tgz", + "integrity": "sha512-8nfdaxVll+IIaEBHFz3CzagIZNNTGp4Mrr+6O4m7c9Bs/L8OcgR/xzZJFwROkGAhV8Nbiv4gqJ42nEXZPYl3Qw==", "dev": true, "dependencies": { "@solidity-parser/parser": "^0.16.0", @@ -3337,9 +3339,9 @@ "dev": true }, "node_modules/tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==" }, "node_modules/type-detect": { "version": "4.0.8", @@ -3350,6 +3352,11 @@ "node": ">=4" } }, + "node_modules/undici-types": { + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==" + }, "node_modules/universalify": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", @@ -4766,9 +4773,12 @@ "dev": true }, "@types/node": { - "version": "18.15.13", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.13.tgz", - "integrity": "sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==" + "version": "22.7.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz", + "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==", + "requires": { + "undici-types": "~6.19.2" + } }, "@types/semver": { "version": "7.5.8", @@ -5136,16 +5146,16 @@ "dev": true }, "ethers": { - "version": "6.13.1", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.13.1.tgz", - "integrity": "sha512-hdJ2HOxg/xx97Lm9HdCWk949BfYqYWpyw4//78SiwOLgASyfrNszfMUNB2joKjvGUdwhHfaiMMFFwacVVoLR9A==", + "version": "6.13.4", + "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.13.4.tgz", + "integrity": "sha512-21YtnZVg4/zKkCQPjrDj38B1r4nQvTZLopUGMLQ1ePU2zV/joCfDC3t3iKQjWRzjjjbzR+mdAIoikeBRNkdllA==", "requires": { "@adraffy/ens-normalize": "1.10.1", "@noble/curves": "1.2.0", "@noble/hashes": "1.3.2", - "@types/node": "18.15.13", + "@types/node": "22.7.5", "aes-js": "4.0.0-beta.5", - "tslib": "2.4.0", + "tslib": "2.7.0", "ws": "8.17.1" }, "dependencies": { @@ -5950,9 +5960,9 @@ "integrity": "sha512-6a1bR6YuWdwMnnsD0lSWj2HtJ86OVKVN1S3mab6PXfNobzSGC9Sf+ObDPrsLtaC6epOw77luEc1GXC55E71bHw==" }, "solhint-community": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/solhint-community/-/solhint-community-4.0.0.tgz", - "integrity": "sha512-BERw3qYzkJE64EwvYrp2+iiTN8yAZOJ74FCiL4bTBp7v0JFUvRYCEGZKAqfHcfi/koKkzM6qThsJUceKm9vvfg==", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/solhint-community/-/solhint-community-3.7.0.tgz", + "integrity": "sha512-8nfdaxVll+IIaEBHFz3CzagIZNNTGp4Mrr+6O4m7c9Bs/L8OcgR/xzZJFwROkGAhV8Nbiv4gqJ42nEXZPYl3Qw==", "dev": true, "requires": { "@solidity-parser/parser": "^0.16.0", @@ -6105,9 +6115,9 @@ "dev": true }, "tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==" }, "type-detect": { "version": "4.0.8", @@ -6115,6 +6125,11 @@ "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", "dev": true }, + "undici-types": { + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==" + }, "universalify": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", diff --git a/package.json b/package.json index 2f147fa..43e0930 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "deploy-test": "source .env && ENV=test forge script script/Deploy.s.sol --rpc-url $GOERLI_RPC_URL -vvvv --broadcast --verify" }, "dependencies": { - "ethers": "^6.8.1", + "ethers": "^6.13.4", "solady": "^0.0.230" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4d5d883..9d13329 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,15 +9,15 @@ importers: .: dependencies: ethers: - specifier: ^6.8.1 - version: 6.9.1 + specifier: ^6.13.4 + version: 6.13.4 solady: specifier: ^0.0.230 version: 0.0.230 devDependencies: '@chainlink/contracts': specifier: ^1.2.0 - version: 1.2.0(ethers@6.9.1) + version: 1.2.0(ethers@6.13.4) '@openzeppelin/contracts': specifier: ^4.9.3 version: 4.9.6 @@ -25,7 +25,7 @@ importers: specifier: ^4.8.2 version: 4.9.5 '@openzeppelin/merkle-tree': - specifier: ^1.0.7 + specifier: ^1.0.4 version: 1.0.7 '@solidstate/contracts': specifier: ^0.0.60 @@ -40,13 +40,13 @@ importers: specifier: ^3.3.3 version: 3.3.3 solhint-community: - specifier: ^4.0.0 - version: 4.0.0 + specifier: ^3.5.0 + version: 3.7.0 packages: - '@adraffy/ens-normalize@1.10.0': - resolution: {integrity: sha512-nA9XHtlAkYfJxY7bce8DcN7eKxWWCWkU+1GR9d+U6MbNpfwQp8TI7vqOsBsMcHoT4mBu2kypKoSKnghEzOOq5Q==} + '@adraffy/ens-normalize@1.10.1': + resolution: {integrity: sha512-96Z2IP3mYmF1Xg2cDm8f1gWGf/HUVedQ3FMifV4kG/PQ4yEP51xDtRAEfhVNt5f/uzpNkZHwWQuUcu6D6K+Ekw==} '@babel/code-frame@7.23.5': resolution: {integrity: sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==} @@ -258,8 +258,8 @@ packages: '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@18.15.13': - resolution: {integrity: sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==} + '@types/node@22.7.5': + resolution: {integrity: sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==} '@types/semver@7.5.8': resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==} @@ -458,8 +458,8 @@ packages: engines: {node: '>=4'} hasBin: true - ethers@6.9.1: - resolution: {integrity: sha512-kuV8fGd4/8Gj7wkurbsuUsm1DCG6N5gKGYdw3fnWG/7QGknhy1xtHD7kbkCWQAcbAYmzLCLqCPedS3FYncFkKQ==} + ethers@6.13.4: + resolution: {integrity: sha512-21YtnZVg4/zKkCQPjrDj38B1r4nQvTZLopUGMLQ1ePU2zV/joCfDC3t3iKQjWRzjjjbzR+mdAIoikeBRNkdllA==} engines: {node: '>=14.0.0'} extendable-error@0.1.7: @@ -840,8 +840,8 @@ packages: solady@0.0.230: resolution: {integrity: sha512-6a1bR6YuWdwMnnsD0lSWj2HtJ86OVKVN1S3mab6PXfNobzSGC9Sf+ObDPrsLtaC6epOw77luEc1GXC55E71bHw==} - solhint-community@4.0.0: - resolution: {integrity: sha512-BERw3qYzkJE64EwvYrp2+iiTN8yAZOJ74FCiL4bTBp7v0JFUvRYCEGZKAqfHcfi/koKkzM6qThsJUceKm9vvfg==} + solhint-community@3.7.0: + resolution: {integrity: sha512-8nfdaxVll+IIaEBHFz3CzagIZNNTGp4Mrr+6O4m7c9Bs/L8OcgR/xzZJFwROkGAhV8Nbiv4gqJ42nEXZPYl3Qw==} hasBin: true spawndamnit@2.0.0: @@ -892,13 +892,16 @@ packages: tr46@0.0.3: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} - tslib@2.4.0: - resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==} + tslib@2.7.0: + resolution: {integrity: sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==} type-detect@4.0.8: resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==} engines: {node: '>=4'} + undici-types@6.19.8: + resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} + universalify@0.1.2: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} @@ -935,12 +938,12 @@ packages: utf-8-validate: optional: true - ws@8.5.0: - resolution: {integrity: sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==} + ws@8.17.1: + resolution: {integrity: sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==} engines: {node: '>=10.0.0'} peerDependencies: bufferutil: ^4.0.1 - utf-8-validate: ^5.0.2 + utf-8-validate: '>=5.0.2' peerDependenciesMeta: bufferutil: optional: true @@ -956,7 +959,7 @@ packages: snapshots: - '@adraffy/ens-normalize@1.10.0': {} + '@adraffy/ens-normalize@1.10.1': {} '@babel/code-frame@7.23.5': dependencies: @@ -975,11 +978,11 @@ snapshots: dependencies: regenerator-runtime: 0.14.1 - '@chainlink/contracts@1.2.0(ethers@6.9.1)': + '@chainlink/contracts@1.2.0(ethers@6.13.4)': dependencies: '@changesets/changelog-github': 0.5.0 '@changesets/cli': 2.27.7 - '@eth-optimism/contracts': 0.6.0(ethers@6.9.1) + '@eth-optimism/contracts': 0.6.0(ethers@6.13.4) '@openzeppelin/contracts': 4.9.3 '@openzeppelin/contracts-upgradeable': 4.9.3 '@scroll-tech/contracts': 0.1.0 @@ -1161,12 +1164,12 @@ snapshots: human-id: 1.0.2 prettier: 2.8.8 - '@eth-optimism/contracts@0.6.0(ethers@6.9.1)': + '@eth-optimism/contracts@0.6.0(ethers@6.13.4)': dependencies: '@eth-optimism/core-utils': 0.12.0 '@ethersproject/abstract-provider': 5.7.0 '@ethersproject/abstract-signer': 5.7.0 - ethers: 6.9.1 + ethers: 6.13.4 transitivePeerDependencies: - bufferutil - utf-8-validate @@ -1430,7 +1433,9 @@ snapshots: '@types/node@12.20.55': {} - '@types/node@18.15.13': {} + '@types/node@22.7.5': + dependencies: + undici-types: 6.19.8 '@types/semver@7.5.8': {} @@ -1612,15 +1617,15 @@ snapshots: esprima@4.0.1: {} - ethers@6.9.1: + ethers@6.13.4: dependencies: - '@adraffy/ens-normalize': 1.10.0 + '@adraffy/ens-normalize': 1.10.1 '@noble/curves': 1.2.0 '@noble/hashes': 1.3.2 - '@types/node': 18.15.13 + '@types/node': 22.7.5 aes-js: 4.0.0-beta.5 - tslib: 2.4.0 - ws: 8.5.0 + tslib: 2.7.0 + ws: 8.17.1 transitivePeerDependencies: - bufferutil - utf-8-validate @@ -1961,7 +1966,7 @@ snapshots: solady@0.0.230: {} - solhint-community@4.0.0: + solhint-community@3.7.0: dependencies: '@solidity-parser/parser': 0.16.2 ajv: 6.12.6 @@ -2034,10 +2039,12 @@ snapshots: tr46@0.0.3: {} - tslib@2.4.0: {} + tslib@2.7.0: {} type-detect@4.0.8: {} + undici-types@6.19.8: {} + universalify@0.1.2: {} uri-js@4.4.1: @@ -2064,7 +2071,7 @@ snapshots: ws@7.4.6: {} - ws@8.5.0: {} + ws@8.17.1: {} yallist@2.1.2: {}