From a79f304c544554d103489704a72dc06d1cfaa1a1 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Mon, 24 Aug 2026 16:17:09 +0200 Subject: [PATCH 01/51] migration to hardhat 3: dependencies and tests --- .solcover.js | 1 - .../modules/ERC7579MultisigConfirmation.sol | 5 +- .../account/modules/ERC7579MultisigMocks.sol | 20 +- .../crosschain/axelar/AxelarGatewayMock.sol | 4 +- .../account/MyAccountMultiSignerWeighted.sol | 4 +- .../MyERC7579DelayedSocialRecovery.sol | 5 +- .../modules/MyERC7579SocialRecovery.sol | 5 +- contracts/mocks/import.sol | 5 - contracts/token/ERC20/extensions/ERC7540.sol | 5 +- .../ERC20/extensions/ERC7540AdminDeposit.sol | 10 +- .../ERC20/extensions/ERC7540AdminRedeem.sol | 10 +- foundry.toml | 19 +- hardhat.config.js | 66 - hardhat.config.ts | 116 + hardhat/remappings.js | 19 - lib/@openzeppelin-contracts | 2 +- lib/@openzeppelin-contracts-upgradeable | 2 +- package-lock.json | 8383 ++++++----------- package.json | 14 +- remappings.txt | 3 +- scripts/generate/run.js | 25 +- scripts/generate/templates/Enumerable.opts.js | 20 +- .../templates/EnumerableMapExtended.js | 6 +- .../templates/EnumerableSetExtended.js | 6 +- solhint.config.cjs | 1 + solhint.config.js | 1 - .../access/manager/AccessManagerLight.test.js | 16 +- test/account/AccountERC7913.test.js | 34 +- test/account/AccountZKEmail.test.js | 29 +- test/account/RoleAccount.test.js | 6 +- test/account/RoleAccountFactory.test.js | 20 +- .../modules/ERC7579DelayedExecutor.test.js | 61 +- test/account/modules/ERC7579Executor.test.js | 31 +- .../account/modules/ERC7579Module.behavior.js | 21 +- test/account/modules/ERC7579Multisig.test.js | 31 +- .../ERC7579MultisigConfirmation.test.js | 47 +- .../modules/ERC7579MultisigStorage.test.js | 30 +- .../modules/ERC7579MultisigWeighted.test.js | 31 +- .../modules/ERC7579SelectorExecutor.test.js | 37 +- .../modules/ERC7579SignatureValidator.test.js | 35 +- test/account/modules/ERC7579Validator.test.js | 27 +- test/crosschain/ERC7786OpenBridge.test.js | 64 +- .../axelar/AxelarGatewayAdapter.test.js | 46 +- test/crosschain/axelar/AxelarHelper.js | 27 +- .../utils/ERC7786Attributes.test.js | 13 +- .../wormhole/WormholeGatewayAdapter.test.js | 21 +- test/crosschain/wormhole/WormholeHelper.js | 37 +- .../TimelockControllerEnumerable.t.sol | 28 +- .../TimelockControllerEnumerableMock.t.sol | 4 +- test/helpers/eip712-types.js | 18 +- test/helpers/enums.js | 31 +- test/helpers/erc7786attributes.js | 4 +- test/helpers/signers.js | 8 +- test/proxy/HybridProxy.test.js | 10 +- .../ERC20/extensions/ERC20Allowlist.test.js | 44 +- .../ERC20/extensions/ERC20Blocklist.test.js | 44 +- .../ERC20/extensions/ERC20Collateral.test.js | 16 +- .../ERC20/extensions/ERC20Custodian.test.js | 37 +- .../ERC20/extensions/ERC20Freezable.test.js | 32 +- .../ERC20/extensions/ERC20Restricted.test.js | 59 +- test/token/ERC20/extensions/ERC20uRWA.test.js | 45 +- .../ERC20/extensions/ERC4626.behavior.js | 88 +- test/token/ERC20/extensions/ERC4626.test.js | 14 +- .../ERC20/extensions/ERC7540.behavior.js | 98 +- .../ERC20/extensions/ERC7540Admin.test.js | 21 +- .../ERC20/extensions/ERC7540Delay.test.js | 23 +- .../ERC20/extensions/ERC7540Sync.test.js | 6 +- .../extensions/ERC7540SyncDeposit.test.js | 19 +- .../extensions/ERC7540SyncRedeem.test.js | 21 +- .../ERC20/extensions/ERC7575.behavior.js | 14 +- test/utils/Masks.test.js | 10 +- test/utils/cryptography/DKIMRegistry.test.js | 10 +- test/utils/cryptography/ZKEmailUtils.test.js | 12 +- .../signers/SignerAccessManaged.test.js | 10 +- .../structs/EnumerableMapExtended.test.js | 24 +- .../structs/EnumerableSetExtended.test.js | 20 +- 76 files changed, 3893 insertions(+), 6298 deletions(-) delete mode 120000 .solcover.js mode change 100644 => 120000 foundry.toml delete mode 100644 hardhat.config.js create mode 100644 hardhat.config.ts delete mode 100644 hardhat/remappings.js create mode 120000 solhint.config.cjs delete mode 120000 solhint.config.js diff --git a/.solcover.js b/.solcover.js deleted file mode 120000 index 58f3784bd..000000000 --- a/.solcover.js +++ /dev/null @@ -1 +0,0 @@ -lib/@openzeppelin-contracts/.solcover.js \ No newline at end of file diff --git a/contracts/account/modules/ERC7579MultisigConfirmation.sol b/contracts/account/modules/ERC7579MultisigConfirmation.sol index 0cb436dfb..83caab11c 100644 --- a/contracts/account/modules/ERC7579MultisigConfirmation.sol +++ b/contracts/account/modules/ERC7579MultisigConfirmation.sol @@ -17,8 +17,9 @@ import {ERC7579Multisig} from "./ERC7579Multisig.sol"; * explicitly agreed to their roles. */ abstract contract ERC7579MultisigConfirmation is ERC7579Multisig, EIP712 { - bytes32 private constant MULTISIG_CONFIRMATION = - keccak256("MultisigConfirmation(address account,address module,uint256 deadline)"); + bytes32 private constant MULTISIG_CONFIRMATION = keccak256( + "MultisigConfirmation(address account,address module,uint256 deadline)" + ); /// @dev Error thrown when a `signer`'s confirmation signature is invalid error ERC7579MultisigInvalidConfirmationSignature(bytes signer); diff --git a/contracts/mocks/account/modules/ERC7579MultisigMocks.sol b/contracts/mocks/account/modules/ERC7579MultisigMocks.sol index 162a36798..d3efd9097 100644 --- a/contracts/mocks/account/modules/ERC7579MultisigMocks.sol +++ b/contracts/mocks/account/modules/ERC7579MultisigMocks.sol @@ -13,8 +13,9 @@ import {MODULE_TYPE_EXECUTOR, IERC7579Hook} from "@openzeppelin/contracts/interf import {Mode} from "@openzeppelin/contracts/account/utils/draft-ERC7579Utils.sol"; abstract contract ERC7579MultisigExecutorMock is EIP712, ERC7579Executor, ERC7579Multisig { - bytes32 private constant EXECUTE_OPERATION = - keccak256("ExecuteOperation(address account,bytes32 mode,bytes executionCalldata,bytes32 salt)"); + bytes32 private constant EXECUTE_OPERATION = keccak256( + "ExecuteOperation(address account,bytes32 mode,bytes executionCalldata,bytes32 salt)" + ); function isModuleType(uint256 moduleTypeId) public pure override(ERC7579Executor, ERC7579Validator) returns (bool) { return ERC7579Executor.isModuleType(moduleTypeId) || ERC7579Executor.isModuleType(moduleTypeId); @@ -45,8 +46,9 @@ abstract contract ERC7579MultisigExecutorMock is EIP712, ERC7579Executor, ERC757 } abstract contract ERC7579MultisigWeightedExecutorMock is EIP712, ERC7579Executor, ERC7579MultisigWeighted { - bytes32 private constant EXECUTE_OPERATION = - keccak256("ExecuteOperation(address account,bytes32 mode,bytes executionCalldata,bytes32 salt)"); + bytes32 private constant EXECUTE_OPERATION = keccak256( + "ExecuteOperation(address account,bytes32 mode,bytes executionCalldata,bytes32 salt)" + ); function isModuleType(uint256 moduleTypeId) public pure override(ERC7579Executor, ERC7579Validator) returns (bool) { return ERC7579Executor.isModuleType(moduleTypeId) || ERC7579Executor.isModuleType(moduleTypeId); @@ -77,8 +79,9 @@ abstract contract ERC7579MultisigWeightedExecutorMock is EIP712, ERC7579Executor } abstract contract ERC7579MultisigConfirmationExecutorMock is ERC7579Executor, ERC7579MultisigConfirmation { - bytes32 private constant EXECUTE_OPERATION = - keccak256("ExecuteOperation(address account,bytes32 mode,bytes executionCalldata,bytes32 salt)"); + bytes32 private constant EXECUTE_OPERATION = keccak256( + "ExecuteOperation(address account,bytes32 mode,bytes executionCalldata,bytes32 salt)" + ); function isModuleType(uint256 moduleTypeId) public pure override(ERC7579Executor, ERC7579Validator) returns (bool) { return ERC7579Executor.isModuleType(moduleTypeId) || ERC7579Executor.isModuleType(moduleTypeId); @@ -109,8 +112,9 @@ abstract contract ERC7579MultisigConfirmationExecutorMock is ERC7579Executor, ER } abstract contract ERC7579MultisigStorageExecutorMock is EIP712, ERC7579Executor, ERC7579MultisigStorage { - bytes32 private constant EXECUTE_OPERATION = - keccak256("ExecuteOperation(address account,bytes32 mode,bytes executionCalldata,bytes32 salt)"); + bytes32 private constant EXECUTE_OPERATION = keccak256( + "ExecuteOperation(address account,bytes32 mode,bytes executionCalldata,bytes32 salt)" + ); function isModuleType(uint256 moduleTypeId) public pure override(ERC7579Executor, ERC7579Validator) returns (bool) { return ERC7579Executor.isModuleType(moduleTypeId) || ERC7579Executor.isModuleType(moduleTypeId); diff --git a/contracts/mocks/crosschain/axelar/AxelarGatewayMock.sol b/contracts/mocks/crosschain/axelar/AxelarGatewayMock.sol index 373a7bb9b..9aeec2fc9 100644 --- a/contracts/mocks/crosschain/axelar/AxelarGatewayMock.sol +++ b/contracts/mocks/crosschain/axelar/AxelarGatewayMock.sol @@ -3,9 +3,7 @@ pragma solidity ^0.8.27; import {IAxelarGateway} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IAxelarGateway.sol"; -import { - IBaseAmplifierGateway -} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IBaseAmplifierGateway.sol"; +import {IBaseAmplifierGateway} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IBaseAmplifierGateway.sol"; import {IAxelarExecutable} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IAxelarExecutable.sol"; import {BitMaps} from "@openzeppelin/contracts/utils/structs/BitMaps.sol"; import {Strings} from "@openzeppelin/contracts/utils/Strings.sol"; diff --git a/contracts/mocks/docs/account/MyAccountMultiSignerWeighted.sol b/contracts/mocks/docs/account/MyAccountMultiSignerWeighted.sol index 211290a88..fd5e76604 100644 --- a/contracts/mocks/docs/account/MyAccountMultiSignerWeighted.sol +++ b/contracts/mocks/docs/account/MyAccountMultiSignerWeighted.sol @@ -6,9 +6,7 @@ pragma solidity ^0.8.27; import {Account} from "@openzeppelin/contracts/account/Account.sol"; import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol"; import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol"; -import { - MultiSignerERC7913Weighted -} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol"; +import {MultiSignerERC7913Weighted} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol"; import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol"; import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol"; import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol"; diff --git a/contracts/mocks/docs/account/modules/MyERC7579DelayedSocialRecovery.sol b/contracts/mocks/docs/account/modules/MyERC7579DelayedSocialRecovery.sol index f3deae5f9..08b6ffe1a 100644 --- a/contracts/mocks/docs/account/modules/MyERC7579DelayedSocialRecovery.sol +++ b/contracts/mocks/docs/account/modules/MyERC7579DelayedSocialRecovery.sol @@ -10,8 +10,9 @@ import {ERC7579DelayedExecutor} from "../../../../account/modules/ERC7579Delayed import {ERC7579Multisig} from "../../../../account/modules/ERC7579Multisig.sol"; abstract contract MyERC7579DelayedSocialRecovery is EIP712, ERC7579DelayedExecutor, ERC7579Multisig { - bytes32 private constant RECOVER_TYPEHASH = - keccak256("Recover(address account,bytes32 salt,bytes32 mode,bytes executionCalldata)"); + bytes32 private constant RECOVER_TYPEHASH = keccak256( + "Recover(address account,bytes32 salt,bytes32 mode,bytes executionCalldata)" + ); function isModuleType(uint256 moduleTypeId) public pure override(ERC7579Executor, ERC7579Validator) returns (bool) { return ERC7579Executor.isModuleType(moduleTypeId) || ERC7579Executor.isModuleType(moduleTypeId); diff --git a/contracts/mocks/docs/account/modules/MyERC7579SocialRecovery.sol b/contracts/mocks/docs/account/modules/MyERC7579SocialRecovery.sol index c0d7e4c02..7f63aece5 100644 --- a/contracts/mocks/docs/account/modules/MyERC7579SocialRecovery.sol +++ b/contracts/mocks/docs/account/modules/MyERC7579SocialRecovery.sol @@ -9,8 +9,9 @@ import {ERC7579Validator} from "../../../../account/modules/ERC7579Validator.sol import {ERC7579Multisig} from "../../../../account/modules/ERC7579Multisig.sol"; abstract contract MyERC7579SocialRecovery is EIP712, ERC7579Executor, ERC7579Multisig, Nonces { - bytes32 private constant RECOVER_TYPEHASH = - keccak256("Recover(address account,bytes32 salt,uint256 nonce,bytes32 mode,bytes executionCalldata)"); + bytes32 private constant RECOVER_TYPEHASH = keccak256( + "Recover(address account,bytes32 salt,uint256 nonce,bytes32 mode,bytes executionCalldata)" + ); function isModuleType(uint256 moduleTypeId) public pure override(ERC7579Executor, ERC7579Validator) returns (bool) { return ERC7579Executor.isModuleType(moduleTypeId) || ERC7579Executor.isModuleType(moduleTypeId); diff --git a/contracts/mocks/import.sol b/contracts/mocks/import.sol index 9bd2c4d33..88c9585ec 100644 --- a/contracts/mocks/import.sol +++ b/contracts/mocks/import.sol @@ -2,9 +2,7 @@ pragma solidity ^0.8.20; -import {ECDSAOwnedDKIMRegistry} from "@zk-email/email-tx-builder/src/utils/ECDSAOwnedDKIMRegistry.sol"; import {AccessManager} from "@openzeppelin/contracts/access/manager/AccessManager.sol"; -import {UpgradeableBeacon} from "@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol"; import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol"; import {ERC721Enumerable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol"; import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol"; @@ -14,7 +12,4 @@ import { AccountERC7913Mock } from "@openzeppelin/contracts/mocks/account/AccountMock.sol"; import {ERC1271WalletMock} from "@openzeppelin/contracts/mocks/ERC1271WalletMock.sol"; -import {CallReceiverMock} from "@openzeppelin/contracts/mocks/CallReceiverMock.sol"; -import {ERC7913P256Verifier} from "@openzeppelin/contracts/utils/cryptography/verifiers/ERC7913P256Verifier.sol"; -import {ERC7913RSAVerifier} from "@openzeppelin/contracts/utils/cryptography/verifiers/ERC7913RSAVerifier.sol"; import {Create2} from "@openzeppelin/contracts/utils/Create2.sol"; diff --git a/contracts/token/ERC20/extensions/ERC7540.sol b/contracts/token/ERC20/extensions/ERC7540.sol index 0ef9c25cf..df9734994 100644 --- a/contracts/token/ERC20/extensions/ERC7540.sol +++ b/contracts/token/ERC20/extensions/ERC7540.sol @@ -543,9 +543,8 @@ abstract contract ERC7540 is ERC165, ERC20, IERC4626, IERC7540, IERC7575Share { revert ERC4626ExceededMaxWithdraw(ownerOrController, assets, maxAssets); } - uint256 shares = _isRedeemAsync() - ? _consumeClaimableWithdraw(assets, ownerOrController) - : previewWithdraw(assets); + uint256 shares = + _isRedeemAsync() ? _consumeClaimableWithdraw(assets, ownerOrController) : previewWithdraw(assets); _withdraw(_msgSender(), receiver, ownerOrController, assets, shares); return shares; } diff --git a/contracts/token/ERC20/extensions/ERC7540AdminDeposit.sol b/contracts/token/ERC20/extensions/ERC7540AdminDeposit.sol index 5dfcf25ac..844fec068 100644 --- a/contracts/token/ERC20/extensions/ERC7540AdminDeposit.sol +++ b/contracts/token/ERC20/extensions/ERC7540AdminDeposit.sol @@ -100,9 +100,8 @@ abstract contract ERC7540AdminDeposit is ERC7540 { // residue left after a partial claim was rounded against the share side. uint256 maxAssets = maxDeposit(controller); uint256 maxShares = maxMint(controller); - uint256 shares = assets == maxAssets - ? maxShares - : Math.mulDiv(assets, maxShares, maxAssets, Math.Rounding.Floor); + uint256 shares = + assets == maxAssets ? maxShares : Math.mulDiv(assets, maxShares, maxAssets, Math.Rounding.Floor); _deposits[controller].claimableAssets -= assets; _deposits[controller].claimableShares -= shares; @@ -116,9 +115,8 @@ abstract contract ERC7540AdminDeposit is ERC7540 { // residue left after a partial claim was rounded against the asset side. uint256 maxAssets = maxDeposit(controller); uint256 maxShares = maxMint(controller); - uint256 assets = shares == maxShares - ? maxAssets - : Math.mulDiv(shares, maxAssets, maxShares, Math.Rounding.Ceil); + uint256 assets = + shares == maxShares ? maxAssets : Math.mulDiv(shares, maxAssets, maxShares, Math.Rounding.Ceil); _deposits[controller].claimableAssets -= assets; _deposits[controller].claimableShares -= shares; diff --git a/contracts/token/ERC20/extensions/ERC7540AdminRedeem.sol b/contracts/token/ERC20/extensions/ERC7540AdminRedeem.sol index 5a4f6da16..9d4d325d4 100644 --- a/contracts/token/ERC20/extensions/ERC7540AdminRedeem.sol +++ b/contracts/token/ERC20/extensions/ERC7540AdminRedeem.sol @@ -95,9 +95,8 @@ abstract contract ERC7540AdminRedeem is ERC7540 { // residue left after a partial claim was rounded against the share side. uint256 maxAssets = maxWithdraw(controller); uint256 maxShares = maxRedeem(controller); - uint256 shares = assets == maxAssets - ? maxShares - : Math.mulDiv(assets, maxShares, maxAssets, Math.Rounding.Ceil); + uint256 shares = + assets == maxAssets ? maxShares : Math.mulDiv(assets, maxShares, maxAssets, Math.Rounding.Ceil); _redeems[controller].claimableAssets -= assets; _redeems[controller].claimableShares -= shares; @@ -111,9 +110,8 @@ abstract contract ERC7540AdminRedeem is ERC7540 { // residue left after a partial claim was rounded against the asset side. uint256 maxShares = maxRedeem(controller); uint256 maxAssets = maxWithdraw(controller); - uint256 assets = shares == maxShares - ? maxAssets - : Math.mulDiv(shares, maxAssets, maxShares, Math.Rounding.Floor); + uint256 assets = + shares == maxShares ? maxAssets : Math.mulDiv(shares, maxAssets, maxShares, Math.Rounding.Floor); _redeems[controller].claimableAssets -= assets; _redeems[controller].claimableShares -= shares; diff --git a/foundry.toml b/foundry.toml deleted file mode 100644 index 61cd3a5b4..000000000 --- a/foundry.toml +++ /dev/null @@ -1,18 +0,0 @@ -[profile.default] -solc_version = '0.8.27' -evm_version = 'prague' -optimizer = true -optimizer-runs = 200 -src = 'contracts' -out = 'out' -libs = ['node_modules', 'lib'] -test = 'test' -cache_path = 'cache_forge' -fs_permissions = [{ access = "read", path = "lib/@openzeppelin-contracts/test/bin/EntryPoint080.bytecode"}] - -[lint] -lint_on_build = false - -[fuzz] -runs = 5000 -max_test_rejects = 150000 diff --git a/foundry.toml b/foundry.toml new file mode 120000 index 000000000..b0232e6e0 --- /dev/null +++ b/foundry.toml @@ -0,0 +1 @@ +lib/@openzeppelin-contracts/foundry.toml \ No newline at end of file diff --git a/hardhat.config.js b/hardhat.config.js deleted file mode 100644 index 575503892..000000000 --- a/hardhat.config.js +++ /dev/null @@ -1,66 +0,0 @@ -// - COMPILER: compiler version (default: 0.8.27) -// - HARDFORK: hardfork version (default: prague) -// - GAS: enable gas report (default: false) -// - COINMARKETCAP: coinmarketcap api key for USD value in gas report - -const { argv } = require('yargs/yargs')() - .env('') - .options({ - compiler: { - type: 'string', - default: '0.8.27', - }, - hardfork: { - type: 'string', - default: 'prague', - }, - gas: { - alias: 'enableGasReport', - type: 'boolean', - default: false, - }, - coinmarketcap: { - alias: 'coinmarketcap', - type: 'string', - default: '', - }, - }); - -require('@nomicfoundation/hardhat-chai-matchers'); -require('@nomicfoundation/hardhat-ethers'); -require('hardhat-exposed'); -require('hardhat-gas-reporter'); -require('hardhat-predeploy'); -require('solidity-coverage'); -require('solidity-docgen'); -require('./hardhat/remappings'); - -module.exports = { - solidity: { - version: argv.compiler, - settings: { - optimizer: { - enabled: true, - runs: 200, - }, - evmVersion: argv.hardfork, - }, - }, - networks: { - hardhat: { - hardfork: argv.hardfork, - }, - }, - exposed: { - imports: true, - initializers: true, - }, - gasReporter: { - enabled: argv.gas, - showMethodSig: true, - includeBytecodeInJSON: true, - currency: 'USD', - coinmarketcap: argv.coinmarketcap, - }, - docgen: require('./docs/config'), -}; diff --git a/hardhat.config.ts b/hardhat.config.ts new file mode 100644 index 000000000..65d705503 --- /dev/null +++ b/hardhat.config.ts @@ -0,0 +1,116 @@ +import { defineConfig } from 'hardhat/config'; + +// Plugins +import hardhatEthers from '@nomicfoundation/hardhat-ethers'; +import hardhatEthersChaiMatchers from '@nomicfoundation/hardhat-ethers-chai-matchers'; +import hardhatIgnoreWarnings from 'hardhat-ignore-warnings'; +import hardhatMocha from '@nomicfoundation/hardhat-mocha'; +import hardhatNetworkHelpers from '@nomicfoundation/hardhat-network-helpers'; +import hardhatPredeploy from 'hardhat-predeploy'; +import hardhatDocgen from '@openzeppelin/contracts/hardhat/hardhat-solidity-docgen/plugin.ts'; +import hardhatExposed from '@openzeppelin/contracts/hardhat/hardhat-exposed/plugin.ts'; +import hardhatTranspiler from '@openzeppelin/contracts/hardhat/hardhat-transpiler/plugin.ts'; +import hardhatOzContractsHelpers from '@openzeppelin/contracts/hardhat/hardhat-oz-contracts-helpers/plugin.ts'; +import '@openzeppelin/contracts/hardhat/async-test-sanity.ts'; + +// Parameters +import yargs from 'yargs/yargs'; +const argv = await yargs() + .env('') + .options({ + compiler: { type: 'string', default: '0.8.35' }, + src: { type: 'string', default: 'contracts' }, + runs: { type: 'number', default: 200 }, + ir: { type: 'boolean', default: false }, + evm: { type: 'string', default: 'osaka' }, + }) + .parse(); + +// Configuration +export default defineConfig({ + plugins: [ + // Imported plugins + hardhatEthers, + hardhatEthersChaiMatchers, + hardhatIgnoreWarnings, + hardhatMocha, + hardhatNetworkHelpers, + hardhatPredeploy, + // Local plugins + hardhatDocgen, + hardhatExposed, + hardhatTranspiler, + hardhatOzContractsHelpers, + ], + paths: { + // `ECDSAOwnedDKIMRegistry` is needed (as-is, not exposed) by the tests. It lives in a submodule reached through a + // remappings.txt entry, so it is a project file that no compilation root imports by name: `npmFilesToBuild` cannot + // reach it (HHE901), and being imported is not enough for Hardhat 3 to emit an artifact. Building its directory as + // a source directory is what makes those artifacts appear. + sources: [argv.src, 'lib/email-tx-builder/packages/contracts/src/utils'], + }, + solidity: { + version: argv.compiler, + // Dependencies that the tests deploy directly. Hardhat 3 only emits artifacts for compilation roots, so importing + // them from a solidity file (the old `contracts/mocks/import.sol` trick) is not enough anymore. + npmFilesToBuild: [ + '@openzeppelin/contracts/mocks/CallReceiverMock.sol', + '@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol', + '@openzeppelin/contracts/utils/cryptography/verifiers/ERC7913P256Verifier.sol', + '@openzeppelin/contracts/utils/cryptography/verifiers/ERC7913RSAVerifier.sol', + ], + settings: { + optimizer: { + enabled: true, + runs: argv.runs, + }, + evmVersion: argv.evm, + viaIR: argv.ir, + outputSelection: { '*': { '*': ['storageLayout'] } }, + }, + }, + networks: { + default: { + type: 'edr-simulated', + hardfork: argv.evm, + // Exposed contracts often exceed the maximum contract size. For normal contract, + // we rely on the `code-size` compiler warning, that will cause a compilation error. + allowUnlimitedContractSize: true, + }, + }, + test: { + solidity: { + fuzz: { + runs: 5000, + maxTestRejects: 150000, + }, + fsPermissions: { + readDirectory: ['node_modules/hardhat-predeploy/bin'], + }, + }, + }, + coverage: { + skipFiles: ['contracts/mocks/**', 'contracts-exposed/**', 'lib/**'], + }, + warnings: { + 'lib/**/*': 'off', + 'npm/**/*': 'off', + 'test/**/*': 'off', + 'contracts-exposed/**/*': { + 'code-size': 'off', + 'initcode-size': 'off', + }, + '*': { + 'transient-storage': 'off', + 6335: 'warn', // is-future-solidity-keyword + default: 'error', + }, + }, + exposed: { + imports: true, + initializers: true, + include: ['contracts/**/*.sol'], + exclude: ['**/*WithInit.sol'], + }, + // docgen: await import('./docs/config.mjs').then(m => m.default), +}); diff --git a/hardhat/remappings.js b/hardhat/remappings.js deleted file mode 100644 index aef6d7dbd..000000000 --- a/hardhat/remappings.js +++ /dev/null @@ -1,19 +0,0 @@ -const fs = require('fs'); -const { task } = require('hardhat/config'); -const { TASK_COMPILE_GET_REMAPPINGS } = require('hardhat/builtin-tasks/task-names'); - -task(TASK_COMPILE_GET_REMAPPINGS).setAction((taskArgs, env, runSuper) => - runSuper().then(remappings => - Object.assign( - remappings, - Object.fromEntries( - fs - .readFileSync('remappings.txt', 'utf-8') - .split('\n') - .filter(Boolean) - .filter(line => !line.startsWith('#')) - .map(line => line.trim().split('=')), - ), - ), - ), -); diff --git a/lib/@openzeppelin-contracts b/lib/@openzeppelin-contracts index cab19933c..b72fb0095 160000 --- a/lib/@openzeppelin-contracts +++ b/lib/@openzeppelin-contracts @@ -1 +1 @@ -Subproject commit cab19933c33c2ad1d4c7a84864a3601dddfd16f3 +Subproject commit b72fb00951a3fe068011ef75d6234c3706cfd31d diff --git a/lib/@openzeppelin-contracts-upgradeable b/lib/@openzeppelin-contracts-upgradeable index 14f52c54d..d8c717774 160000 --- a/lib/@openzeppelin-contracts-upgradeable +++ b/lib/@openzeppelin-contracts-upgradeable @@ -1 +1 @@ -Subproject commit 14f52c54d3a1eefbda3d4071efba24d3c1e07e8a +Subproject commit d8c717774cfa3a0396dd3e94db58b7580218651e diff --git a/package-lock.json b/package-lock.json index 40f1fec49..85c3090d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,8 @@ "license": "MIT", "devDependencies": { "@openzeppelin/contracts": "file:lib/@openzeppelin-contracts", - "husky": "^9.1.7" + "husky": "^9.1.7", + "openzeppelin-solidity": "file:lib/@openzeppelin-contracts" } }, "lib/@openzeppelin-contracts": { @@ -26,25 +27,28 @@ "@eslint/compat": "^1.2.1", "@ethereumjs/mpt": "^10.1.0", "@noble/curves": "^2.0.1", - "@nomicfoundation/hardhat-chai-matchers": "^2.0.6", - "@nomicfoundation/hardhat-ethers": "^3.0.9", - "@nomicfoundation/hardhat-network-helpers": "^1.0.13", + "@nomicfoundation/hardhat-ethers": "^4.0.14", + "@nomicfoundation/hardhat-ethers-chai-matchers": "^3.0.11", + "@nomicfoundation/hardhat-mocha": "^3.0.21", + "@nomicfoundation/hardhat-network-helpers": "^3.0.11", "@openzeppelin/docs-utils": "^0.1.6", "@openzeppelin/merkle-tree": "^1.0.7", - "@openzeppelin/upgrade-safe-transpiler": "^0.4.1", + "@openzeppelin/upgrade-safe-transpiler": "^0.4.2", "@openzeppelin/upgrades-core": "^1.20.6", - "chai": "^4.2.0", + "@types/node": "^25.9.4", + "@types/yargs": "^17.0.35", + "chai": "^5.3.3", "eslint": "^9.0.0", "eslint-config-prettier": "^10.0.0", + "eslint-plugin-mocha": "^11.3.0", "ethers": "^6.16.0", "glob": "^13.0.0", "globals": "^17.0.0", "graphlib": "^2.1.8", - "hardhat": "^2.28.5", - "hardhat-exposed": "^0.3.15", - "hardhat-gas-reporter": "^2.1.0", - "hardhat-ignore-warnings": "^0.2.11", - "hardhat-predeploy": "^0.4.1", + "handlebars": "^4.7.9", + "hardhat": "^3.9.1", + "hardhat-ignore-warnings": "^0.3.0", + "hardhat-predeploy": "^1.0.1", "husky": "^9.1.7", "interoperable-addresses": "^0.1.3", "lint-staged": "^17.0.0", @@ -55,101 +59,13 @@ "prettier-plugin-solidity": "^2.0.0", "rimraf": "^6.0.0", "semver": "^7.3.5", - "solhint": "^6.0.1", + "solhint": "^6.2.3", "solhint-plugin-openzeppelin": "file:scripts/solhint-custom", - "solidity-ast": "^0.4.50", - "solidity-coverage": "^0.8.14", - "solidity-docgen": "^0.6.0-beta.29", + "solidity-ast": "^0.4.61", "undici": "^8.2.0", "yargs": "^18.0.0" } }, - "lib/@openzeppelin-contracts/node_modules/@noble/curves": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-2.2.0.tgz", - "integrity": "sha512-T/BoHgFXirb0ENSPBquzX0rcjXeM6Lo892a2jlYJkqk83LqZx0l1Of7DzlKJ6jkpvMrkHSnAcgb5JegL8SeIkQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@noble/hashes": "2.2.0" - }, - "engines": { - "node": ">= 20.19.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "lib/@openzeppelin-contracts/node_modules/@noble/hashes": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-2.2.0.tgz", - "integrity": "sha512-IYqDGiTXab6FniAgnSdZwgWbomxpy9FtYvLKs7wCUs2a8RkITG+DFGO1DM9cr+E3/RgADRpFjrKVaJ1z6sjtEg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 20.19.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "lib/@openzeppelin-contracts/node_modules/balanced-match": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", - "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", - "dev": true, - "license": "MIT", - "engines": { - "node": "18 || 20 || >=22" - } - }, - "lib/@openzeppelin-contracts/node_modules/brace-expansion": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", - "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^4.0.2" - }, - "engines": { - "node": "18 || 20 || >=22" - } - }, - "lib/@openzeppelin-contracts/node_modules/glob": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.0.tgz", - "integrity": "sha512-tvZgpqk6fz4BaNZ66ZsRaZnbHvP/jG3uKJvAZOwEVUL4RTA5nJeeLYfyN9/VA8NX/V3IBG+hkeuGpKjvELkVhA==", - "dev": true, - "license": "BlueOak-1.0.0", - "dependencies": { - "minimatch": "^10.1.1", - "minipass": "^7.1.2", - "path-scurry": "^2.0.0" - }, - "engines": { - "node": "20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "lib/@openzeppelin-contracts/node_modules/minimatch": { - "version": "10.2.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz", - "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==", - "dev": true, - "license": "BlueOak-1.0.0", - "dependencies": { - "brace-expansion": "^5.0.5" - }, - "engines": { - "node": "18 || 20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "lib/@openzeppelin-contracts/scripts/solhint-custom": { "name": "solhint-plugin-openzeppelin", "version": "0.0.0", @@ -159,20 +75,20 @@ } }, "node_modules/@adraffy/ens-normalize": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.10.1.tgz", - "integrity": "sha512-96Z2IP3mYmF1Xg2cDm8f1gWGf/HUVedQ3FMifV4kG/PQ4yEP51xDtRAEfhVNt5f/uzpNkZHwWQuUcu6D6K+Ekw==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.11.1.tgz", + "integrity": "sha512-nhCBV3quEgesuf7c7KYfperqSS14T8bYuvJ8PcLJp6znkZpFc0AuW4qBtr8eKVyPPe/8RSr7sglCWPU5eaxwKQ==", "dev": true, "license": "MIT" }, "node_modules/@babel/code-frame": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz", - "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz", + "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.27.1", + "@babel/helper-validator-identifier": "^7.29.7", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" }, @@ -181,9 +97,9 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz", - "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz", + "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==", "dev": true, "license": "MIT", "engines": { @@ -191,9 +107,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.1.tgz", - "integrity": "sha512-1x3D2xEk2fRo3PAhwQwu5UubzgiVWSXTBfWpVd2Mx2AzRqJuDJCsgaDVZ7HB5iGzDW1Hl1sWN2mFyKjmR9uAog==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.7.tgz", + "integrity": "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==", "dev": true, "license": "MIT", "engines": { @@ -208,13 +124,13 @@ "license": "(Apache-2.0 WITH LLVM-exception)" }, "node_modules/@changesets/apply-release-plan": { - "version": "7.0.12", - "resolved": "https://registry.npmjs.org/@changesets/apply-release-plan/-/apply-release-plan-7.0.12.tgz", - "integrity": "sha512-EaET7As5CeuhTzvXTQCRZeBUcisoYPDDcXvgTE/2jmmypKp0RC7LxKj/yzqeh/1qFTZI7oDGFcL1PHRuQuketQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@changesets/apply-release-plan/-/apply-release-plan-7.1.1.tgz", + "integrity": "sha512-9qPCm/rLx/xoOFXIHGB229+4GOL76S4MC+7tyOuTsR6+1jYlfFDQORdvwR5hDA6y4FL2BPt3qpbcQIS+dW85LA==", "dev": true, "license": "MIT", "dependencies": { - "@changesets/config": "^3.1.1", + "@changesets/config": "^3.1.4", "@changesets/get-version-range-type": "^0.4.0", "@changesets/git": "^3.0.4", "@changesets/should-skip-package": "^0.1.2", @@ -246,14 +162,14 @@ } }, "node_modules/@changesets/assemble-release-plan": { - "version": "6.0.7", - "resolved": "https://registry.npmjs.org/@changesets/assemble-release-plan/-/assemble-release-plan-6.0.7.tgz", - "integrity": "sha512-vS5J92Rm7ZUcrvtu6WvggGWIdohv8s1/3ypRYQX8FsPO+KPDx6JaNC3YwSfh2umY/faGGfNnq42A7PRT0aZPFw==", + "version": "6.0.10", + "resolved": "https://registry.npmjs.org/@changesets/assemble-release-plan/-/assemble-release-plan-6.0.10.tgz", + "integrity": "sha512-rSDcqdJ9KbVyjpBIuCidhvZNIiVt1XaIYp73ycVQRIA5n/j6wQaEk0ChRLMUQ1vkxZe51PTQ9OIhbg6HQMW45A==", "dev": true, "license": "MIT", "dependencies": { "@changesets/errors": "^0.2.0", - "@changesets/get-dependents-graph": "^2.1.3", + "@changesets/get-dependents-graph": "^2.1.4", "@changesets/should-skip-package": "^0.1.2", "@changesets/types": "^6.1.0", "@manypkg/get-packages": "^1.1.3", @@ -282,45 +198,33 @@ "dotenv": "^8.1.0" } }, - "node_modules/@changesets/changelog-github/node_modules/dotenv": { - "version": "8.6.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz", - "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==", - "dev": true, - "license": "BSD-2-Clause", - "engines": { - "node": ">=10" - } - }, "node_modules/@changesets/cli": { - "version": "2.29.3", - "resolved": "https://registry.npmjs.org/@changesets/cli/-/cli-2.29.3.tgz", - "integrity": "sha512-TNhKr6Loc7I0CSD9LpAyVNSxWBHElXVmmvQYIZQvaMan5jddmL7geo3+08Wi7ImgHFVNB0Nhju/LzXqlrkoOxg==", + "version": "2.31.1", + "resolved": "https://registry.npmjs.org/@changesets/cli/-/cli-2.31.1.tgz", + "integrity": "sha512-uO05WTcRBwuVOJVSW8Cmpqw6q0WDL53ajGCMyszutvOe5toOnunbpM4jZzf+qxBOz7i0AzopZ8diBuewjmF40w==", "dev": true, "license": "MIT", "dependencies": { - "@changesets/apply-release-plan": "^7.0.12", - "@changesets/assemble-release-plan": "^6.0.7", + "@changesets/apply-release-plan": "^7.1.1", + "@changesets/assemble-release-plan": "^6.0.10", "@changesets/changelog-git": "^0.2.1", - "@changesets/config": "^3.1.1", + "@changesets/config": "^3.1.4", "@changesets/errors": "^0.2.0", - "@changesets/get-dependents-graph": "^2.1.3", - "@changesets/get-release-plan": "^4.0.11", + "@changesets/get-dependents-graph": "^2.1.4", + "@changesets/get-release-plan": "^4.0.16", "@changesets/git": "^3.0.4", "@changesets/logger": "^0.1.1", "@changesets/pre": "^2.0.2", - "@changesets/read": "^0.6.5", + "@changesets/read": "^0.6.7", "@changesets/should-skip-package": "^0.1.2", "@changesets/types": "^6.1.0", "@changesets/write": "^0.4.0", + "@inquirer/external-editor": "^1.0.2", "@manypkg/get-packages": "^1.1.3", "ansi-colors": "^4.1.3", - "ci-info": "^3.7.0", "enquirer": "^2.4.1", - "external-editor": "^3.1.0", "fs-extra": "^7.0.1", "mri": "^1.2.0", - "p-limit": "^2.2.0", "package-manager-detector": "^0.2.0", "picocolors": "^1.1.0", "resolve-from": "^5.0.0", @@ -332,32 +236,17 @@ "changeset": "bin.js" } }, - "node_modules/@changesets/cli/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/@changesets/config": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@changesets/config/-/config-3.1.1.tgz", - "integrity": "sha512-bd+3Ap2TKXxljCggI0mKPfzCQKeV/TU4yO2h2C6vAihIo8tzseAn2e7klSuiyYYXvgu53zMN1OeYMIQkaQoWnA==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/@changesets/config/-/config-3.1.4.tgz", + "integrity": "sha512-pf0bvD/v6WI2cRlZ6hzpjtZdSlXDXMAJ+Iz7xfFzV4ZxJ8OGGAON+1qYc99ZPrijnt4xp3VGG7eNvAOGS24V1Q==", "dev": true, "license": "MIT", "dependencies": { "@changesets/errors": "^0.2.0", - "@changesets/get-dependents-graph": "^2.1.3", + "@changesets/get-dependents-graph": "^2.1.4", "@changesets/logger": "^0.1.1", + "@changesets/should-skip-package": "^0.1.2", "@changesets/types": "^6.1.0", "@manypkg/get-packages": "^1.1.3", "fs-extra": "^7.0.1", @@ -375,9 +264,9 @@ } }, "node_modules/@changesets/get-dependents-graph": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@changesets/get-dependents-graph/-/get-dependents-graph-2.1.3.tgz", - "integrity": "sha512-gphr+v0mv2I3Oxt19VdWRRUxq3sseyUpX9DaHpTUmLj92Y10AGy+XOtV+kbM6L/fDcpx7/ISDFK6T8A/P3lOdQ==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@changesets/get-dependents-graph/-/get-dependents-graph-2.1.4.tgz", + "integrity": "sha512-ZsS00x6WvmHq3sQv8oCMwL0f/z3wbXCVuSVTJwCnnmbC/iBdNJGFx1EcbMG4PC6sXRyH69liM4A2WKXzn/kRPg==", "dev": true, "license": "MIT", "dependencies": { @@ -399,16 +288,16 @@ } }, "node_modules/@changesets/get-release-plan": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/@changesets/get-release-plan/-/get-release-plan-4.0.11.tgz", - "integrity": "sha512-4DZpsewsc/1m5TArVg5h1c0U94am+cJBnu3izAM3yYIZr8+zZwa3AXYdEyCNURzjx0wWr80u/TWoxshbwdZXOA==", + "version": "4.0.16", + "resolved": "https://registry.npmjs.org/@changesets/get-release-plan/-/get-release-plan-4.0.16.tgz", + "integrity": "sha512-2K5Om6CrMPm45rtvckfzWo7e9jOVCKLCnXia5eUPaURH7/LWzri7pK1TycdzAuAtehLkW7VPbWLCSExTHmiI6g==", "dev": true, "license": "MIT", "dependencies": { - "@changesets/assemble-release-plan": "^6.0.7", - "@changesets/config": "^3.1.1", + "@changesets/assemble-release-plan": "^6.0.10", + "@changesets/config": "^3.1.4", "@changesets/pre": "^2.0.2", - "@changesets/read": "^0.6.5", + "@changesets/read": "^0.6.7", "@changesets/types": "^6.1.0", "@manypkg/get-packages": "^1.1.3" } @@ -445,14 +334,14 @@ } }, "node_modules/@changesets/parse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@changesets/parse/-/parse-0.4.1.tgz", - "integrity": "sha512-iwksMs5Bf/wUItfcg+OXrEpravm5rEd9Bf4oyIPL4kVTmJQ7PNDSd6MDYkpSJR1pn7tz/k8Zf2DhTCqX08Ou+Q==", + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@changesets/parse/-/parse-0.4.3.tgz", + "integrity": "sha512-ZDmNc53+dXdWEv7fqIUSgRQOLYoUom5Z40gmLgmATmYR9NbL6FJJHwakcCpzaeCy+1D0m0n7mT4jj2B/MQPl7A==", "dev": true, "license": "MIT", "dependencies": { "@changesets/types": "^6.1.0", - "js-yaml": "^3.13.1" + "js-yaml": "^4.1.1" } }, "node_modules/@changesets/pre": { @@ -469,15 +358,15 @@ } }, "node_modules/@changesets/read": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/@changesets/read/-/read-0.6.5.tgz", - "integrity": "sha512-UPzNGhsSjHD3Veb0xO/MwvasGe8eMyNrR/sT9gR8Q3DhOQZirgKhhXv/8hVsI0QpPjR004Z9iFxoJU6in3uGMg==", + "version": "0.6.7", + "resolved": "https://registry.npmjs.org/@changesets/read/-/read-0.6.7.tgz", + "integrity": "sha512-D1G4AUYGrBEk8vj8MGwf75k9GpN6XL3wg8i42P2jZZwFLXnlr2Pn7r9yuQNbaMCarP7ZQWNJbV6XLeysAIMhTA==", "dev": true, "license": "MIT", "dependencies": { "@changesets/git": "^3.0.4", "@changesets/logger": "^0.1.1", - "@changesets/parse": "^0.4.1", + "@changesets/parse": "^0.4.3", "@changesets/types": "^6.1.0", "fs-extra": "^7.0.1", "p-filter": "^2.1.0", @@ -531,961 +420,838 @@ "url": "https://github.com/prettier/prettier?sponsor=1" } }, - "node_modules/@colors/colors": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", - "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==", + "node_modules/@esbuild/aix-ppc64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.2.tgz", + "integrity": "sha512-XExcO+dvLKvVtNTibSTBej1NCAbaGhWn9Ww1ZPx80qsahhPFe/8jgWP0IchNe0F3HwkU7n8ejhH8bjonqht8mQ==", + "cpu": [ + "ppc64" + ], "dev": true, "license": "MIT", "optional": true, + "os": [ + "aix" + ], "engines": { - "node": ">=0.1.90" + "node": ">=18" } }, - "node_modules/@eslint-community/eslint-utils": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz", - "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==", + "node_modules/@esbuild/android-arm": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.2.tgz", + "integrity": "sha512-kXXoiPVVGQcnIYGOeaovwOURpniDBpSq4A03qkQ+BMQqtGG6HYap3xne9C1O1yo4TR3qxlCX5IqqmX6fFo2Lqg==", + "cpu": [ + "arm" + ], "dev": true, "license": "MIT", - "dependencies": { - "eslint-visitor-keys": "^3.4.3" - }, + "optional": true, + "os": [ + "android" + ], "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + "node": ">=18" } }, - "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "node_modules/@esbuild/android-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.2.tgz", + "integrity": "sha512-5YfKeeI8qWfBZIX+u2xZC3Zlb3Os/gLS2sbEKM+I4ZOcsWmHS2WLysCcQZDAFRslDUU5Oiq44gf6PYN1vGwG5A==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "Apache-2.0", + "license": "MIT", + "optional": true, + "os": [ + "android" + ], "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" + "node": ">=18" } }, - "node_modules/@eslint-community/regexpp": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", - "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", + "node_modules/@esbuild/android-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.2.tgz", + "integrity": "sha512-O387ite7SzUyCcy3JQX4P4bLtEA7bLLkx+esve5JHnyYfNTxcVpXZo9jhdB0lTKN44gztELTdU7nS8Nr16Fs1Q==", + "cpu": [ + "x64" + ], "dev": true, "license": "MIT", + "optional": true, + "os": [ + "android" + ], "engines": { - "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + "node": ">=18" } }, - "node_modules/@eslint/compat": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/@eslint/compat/-/compat-1.2.9.tgz", - "integrity": "sha512-gCdSY54n7k+driCadyMNv8JSPzYLeDVM/ikZRtvtROBpRdFSkS8W9A82MqsaY7lZuwL0wiapgD0NT1xT0hyJsA==", + "node_modules/@esbuild/darwin-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.2.tgz", + "integrity": "sha512-n4KqkOQrraxHJcgjM1RvwbigfQKIKJVpM7xp+KsxiyUSrRdIXnt73VhrPAx0fV44hgfmIVKjxMN9J1t5jySVkw==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "Apache-2.0", + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "peerDependencies": { - "eslint": "^9.10.0" - }, - "peerDependenciesMeta": { - "eslint": { - "optional": true - } + "node": ">=18" } }, - "node_modules/@eslint/config-array": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz", - "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==", + "node_modules/@esbuild/darwin-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.2.tgz", + "integrity": "sha512-uq6suIWYP37qzGddBKPw5QEQPi6HiLGsO7UmkpfyaYNQ3D+rN6w6WfwH+nuqcGXWvawGwxOEroO4YGnFh95azw==", + "cpu": [ + "x64" + ], "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@eslint/object-schema": "^2.1.6", - "debug": "^4.3.1", - "minimatch": "^3.1.2" - }, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": ">=18" } }, - "node_modules/@eslint/config-array/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.2.tgz", + "integrity": "sha512-n+I0BTSRIoy+d6RPKnEVwql5UwBJolytvY4mAOIEJorKlqgPII8ix6slVVrfZ5Tnj7glIZvloylbB/EJPMWEXw==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], "engines": { - "node": "*" + "node": ">=18" } }, - "node_modules/@eslint/config-helpers": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.2.tgz", - "integrity": "sha512-+GPzk8PlG0sPpzdU5ZvIRMPidzAnZDl/s9L+y13iodqvb8leL53bTannOrQ/Im7UkpsmFU5Ily5U60LWixnmLg==", + "node_modules/@esbuild/freebsd-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.2.tgz", + "integrity": "sha512-78XJTJkvPs0kz2w61301PJjXl4g7q3JqiYMZ/M/yVI73EHBrCRTgkhu9oqG7vPqq+a/yadEW8aD+agKlk5xrmg==", + "cpu": [ + "x64" + ], "dev": true, - "license": "Apache-2.0", + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": ">=18" } }, - "node_modules/@eslint/core": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz", - "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==", + "node_modules/@esbuild/linux-arm": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.2.tgz", + "integrity": "sha512-XlDnu2q5yoqems+xay6wSAcg9DDD7K9RLKZEBOMZm3ckNpJBvOX20tSfby8KfrrhINDyv9V2YVZKY/SpoGJI8w==", + "cpu": [ + "arm" + ], "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@types/json-schema": "^7.0.15" - }, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": ">=18" } }, - "node_modules/@eslint/eslintrc": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz", - "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==", + "node_modules/@esbuild/linux-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.2.tgz", + "integrity": "sha512-pW4AC0P3it8c7do9MVM4p51FzHzdM/TZrerurgRcHJ2WTa1VQ1CIq18xncfpBJw4ojkiZZrKW2yIBWBP92j6Ug==", + "cpu": [ + "arm64" + ], "dev": true, "license": "MIT", - "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^10.0.1", - "globals": "^14.0.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - }, + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" + "node": ">=18" } }, - "node_modules/@eslint/eslintrc/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "node_modules/@esbuild/linux-ia32": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.2.tgz", + "integrity": "sha512-CYbnj78HsIeA+DhgUKgFCfvNsTHFhMMrinUrMZpDXJXKN8T3XViTZ/+wtHeVxEWY8ewSzTFN+nRmSwO2tZaLUQ==", + "cpu": [ + "ia32" + ], "dev": true, "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" } }, - "node_modules/@eslint/eslintrc/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "node_modules/@esbuild/linux-loong64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.2.tgz", + "integrity": "sha512-buwkd8nsph4R+ajRvw0qM5Hja/TXQow3ptzWO2EbG/cqcIkHloRrdlBtQlshyYGTNFvfkfJ5tpPLVkY4DtsPfQ==", + "cpu": [ + "loong64" + ], "dev": true, - "license": "Python-2.0" + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } }, - "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", - "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", + "node_modules/@esbuild/linux-mips64el": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.2.tgz", + "integrity": "sha512-ZVykbDyk7519VwiNb9Lcj9m8XM6v5V9uKPvrEMkkEedVewf+0itkhahp4HDpgERXhwLRpWFypsGbG/J8s0QjJA==", + "cpu": [ + "mips64el" + ], "dev": true, "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@eslint/eslintrc/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "node_modules/@esbuild/linux-ppc64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.2.tgz", + "integrity": "sha512-CAXl+Dtd9UUuJd8pKKdwh6MLm3MUMiqMPmhZ3tTSXPqfyQ3vDl6R5hZdZ/kYojK4ofXtdfSv1tFq8XzWx3heNQ==", + "cpu": [ + "ppc64" + ], "dev": true, "license": "MIT", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" } }, - "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "node_modules/@esbuild/linux-riscv64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.2.tgz", + "integrity": "sha512-GeXCej4IQtU1B+QlDV8W/RRvbzI3O/Stss+/bCXv4lZls5WGRtu2a+3JkA3i4qIUlMXpcHebWpF8AkJhATowuA==", + "cpu": [ + "riscv64" + ], "dev": true, - "license": "MIT" + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } }, - "node_modules/@eslint/eslintrc/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "node_modules/@esbuild/linux-s390x": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.2.tgz", + "integrity": "sha512-3H1weTYZPxt/WOhByszQZybS9w5lKzUn1FDMsgEChbHWQwHYQQRfBxgCcZvPhjHfKyJjIievvMmEUawJrdY9Dg==", + "cpu": [ + "s390x" + ], "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": "*" + "node": ">=18" } }, - "node_modules/@eslint/js": { - "version": "9.26.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.26.0.tgz", - "integrity": "sha512-I9XlJawFdSMvWjDt6wksMCrgns5ggLNfFwFvnShsleWruvXM514Qxk8V246efTw+eo9JABvVz+u3q2RiAowKxQ==", + "node_modules/@esbuild/linux-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.2.tgz", + "integrity": "sha512-4xTZr1FUmSoQW4XIWmit3tzQrUTZM+N3P0XV8xROKYF50XfI7xeO90+1bZvNwxIufQ9hDQVRJH5YhgPVF8A/HQ==", + "cpu": [ + "x64" + ], "dev": true, "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": ">=18" } }, - "node_modules/@eslint/object-schema": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz", - "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==", + "node_modules/@esbuild/netbsd-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.2.tgz", + "integrity": "sha512-sSATRjPeDBg3pdgHoQfoYBob11Kk1FGa9lui5RIHZCoCkJa9QKlvl3/vKz2usCmYYjs7ymJR/2Nnsqe+Hjt5nw==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "Apache-2.0", + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": ">=18" } }, - "node_modules/@eslint/plugin-kit": { - "version": "0.2.8", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.8.tgz", - "integrity": "sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==", + "node_modules/@esbuild/netbsd-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.2.tgz", + "integrity": "sha512-lqnzCV+mM0gIADaKihiCg6ifgfU2L3h5E33rNQBN1Y4MaVGnzryzmvvf7UHxprpQdE8hpqLolJ9Rl+SkIRDpyw==", + "cpu": [ + "x64" + ], "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@eslint/core": "^0.13.0", - "levn": "^0.4.1" - }, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": ">=18" } }, - "node_modules/@ethereumjs/common": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-3.2.0.tgz", - "integrity": "sha512-pksvzI0VyLgmuEF2FA/JR/4/y6hcPq8OUail3/AvycBaW1d5VSauOZzqGvJ3RTmR4MU35lWE8KseKOsEhrFRBA==", + "node_modules/@esbuild/openbsd-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.2.tgz", + "integrity": "sha512-AL2qJILH7lNjrDmCQDvdxMfAUIv8KMNZOvrwAQ8i8//ntL9FflhOyMJ8OZSMBb8/AWXe3/5v5S20y3zCoZWKoQ==", + "cpu": [ + "arm64" + ], "dev": true, "license": "MIT", - "dependencies": { - "@ethereumjs/util": "^8.1.0", - "crc-32": "^1.2.0" + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" } }, - "node_modules/@ethereumjs/mpt": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/@ethereumjs/mpt/-/mpt-10.1.0.tgz", - "integrity": "sha512-gWxx8n1OB2Js3EFWNeSdsUdYvw1P5WvdKxHmeq+giO03mt5fGRbuSh3ruXzreG4JRugpNSW6Dwqk+StVwjrQ4Q==", + "node_modules/@esbuild/openbsd-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.2.tgz", + "integrity": "sha512-QtiuPytchRyC4rwUKhexJdQKvDuZ6hWloi3igqPQNUJCS1/v9EiO3UTOXR6A3FoMo4fnAKbWJdqaIwhOzh8qEw==", + "cpu": [ + "x64" + ], "dev": true, - "license": "MPL-2.0", - "dependencies": { - "@ethereumjs/rlp": "^10.1.0", - "@ethereumjs/util": "^10.1.0", - "debug": "^4.4.0", - "ethereum-cryptography": "^3.2.0", - "lru-cache": "11.0.2" - }, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], "engines": { "node": ">=18" } }, - "node_modules/@ethereumjs/mpt/node_modules/@ethereumjs/rlp": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/@ethereumjs/rlp/-/rlp-10.1.0.tgz", - "integrity": "sha512-r67BJbwilammAqYI4B5okA66cNdTlFzeWxPNJOolKV52ZS/flo0tUBf4x4gxWXBgh48OgsdFV1Qp5pRoSe8IhQ==", + "node_modules/@esbuild/openharmony-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.2.tgz", + "integrity": "sha512-WkhYDmpTjLvGlScA1rwjRUmhl4k8oXR3cIbtqWmELgU/dFeHHlEllxDvdWcNJV9rbzCexB5vz8gtNewWLgCT7Q==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "MPL-2.0", - "bin": { - "rlp": "bin/rlp.cjs" - }, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ], "engines": { "node": ">=18" } }, - "node_modules/@ethereumjs/mpt/node_modules/@ethereumjs/util": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/@ethereumjs/util/-/util-10.1.0.tgz", - "integrity": "sha512-GGTCkRu1kWXbz2JoUnIYtJBOoA9T5akzsYa91Bh+DZQ3Cj4qXj3hkNU0Rx6wZlbcmkmhQfrjZfVt52eJO/y2nA==", + "node_modules/@esbuild/sunos-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.2.tgz", + "integrity": "sha512-GPMSkTOtMnv2U2F8gxe4Io6qmVs+YKyp832Etqqxr0hFngmXQ3rzwytelm3GIn7T4VviRUlf3sOgBOiTdvaf7g==", + "cpu": [ + "x64" + ], "dev": true, - "license": "MPL-2.0", - "dependencies": { - "@ethereumjs/rlp": "^10.1.0", - "ethereum-cryptography": "^3.2.0" - }, + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], "engines": { "node": ">=18" } }, - "node_modules/@ethereumjs/mpt/node_modules/lru-cache": { - "version": "11.0.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.2.tgz", - "integrity": "sha512-123qHRfJBmo2jXDbo/a5YOQrJoHF/GNQTLzQ5+IdK5pWpceK17yRc6ozlWd25FxvGKQbIUs91fDFkXmDHTKcyA==", + "node_modules/@esbuild/win32-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.2.tgz", + "integrity": "sha512-PIhhEkE9uPBleRBrQEJpUn7MBnibZzbGzYWPmY3x+YoVg/95zbjB4CxPPOQ8l5tYYM4mMaCthF8/1DIfBQQyWQ==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "ISC", + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], "engines": { - "node": "20 || >=22" + "node": ">=18" } }, - "node_modules/@ethereumjs/rlp": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@ethereumjs/rlp/-/rlp-4.0.1.tgz", - "integrity": "sha512-tqsQiBQDQdmPWE1xkkBq4rlSW5QZpLOUJ5RJh2/9fug+q9tnUhuZoVLk7s0scUIKTOzEtR72DFBXI4WiZcMpvw==", + "node_modules/@esbuild/win32-ia32": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.2.tgz", + "integrity": "sha512-YmJbfTlvU7Sdn9BB+4PRES4oB6pxgS37MAONj+hBr/cpXS1aBPKXxNnDbu+QCWPj0o9dgyxeq79g6c5P8KeuYA==", + "cpu": [ + "ia32" + ], "dev": true, - "license": "MPL-2.0", - "bin": { - "rlp": "bin/rlp" - }, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], "engines": { - "node": ">=14" + "node": ">=18" } }, - "node_modules/@ethereumjs/tx": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-4.2.0.tgz", - "integrity": "sha512-1nc6VO4jtFd172BbSnTnDQVr9IYBFl1y4xPzZdtkrkKIncBCkdbgfdRV+MiTkJYAtTxvV12GRZLqBFT1PNK6Yw==", + "node_modules/@esbuild/win32-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.2.tgz", + "integrity": "sha512-5ebpxr3nWMzrL/rnUI755Jkuee0bHL/Gq0WTF9lvcpv73wAp5eu8MfBUgWK9bhWvZjj7yX8etf/8tI8Ney695g==", + "cpu": [ + "x64" + ], "dev": true, - "license": "MPL-2.0", - "dependencies": { - "@ethereumjs/common": "^3.2.0", - "@ethereumjs/rlp": "^4.0.1", - "@ethereumjs/util": "^8.1.0", - "ethereum-cryptography": "^2.0.0" - }, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], "engines": { - "node": ">=14" + "node": ">=18" } }, - "node_modules/@ethereumjs/tx/node_modules/@noble/curves": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz", - "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==", + "node_modules/@eslint-community/eslint-utils": { + "version": "4.10.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.10.1.tgz", + "integrity": "sha512-cuadcxVFE8sDK6iWJbs8Sn0av2Nrh2QSGQhVlBW9AaAHqHwjWsZHT8LJ4hFGPh7ASBV2deFdM7H/DPjulmh8rg==", "dev": true, "license": "MIT", "dependencies": { - "@noble/hashes": "1.4.0" + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, "funding": { - "url": "https://paulmillr.com/funding/" + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } }, - "node_modules/@ethereumjs/tx/node_modules/@noble/hashes": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz", - "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==", + "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, - "license": "MIT", + "license": "Apache-2.0", "engines": { - "node": ">= 16" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, "funding": { - "url": "https://paulmillr.com/funding/" + "url": "https://opencollective.com/eslint" } }, - "node_modules/@ethereumjs/tx/node_modules/@scure/base": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.9.tgz", - "integrity": "sha512-8YKhl8GHiNI/pU2VMaofa2Tor7PJRAjwQLBBuilkJ9L5+13yVbC7JO/wS7piioAvPSwR3JKM1IJ/u4xQzbcXKg==", + "node_modules/@eslint-community/regexpp": { + "version": "4.12.2", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz", + "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==", "dev": true, "license": "MIT", - "funding": { - "url": "https://paulmillr.com/funding/" + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, - "node_modules/@ethereumjs/tx/node_modules/@scure/bip32": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz", - "integrity": "sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==", + "node_modules/@eslint/compat": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@eslint/compat/-/compat-1.4.1.tgz", + "integrity": "sha512-cfO82V9zxxGBxcQDr1lfaYB7wykTa0b00mGa36FrJl7iTFd0Z2cHfEYuxcBRP/iNijCsWsEkA+jzT8hGYmv33w==", "dev": true, - "license": "MIT", + "license": "Apache-2.0", "dependencies": { - "@noble/curves": "~1.4.0", - "@noble/hashes": "~1.4.0", - "@scure/base": "~1.1.6" + "@eslint/core": "^0.17.0" }, - "funding": { - "url": "https://paulmillr.com/funding/" + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "peerDependencies": { + "eslint": "^8.40 || 9" + }, + "peerDependenciesMeta": { + "eslint": { + "optional": true + } } }, - "node_modules/@ethereumjs/tx/node_modules/@scure/bip39": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz", - "integrity": "sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==", + "node_modules/@eslint/config-array": { + "version": "0.21.2", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.2.tgz", + "integrity": "sha512-nJl2KGTlrf9GjLimgIru+V/mzgSK0ABCDQRvxw5BjURL7WfH5uoWmizbH7QB6MmnMBd8cIC9uceWnezL1VZWWw==", "dev": true, - "license": "MIT", + "license": "Apache-2.0", "dependencies": { - "@noble/hashes": "~1.4.0", - "@scure/base": "~1.1.6" + "@eslint/object-schema": "^2.1.7", + "debug": "^4.3.1", + "minimatch": "^3.1.5" }, - "funding": { - "url": "https://paulmillr.com/funding/" + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, - "node_modules/@ethereumjs/tx/node_modules/ethereum-cryptography": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.2.1.tgz", - "integrity": "sha512-r/W8lkHSiTLxUxW8Rf3u4HGB0xQweG2RyETjywylKZSzLWoWAijRz8WCuOtJ6wah+avllXBqZuk29HCCvhEIRg==", + "node_modules/@eslint/config-array/node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@eslint/config-array/node_modules/brace-expansion": { + "version": "1.1.18", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.18.tgz", + "integrity": "sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==", "dev": true, "license": "MIT", "dependencies": { - "@noble/curves": "1.4.2", - "@noble/hashes": "1.4.0", - "@scure/bip32": "1.4.0", - "@scure/bip39": "1.3.0" + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" } }, - "node_modules/@ethereumjs/util": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@ethereumjs/util/-/util-8.1.0.tgz", - "integrity": "sha512-zQ0IqbdX8FZ9aw11vP+dZkKDkS+kgIvQPHnSAXzP9pLu+Rfu3D3XEeLbicvoXJTYnhZiPmsZUxgdzXwNKxRPbA==", + "node_modules/@eslint/config-array/node_modules/minimatch": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", "dev": true, - "license": "MPL-2.0", + "license": "ISC", "dependencies": { - "@ethereumjs/rlp": "^4.0.1", - "ethereum-cryptography": "^2.0.0", - "micro-ftch": "^0.3.1" + "brace-expansion": "^1.1.7" }, "engines": { - "node": ">=14" + "node": "*" } }, - "node_modules/@ethereumjs/util/node_modules/@noble/curves": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz", - "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==", + "node_modules/@eslint/config-helpers": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.2.tgz", + "integrity": "sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==", "dev": true, - "license": "MIT", + "license": "Apache-2.0", "dependencies": { - "@noble/hashes": "1.4.0" + "@eslint/core": "^0.17.0" }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/@ethereumjs/util/node_modules/@noble/hashes": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz", - "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==", - "dev": true, - "license": "MIT", "engines": { - "node": ">= 16" - }, - "funding": { - "url": "https://paulmillr.com/funding/" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, - "node_modules/@ethereumjs/util/node_modules/@scure/base": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.9.tgz", - "integrity": "sha512-8YKhl8GHiNI/pU2VMaofa2Tor7PJRAjwQLBBuilkJ9L5+13yVbC7JO/wS7piioAvPSwR3JKM1IJ/u4xQzbcXKg==", + "node_modules/@eslint/core": { + "version": "0.17.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz", + "integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==", "dev": true, - "license": "MIT", - "funding": { - "url": "https://paulmillr.com/funding/" + "license": "Apache-2.0", + "dependencies": { + "@types/json-schema": "^7.0.15" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, - "node_modules/@ethereumjs/util/node_modules/@scure/bip32": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz", - "integrity": "sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==", + "node_modules/@eslint/eslintrc": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.6.tgz", + "integrity": "sha512-l2Ul9PrHsPCKcEY/ac7VgFj9D80C7S68sOKc618SyHDPK36s1XcFebXY0iTzUVn4Yq+YbwvSnDmCz9yxjX+QrA==", "dev": true, "license": "MIT", "dependencies": { - "@noble/curves": "~1.4.0", - "@noble/hashes": "~1.4.0", - "@scure/base": "~1.1.6" + "ajv": "^6.14.0", + "debug": "^4.3.2", + "espree": "^10.0.1", + "globals": "^14.0.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.3.0", + "minimatch": "^3.1.5", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { - "url": "https://paulmillr.com/funding/" + "url": "https://opencollective.com/eslint" } }, - "node_modules/@ethereumjs/util/node_modules/@scure/bip39": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz", - "integrity": "sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==", + "node_modules/@eslint/eslintrc/node_modules/ajv": { + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.15.0.tgz", + "integrity": "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==", "dev": true, "license": "MIT", "dependencies": { - "@noble/hashes": "~1.4.0", - "@scure/base": "~1.1.6" + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" }, "funding": { - "url": "https://paulmillr.com/funding/" + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/@ethereumjs/util/node_modules/ethereum-cryptography": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.2.1.tgz", - "integrity": "sha512-r/W8lkHSiTLxUxW8Rf3u4HGB0xQweG2RyETjywylKZSzLWoWAijRz8WCuOtJ6wah+avllXBqZuk29HCCvhEIRg==", + "node_modules/@eslint/eslintrc/node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true, - "license": "MIT", - "dependencies": { - "@noble/curves": "1.4.2", - "@noble/hashes": "1.4.0", - "@scure/bip32": "1.4.0", - "@scure/bip39": "1.3.0" - } + "license": "MIT" }, - "node_modules/@ethersproject/abi": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.8.0.tgz", - "integrity": "sha512-b9YS/43ObplgyV6SlyQsG53/vkSal0MNA1fskSC4mbnCMi8R+NkcH8K9FPYNESf6jUefBUniE4SOKms0E/KK1Q==", + "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { + "version": "1.1.18", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.18.tgz", + "integrity": "sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==", "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], "license": "MIT", "dependencies": { - "@ethersproject/address": "^5.8.0", - "@ethersproject/bignumber": "^5.8.0", - "@ethersproject/bytes": "^5.8.0", - "@ethersproject/constants": "^5.8.0", - "@ethersproject/hash": "^5.8.0", - "@ethersproject/keccak256": "^5.8.0", - "@ethersproject/logger": "^5.8.0", - "@ethersproject/properties": "^5.8.0", - "@ethersproject/strings": "^5.8.0" + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" } }, - "node_modules/@ethersproject/abstract-provider": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.8.0.tgz", - "integrity": "sha512-wC9SFcmh4UK0oKuLJQItoQdzS/qZ51EJegK6EmAWlh+OptpQ/npECOR3QqECd8iGHC0RJb4WKbVdSfif4ammrg==", + "node_modules/@eslint/eslintrc/node_modules/globals": { + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", + "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], "license": "MIT", - "dependencies": { - "@ethersproject/bignumber": "^5.8.0", - "@ethersproject/bytes": "^5.8.0", - "@ethersproject/logger": "^5.8.0", - "@ethersproject/networks": "^5.8.0", - "@ethersproject/properties": "^5.8.0", - "@ethersproject/transactions": "^5.8.0", - "@ethersproject/web": "^5.8.0" + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@ethersproject/abstract-signer": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.8.0.tgz", - "integrity": "sha512-N0XhZTswXcmIZQdYtUnd79VJzvEwXQw6PK0dTl9VoYrEBxxCPXqS0Eod7q5TNKRxe1/5WUMuR0u0nqTF/avdCA==", + "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", + "license": "MIT" + }, + "node_modules/@eslint/eslintrc/node_modules/minimatch": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", + "dev": true, + "license": "ISC", "dependencies": { - "@ethersproject/abstract-provider": "^5.8.0", - "@ethersproject/bignumber": "^5.8.0", - "@ethersproject/bytes": "^5.8.0", - "@ethersproject/logger": "^5.8.0", - "@ethersproject/properties": "^5.8.0" + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" } }, - "node_modules/@ethersproject/address": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.8.0.tgz", - "integrity": "sha512-GhH/abcC46LJwshoN+uBNoKVFPxUuZm6dA257z0vZkKmU1+t8xTn8oK7B9qrj8W2rFRMch4gbJl6PmVxjxBEBA==", + "node_modules/@eslint/js": { + "version": "9.39.5", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.5.tgz", + "integrity": "sha512-QywQuszQh77pIXCsq998c8hbhSTI/azTty1Z6N53dmAudKHhy573j3yvRLsX2BSp8YpLtoCEG8E9DJe+8zUh4A==", "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], "license": "MIT", - "dependencies": { - "@ethersproject/bignumber": "^5.8.0", - "@ethersproject/bytes": "^5.8.0", - "@ethersproject/keccak256": "^5.8.0", - "@ethersproject/logger": "^5.8.0", - "@ethersproject/rlp": "^5.8.0" + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://eslint.org/donate" } }, - "node_modules/@ethersproject/base64": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.8.0.tgz", - "integrity": "sha512-lN0oIwfkYj9LbPx4xEkie6rAMJtySbpOAFXSDVQaBnAzYfB4X2Qr+FXJGxMoc3Bxp2Sm8OwvzMrywxyw0gLjIQ==", + "node_modules/@eslint/object-schema": { + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz", + "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==", "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/bytes": "^5.8.0" + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, - "node_modules/@ethersproject/bignumber": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ethersproject/bignumber/-/bignumber-5.8.0.tgz", - "integrity": "sha512-ZyaT24bHaSeJon2tGPKIiHszWjD/54Sz8t57Toch475lCLljC6MgPmxk7Gtzz+ddNN5LuHea9qhAe0x3D+uYPA==", + "node_modules/@eslint/plugin-kit": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz", + "integrity": "sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==", "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", + "license": "Apache-2.0", "dependencies": { - "@ethersproject/bytes": "^5.8.0", - "@ethersproject/logger": "^5.8.0", - "bn.js": "^5.2.1" + "@eslint/core": "^0.17.0", + "levn": "^0.4.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, - "node_modules/@ethersproject/bytes": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ethersproject/bytes/-/bytes-5.8.0.tgz", - "integrity": "sha512-vTkeohgJVCPVHu5c25XWaWQOZ4v+DkGoC42/TS2ond+PARCxTJvgTFUNDZovyQ/uAQ4EcpqqowKydcdmRKjg7A==", + "node_modules/@ethereumjs/common": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-3.2.0.tgz", + "integrity": "sha512-pksvzI0VyLgmuEF2FA/JR/4/y6hcPq8OUail3/AvycBaW1d5VSauOZzqGvJ3RTmR4MU35lWE8KseKOsEhrFRBA==", "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], "license": "MIT", "dependencies": { - "@ethersproject/logger": "^5.8.0" + "@ethereumjs/util": "^8.1.0", + "crc-32": "^1.2.0" } }, - "node_modules/@ethersproject/constants": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ethersproject/constants/-/constants-5.8.0.tgz", - "integrity": "sha512-wigX4lrf5Vu+axVTIvNsuL6YrV4O5AXl5ubcURKMEME5TnWBouUh0CDTWxZ2GpnRn1kcCgE7l8O5+VbV9QTTcg==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/bignumber": "^5.8.0" - } - }, - "node_modules/@ethersproject/hash": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.8.0.tgz", - "integrity": "sha512-ac/lBcTbEWW/VGJij0CNSw/wPcw9bSRgCB0AIBz8CvED/jfvDoV9hsIIiWfvWmFEi8RcXtlNwp2jv6ozWOsooA==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/abstract-signer": "^5.8.0", - "@ethersproject/address": "^5.8.0", - "@ethersproject/base64": "^5.8.0", - "@ethersproject/bignumber": "^5.8.0", - "@ethersproject/bytes": "^5.8.0", - "@ethersproject/keccak256": "^5.8.0", - "@ethersproject/logger": "^5.8.0", - "@ethersproject/properties": "^5.8.0", - "@ethersproject/strings": "^5.8.0" - } - }, - "node_modules/@ethersproject/keccak256": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ethersproject/keccak256/-/keccak256-5.8.0.tgz", - "integrity": "sha512-A1pkKLZSz8pDaQ1ftutZoaN46I6+jvuqugx5KYNeQOPqq+JZ0Txm7dlWesCHB5cndJSu5vP2VKptKf7cksERng==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/bytes": "^5.8.0", - "js-sha3": "0.8.0" - } - }, - "node_modules/@ethersproject/logger": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ethersproject/logger/-/logger-5.8.0.tgz", - "integrity": "sha512-Qe6knGmY+zPPWTC+wQrpitodgBfH7XoceCGL5bJVejmH+yCS3R8jJm8iiWuvWbG76RUmyEG53oqv6GMVWqunjA==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT" - }, - "node_modules/@ethersproject/networks": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.8.0.tgz", - "integrity": "sha512-egPJh3aPVAzbHwq8DD7Po53J4OUSsA1MjQp8Vf/OZPav5rlmWUaFLiq8cvQiGK0Z5K6LYzm29+VA/p4RL1FzNg==", + "node_modules/@ethereumjs/common/node_modules/@ethereumjs/rlp": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@ethereumjs/rlp/-/rlp-4.0.1.tgz", + "integrity": "sha512-tqsQiBQDQdmPWE1xkkBq4rlSW5QZpLOUJ5RJh2/9fug+q9tnUhuZoVLk7s0scUIKTOzEtR72DFBXI4WiZcMpvw==", "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/logger": "^5.8.0" + "license": "MPL-2.0", + "bin": { + "rlp": "bin/rlp" + }, + "engines": { + "node": ">=14" } }, - "node_modules/@ethersproject/properties": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.8.0.tgz", - "integrity": "sha512-PYuiEoQ+FMaZZNGrStmN7+lWjlsoufGIHdww7454FIaGdbe/p5rnaCXTr5MtBYl3NkeoVhHZuyzChPeGeKIpQw==", + "node_modules/@ethereumjs/common/node_modules/@ethereumjs/util": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@ethereumjs/util/-/util-8.1.0.tgz", + "integrity": "sha512-zQ0IqbdX8FZ9aw11vP+dZkKDkS+kgIvQPHnSAXzP9pLu+Rfu3D3XEeLbicvoXJTYnhZiPmsZUxgdzXwNKxRPbA==", "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", + "license": "MPL-2.0", "dependencies": { - "@ethersproject/logger": "^5.8.0" + "@ethereumjs/rlp": "^4.0.1", + "ethereum-cryptography": "^2.0.0", + "micro-ftch": "^0.3.1" + }, + "engines": { + "node": ">=14" } }, - "node_modules/@ethersproject/rlp": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.8.0.tgz", - "integrity": "sha512-LqZgAznqDbiEunaUvykH2JAoXTT9NV0Atqk8rQN9nx9SEgThA/WMx5DnW8a9FOufo//6FZOCHZ+XiClzgbqV9Q==", + "node_modules/@ethereumjs/mpt": { + "version": "10.1.3", + "resolved": "https://registry.npmjs.org/@ethereumjs/mpt/-/mpt-10.1.3.tgz", + "integrity": "sha512-pN43KoH8V0afpIltMFJf0tSSpX9Xssp9LGAyamnYc93oe0r8bRafeizPWR9aDsS+WXSg/IWQscoZ3xTybQSYoA==", "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", + "license": "MPL-2.0", "dependencies": { - "@ethersproject/bytes": "^5.8.0", - "@ethersproject/logger": "^5.8.0" + "@ethereumjs/rlp": "^10.1.3", + "@ethereumjs/util": "^10.1.3", + "@noble/hashes": "^2.0.1", + "debug": "^4.4.0", + "lru-cache": "11.0.2" + }, + "engines": { + "node": ">=20" } }, - "node_modules/@ethersproject/signing-key": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.8.0.tgz", - "integrity": "sha512-LrPW2ZxoigFi6U6aVkFN/fa9Yx/+4AtIUe4/HACTvKJdhm0eeb107EVCIQcrLZkxaSIgc/eCrX8Q1GtbH+9n3w==", + "node_modules/@ethereumjs/rlp": { + "version": "10.1.3", + "resolved": "https://registry.npmjs.org/@ethereumjs/rlp/-/rlp-10.1.3.tgz", + "integrity": "sha512-d795YWkN6O8EJh/PgJ2zZKCdBMl8OlqkuVQESoidH666gaFtUuJ01jDtiuqfyOqTNcTdGhHi8LkQv1WEZzvZZw==", "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/bytes": "^5.8.0", - "@ethersproject/logger": "^5.8.0", - "@ethersproject/properties": "^5.8.0", - "bn.js": "^5.2.1", - "elliptic": "6.6.1", - "hash.js": "1.1.7" + "license": "MPL-2.0", + "bin": { + "rlp": "bin/rlp.cjs" + }, + "engines": { + "node": ">=20" } }, - "node_modules/@ethersproject/strings": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ethersproject/strings/-/strings-5.8.0.tgz", - "integrity": "sha512-qWEAk0MAvl0LszjdfnZ2uC8xbR2wdv4cDabyHiBh3Cldq/T8dPH3V4BbBsAYJUeonwD+8afVXld274Ls+Y1xXg==", + "node_modules/@ethereumjs/tx": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-4.2.0.tgz", + "integrity": "sha512-1nc6VO4jtFd172BbSnTnDQVr9IYBFl1y4xPzZdtkrkKIncBCkdbgfdRV+MiTkJYAtTxvV12GRZLqBFT1PNK6Yw==", "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", + "license": "MPL-2.0", "dependencies": { - "@ethersproject/bytes": "^5.8.0", - "@ethersproject/constants": "^5.8.0", - "@ethersproject/logger": "^5.8.0" + "@ethereumjs/common": "^3.2.0", + "@ethereumjs/rlp": "^4.0.1", + "@ethereumjs/util": "^8.1.0", + "ethereum-cryptography": "^2.0.0" + }, + "engines": { + "node": ">=14" } }, - "node_modules/@ethersproject/transactions": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.8.0.tgz", - "integrity": "sha512-UglxSDjByHG0TuU17bDfCemZ3AnKO2vYrL5/2n2oXvKzvb7Cz+W9gOWXKARjp2URVwcWlQlPOEQyAviKwT4AHg==", + "node_modules/@ethereumjs/tx/node_modules/@ethereumjs/rlp": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@ethereumjs/rlp/-/rlp-4.0.1.tgz", + "integrity": "sha512-tqsQiBQDQdmPWE1xkkBq4rlSW5QZpLOUJ5RJh2/9fug+q9tnUhuZoVLk7s0scUIKTOzEtR72DFBXI4WiZcMpvw==", "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/address": "^5.8.0", - "@ethersproject/bignumber": "^5.8.0", - "@ethersproject/bytes": "^5.8.0", - "@ethersproject/constants": "^5.8.0", - "@ethersproject/keccak256": "^5.8.0", - "@ethersproject/logger": "^5.8.0", - "@ethersproject/properties": "^5.8.0", - "@ethersproject/rlp": "^5.8.0", - "@ethersproject/signing-key": "^5.8.0" + "license": "MPL-2.0", + "bin": { + "rlp": "bin/rlp" + }, + "engines": { + "node": ">=14" } }, - "node_modules/@ethersproject/units": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ethersproject/units/-/units-5.8.0.tgz", - "integrity": "sha512-lxq0CAnc5kMGIiWW4Mr041VT8IhNM+Pn5T3haO74XZWFulk7wH1Gv64HqE96hT4a7iiNMdOCFEBgaxWuk8ETKQ==", + "node_modules/@ethereumjs/tx/node_modules/@ethereumjs/util": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@ethereumjs/util/-/util-8.1.0.tgz", + "integrity": "sha512-zQ0IqbdX8FZ9aw11vP+dZkKDkS+kgIvQPHnSAXzP9pLu+Rfu3D3XEeLbicvoXJTYnhZiPmsZUxgdzXwNKxRPbA==", "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", + "license": "MPL-2.0", "dependencies": { - "@ethersproject/bignumber": "^5.8.0", - "@ethersproject/constants": "^5.8.0", - "@ethersproject/logger": "^5.8.0" + "@ethereumjs/rlp": "^4.0.1", + "ethereum-cryptography": "^2.0.0", + "micro-ftch": "^0.3.1" + }, + "engines": { + "node": ">=14" } }, - "node_modules/@ethersproject/web": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.8.0.tgz", - "integrity": "sha512-j7+Ksi/9KfGviws6Qtf9Q7KCqRhpwrYKQPs+JBA/rKVFF/yaWLHJEH3zfVP2plVu+eys0d2DlFmhoQJayFewcw==", + "node_modules/@ethereumjs/util": { + "version": "10.1.3", + "resolved": "https://registry.npmjs.org/@ethereumjs/util/-/util-10.1.3.tgz", + "integrity": "sha512-PhezOVe4DFaC+QLIsnK/tiOaXjpjS2F9AH4Ez0EfWevFw9NWNSg95l7I0dWuHF0B7v9odm2Ijqwo0EnARXtUmA==", "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", + "license": "MPL-2.0", "dependencies": { - "@ethersproject/base64": "^5.8.0", - "@ethersproject/bytes": "^5.8.0", - "@ethersproject/logger": "^5.8.0", - "@ethersproject/properties": "^5.8.0", - "@ethersproject/strings": "^5.8.0" - } - }, - "node_modules/@fastify/busboy": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.1.tgz", - "integrity": "sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==", - "dev": true, - "license": "MIT", + "@ethereumjs/rlp": "^10.1.3", + "@noble/curves": "^2.0.1", + "@noble/hashes": "^2.0.1" + }, "engines": { - "node": ">=14" + "node": ">=20" } }, "node_modules/@frangio/servbot": { @@ -1500,41 +1266,41 @@ } }, "node_modules/@humanfs/core": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", - "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.2.tgz", + "integrity": "sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==", "dev": true, "license": "Apache-2.0", + "dependencies": { + "@humanfs/types": "^0.15.0" + }, "engines": { "node": ">=18.18.0" } }, "node_modules/@humanfs/node": { - "version": "0.16.6", - "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", - "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", + "version": "0.16.8", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.8.tgz", + "integrity": "sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@humanfs/core": "^0.19.1", - "@humanwhocodes/retry": "^0.3.0" + "@humanfs/core": "^0.19.2", + "@humanfs/types": "^0.15.0", + "@humanwhocodes/retry": "^0.4.0" }, "engines": { "node": ">=18.18.0" } }, - "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", - "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", + "node_modules/@humanfs/types": { + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/@humanfs/types/-/types-0.15.0.tgz", + "integrity": "sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==", "dev": true, "license": "Apache-2.0", "engines": { - "node": ">=18.18" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" + "node": ">=18.18.0" } }, "node_modules/@humanwhocodes/module-importer": { @@ -1575,27 +1341,26 @@ "url": "https://github.com/sponsors/nzakas" } }, - "node_modules/@isaacs/balanced-match": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz", - "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "20 || >=22" - } - }, - "node_modules/@isaacs/brace-expansion": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz", - "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==", + "node_modules/@inquirer/external-editor": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@inquirer/external-editor/-/external-editor-1.0.3.tgz", + "integrity": "sha512-RWbSrDiYmO4LbejWY7ttpxczuwQyZLBUyygsA9Nsv95hpzUWwnNTVQmAq3xuh7vNwCp07UTmE5i11XAEExx4RA==", "dev": true, "license": "MIT", "dependencies": { - "@isaacs/balanced-match": "^4.0.1" + "chardet": "^2.1.1", + "iconv-lite": "^0.7.0" }, "engines": { - "node": "20 || >=22" + "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@isaacs/cliui": { @@ -1604,6 +1369,7 @@ "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", "dev": true, "license": "ISC", + "peer": true, "dependencies": { "string-width": "^5.1.2", "string-width-cjs": "npm:string-width@^4.2.0", @@ -1617,11 +1383,12 @@ } }, "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", - "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.3.0.tgz", + "integrity": "sha512-WpDfL7NO6j7tH88IDBNVdUJxDh9nmCteAVW9dsep846XdwF4naCBK+/tGLX3KJgcpgMRXCFlTM2hKGoK9FsdrQ==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -1630,11 +1397,12 @@ } }, "node_modules/@isaacs/cliui/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -1647,7 +1415,8 @@ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/@isaacs/cliui/node_modules/string-width": { "version": "5.1.2", @@ -1655,6 +1424,7 @@ "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "eastasianwidth": "^0.2.0", "emoji-regex": "^9.2.2", @@ -1668,13 +1438,14 @@ } }, "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", + "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { - "ansi-regex": "^6.0.1" + "ansi-regex": "^6.2.2" }, "engines": { "node": ">=12" @@ -1689,6 +1460,7 @@ "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "ansi-styles": "^6.1.0", "string-width": "^5.0.1", @@ -1714,6 +1486,13 @@ "fs-extra": "^8.1.0" } }, + "node_modules/@manypkg/find-root/node_modules/@types/node": { + "version": "12.20.55", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz", + "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==", + "dev": true, + "license": "MIT" + }, "node_modules/@manypkg/find-root/node_modules/fs-extra": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", @@ -1781,9 +1560,9 @@ } }, "node_modules/@metamask/superstruct": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/@metamask/superstruct/-/superstruct-3.2.1.tgz", - "integrity": "sha512-fLgJnDOXFmuVlB38rUN5SmU7hAFQcCjrg3Vrxz67KTY7YHFnSNEKvX4avmEBdOI0yTCxZjwMCFEqsC8k2+Wd3g==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/@metamask/superstruct/-/superstruct-3.4.1.tgz", + "integrity": "sha512-caTaaBUcwBGbUNf3r0uT48upX4nECRbKhQ9pPOfW4sIkfcIUUDV4S9DZxq/5fuNPVt5KWpyd5xIIz0sP+iWLlg==", "dev": true, "license": "MIT", "engines": { @@ -1811,26 +1590,17 @@ "node": ">=16.0.0" } }, - "node_modules/@modelcontextprotocol/sdk": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.11.0.tgz", - "integrity": "sha512-k/1pb70eD638anoi0e8wUGAlbMJXyvdV4p62Ko+EZ7eBe1xMx8Uhak1R5DgfoofsK5IBBnRwsYGTaLZl+6/+RQ==", + "node_modules/@metamask/utils/node_modules/@noble/hashes": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz", + "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==", "dev": true, "license": "MIT", - "dependencies": { - "content-type": "^1.0.5", - "cors": "^2.8.5", - "cross-spawn": "^7.0.3", - "eventsource": "^3.0.2", - "express": "^5.0.1", - "express-rate-limit": "^7.5.0", - "pkce-challenge": "^5.0.0", - "raw-body": "^3.0.0", - "zod": "^3.23.8", - "zod-to-json-schema": "^3.24.1" - }, "engines": { - "node": ">=18" + "node": "^14.21.3 || >=16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" } }, "node_modules/@noble/ciphers": { @@ -1847,47 +1617,34 @@ } }, "node_modules/@noble/curves": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.9.0.tgz", - "integrity": "sha512-7YDlXiNMdO1YZeH6t/kvopHHbIZzlxrCV9WLqCY6QhcXOoXiNCMDqJIglZ9Yjx5+w7Dz30TITFrlTjnRg7sKEg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-2.3.0.tgz", + "integrity": "sha512-v7cY+4oWYPQszRj6ZFGzTVL7uP2TaLo1xMhWHzYC5wj0ZhOXQ5x+sBre8rF3hi8cAoi0bh1qXoovoOkdFtvqEg==", "dev": true, "license": "MIT", "dependencies": { - "@noble/hashes": "1.8.0" + "@noble/hashes": "2.3.0" }, "engines": { - "node": "^14.21.3 || >=16" + "node": ">= 20.19.0" }, "funding": { "url": "https://paulmillr.com/funding/" } }, "node_modules/@noble/hashes": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz", - "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-2.3.0.tgz", + "integrity": "sha512-oN+QwyX7VSHotibwubG3kpzbwKrfnyR6OOO+3Nk/53ADL7FmgHHz4TgrbaYKvvOw09u6QTx0oiH1cNCIOuN0CQ==", "dev": true, "license": "MIT", "engines": { - "node": "^14.21.3 || >=16" + "node": ">= 20.19.0" }, "funding": { "url": "https://paulmillr.com/funding/" } }, - "node_modules/@noble/secp256k1": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.1.tgz", - "integrity": "sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], - "license": "MIT" - }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -1927,139 +1684,279 @@ } }, "node_modules/@nomicfoundation/edr": { - "version": "0.12.0-next.23", - "resolved": "https://registry.npmjs.org/@nomicfoundation/edr/-/edr-0.12.0-next.23.tgz", - "integrity": "sha512-F2/6HZh8Q9RsgkOIkRrckldbhPjIZY7d4mT9LYuW68miwGQ5l7CkAgcz9fRRiurA0+YJhtsbx/EyrD9DmX9BOw==", + "version": "0.17.0", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr/-/edr-0.17.0.tgz", + "integrity": "sha512-gnPDZEgIzkp5fwGMI8AVoRconp1BK8SGWiBTtQXq9G0+CAvS7hlz7Y9HiHptyv84cqKVacRSDqsS+7oN08su1Q==", "dev": true, "license": "MIT", - "dependencies": { - "@nomicfoundation/edr-darwin-arm64": "0.12.0-next.23", - "@nomicfoundation/edr-darwin-x64": "0.12.0-next.23", - "@nomicfoundation/edr-linux-arm64-gnu": "0.12.0-next.23", - "@nomicfoundation/edr-linux-arm64-musl": "0.12.0-next.23", - "@nomicfoundation/edr-linux-x64-gnu": "0.12.0-next.23", - "@nomicfoundation/edr-linux-x64-musl": "0.12.0-next.23", - "@nomicfoundation/edr-win32-x64-msvc": "0.12.0-next.23" - }, "engines": { - "node": ">= 20" + "node": ">= 22" + }, + "optionalDependencies": { + "@nomicfoundation/edr-darwin-arm64": "0.17.0", + "@nomicfoundation/edr-darwin-x64": "0.17.0", + "@nomicfoundation/edr-linux-arm64-gnu": "0.17.0", + "@nomicfoundation/edr-linux-arm64-musl": "0.17.0", + "@nomicfoundation/edr-linux-x64-gnu": "0.17.0", + "@nomicfoundation/edr-linux-x64-musl": "0.17.0", + "@nomicfoundation/edr-win32-x64-msvc": "0.17.0" } }, "node_modules/@nomicfoundation/edr-darwin-arm64": { - "version": "0.12.0-next.23", - "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-darwin-arm64/-/edr-darwin-arm64-0.12.0-next.23.tgz", - "integrity": "sha512-Amh7mRoDzZyJJ4efqoePqdoZOzharmSOttZuJDlVE5yy07BoE8hL6ZRpa5fNYn0LCqn/KoWs8OHANWxhKDGhvQ==", + "version": "0.17.0", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-darwin-arm64/-/edr-darwin-arm64-0.17.0.tgz", + "integrity": "sha512-rw+lAEQ9/XB5kvTRlu9fs+bZ1byF3OIMOpNfkg6cSUDCZZeXXhgpbzCWVHnmY6VVcka0L/qUDbhsNPD6GmBFIw==", + "cpu": [ + "arm64" + ], "dev": true, "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], "engines": { - "node": ">= 20" + "node": ">= 22" } }, "node_modules/@nomicfoundation/edr-darwin-x64": { - "version": "0.12.0-next.23", - "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-darwin-x64/-/edr-darwin-x64-0.12.0-next.23.tgz", - "integrity": "sha512-9wn489FIQm7m0UCD+HhktjWx6vskZzeZD9oDc2k9ZvbBzdXwPp5tiDqUBJ+eQpByAzCDfteAJwRn2lQCE0U+Iw==", + "version": "0.17.0", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-darwin-x64/-/edr-darwin-x64-0.17.0.tgz", + "integrity": "sha512-QLE4fnl0B8GK40H0QE4I4jXZ9rqG0P+QawZjlVjJAjl3mLcSCJNaNHVX1S5Z5Ee4Acrr6dfgAH8nRsTu6N8Zfw==", + "cpu": [ + "x64" + ], "dev": true, "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], "engines": { - "node": ">= 20" + "node": ">= 22" } }, "node_modules/@nomicfoundation/edr-linux-arm64-gnu": { - "version": "0.12.0-next.23", - "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-arm64-gnu/-/edr-linux-arm64-gnu-0.12.0-next.23.tgz", - "integrity": "sha512-nlk5EejSzEUfEngv0Jkhqq3/wINIfF2ED9wAofc22w/V1DV99ASh9l3/e/MIHOQFecIZ9MDqt0Em9/oDyB1Uew==", + "version": "0.17.0", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-arm64-gnu/-/edr-linux-arm64-gnu-0.17.0.tgz", + "integrity": "sha512-NzdxADNC7L1BfgfmrqUhzUddz4Cg3Uf1pkXbVlJ38Tvn3h09m/D7+VAlxXjkvrJ5M7OoaHmr114vSlQ9zNSFJw==", + "cpu": [ + "arm64" + ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">= 20" + "node": ">= 22" } }, "node_modules/@nomicfoundation/edr-linux-arm64-musl": { - "version": "0.12.0-next.23", - "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-arm64-musl/-/edr-linux-arm64-musl-0.12.0-next.23.tgz", - "integrity": "sha512-SJuPBp3Rc6vM92UtVTUxZQ/QlLhLfwTftt2XUiYohmGKB3RjGzpgduEFMCA0LEnucUckU6UHrJNFHiDm77C4PQ==", + "version": "0.17.0", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-arm64-musl/-/edr-linux-arm64-musl-0.17.0.tgz", + "integrity": "sha512-1o3LTouqc831tR+cr2dfckVRlEat8Om/dqYC58NFAaED/OVj52ndX4p+qvKg2qQ0AvW6wszjRZ4TY01F3VHZ/A==", + "cpu": [ + "arm64" + ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">= 20" + "node": ">= 22" } }, "node_modules/@nomicfoundation/edr-linux-x64-gnu": { - "version": "0.12.0-next.23", - "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-x64-gnu/-/edr-linux-x64-gnu-0.12.0-next.23.tgz", - "integrity": "sha512-NU+Qs3u7Qt6t3bJFdmmjd5CsvgI2bPPzO31KifM2Ez96/jsXYho5debtTQnimlb5NAqiHTSlxjh/F8ROcptmeQ==", + "version": "0.17.0", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-x64-gnu/-/edr-linux-x64-gnu-0.17.0.tgz", + "integrity": "sha512-pDyvBR9tXBGL6u0Qc60Hi7szpjHq9xqa9aHgT81/qbcisTRkwpqEcHv6zFJ6ZIkCZa0+WYcziQ67Nho17btYvA==", + "cpu": [ + "x64" + ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">= 20" + "node": ">= 22" } }, "node_modules/@nomicfoundation/edr-linux-x64-musl": { - "version": "0.12.0-next.23", - "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-x64-musl/-/edr-linux-x64-musl-0.12.0-next.23.tgz", - "integrity": "sha512-F78fZA2h6/ssiCSZOovlgIu0dUeI7ItKPsDDF3UUlIibef052GCXmliMinC90jVPbrjUADMd1BUwjfI0Z8OllQ==", + "version": "0.17.0", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-x64-musl/-/edr-linux-x64-musl-0.17.0.tgz", + "integrity": "sha512-AnPUwuhKUkbgDM7TDfU3q3R4uXP4P+0IG8+8hdph/sgo34LA0cFILWQhKKnR4eSdlgLiepG9bjpF84yXuydyuA==", + "cpu": [ + "x64" + ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">= 20" + "node": ">= 22" } }, "node_modules/@nomicfoundation/edr-win32-x64-msvc": { - "version": "0.12.0-next.23", - "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-win32-x64-msvc/-/edr-win32-x64-msvc-0.12.0-next.23.tgz", - "integrity": "sha512-IfJZQJn7d/YyqhmguBIGoCKjE9dKjbu6V6iNEPApfwf5JyyjHYyyfkLU4rf7hygj57bfH4sl1jtQ6r8HnT62lw==", + "version": "0.17.0", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-win32-x64-msvc/-/edr-win32-x64-msvc-0.17.0.tgz", + "integrity": "sha512-buvHzzK/UzeXcgY7UD0izceM2GRxC5akKgBaCfPdcpQybOmSdJHUm9kSCEWmy/YTf4HVLLgA9EyrHCLqY2Tsrw==", + "cpu": [ + "x64" + ], "dev": true, "license": "MIT", + "optional": true, + "os": [ + "win32" + ], "engines": { - "node": ">= 20" + "node": ">= 22" + } + }, + "node_modules/@nomicfoundation/hardhat-errors": { + "version": "3.0.20", + "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-errors/-/hardhat-errors-3.0.20.tgz", + "integrity": "sha512-6wmiB5zkqQ+3d+3Ta/vl0MvlIXdrAwUF+OMX2bi7RbCgBfGbbjBbzQhXmJUuhx6XDMPeswdRjjOChpK07tDNmw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nomicfoundation/hardhat-utils": "^4.1.5" } }, - "node_modules/@nomicfoundation/hardhat-chai-matchers": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-chai-matchers/-/hardhat-chai-matchers-2.0.8.tgz", - "integrity": "sha512-Z5PiCXH4xhNLASROlSUOADfhfpfhYO6D7Hn9xp8PddmHey0jq704cr6kfU8TRrQ4PUZbpfsZadPj+pCfZdjPIg==", + "node_modules/@nomicfoundation/hardhat-ethers": { + "version": "4.0.15", + "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-ethers/-/hardhat-ethers-4.0.15.tgz", + "integrity": "sha512-qLBvq2RcKuffObX08LVZr9LixDSnsJwwxeRKYCfr5p1VTkMT0XP5JU2Y8AOIady39O5v7ZuzIEY+xH+DdqrBKA==", "dev": true, "license": "MIT", "dependencies": { - "@types/chai-as-promised": "^7.1.3", - "chai-as-promised": "^7.1.1", - "deep-eql": "^4.0.1", - "ordinal": "^1.0.3" + "@nomicfoundation/hardhat-errors": "^3.0.17", + "@nomicfoundation/hardhat-utils": "^4.1.5", + "@nomicfoundation/hardhat-zod-utils": "^3.0.5", + "ethereum-cryptography": "^2.2.1", + "ethers": "^6.14.0", + "zod": "^3.23.8" }, "peerDependencies": { - "@nomicfoundation/hardhat-ethers": "^3.0.0", - "chai": "^4.2.0", - "ethers": "^6.1.0", - "hardhat": "^2.9.4" + "hardhat": "^3.8.0" } }, - "node_modules/@nomicfoundation/hardhat-ethers": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-ethers/-/hardhat-ethers-3.1.0.tgz", - "integrity": "sha512-jx6fw3Ms7QBwFGT2MU6ICG292z0P81u6g54JjSV105+FbTZOF4FJqPksLfDybxkkOeq28eDxbqq7vpxRYyIlxA==", + "node_modules/@nomicfoundation/hardhat-ethers-chai-matchers": { + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-ethers-chai-matchers/-/hardhat-ethers-chai-matchers-3.0.11.tgz", + "integrity": "sha512-pAOTjBQRNKqCh8cLJD6dsOeGWrU8fe9Wrz4UqO03qhJbwmj0md2bq2LEPaMZAgDtxVS0ZteiVGx64DgBfyb7XA==", "dev": true, "license": "MIT", "dependencies": { - "debug": "^4.1.1", - "lodash.isequal": "^4.5.0" + "@nomicfoundation/hardhat-utils": "^4.1.4", + "@types/chai-as-promised": "^8.0.1", + "chai-as-promised": "^8.0.0", + "deep-eql": "^5.0.1" }, "peerDependencies": { + "@nomicfoundation/hardhat-ethers": "^4.0.7", + "chai": ">=5.1.2 <7", "ethers": "^6.14.0", - "hardhat": "^2.26.0" + "hardhat": "^3.8.0" + } + }, + "node_modules/@nomicfoundation/hardhat-mocha": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-mocha/-/hardhat-mocha-3.1.0.tgz", + "integrity": "sha512-bZgm1NWoVvwPdc2SQwjyj/HuFePG5LjS+zuLqqwwW8w5hq5+NIFZtgcOoTFNhShDFXeItLxOYiC2K2Pk/q2scw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nomicfoundation/hardhat-errors": "^3.0.15", + "@nomicfoundation/hardhat-utils": "^4.1.2", + "@nomicfoundation/hardhat-zod-utils": "^3.0.5", + "tsx": "^4.23.1", + "zod": "^3.23.8" + }, + "peerDependencies": { + "hardhat": "^3.12.0", + "mocha": "^11.0.0" } }, "node_modules/@nomicfoundation/hardhat-network-helpers": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-network-helpers/-/hardhat-network-helpers-1.1.0.tgz", - "integrity": "sha512-ZS+NulZuR99NUHt2VwcgZvgeD6Y63qrbORNRuKO+lTowJxNVsrJ0zbRx1j5De6G3dOno5pVGvuYSq2QVG0qCYg==", + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-network-helpers/-/hardhat-network-helpers-3.0.11.tgz", + "integrity": "sha512-3/xuORejAOGbfqBmIen+OCHu9ExK9O8pjE11ILU9NcN37zy3GDbyNCKV9keK1gSjWWVb0okAlAR/yvewfEE4TA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nomicfoundation/hardhat-errors": "^3.0.16", + "@nomicfoundation/hardhat-utils": "^4.1.4" + }, + "peerDependencies": { + "hardhat": "^3.8.0" + } + }, + "node_modules/@nomicfoundation/hardhat-utils": { + "version": "4.1.8", + "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-utils/-/hardhat-utils-4.1.8.tgz", + "integrity": "sha512-6dyf/irAQ01kUjd8ol83/KAqZCCwnrlF8sSb2aHDAxR5hG1yxi6xf29HqG3UwCtEPyojN/n+lydZ8NEMRQ2/dg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@streamparser/json-node": "^0.0.22", + "env-paths": "^4.0.0", + "ethereum-cryptography": "^2.2.1", + "fast-equals": "^6.0.0", + "json-stream-stringify": "^3.1.7", + "rfdc": "^1.3.1", + "undici": "^6.28.0" + } + }, + "node_modules/@nomicfoundation/hardhat-utils/node_modules/undici": { + "version": "6.28.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.28.0.tgz", + "integrity": "sha512-LIY910g9TI13YS95lrMFrs8Rm/u/irgHeTWoKCoteeJ04CUJ92eEfj0rVn+7VKMPBpUPiUoBKfhNyLI23EE/KA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18.17" + } + }, + "node_modules/@nomicfoundation/hardhat-vendored": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-vendored/-/hardhat-vendored-3.0.4.tgz", + "integrity": "sha512-RO8Otj1FvRvxJmXzkxh1vTwK/+cqSVPYLqY6RrWkmzHEEcxnAwAFsBYdW7xyTEyW/pVbSSNd2gs3aoGdGZaoNA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@nomicfoundation/hardhat-zod-utils": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-zod-utils/-/hardhat-zod-utils-3.0.6.tgz", + "integrity": "sha512-DraBttTle+tRi24wkEfTYUrsX/Cdp74ySXcc4MUzMQPBQNUTFx5YyTH7qFhXQdz3V171iqLAQpOAhNcEqwmq9Q==", "dev": true, "license": "MIT", "dependencies": { - "ethereumjs-util": "^7.1.4" + "@nomicfoundation/hardhat-errors": "^3.0.13", + "@nomicfoundation/hardhat-utils": "^4.1.2" }, "peerDependencies": { - "hardhat": "^2.26.0" + "zod": "^3.23.8" } }, "node_modules/@nomicfoundation/slang": { @@ -2193,159 +2090,176 @@ "oz-docs": "oz-docs.js" } }, - "node_modules/@openzeppelin/merkle-tree": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@openzeppelin/merkle-tree/-/merkle-tree-1.0.8.tgz", - "integrity": "sha512-E2c9/Y3vjZXwVvPZKqCKUn7upnvam1P1ZhowJyZVQSkzZm5WhumtaRr+wkUXrZVfkIc7Gfrl7xzabElqDL09ow==", + "node_modules/@openzeppelin/docs-utils/node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "license": "MIT", "dependencies": { - "@metamask/abi-utils": "^2.0.4", - "ethereum-cryptography": "^3.0.0" + "sprintf-js": "~1.0.2" } }, - "node_modules/@openzeppelin/upgrade-safe-transpiler": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@openzeppelin/upgrade-safe-transpiler/-/upgrade-safe-transpiler-0.4.1.tgz", - "integrity": "sha512-IxNqDuHLBUp7WcTtrfNrl7ccHzaKLB0Pn9YLE6HyMdzppbBiKls47cHFIC/uLI91cvZP0cheIyvtA3g/3FEdOA==", + "node_modules/@openzeppelin/docs-utils/node_modules/env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", "dev": true, "license": "MIT", - "dependencies": { - "ajv": "^8.0.0", - "compare-versions": "^6.0.0", - "ethereum-cryptography": "^3.0.0", - "lodash": "^4.17.20", - "minimatch": "^10.0.3", - "minimist": "^1.2.5", - "solidity-ast": "^0.4.51" - }, - "bin": { - "upgrade-safe-transpiler": "dist/cli.js" + "engines": { + "node": ">=6" } }, - "node_modules/@openzeppelin/upgrade-safe-transpiler/node_modules/minimatch": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz", - "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==", + "node_modules/@openzeppelin/docs-utils/node_modules/js-yaml": { + "version": "3.15.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.15.1.tgz", + "integrity": "sha512-S99WuO3HlhO3XN41EtYUNl9zzXjoJx7QvmipxsJVxtCBT0YHEFy+iOJhjSvrmV12nYhWpZaM8lPHkJm0yUMbag==", "dev": true, - "license": "BlueOak-1.0.0", + "license": "MIT", "dependencies": { - "@isaacs/brace-expansion": "^5.0.0" - }, - "engines": { - "node": "20 || >=22" + "argparse": "^1.0.7", + "esprima": "^4.0.0" }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "bin": { + "js-yaml": "bin/js-yaml.js" } }, - "node_modules/@openzeppelin/upgrades-core": { - "version": "1.44.0", - "resolved": "https://registry.npmjs.org/@openzeppelin/upgrades-core/-/upgrades-core-1.44.0.tgz", - "integrity": "sha512-AUnQW7cbh2ntFuQdHi5C0vKB+QfkTQtzXgCmzazXLJDX7slFTF676lw+x97ZKfzwQw5unO1+ALZMx+s+2yQUew==", + "node_modules/@openzeppelin/merkle-tree": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@openzeppelin/merkle-tree/-/merkle-tree-1.0.8.tgz", + "integrity": "sha512-E2c9/Y3vjZXwVvPZKqCKUn7upnvam1P1ZhowJyZVQSkzZm5WhumtaRr+wkUXrZVfkIc7Gfrl7xzabElqDL09ow==", "dev": true, "license": "MIT", "dependencies": { - "@nomicfoundation/slang": "^0.18.3", - "bignumber.js": "^9.1.2", - "cbor": "^10.0.0", - "chalk": "^4.1.0", - "compare-versions": "^6.0.0", - "debug": "^4.1.1", - "ethereumjs-util": "^7.0.3", - "minimatch": "^9.0.5", - "minimist": "^1.2.7", - "proper-lockfile": "^4.1.1", - "solidity-ast": "^0.4.60" - }, - "bin": { - "openzeppelin-upgrades-core": "dist/cli/cli.js" + "@metamask/abi-utils": "^2.0.4", + "ethereum-cryptography": "^3.0.0" } }, - "node_modules/@openzeppelin/upgrades-core/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/@openzeppelin/merkle-tree/node_modules/@noble/curves": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.9.0.tgz", + "integrity": "sha512-7YDlXiNMdO1YZeH6t/kvopHHbIZzlxrCV9WLqCY6QhcXOoXiNCMDqJIglZ9Yjx5+w7Dz30TITFrlTjnRg7sKEg==", "dev": true, "license": "MIT", "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "@noble/hashes": "1.8.0" }, "engines": { - "node": ">=10" + "node": "^14.21.3 || >=16" }, "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "url": "https://paulmillr.com/funding/" } }, - "node_modules/@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "node_modules/@openzeppelin/merkle-tree/node_modules/@noble/hashes": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz", + "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==", "dev": true, "license": "MIT", - "optional": true, "engines": { - "node": ">=14" + "node": "^14.21.3 || >=16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" } }, - "node_modules/@pnpm/config.env-replace": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz", - "integrity": "sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w==", + "node_modules/@openzeppelin/merkle-tree/node_modules/@scure/bip32": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.7.0.tgz", + "integrity": "sha512-E4FFX/N3f4B80AKWp5dP6ow+flD1LQZo/w8UnLGYZO674jS6YnYeepycOOksv+vLPSpgN35wgKgy+ybfTb2SMw==", "dev": true, "license": "MIT", - "engines": { - "node": ">=12.22.0" + "dependencies": { + "@noble/curves": "~1.9.0", + "@noble/hashes": "~1.8.0", + "@scure/base": "~1.2.5" + }, + "funding": { + "url": "https://paulmillr.com/funding/" } }, - "node_modules/@pnpm/network.ca-file": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@pnpm/network.ca-file/-/network.ca-file-1.0.2.tgz", - "integrity": "sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA==", + "node_modules/@openzeppelin/merkle-tree/node_modules/@scure/bip39": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.6.0.tgz", + "integrity": "sha512-+lF0BbLiJNwVlev4eKelw1WWLaiKXw7sSl8T6FvBlWkdX+94aGJ4o8XjUdlyhTCjd8c+B3KT3JfS8P0bLRNU6A==", "dev": true, "license": "MIT", "dependencies": { - "graceful-fs": "4.2.10" + "@noble/hashes": "~1.8.0", + "@scure/base": "~1.2.5" }, - "engines": { - "node": ">=12.22.0" + "funding": { + "url": "https://paulmillr.com/funding/" } }, - "node_modules/@pnpm/network.ca-file/node_modules/graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true, - "license": "ISC" + "node_modules/@openzeppelin/merkle-tree/node_modules/ethereum-cryptography": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-3.2.0.tgz", + "integrity": "sha512-Urr5YVsalH+Jo0sYkTkv1MyI9bLYZwW8BENZCeE1QYaTHETEYx0Nv/SVsWkSqpYrzweg6d8KMY1wTjH/1m/BIg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@noble/ciphers": "1.3.0", + "@noble/curves": "1.9.0", + "@noble/hashes": "1.8.0", + "@scure/bip32": "1.7.0", + "@scure/bip39": "1.6.0" + }, + "engines": { + "node": "^14.21.3 || >=16", + "npm": ">=9" + } }, - "node_modules/@pnpm/npm-conf": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.3.1.tgz", - "integrity": "sha512-c83qWb22rNRuB0UaVCI0uRPNRr8Z0FWnEIvT47jiHAmOIUHbBOg5XvV7pM5x+rKn9HRpjxquDbXYSXr3fAKFcw==", + "node_modules/@openzeppelin/upgrade-safe-transpiler": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@openzeppelin/upgrade-safe-transpiler/-/upgrade-safe-transpiler-0.4.2.tgz", + "integrity": "sha512-Rct4coEubwKpUIcFv41DUHQiOMMTH1EZ23oYBESFqN79TZ7qiUMdfgQKsokwozkqqPD7WR4dvZpzdFl46wrZzg==", "dev": true, "license": "MIT", "dependencies": { - "@pnpm/config.env-replace": "^1.1.0", - "@pnpm/network.ca-file": "^1.0.1", - "config-chain": "^1.1.11" + "ajv": "^8.0.0", + "compare-versions": "^6.0.0", + "ethereum-cryptography": "^3.0.0", + "lodash": "^4.17.20", + "minimatch": "^10.0.3", + "minimist": "^1.2.5", + "solidity-ast": "^0.4.51" + }, + "bin": { + "upgrade-safe-transpiler": "dist/cli.js" + } + }, + "node_modules/@openzeppelin/upgrade-safe-transpiler/node_modules/@noble/curves": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.9.0.tgz", + "integrity": "sha512-7YDlXiNMdO1YZeH6t/kvopHHbIZzlxrCV9WLqCY6QhcXOoXiNCMDqJIglZ9Yjx5+w7Dz30TITFrlTjnRg7sKEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@noble/hashes": "1.8.0" }, "engines": { - "node": ">=12" + "node": "^14.21.3 || >=16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" } }, - "node_modules/@scure/base": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.2.6.tgz", - "integrity": "sha512-g/nm5FgUa//MCj1gV09zTJTaM6KBAHqLN907YVQqf7zC49+DcO4B1so4ZX07Ef10Twr6nuqYEH9GEggFXA4Fmg==", + "node_modules/@openzeppelin/upgrade-safe-transpiler/node_modules/@noble/hashes": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz", + "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==", "dev": true, "license": "MIT", + "engines": { + "node": "^14.21.3 || >=16" + }, "funding": { "url": "https://paulmillr.com/funding/" } }, - "node_modules/@scure/bip32": { + "node_modules/@openzeppelin/upgrade-safe-transpiler/node_modules/@scure/bip32": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.7.0.tgz", "integrity": "sha512-E4FFX/N3f4B80AKWp5dP6ow+flD1LQZo/w8UnLGYZO674jS6YnYeepycOOksv+vLPSpgN35wgKgy+ybfTb2SMw==", @@ -2360,7 +2274,7 @@ "url": "https://paulmillr.com/funding/" } }, - "node_modules/@scure/bip39": { + "node_modules/@openzeppelin/upgrade-safe-transpiler/node_modules/@scure/bip39": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.6.0.tgz", "integrity": "sha512-+lF0BbLiJNwVlev4eKelw1WWLaiKXw7sSl8T6FvBlWkdX+94aGJ4o8XjUdlyhTCjd8c+B3KT3JfS8P0bLRNU6A==", @@ -2374,166 +2288,228 @@ "url": "https://paulmillr.com/funding/" } }, - "node_modules/@sentry/core": { - "version": "5.30.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.30.0.tgz", - "integrity": "sha512-TmfrII8w1PQZSZgPpUESqjB+jC6MvZJZdLtE/0hZ+SrnKhW3x5WlYLvTXZpcWePYBku7rl2wn1RZu6uT0qCTeg==", + "node_modules/@openzeppelin/upgrade-safe-transpiler/node_modules/ethereum-cryptography": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-3.2.0.tgz", + "integrity": "sha512-Urr5YVsalH+Jo0sYkTkv1MyI9bLYZwW8BENZCeE1QYaTHETEYx0Nv/SVsWkSqpYrzweg6d8KMY1wTjH/1m/BIg==", "dev": true, - "license": "BSD-3-Clause", + "license": "MIT", "dependencies": { - "@sentry/hub": "5.30.0", - "@sentry/minimal": "5.30.0", - "@sentry/types": "5.30.0", - "@sentry/utils": "5.30.0", - "tslib": "^1.9.3" + "@noble/ciphers": "1.3.0", + "@noble/curves": "1.9.0", + "@noble/hashes": "1.8.0", + "@scure/bip32": "1.7.0", + "@scure/bip39": "1.6.0" }, "engines": { - "node": ">=6" + "node": "^14.21.3 || >=16", + "npm": ">=9" } }, - "node_modules/@sentry/core/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "node_modules/@openzeppelin/upgrades-core": { + "version": "1.46.0", + "resolved": "https://registry.npmjs.org/@openzeppelin/upgrades-core/-/upgrades-core-1.46.0.tgz", + "integrity": "sha512-UFSeO/4r8eeXj0C/HAwV+J4b72sE1HX0aALQFs5S2RBOsfXvKweyjQf35vrK32LQiyHdP6IPShAsEBVvpSEgGQ==", "dev": true, - "license": "0BSD" + "license": "MIT", + "dependencies": { + "@nomicfoundation/slang": "^0.18.3", + "bignumber.js": "^9.1.2", + "cbor": "^10.0.0", + "chalk": "^4.1.0", + "compare-versions": "^6.0.0", + "debug": "^4.1.1", + "ethereumjs-util": "^7.0.3", + "minimatch": "^10.2.5", + "minimist": "^1.2.7", + "proper-lockfile": "^4.1.1", + "solidity-ast": "^0.4.60" + }, + "bin": { + "openzeppelin-upgrades-core": "dist/cli/cli.js" + } }, - "node_modules/@sentry/hub": { - "version": "5.30.0", - "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.30.0.tgz", - "integrity": "sha512-2tYrGnzb1gKz2EkMDQcfLrDTvmGcQPuWxLnJKXJvYTQDGLlEvi2tWz1VIHjunmOvJrB5aIQLhm+dcMRwFZDCqQ==", + "node_modules/@openzeppelin/upgrades-core/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, - "license": "BSD-3-Clause", + "license": "MIT", "dependencies": { - "@sentry/types": "5.30.0", - "@sentry/utils": "5.30.0", - "tslib": "^1.9.3" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" }, "engines": { - "node": ">=6" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/@sentry/hub/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", "dev": true, - "license": "0BSD" + "license": "MIT", + "optional": true, + "peer": true, + "engines": { + "node": ">=14" + } }, - "node_modules/@sentry/minimal": { - "version": "5.30.0", - "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.30.0.tgz", - "integrity": "sha512-BwWb/owZKtkDX+Sc4zCSTNcvZUq7YcH3uAVlmh/gtR9rmUvbzAA3ewLuB3myi4wWRAMEtny6+J/FN/x+2wn9Xw==", + "node_modules/@pnpm/config.env-replace": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz", + "integrity": "sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w==", "dev": true, - "license": "BSD-3-Clause", + "license": "MIT", + "engines": { + "node": ">=12.22.0" + } + }, + "node_modules/@pnpm/network.ca-file": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@pnpm/network.ca-file/-/network.ca-file-1.0.2.tgz", + "integrity": "sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA==", + "dev": true, + "license": "MIT", "dependencies": { - "@sentry/hub": "5.30.0", - "@sentry/types": "5.30.0", - "tslib": "^1.9.3" + "graceful-fs": "4.2.10" }, "engines": { - "node": ">=6" + "node": ">=12.22.0" } }, - "node_modules/@sentry/minimal/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "node_modules/@pnpm/network.ca-file/node_modules/graceful-fs": { + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true, - "license": "0BSD" + "license": "ISC" }, - "node_modules/@sentry/node": { - "version": "5.30.0", - "resolved": "https://registry.npmjs.org/@sentry/node/-/node-5.30.0.tgz", - "integrity": "sha512-Br5oyVBF0fZo6ZS9bxbJZG4ApAjRqAnqFFurMVJJdunNb80brh7a5Qva2kjhm+U6r9NJAB5OmDyPkA1Qnt+QVg==", + "node_modules/@pnpm/npm-conf": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-3.0.3.tgz", + "integrity": "sha512-//0sR/cow/s4ICQaYoAobOl4aU8cjU6x/V24V7XkKotb9+O+3zySIYp146vpaobYHnxa4pZX8NkV54Z5AwbDKA==", "dev": true, - "license": "BSD-3-Clause", + "license": "MIT", "dependencies": { - "@sentry/core": "5.30.0", - "@sentry/hub": "5.30.0", - "@sentry/tracing": "5.30.0", - "@sentry/types": "5.30.0", - "@sentry/utils": "5.30.0", - "cookie": "^0.4.1", - "https-proxy-agent": "^5.0.0", - "lru_map": "^0.3.3", - "tslib": "^1.9.3" + "@pnpm/config.env-replace": "^1.1.0", + "@pnpm/network.ca-file": "^1.0.1", + "config-chain": "^1.1.11" }, "engines": { - "node": ">=6" + "node": ">=12" } }, - "node_modules/@sentry/node/node_modules/cookie": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", - "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==", + "node_modules/@scure/base": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.2.6.tgz", + "integrity": "sha512-g/nm5FgUa//MCj1gV09zTJTaM6KBAHqLN907YVQqf7zC49+DcO4B1so4ZX07Ef10Twr6nuqYEH9GEggFXA4Fmg==", "dev": true, "license": "MIT", - "engines": { - "node": ">= 0.6" + "funding": { + "url": "https://paulmillr.com/funding/" } }, - "node_modules/@sentry/node/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "node_modules/@scure/bip32": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz", + "integrity": "sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==", "dev": true, - "license": "0BSD" + "license": "MIT", + "dependencies": { + "@noble/curves": "~1.4.0", + "@noble/hashes": "~1.4.0", + "@scure/base": "~1.1.6" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } }, - "node_modules/@sentry/tracing": { - "version": "5.30.0", - "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-5.30.0.tgz", - "integrity": "sha512-dUFowCr0AIMwiLD7Fs314Mdzcug+gBVo/+NCMyDw8tFxJkwWAKl7Qa2OZxLQ0ZHjakcj1hNKfCQJ9rhyfOl4Aw==", + "node_modules/@scure/bip32/node_modules/@noble/curves": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz", + "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==", "dev": true, "license": "MIT", "dependencies": { - "@sentry/hub": "5.30.0", - "@sentry/minimal": "5.30.0", - "@sentry/types": "5.30.0", - "@sentry/utils": "5.30.0", - "tslib": "^1.9.3" + "@noble/hashes": "1.4.0" }, - "engines": { - "node": ">=6" + "funding": { + "url": "https://paulmillr.com/funding/" } }, - "node_modules/@sentry/tracing/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "node_modules/@scure/bip32/node_modules/@noble/hashes": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz", + "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==", "dev": true, - "license": "0BSD" + "license": "MIT", + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } }, - "node_modules/@sentry/types": { - "version": "5.30.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.30.0.tgz", - "integrity": "sha512-R8xOqlSTZ+htqrfteCWU5Nk0CDN5ApUTvrlvBuiH1DyP6czDZ4ktbZB0hAgBlVcK0U+qpD3ag3Tqqpa5Q67rPw==", + "node_modules/@scure/bip32/node_modules/@scure/base": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.9.tgz", + "integrity": "sha512-8YKhl8GHiNI/pU2VMaofa2Tor7PJRAjwQLBBuilkJ9L5+13yVbC7JO/wS7piioAvPSwR3JKM1IJ/u4xQzbcXKg==", "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=6" + "license": "MIT", + "funding": { + "url": "https://paulmillr.com/funding/" } }, - "node_modules/@sentry/utils": { - "version": "5.30.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.30.0.tgz", - "integrity": "sha512-zaYmoH0NWWtvnJjC9/CBseXMtKHm/tm40sz3YfJRxeQjyzRqNQPgivpd9R/oDJCYj999mzdW382p/qi2ypjLww==", + "node_modules/@scure/bip39": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz", + "integrity": "sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==", "dev": true, - "license": "BSD-3-Clause", + "license": "MIT", "dependencies": { - "@sentry/types": "5.30.0", - "tslib": "^1.9.3" + "@noble/hashes": "~1.4.0", + "@scure/base": "~1.1.6" }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@scure/bip39/node_modules/@noble/hashes": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz", + "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==", + "dev": true, + "license": "MIT", "engines": { - "node": ">=6" + "node": ">= 16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@scure/bip39/node_modules/@scure/base": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.9.tgz", + "integrity": "sha512-8YKhl8GHiNI/pU2VMaofa2Tor7PJRAjwQLBBuilkJ9L5+13yVbC7JO/wS7piioAvPSwR3JKM1IJ/u4xQzbcXKg==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://paulmillr.com/funding/" } }, - "node_modules/@sentry/utils/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "node_modules/@sentry/core": { + "version": "9.47.1", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-9.47.1.tgz", + "integrity": "sha512-KX62+qIt4xgy8eHKHiikfhz2p5fOciXd0Cl+dNzhgPFq8klq4MGMNaf148GB3M/vBqP4nw/eFvRMAayFCgdRQw==", "dev": true, - "license": "0BSD" + "license": "MIT", + "engines": { + "node": ">=18" + } }, "node_modules/@sindresorhus/is": { "version": "5.6.0", @@ -2549,12 +2525,29 @@ } }, "node_modules/@solidity-parser/parser": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.19.0.tgz", - "integrity": "sha512-RV16k/qIxW/wWc+mLzV3ARyKUaMUTBy9tOLMzFhtNSKYeTAanQ3a5MudJKf/8arIFnA2L27SNjarQKmFg0w/jA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.20.2.tgz", + "integrity": "sha512-rbu0bzwNvMcwAjH86hiEAcOeRI2EeK8zCkHDrFykh/Al8mvJeFmjy3UrE7GYQjNwOgbGUUtCn5/k8CB8zIu7QA==", "dev": true, "license": "MIT" }, + "node_modules/@streamparser/json": { + "version": "0.0.22", + "resolved": "https://registry.npmjs.org/@streamparser/json/-/json-0.0.22.tgz", + "integrity": "sha512-b6gTSBjJ8G8SuO3Gbbj+zXbVx8NSs1EbpbMKpzGLWMdkR+98McH9bEjSz3+0mPJf68c5nxa3CrJHp5EQNXM6zQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@streamparser/json-node": { + "version": "0.0.22", + "resolved": "https://registry.npmjs.org/@streamparser/json-node/-/json-node-0.0.22.tgz", + "integrity": "sha512-sJT2ptNRwqB1lIsQrQlCoWk5rF4tif9wDh+7yluAGijJamAhrHGYpFB/Zg3hJeceoZypi74ftXk8DHzwYpbZSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@streamparser/json": "^0.0.22" + } + }, "node_modules/@szmarczak/http-timer": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz", @@ -2569,9 +2562,9 @@ } }, "node_modules/@types/bn.js": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.6.tgz", - "integrity": "sha512-Xh8vSwUeMKeYYrj3cX4lGQgFSF/N03r+tv4AiLl1SucqV+uTQpxRcnM8AkXKHwYP9ZPXOYXRr2KPXpVlIvqh9w==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.2.0.tgz", + "integrity": "sha512-DLbJ1BPqxvQhIGbeu8VbUC1DiAiahHtAYvA0ZEAa4P31F7IaArc8z3C3BRQdWX4mtLQuABG4yzp76ZrS02Ui1Q==", "dev": true, "license": "MIT", "dependencies": { @@ -2579,19 +2572,20 @@ } }, "node_modules/@types/chai": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.2.tgz", - "integrity": "sha512-8kB30R7Hwqf40JPiKhVzodJs2Qc1ZJ5zuT3uzw5Hq/dhNCl3G3l83jfpdI1e20BP348+fV7VIL/+FxaXkqBmWg==", + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.3.tgz", + "integrity": "sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==", "dev": true, "license": "MIT", "dependencies": { - "@types/deep-eql": "*" + "@types/deep-eql": "*", + "assertion-error": "^2.0.1" } }, "node_modules/@types/chai-as-promised": { - "version": "7.1.8", - "resolved": "https://registry.npmjs.org/@types/chai-as-promised/-/chai-as-promised-7.1.8.tgz", - "integrity": "sha512-ThlRVIJhr69FLlh6IctTXFkmhtP3NpMZ2QGq69StYLyKZFp/HOp1VdKZj7RvfNWYYcJ1xlbLGLLWj1UvP5u/Gw==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@types/chai-as-promised/-/chai-as-promised-8.0.2.tgz", + "integrity": "sha512-meQ1wDr1K5KRCSvG2lX7n7/5wf70BeptTKst0axGvnN6zqaVpRqegoIbugiAPSqOW9K9aL8gDVrm7a2LXOtn2Q==", "dev": true, "license": "MIT", "dependencies": { @@ -2599,9 +2593,9 @@ } }, "node_modules/@types/debug": { - "version": "4.1.12", - "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz", - "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==", + "version": "4.1.13", + "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.13.tgz", + "integrity": "sha512-KSVgmQmzMwPlmtljOomayoR89W4FynCAi3E8PPs7vmDVPe84hT+vGPKkJfThkmXs0x0jAaa9U8uW8bbfyS2fWw==", "dev": true, "license": "MIT", "dependencies": { @@ -2616,27 +2610,16 @@ "license": "MIT" }, "node_modules/@types/estree": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz", - "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz", + "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==", "dev": true, "license": "MIT" }, - "node_modules/@types/glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/minimatch": "*", - "@types/node": "*" - } - }, - "node_modules/@types/http-cache-semantics": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz", - "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==", + "node_modules/@types/http-cache-semantics": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz", + "integrity": "sha512-L3LgimLHXtGkWikKnsPg0/VFx9OGZaC+eN1u4r+OB1XRqH3meBIAVC2zr1WdMH+RHmnRkqliQAOHNJ/E0j/e0Q==", "dev": true, "license": "MIT" }, @@ -2647,13 +2630,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/minimatch": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz", - "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==", - "dev": true, - "license": "MIT" - }, "node_modules/@types/ms": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz", @@ -2662,11 +2638,14 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "12.20.55", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz", - "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==", + "version": "25.9.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-25.9.5.tgz", + "integrity": "sha512-OScDchr2fwuUmWdf4kZ9h7PcJiYDVInhJizG/biAq3cAvqwYktuy/TYGGdZNMtNTFUP7rnb0NU4TUdm82kt4Rg==", "dev": true, - "license": "MIT" + "license": "MIT", + "dependencies": { + "undici-types": ">=7.24.0 <7.24.7" + } }, "node_modules/@types/pbkdf2": { "version": "3.1.2", @@ -2679,62 +2658,36 @@ } }, "node_modules/@types/secp256k1": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/@types/secp256k1/-/secp256k1-4.0.6.tgz", - "integrity": "sha512-hHxJU6PAEUn0TP4S/ZOzuTUvJWuZ6eIKeNKb5RBpODvSl6hp1Wrw4s7ATY50rklRCScUDpHzVA/DQdSjJ3UoYQ==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/@types/secp256k1/-/secp256k1-4.0.7.tgz", + "integrity": "sha512-Rcvjl6vARGAKRO6jHeKMatGrvOMGrR/AR11N1x2LqintPCyDZ7NBhrh238Z2VZc7aM7KIwnFpFQ7fnfK4H/9Qw==", "dev": true, "license": "MIT", "dependencies": { "@types/node": "*" } }, - "node_modules/abbrev": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", - "integrity": "sha512-LEyx4aLEC3x6T0UguF6YILf+ntvmOaWsVfENmIW0E9H09vKlLDGelMjjSm0jkDHALj8A8quZ/HapKNigzwge+Q==", - "dev": true, - "license": "ISC" - }, - "node_modules/abitype": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/abitype/-/abitype-1.0.8.tgz", - "integrity": "sha512-ZeiI6h3GnW06uYDLx0etQtX/p8E24UaHHBj57RSjK7YBFe7iuVn07EDpOeP451D06sF27VOz9JJPlIKJmXgkEg==", + "node_modules/@types/yargs": { + "version": "17.0.35", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.35.tgz", + "integrity": "sha512-qUHkeCyQFxMXg79wQfTtfndEC+N9ZZg76HJftDJp+qH2tV7Gj4OJi7l+PiWwJ+pWtW8GwSmqsDj/oymhrTWXjg==", "dev": true, "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/wevm" - }, - "peerDependencies": { - "typescript": ">=5.0.4", - "zod": "^3 >=3.22.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - }, - "zod": { - "optional": true - } + "dependencies": { + "@types/yargs-parser": "*" } }, - "node_modules/accepts": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz", - "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==", + "node_modules/@types/yargs-parser": { + "version": "21.0.3", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", + "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", "dev": true, - "license": "MIT", - "dependencies": { - "mime-types": "^3.0.0", - "negotiator": "^1.0.0" - }, - "engines": { - "node": ">= 0.6" - } + "license": "MIT" }, "node_modules/acorn": { - "version": "8.14.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", - "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.18.0.tgz", + "integrity": "sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ==", "dev": true, "license": "MIT", "bin": { @@ -2755,13 +2708,13 @@ } }, "node_modules/adm-zip": { - "version": "0.4.16", - "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.16.tgz", - "integrity": "sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.6.0.tgz", + "integrity": "sha512-XleryMhbuksdKtofnWZ9Sk+4CUTbms4Mb/EU32SZwToAyZ5RgVos/ki8n+yr0LWHOGKuakbXTuuYNHLQjhddgg==", "dev": true, "license": "MIT", "engines": { - "node": ">=0.3.0" + "node": ">=14.0" } }, "node_modules/aes-js": { @@ -2771,37 +2724,10 @@ "dev": true, "license": "MIT" }, - "node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, - "license": "MIT", - "dependencies": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "version": "8.20.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz", + "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==", "dev": true, "license": "MIT", "dependencies": { @@ -2815,37 +2741,6 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/ajv-errors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz", - "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "ajv": ">=5.0.0" - } - }, - "node_modules/amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==", - "dev": true, - "license": "BSD-3-Clause OR MIT", - "optional": true, - "engines": { - "node": ">=0.4.2" - } - }, - "node_modules/ansi-align": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz", - "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^4.1.0" - } - }, "node_modules/ansi-colors": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", @@ -2856,22 +2751,6 @@ "node": ">=6" } }, - "node_modules/ansi-escapes": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "type-fest": "^0.21.3" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", @@ -2898,16 +2777,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/antlr4": { - "version": "4.13.2", - "resolved": "https://registry.npmjs.org/antlr4/-/antlr4-4.13.2.tgz", - "integrity": "sha512-QiVbZhyy4xAZ17UPEuG3YTOt8ZaoeOR1CvEAqrEsDBsOqINslaB147i9xqljZqoyf5S+EUlGStaj+t22LT9MOg==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=16" - } - }, "node_modules/anymatch": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", @@ -2923,14 +2792,11 @@ } }, "node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true, - "license": "MIT", - "dependencies": { - "sprintf-js": "~1.0.2" - } + "license": "Python-2.0" }, "node_modules/array-union": { "version": "2.1.0", @@ -2943,13 +2809,13 @@ } }, "node_modules/assertion-error": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", - "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", + "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==", "dev": true, "license": "MIT", "engines": { - "node": "*" + "node": ">=12" } }, "node_modules/ast-parents": { @@ -2969,38 +2835,31 @@ "node": ">=8" } }, - "node_modules/async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==", - "dev": true, - "license": "MIT" - }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/axios": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.9.0.tgz", - "integrity": "sha512-re4CqKTJaURpzbLHtIi6XpDv20/CnpXOtjRY5/CU32L8gU8ek9UIivcfvSWvmKEngmVbrUtPpdDwWDWL7DNHvg==", + "node_modules/available-typed-arrays": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", "dev": true, "license": "MIT", "dependencies": { - "follow-redirects": "^1.15.6", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", "dev": true, - "license": "MIT" + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } }, "node_modules/base-x": { "version": "3.0.11", @@ -3013,9 +2872,9 @@ } }, "node_modules/better-ajv-errors": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/better-ajv-errors/-/better-ajv-errors-2.0.2.tgz", - "integrity": "sha512-1cLrJXEq46n0hjV8dDYwg9LKYjDb3KbeW7nZTv4kvfoDD9c2DXHIE31nxM+Y/cIfXMggLUfmxbm6h/JoM/yotA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/better-ajv-errors/-/better-ajv-errors-2.0.3.tgz", + "integrity": "sha512-t1vxUP+vYKsaYi/BbKo2K98nEAZmfi4sjwvmRT8aOPDzPJeAtLurfoIDazVkLILxO4K+Sw4YrLYnBQ46l6pePg==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -3063,9 +2922,9 @@ } }, "node_modules/bignumber.js": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.3.0.tgz", - "integrity": "sha512-EM7aMFTXbptt/wZdMlBv2t8IViwQL+h6SLHosp8Yf0dqJMTnY6iL32opnAB6kAdL0SZPuvcAzFr31o0c/R3/RA==", + "version": "9.3.1", + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.3.1.tgz", + "integrity": "sha512-Ko0uX15oIUS7wJ3Rb30Fs6SkVbLmPBAKdlm7q9+ak9bbIeFf0MwuBsQV6z7+X768/cHsfg+WlysDWJcmthjsjQ==", "dev": true, "license": "MIT", "engines": { @@ -3093,95 +2952,23 @@ "license": "MIT" }, "node_modules/bn.js": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.2.tgz", - "integrity": "sha512-v2YAxEmKaBLahNwE1mjp4WON6huMNeuDvagFZW+ASCuA/ku0bXR9hSMw0XpiqMoA3+rmnyck/tPRSFQkoC9Cuw==", + "version": "5.2.5", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.5.tgz", + "integrity": "sha512-Vq886eXykuP5E6HcKSSStP3bJgrE6In5WKxVUvJ8XGpWWYs2xZHWqUwzCtGgEtBcxyd57KBFDPFoUfNzdaHCNg==", "dev": true, "license": "MIT" }, - "node_modules/body-parser": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz", - "integrity": "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==", - "dev": true, - "license": "MIT", - "dependencies": { - "bytes": "^3.1.2", - "content-type": "^1.0.5", - "debug": "^4.4.0", - "http-errors": "^2.0.0", - "iconv-lite": "^0.6.3", - "on-finished": "^2.4.1", - "qs": "^6.14.0", - "raw-body": "^3.0.0", - "type-is": "^2.0.0" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/boxen": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz", - "integrity": "sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-align": "^3.0.0", - "camelcase": "^6.2.0", - "chalk": "^4.1.0", - "cli-boxes": "^2.2.1", - "string-width": "^4.2.2", - "type-fest": "^0.20.2", - "widest-line": "^3.1.0", - "wrap-ansi": "^7.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/boxen/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/brace-expansion": { + "version": "5.0.9", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.9.tgz", + "integrity": "sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==", "dev": true, "license": "MIT", "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" + "balanced-match": "^4.0.2" }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/boxen/node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, - "license": "(MIT OR CC0-1.0)", "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "node": "20 || >=22" } }, "node_modules/braces": { @@ -3204,19 +2991,13 @@ "dev": true, "license": "MIT" }, - "node_modules/brotli-wasm": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brotli-wasm/-/brotli-wasm-2.0.1.tgz", - "integrity": "sha512-+3USgYsC7bzb5yU0/p2HnnynZl0ak0E6uoIm4UW4Aby/8s8HFCq6NCfrrf1E9c3O8OCSzq3oYO1tUVqIi61Nww==", - "dev": true, - "license": "Apache-2.0" - }, "node_modules/browser-stdout": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", "dev": true, - "license": "ISC" + "license": "ISC", + "peer": true }, "node_modules/browserify-aes": { "version": "1.2.0", @@ -3255,13 +3036,6 @@ "safe-buffer": "^5.1.2" } }, - "node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true, - "license": "MIT" - }, "node_modules/buffer-xor": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", @@ -3269,16 +3043,6 @@ "dev": true, "license": "MIT" }, - "node_modules/bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/cacheable-lookup": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz", @@ -3308,17 +3072,23 @@ "node": ">=14.16" } }, - "node_modules/cacheable-request/node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "node_modules/call-bind": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.9.tgz", + "integrity": "sha512-a/hy+pNsFUTR+Iz8TCJvXudKVLAnz/DyeSUo10I5yvFDQJBFU2s9uqQpoSrJlroHUKoKqzg+epxyP9lqFdzfBQ==", "dev": true, "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "get-intrinsic": "^1.3.0", + "set-function-length": "^1.2.2" + }, "engines": { - "node": ">=10" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/call-bind-apply-helpers": { @@ -3368,6 +3138,7 @@ "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=10" }, @@ -3376,48 +3147,46 @@ } }, "node_modules/cbor": { - "version": "10.0.3", - "resolved": "https://registry.npmjs.org/cbor/-/cbor-10.0.3.tgz", - "integrity": "sha512-72Jnj81xMsqepqdcSdf2+fflz/UDsThOHy5hj2MW5F5xzHL8Oa0KQ6I6V9CwVUPxg5pf+W9xp6W2KilaRXWWtw==", + "version": "10.0.12", + "resolved": "https://registry.npmjs.org/cbor/-/cbor-10.0.12.tgz", + "integrity": "sha512-exQDevYd7ZQLP4moMQcZkKCVZsXLAtUSflObr3xTh4xzFIv/xBCdvCd6L259kQOUP2kcTC0jvC6PpZIf/WmRXA==", "dev": true, "license": "MIT", "dependencies": { "nofilter": "^3.0.2" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "node_modules/chai": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.5.0.tgz", - "integrity": "sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/chai/-/chai-5.3.3.tgz", + "integrity": "sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==", "dev": true, "license": "MIT", "dependencies": { - "assertion-error": "^1.1.0", - "check-error": "^1.0.3", - "deep-eql": "^4.1.3", - "get-func-name": "^2.0.2", - "loupe": "^2.3.6", - "pathval": "^1.1.1", - "type-detect": "^4.1.0" + "assertion-error": "^2.0.1", + "check-error": "^2.1.1", + "deep-eql": "^5.0.1", + "loupe": "^3.1.0", + "pathval": "^2.0.0" }, "engines": { - "node": ">=4" + "node": ">=18" } }, "node_modules/chai-as-promised": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.2.tgz", - "integrity": "sha512-aBDHZxRzYnUYuIAIPBH2s511DjlKPzXNlXSGFC8CwmroWQLfrW0LtE1nK3MAwwNhJPa9raEjNCmRoFpG0Hurdw==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-8.0.2.tgz", + "integrity": "sha512-1GadL+sEJVLzDjcawPM4kjfnL+p/9vrxiEUonowKOAzvVg0PixJUdtuDzdkDeQhK3zfOE76GqGkZIQ7/Adcrqw==", "dev": true, - "license": "WTFPL", + "license": "MIT", "dependencies": { - "check-error": "^1.0.2" + "check-error": "^2.1.1" }, "peerDependencies": { - "chai": ">= 2.1.2 < 6" + "chai": ">= 2.1.2 < 7" } }, "node_modules/chalk": { @@ -3435,33 +3204,20 @@ } }, "node_modules/chardet": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-2.2.0.tgz", + "integrity": "sha512-rddelWYNPRrXq6PtNEN2S3f6t9ILzvqaN5pVgi4kqt9jHQaXIial9PznB5iSPVlQSLNaaH22ItWz3EJtQ10+OA==", "dev": true, "license": "MIT" }, - "node_modules/charenc": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz", - "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": "*" - } - }, "node_modules/check-error": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", - "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.3.tgz", + "integrity": "sha512-PAJdDJusoxnwm1VwW07VWwUN1sl7smmC3OKggvndJFadxxDRyFJBX/ggnu/KE4kQAB7a3Dp8f/YXC1FlUprWmA==", "dev": true, "license": "MIT", - "dependencies": { - "get-func-name": "^2.0.2" - }, "engines": { - "node": "*" + "node": ">= 16" } }, "node_modules/chokidar": { @@ -3489,75 +3245,21 @@ "fsevents": "~2.3.2" } }, - "node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/cipher-base": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.6.tgz", - "integrity": "sha512-3Ek9H3X6pj5TgenXYtNWdaBon1tgYCaebd+XPg0keyjEbEfkD4KkmAxkQ/i1vYvxdcT5nscLBfq9VJRmCBcFSw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.7.tgz", + "integrity": "sha512-Mz9QMT5fJe7bKI7MH31UilT5cEK5EHHRCccw/YRFsRY47AuNgaV6HY3rscp0/I4Q+tTW/5zoqpSeRRI54TkDWA==", "dev": true, "license": "MIT", "dependencies": { "inherits": "^2.0.4", - "safe-buffer": "^5.2.1" + "safe-buffer": "^5.2.1", + "to-buffer": "^1.2.2" }, "engines": { "node": ">= 0.10" } }, - "node_modules/clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/cli-boxes": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz", - "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cli-table3": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.5.tgz", - "integrity": "sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "string-width": "^4.2.0" - }, - "engines": { - "node": "10.* || >= 12.*" - }, - "optionalDependencies": { - "@colors/colors": "1.5.0" - } - }, "node_modules/cliui": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/cliui/-/cliui-9.0.1.tgz", @@ -3574,9 +3276,9 @@ } }, "node_modules/cliui/node_modules/ansi-regex": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", - "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.3.0.tgz", + "integrity": "sha512-WpDfL7NO6j7tH88IDBNVdUJxDh9nmCteAVW9dsep846XdwF4naCBK+/tGLX3KJgcpgMRXCFlTM2hKGoK9FsdrQ==", "dev": true, "license": "MIT", "engines": { @@ -3586,23 +3288,10 @@ "url": "https://github.com/chalk/ansi-regex?sponsor=1" } }, - "node_modules/cliui/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, "node_modules/cliui/node_modules/emoji-regex": { - "version": "10.4.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", - "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", + "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==", "dev": true, "license": "MIT" }, @@ -3625,13 +3314,13 @@ } }, "node_modules/cliui/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", + "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", "dev": true, "license": "MIT", "dependencies": { - "ansi-regex": "^6.0.1" + "ansi-regex": "^6.2.2" }, "engines": { "node": ">=12" @@ -3640,24 +3329,6 @@ "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, - "node_modules/cliui/node_modules/wrap-ansi": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz", - "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^6.2.1", - "string-width": "^7.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -3678,26 +3349,16 @@ "dev": true, "license": "MIT" }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "node_modules/commander": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", "dev": true, "license": "MIT", - "dependencies": { - "delayed-stream": "~1.0.0" - }, "engines": { - "node": ">= 0.8" + "node": ">=14" } }, - "node_modules/command-exists": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz", - "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==", - "dev": true, - "license": "MIT" - }, "node_modules/compare-versions": { "version": "6.1.1", "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-6.1.1.tgz", @@ -3723,62 +3384,12 @@ "proto-list": "~1.2.1" } }, - "node_modules/content-disposition": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz", - "integrity": "sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==", - "dev": true, - "license": "MIT", - "dependencies": { - "safe-buffer": "5.2.1" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/content-type": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", - "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/cookie": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", - "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/cookie-signature": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz", - "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.6.0" - } - }, - "node_modules/cors": { - "version": "2.8.5", - "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", - "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "node_modules/core-util-is": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", "dev": true, - "license": "MIT", - "dependencies": { - "object-assign": "^4", - "vary": "^1" - }, - "engines": { - "node": ">= 0.10" - } + "license": "MIT" }, "node_modules/cosmiconfig": { "version": "8.3.6", @@ -3807,26 +3418,6 @@ } } }, - "node_modules/cosmiconfig/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true, - "license": "Python-2.0" - }, - "node_modules/cosmiconfig/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "license": "MIT", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, "node_modules/crc-32": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz", @@ -3884,16 +3475,6 @@ "node": ">= 8" } }, - "node_modules/crypt": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz", - "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": "*" - } - }, "node_modules/dataloader": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/dataloader/-/dataloader-1.4.0.tgz", @@ -3901,16 +3482,10 @@ "dev": true, "license": "BSD-3-Clause" }, - "node_modules/death": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/death/-/death-1.1.0.tgz", - "integrity": "sha512-vsV6S4KVHvTGxbEcij7hkWRv0It+sGGWVOM67dQde/o5Xjnr+KmLjxWJii2uEObIrt1CcM9w0Yaovx+iOlIL+w==", - "dev": true - }, "node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, "license": "MIT", "dependencies": { @@ -3931,6 +3506,7 @@ "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=10" }, @@ -3968,14 +3544,11 @@ } }, "node_modules/deep-eql": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.4.tgz", - "integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz", + "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==", "dev": true, "license": "MIT", - "dependencies": { - "type-detect": "^4.0.0" - }, "engines": { "node": ">=6" } @@ -4007,24 +3580,22 @@ "node": ">=10" } }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", "dev": true, "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, "engines": { - "node": ">= 0.8" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/detect-indent": { @@ -4038,27 +3609,16 @@ } }, "node_modules/diff": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", - "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz", + "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==", "dev": true, "license": "BSD-3-Clause", + "peer": true, "engines": { "node": ">=0.3.1" } }, - "node_modules/difflib": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/difflib/-/difflib-0.2.4.tgz", - "integrity": "sha512-9YVwmMb0wQHQNr5J9m6BSj6fk4pfGITGQOOs+D9Fl+INODWFOfvhIU1hNv6GgR1RBoC/9NJcwu77zShxV0kT7w==", - "dev": true, - "dependencies": { - "heap": ">= 0.2.0" - }, - "engines": { - "node": "*" - } - }, "node_modules/dir-glob": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", @@ -4072,6 +3632,16 @@ "node": ">=8" } }, + "node_modules/dotenv": { + "version": "8.6.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz", + "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=10" + } + }, "node_modules/dunder-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", @@ -4092,14 +3662,8 @@ "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", "dev": true, - "license": "MIT" - }, - "node_modules/ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", - "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/elliptic": { "version": "6.6.1", @@ -4118,9 +3682,9 @@ } }, "node_modules/elliptic/node_modules/bn.js": { - "version": "4.12.2", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz", - "integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==", + "version": "4.12.5", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.5.tgz", + "integrity": "sha512-3aRg6/JxfffFD+OlOjOFR3Vo79l39ooBTFucxx+MT3dhCtzn3EmiUPQo+6/OZuI2jbXi3YKgmiTFBgChQMwIRQ==", "dev": true, "license": "MIT" }, @@ -4131,16 +3695,6 @@ "dev": true, "license": "MIT" }, - "node_modules/encodeurl": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", - "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/enquirer": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz", @@ -4156,19 +3710,25 @@ } }, "node_modules/env-paths": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", - "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-4.0.0.tgz", + "integrity": "sha512-pxP8eL2SwwaTRi/KHYwLYXinDs7gL3jxFcBYmEdYfZmZXbaVDvdppd0XBU8qVz03rDfKZMXg1omHCbsJjZrMsw==", "dev": true, "license": "MIT", + "dependencies": { + "is-safe-filename": "^0.1.0" + }, "engines": { - "node": ">=6" + "node": ">=20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz", + "integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==", "dev": true, "license": "MIT", "dependencies": { @@ -4196,9 +3756,9 @@ } }, "node_modules/es-object-atoms": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", - "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.2.tgz", + "integrity": "sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==", "dev": true, "license": "MIT", "dependencies": { @@ -4208,20 +3768,46 @@ "node": ">= 0.4" } }, - "node_modules/es-set-tostringtag": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", - "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "node_modules/esbuild": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.2.tgz", + "integrity": "sha512-HKVLS8dvII+xoKW9kmqxbRKrnWEXfJJr/FZhhJmiqIB0e053QNYFqOBouTMO/k5sID4MvCiUCvv8b9M4h32wIA==", "dev": true, + "hasInstallScript": true, "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.6", - "has-tostringtag": "^1.0.2", - "hasown": "^2.0.2" + "bin": { + "esbuild": "bin/esbuild" }, "engines": { - "node": ">= 0.4" + "node": ">=18" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.28.2", + "@esbuild/android-arm": "0.28.2", + "@esbuild/android-arm64": "0.28.2", + "@esbuild/android-x64": "0.28.2", + "@esbuild/darwin-arm64": "0.28.2", + "@esbuild/darwin-x64": "0.28.2", + "@esbuild/freebsd-arm64": "0.28.2", + "@esbuild/freebsd-x64": "0.28.2", + "@esbuild/linux-arm": "0.28.2", + "@esbuild/linux-arm64": "0.28.2", + "@esbuild/linux-ia32": "0.28.2", + "@esbuild/linux-loong64": "0.28.2", + "@esbuild/linux-mips64el": "0.28.2", + "@esbuild/linux-ppc64": "0.28.2", + "@esbuild/linux-riscv64": "0.28.2", + "@esbuild/linux-s390x": "0.28.2", + "@esbuild/linux-x64": "0.28.2", + "@esbuild/netbsd-arm64": "0.28.2", + "@esbuild/netbsd-x64": "0.28.2", + "@esbuild/openbsd-arm64": "0.28.2", + "@esbuild/openbsd-x64": "0.28.2", + "@esbuild/openharmony-arm64": "0.28.2", + "@esbuild/sunos-x64": "0.28.2", + "@esbuild/win32-arm64": "0.28.2", + "@esbuild/win32-ia32": "0.28.2", + "@esbuild/win32-x64": "0.28.2" } }, "node_modules/escalade": { @@ -4234,13 +3820,6 @@ "node": ">=6" } }, - "node_modules/escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", - "dev": true, - "license": "MIT" - }, "node_modules/escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", @@ -4254,186 +3833,114 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/escodegen": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", - "integrity": "sha512-yhi5S+mNTOuRvyW4gWlg5W1byMaQGWWSYHXsuFZ7GBo7tpyOwi2EdzMP/QWxh9hwkD2m+wDVHJsxhRIj+v/b/A==", + "node_modules/eslint": { + "version": "9.39.5", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.5.tgz", + "integrity": "sha512-DgZS62aPLXKlnxILS/AYCoRvHaZeXceIzlXPkkGGzJWSow1aEk0lbTlxUSlyjC8jcaKxAdOnTDz+o1JFSBsyjw==", + "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", "dev": true, - "license": "BSD-2-Clause", + "license": "MIT", "dependencies": { - "esprima": "^2.7.1", - "estraverse": "^1.9.1", + "@eslint-community/eslint-utils": "^4.8.0", + "@eslint-community/regexpp": "^4.12.1", + "@eslint/config-array": "^0.21.2", + "@eslint/config-helpers": "^0.4.2", + "@eslint/core": "^0.17.0", + "@eslint/eslintrc": "^3.3.6", + "@eslint/js": "9.39.5", + "@eslint/plugin-kit": "^0.4.1", + "@humanfs/node": "^0.16.6", + "@humanwhocodes/module-importer": "^1.0.1", + "@humanwhocodes/retry": "^0.4.2", + "@types/estree": "^1.0.6", + "ajv": "^6.14.0", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.6", + "debug": "^4.3.2", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^8.4.0", + "eslint-visitor-keys": "^4.2.1", + "espree": "^10.4.0", + "esquery": "^1.5.0", "esutils": "^2.0.2", - "optionator": "^0.8.1" + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^8.0.0", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.5", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3" }, "bin": { - "escodegen": "bin/escodegen.js", - "esgenerate": "bin/esgenerate.js" + "eslint": "bin/eslint.js" }, "engines": { - "node": ">=0.12.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, - "optionalDependencies": { - "source-map": "~0.2.0" + "funding": { + "url": "https://eslint.org/donate" + }, + "peerDependencies": { + "jiti": "*" + }, + "peerDependenciesMeta": { + "jiti": { + "optional": true + } } }, - "node_modules/escodegen/node_modules/esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha512-OarPfz0lFCiW4/AV2Oy1Rp9qu0iusTKqykwTspGCZtPxmF81JR4MmIebvF1F9+UOKth2ZubLQ4XGGaU+hSn99A==", + "node_modules/eslint-config-prettier": { + "version": "10.1.8", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.1.8.tgz", + "integrity": "sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==", "dev": true, - "license": "BSD-2-Clause", + "license": "MIT", "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" + "eslint-config-prettier": "bin/cli.js" }, - "engines": { - "node": ">=0.10.0" + "funding": { + "url": "https://opencollective.com/eslint-config-prettier" + }, + "peerDependencies": { + "eslint": ">=7.0.0" } }, - "node_modules/escodegen/node_modules/estraverse": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz", - "integrity": "sha512-25w1fMXQrGdoquWnScXZGckOv+Wes+JDnuN/+7ex3SauFRS72r2lFDec0EKPt2YD1wUJ/IrfEex+9yp4hfSOJA==", + "node_modules/eslint-plugin-mocha": { + "version": "11.3.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-11.3.0.tgz", + "integrity": "sha512-anENwrIwmdvunmmssjMn5a4nTd+mYMkqBlwjksxOECcIThLNhefWJIiTWY7pY/arMQFjNwHQjVOZb6pQ9PrLjg==", "dev": true, - "engines": { - "node": ">=0.10.0" + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.1", + "globals": "^15.14.0" + }, + "peerDependencies": { + "eslint": ">=9.0.0" } }, - "node_modules/escodegen/node_modules/levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", + "node_modules/eslint-plugin-mocha/node_modules/globals": { + "version": "15.15.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz", + "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==", "dev": true, "license": "MIT", - "dependencies": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/escodegen/node_modules/optionator": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", - "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", - "dev": true, - "license": "MIT", - "dependencies": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.6", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "word-wrap": "~1.2.3" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/escodegen/node_modules/prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", - "dev": true, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/escodegen/node_modules/type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", - "dev": true, - "license": "MIT", - "dependencies": { - "prelude-ls": "~1.1.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/eslint": { - "version": "9.26.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.26.0.tgz", - "integrity": "sha512-Hx0MOjPh6uK9oq9nVsATZKE/Wlbai7KFjfCuw9UHaguDW3x+HF0O5nIi3ud39TWgrTjTO5nHxmL3R1eANinWHQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.20.0", - "@eslint/config-helpers": "^0.2.1", - "@eslint/core": "^0.13.0", - "@eslint/eslintrc": "^3.3.1", - "@eslint/js": "9.26.0", - "@eslint/plugin-kit": "^0.2.8", - "@humanfs/node": "^0.16.6", - "@humanwhocodes/module-importer": "^1.0.1", - "@humanwhocodes/retry": "^0.4.2", - "@modelcontextprotocol/sdk": "^1.8.0", - "@types/estree": "^1.0.6", - "@types/json-schema": "^7.0.15", - "ajv": "^6.12.4", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.6", - "debug": "^4.3.2", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.3.0", - "eslint-visitor-keys": "^4.2.0", - "espree": "^10.3.0", - "esquery": "^1.5.0", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^8.0.0", - "find-up": "^5.0.0", - "glob-parent": "^6.0.2", - "ignore": "^5.2.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "zod": "^3.24.2" - }, - "bin": { - "eslint": "bin/eslint.js" - }, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": ">=18" }, "funding": { - "url": "https://eslint.org/donate" - }, - "peerDependencies": { - "jiti": "*" - }, - "peerDependenciesMeta": { - "jiti": { - "optional": true - } - } - }, - "node_modules/eslint-config-prettier": { - "version": "10.1.3", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.1.3.tgz", - "integrity": "sha512-vDo4d9yQE+cS2tdIT4J02H/16veRvkHgiLDRpej+WL67oCfbOb97itZXn8wMPJ/GsiEBVjrjs//AVNw2Cp1EcA==", - "dev": true, - "license": "MIT", - "bin": { - "eslint-config-prettier": "bin/cli.js" - }, - "peerDependencies": { - "eslint": ">=7.0.0" + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/eslint-scope": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz", - "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz", + "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -4448,9 +3955,9 @@ } }, "node_modules/eslint-visitor-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", - "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", + "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", "dev": true, "license": "Apache-2.0", "engines": { @@ -4461,9 +3968,9 @@ } }, "node_modules/eslint/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.15.0.tgz", + "integrity": "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==", "dev": true, "license": "MIT", "dependencies": { @@ -4477,6 +3984,24 @@ "url": "https://github.com/sponsors/epoberezkin" } }, + "node_modules/eslint/node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/eslint/node_modules/brace-expansion": { + "version": "1.1.18", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.18.tgz", + "integrity": "sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, "node_modules/eslint/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", @@ -4548,9 +4073,9 @@ } }, "node_modules/eslint/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", "dev": true, "license": "ISC", "dependencies": { @@ -4606,15 +4131,15 @@ } }, "node_modules/espree": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", - "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz", + "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "acorn": "^8.14.0", + "acorn": "^8.15.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^4.2.0" + "eslint-visitor-keys": "^4.2.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -4638,9 +4163,9 @@ } }, "node_modules/esquery": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", - "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.7.0.tgz", + "integrity": "sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -4683,42 +4208,43 @@ "node": ">=0.10.0" } }, - "node_modules/etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", + "node_modules/ethereum-cryptography": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.2.1.tgz", + "integrity": "sha512-r/W8lkHSiTLxUxW8Rf3u4HGB0xQweG2RyETjywylKZSzLWoWAijRz8WCuOtJ6wah+avllXBqZuk29HCCvhEIRg==", "dev": true, "license": "MIT", - "engines": { - "node": ">= 0.6" + "dependencies": { + "@noble/curves": "1.4.2", + "@noble/hashes": "1.4.0", + "@scure/bip32": "1.4.0", + "@scure/bip39": "1.3.0" } }, - "node_modules/ethereum-bloom-filters": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/ethereum-bloom-filters/-/ethereum-bloom-filters-1.2.0.tgz", - "integrity": "sha512-28hyiE7HVsWubqhpVLVmZXFd4ITeHi+BUu05o9isf0GUpMtzBUi+8/gFrGaGYzvGAJQmJ3JKj77Mk9G98T84rA==", + "node_modules/ethereum-cryptography/node_modules/@noble/curves": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz", + "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==", "dev": true, "license": "MIT", "dependencies": { - "@noble/hashes": "^1.4.0" + "@noble/hashes": "1.4.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" } }, - "node_modules/ethereum-cryptography": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-3.2.0.tgz", - "integrity": "sha512-Urr5YVsalH+Jo0sYkTkv1MyI9bLYZwW8BENZCeE1QYaTHETEYx0Nv/SVsWkSqpYrzweg6d8KMY1wTjH/1m/BIg==", + "node_modules/ethereum-cryptography/node_modules/@noble/hashes": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz", + "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==", "dev": true, "license": "MIT", - "dependencies": { - "@noble/ciphers": "1.3.0", - "@noble/curves": "1.9.0", - "@noble/hashes": "1.8.0", - "@scure/bip32": "1.7.0", - "@scure/bip39": "1.6.0" - }, "engines": { - "node": "^14.21.3 || >=16", - "npm": ">=9" + "node": ">= 16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" } }, "node_modules/ethereumjs-util": { @@ -4763,9 +4289,9 @@ } }, "node_modules/ethers": { - "version": "6.16.0", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.16.0.tgz", - "integrity": "sha512-U1wulmetNymijEhpSEQ7Ct/P/Jw9/e7R1j5XIbPRydgV2DjLVMsULDlNksq3RQnFgKoLlZf88ijYtWEXcPa07A==", + "version": "6.17.0", + "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.17.0.tgz", + "integrity": "sha512-BpyrpIPJ3ydEVow8zGaz1DuPS7YU8DcWxuBnY9a0UA/lvAPwrMr+EPXsfrul628SRaekPNeIM4UFh/91GWZang==", "dev": true, "funding": [ { @@ -4779,13 +4305,13 @@ ], "license": "MIT", "dependencies": { - "@adraffy/ens-normalize": "1.10.1", + "@adraffy/ens-normalize": "1.11.1", "@noble/curves": "1.2.0", "@noble/hashes": "1.3.2", "@types/node": "22.7.5", "aes-js": "4.0.0-beta.5", "tslib": "2.7.0", - "ws": "8.17.1" + "ws": "8.21.0" }, "engines": { "node": ">=14.0.0" @@ -4827,58 +4353,13 @@ "undici-types": "~6.19.2" } }, - "node_modules/ethjs-unit": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/ethjs-unit/-/ethjs-unit-0.1.6.tgz", - "integrity": "sha512-/Sn9Y0oKl0uqQuvgFk/zQgR7aw1g36qX/jzSQ5lSwlO0GigPymk4eGQfeNTD03w1dPOqfz8V77Cy43jH56pagw==", - "dev": true, - "license": "MIT", - "dependencies": { - "bn.js": "4.11.6", - "number-to-bn": "1.7.0" - }, - "engines": { - "node": ">=6.5.0", - "npm": ">=3" - } - }, - "node_modules/ethjs-unit/node_modules/bn.js": { - "version": "4.11.6", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", - "integrity": "sha512-XWwnNNFCuuSQ0m3r3C4LE3EiORltHd9M05pq6FOlVeiophzRbMo50Sbz1ehl8K3Z+jw9+vmgnXefY1hz8X+2wA==", - "dev": true, - "license": "MIT" - }, - "node_modules/eventemitter3": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", - "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==", + "node_modules/ethers/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==", "dev": true, "license": "MIT" }, - "node_modules/eventsource": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-3.0.6.tgz", - "integrity": "sha512-l19WpE2m9hSuyP06+FbuUUf1G+R0SFLrtQfbRb9PRr+oimOfxQhgGCbVaXg5IvZyyTThJsxh6L/srkMiCeBPDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "eventsource-parser": "^3.0.1" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/eventsource-parser": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.1.tgz", - "integrity": "sha512-VARTJ9CYeuQYb0pZEPbzi740OWFgpHe7AYJ2WFZVnUDUQp5Dk2yJUgF36YsZ81cOyxT0QxmXD2EQpapAouzWVA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18.0.0" - } - }, "node_modules/evp_bytestokey": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", @@ -4890,65 +4371,6 @@ "safe-buffer": "^5.1.1" } }, - "node_modules/express": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz", - "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==", - "dev": true, - "license": "MIT", - "dependencies": { - "accepts": "^2.0.0", - "body-parser": "^2.2.0", - "content-disposition": "^1.0.0", - "content-type": "^1.0.5", - "cookie": "^0.7.1", - "cookie-signature": "^1.2.1", - "debug": "^4.4.0", - "encodeurl": "^2.0.0", - "escape-html": "^1.0.3", - "etag": "^1.8.1", - "finalhandler": "^2.1.0", - "fresh": "^2.0.0", - "http-errors": "^2.0.0", - "merge-descriptors": "^2.0.0", - "mime-types": "^3.0.0", - "on-finished": "^2.4.1", - "once": "^1.4.0", - "parseurl": "^1.3.3", - "proxy-addr": "^2.0.7", - "qs": "^6.14.0", - "range-parser": "^1.2.1", - "router": "^2.2.0", - "send": "^1.1.0", - "serve-static": "^2.2.0", - "statuses": "^2.0.1", - "type-is": "^2.0.1", - "vary": "^1.1.2" - }, - "engines": { - "node": ">= 18" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" - } - }, - "node_modules/express-rate-limit": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.5.0.tgz", - "integrity": "sha512-eB5zbQh5h+VenMPM3fh+nw1YExi5nMr6HUCR62ELSP11huvxm/Uir1H1QEyTkk5QX6A58pX6NmaTMceKZ0Eodg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 16" - }, - "funding": { - "url": "https://github.com/sponsors/express-rate-limit" - }, - "peerDependencies": { - "express": "^4.11 || 5 || ^5.0.0-beta.1" - } - }, "node_modules/extendable-error": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/extendable-error/-/extendable-error-0.1.7.tgz", @@ -4956,34 +4378,6 @@ "dev": true, "license": "MIT" }, - "node_modules/external-editor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", - "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", - "dev": true, - "license": "MIT", - "dependencies": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/external-editor/node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -4998,6 +4392,16 @@ "dev": true, "license": "Apache-2.0" }, + "node_modules/fast-equals": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-6.0.2.tgz", + "integrity": "sha512-sAjhj9ZhOxYCGiNMnZLaucOqf5ZeFnHNoKoAZiD9thhJ0N8RP85qJK759/97C/3L7NzzmGVB5uiX9AUpySZmUQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/fast-glob": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", @@ -5030,9 +4434,9 @@ "license": "MIT" }, "node_modules/fast-uri": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz", - "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.6.tgz", + "integrity": "sha512-7Ical1vFEMr0onbVzEDIreM22I4khW+fzyQPwvAFWBp1iwdshSZRsL4jjRvPG9JP1uiqMHRto+YU6R2/CzDz5Q==", "dev": true, "funding": [ { @@ -5047,1185 +4451,317 @@ "license": "BSD-3-Clause" }, "node_modules/fastq": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", - "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", + "version": "1.20.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz", + "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==", "dev": true, "license": "ISC", "dependencies": { "reusify": "^1.0.4" - } - }, - "node_modules/file-entry-cache": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", - "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "flat-cache": "^4.0.0" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/fill-range": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", - "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "dev": true, - "license": "MIT", - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/finalhandler": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.0.tgz", - "integrity": "sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "^4.4.0", - "encodeurl": "^2.0.0", - "escape-html": "^1.0.3", - "on-finished": "^2.4.1", - "parseurl": "^1.3.3", - "statuses": "^2.0.1" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "license": "MIT", - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/flat": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", - "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", - "dev": true, - "license": "BSD-3-Clause", - "bin": { - "flat": "cli.js" - } - }, - "node_modules/flat-cache": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", - "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", - "dev": true, - "license": "MIT", - "dependencies": { - "flatted": "^3.2.9", - "keyv": "^4.5.4" - }, - "engines": { - "node": ">=16" - } - }, - "node_modules/flatted": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", - "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", - "dev": true, - "license": "ISC" - }, - "node_modules/follow-redirects": { - "version": "1.15.9", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", - "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/RubenVerborgh" - } - ], - "license": "MIT", - "engines": { - "node": ">=4.0" - }, - "peerDependenciesMeta": { - "debug": { - "optional": true - } - } - }, - "node_modules/foreground-child": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", - "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", - "dev": true, - "license": "ISC", - "dependencies": { - "cross-spawn": "^7.0.6", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/form-data": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz", - "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==", - "dev": true, - "license": "MIT", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "es-set-tostringtag": "^2.1.0", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/form-data-encoder": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz", - "integrity": "sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 14.17" - } - }, - "node_modules/form-data/node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/form-data/node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "license": "MIT", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/forwarded": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", - "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/fp-ts": { - "version": "1.19.3", - "resolved": "https://registry.npmjs.org/fp-ts/-/fp-ts-1.19.3.tgz", - "integrity": "sha512-H5KQDspykdHuztLTg+ajGN0Z2qUjcEf3Ybxc6hLt0k7/zPkn29XnKnxlBPyW2XIddWrGaJBzBl4VLYOtk39yZg==", - "dev": true, - "license": "MIT" - }, - "node_modules/fresh": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz", - "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - }, - "engines": { - "node": ">=6 <7 || >=8" - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true, - "license": "ISC" - }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, - "node_modules/function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, - "license": "ISC", - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/get-east-asian-width": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz", - "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/get-func-name": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", - "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "*" - } - }, - "node_modules/get-intrinsic": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", - "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.2", - "es-define-property": "^1.0.1", - "es-errors": "^1.3.0", - "es-object-atoms": "^1.1.1", - "function-bind": "^1.1.2", - "get-proto": "^1.0.1", - "gopd": "^1.2.0", - "has-symbols": "^1.1.0", - "hasown": "^2.0.2", - "math-intrinsics": "^1.1.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", - "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "dev": true, - "license": "MIT", - "dependencies": { - "dunder-proto": "^1.0.1", - "es-object-atoms": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/ghost-testrpc": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/ghost-testrpc/-/ghost-testrpc-0.0.2.tgz", - "integrity": "sha512-i08dAEgJ2g8z5buJIrCTduwPIhih3DP+hOCTyyryikfV8T0bNvHnGXO67i0DD1H4GBDETTclPy9njZbfluQYrQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "chalk": "^2.4.2", - "node-emoji": "^1.10.0" - }, - "bin": { - "testrpc-sc": "index.js" - } - }, - "node_modules/ghost-testrpc/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/ghost-testrpc/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/ghost-testrpc/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/ghost-testrpc/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true, - "license": "MIT" - }, - "node_modules/ghost-testrpc/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/ghost-testrpc/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/ghost-testrpc/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/glob": { - "version": "11.0.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.2.tgz", - "integrity": "sha512-YT7U7Vye+t5fZ/QMkBFrTJ7ZQxInIUjwyAjVj84CYXqgBdv30MFUPGnBR6sQaVq6Is15wYJUsnzTuWaGRBhBAQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^4.0.1", - "minimatch": "^10.0.0", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^2.0.0" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "engines": { - "node": "20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/glob/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/glob/node_modules/minimatch": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz", - "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": "20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/global-modules": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", - "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==", - "dev": true, - "license": "MIT", - "dependencies": { - "global-prefix": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/global-prefix": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", - "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", - "dev": true, - "license": "MIT", - "dependencies": { - "ini": "^1.3.5", - "kind-of": "^6.0.2", - "which": "^1.3.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/global-prefix/node_modules/which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "which": "bin/which" - } - }, - "node_modules/globals": { - "version": "17.5.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-17.5.0.tgz", - "integrity": "sha512-qoV+HK2yFl/366t2/Cb3+xxPUo5BuMynomoDmiaZBIdbs+0pYbjfZU+twLhGKp4uCZ/+NbtpVepH5bGCxRyy2g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "license": "MIT", - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/gopd": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", - "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/got": { - "version": "12.6.1", - "resolved": "https://registry.npmjs.org/got/-/got-12.6.1.tgz", - "integrity": "sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sindresorhus/is": "^5.2.0", - "@szmarczak/http-timer": "^5.0.1", - "cacheable-lookup": "^7.0.0", - "cacheable-request": "^10.2.8", - "decompress-response": "^6.0.0", - "form-data-encoder": "^2.1.2", - "get-stream": "^6.0.1", - "http2-wrapper": "^2.1.10", - "lowercase-keys": "^3.0.0", - "p-cancelable": "^3.0.0", - "responselike": "^3.0.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sindresorhus/got?sponsor=1" - } - }, - "node_modules/got/node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/graphlib": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/graphlib/-/graphlib-2.1.8.tgz", - "integrity": "sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==", - "dev": true, - "license": "MIT", - "dependencies": { - "lodash": "^4.17.15" - } - }, - "node_modules/handlebars": { - "version": "4.7.8", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", - "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "minimist": "^1.2.5", - "neo-async": "^2.6.2", - "source-map": "^0.6.1", - "wordwrap": "^1.0.0" - }, - "bin": { - "handlebars": "bin/handlebars" - }, - "engines": { - "node": ">=0.4.7" - }, - "optionalDependencies": { - "uglify-js": "^3.1.4" - } - }, - "node_modules/handlebars/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/hardhat": { - "version": "2.28.6", - "resolved": "https://registry.npmjs.org/hardhat/-/hardhat-2.28.6.tgz", - "integrity": "sha512-zQze7qe+8ltwHvhX5NQ8sN1N37WWZGw8L63y+2XcPxGwAjc/SMF829z3NS6o1krX0sryhAsVBK/xrwUqlsot4Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@ethereumjs/util": "^9.1.0", - "@ethersproject/abi": "^5.1.2", - "@nomicfoundation/edr": "0.12.0-next.23", - "@nomicfoundation/solidity-analyzer": "^0.1.0", - "@sentry/node": "^5.18.1", - "adm-zip": "^0.4.16", - "aggregate-error": "^3.0.0", - "ansi-escapes": "^4.3.0", - "boxen": "^5.1.2", - "chokidar": "^4.0.0", - "ci-info": "^2.0.0", - "debug": "^4.1.1", - "enquirer": "^2.3.0", - "env-paths": "^2.2.0", - "ethereum-cryptography": "^1.0.3", - "find-up": "^5.0.0", - "fp-ts": "1.19.3", - "fs-extra": "^7.0.1", - "immutable": "^4.0.0-rc.12", - "io-ts": "1.10.4", - "json-stream-stringify": "^3.1.4", - "keccak": "^3.0.2", - "lodash": "^4.17.11", - "micro-eth-signer": "^0.14.0", - "mnemonist": "^0.38.0", - "mocha": "^10.0.0", - "p-map": "^4.0.0", - "picocolors": "^1.1.0", - "raw-body": "^2.4.1", - "resolve": "1.17.0", - "semver": "^6.3.0", - "solc": "0.8.26", - "source-map-support": "^0.5.13", - "stacktrace-parser": "^0.1.10", - "tinyglobby": "^0.2.6", - "tsort": "0.0.1", - "undici": "^5.14.0", - "uuid": "^8.3.2", - "ws": "^7.4.6" - }, - "bin": { - "hardhat": "internal/cli/bootstrap.js" - }, - "peerDependencies": { - "ts-node": "*", - "typescript": "*" - }, - "peerDependenciesMeta": { - "ts-node": { - "optional": true - }, - "typescript": { - "optional": true - } - } - }, - "node_modules/hardhat-exposed": { - "version": "0.3.19", - "resolved": "https://registry.npmjs.org/hardhat-exposed/-/hardhat-exposed-0.3.19.tgz", - "integrity": "sha512-vVye5TurJu8dWeo4ma+EfLAOQaJyica4uncd0/BGPO2tmexuDwZUmE1vYx81PlP4Iak3wqkNTEPxWQaE2ZnKnw==", - "dev": true, - "license": "MIT", - "dependencies": { - "micromatch": "^4.0.8", - "solidity-ast": "^0.4.59" - }, - "peerDependencies": { - "hardhat": "^2.3.0" - } - }, - "node_modules/hardhat-gas-reporter": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/hardhat-gas-reporter/-/hardhat-gas-reporter-2.2.3.tgz", - "integrity": "sha512-/52fDR0WOgPTjImmx4j179SAgxPv/499TD0o0qnMhaRr24i2cqlcmCW92FJi0QAKu7HcnxdBGZWQP/5aPjQqUw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@ethersproject/abi": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/units": "^5.7.0", - "@solidity-parser/parser": "^0.19.0", - "axios": "^1.6.7", - "brotli-wasm": "^2.0.1", - "chalk": "4.1.2", - "cli-table3": "^0.6.3", - "ethereum-cryptography": "^2.1.3", - "glob": "^10.3.10", - "jsonschema": "^1.4.1", - "lodash": "^4.17.21", - "markdown-table": "2.0.0", - "sha1": "^1.1.1", - "viem": "^2.27.0" - }, - "peerDependencies": { - "hardhat": "^2.16.0" - } - }, - "node_modules/hardhat-gas-reporter/node_modules/@noble/curves": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz", - "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@noble/hashes": "1.4.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/hardhat-gas-reporter/node_modules/@noble/hashes": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz", - "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 16" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/hardhat-gas-reporter/node_modules/@scure/base": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.9.tgz", - "integrity": "sha512-8YKhl8GHiNI/pU2VMaofa2Tor7PJRAjwQLBBuilkJ9L5+13yVbC7JO/wS7piioAvPSwR3JKM1IJ/u4xQzbcXKg==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/hardhat-gas-reporter/node_modules/@scure/bip32": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz", - "integrity": "sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@noble/curves": "~1.4.0", - "@noble/hashes": "~1.4.0", - "@scure/base": "~1.1.6" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/hardhat-gas-reporter/node_modules/@scure/bip39": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz", - "integrity": "sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==", + } + }, + "node_modules/file-entry-cache": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", + "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", "dev": true, "license": "MIT", "dependencies": { - "@noble/hashes": "~1.4.0", - "@scure/base": "~1.1.6" + "flat-cache": "^4.0.0" }, - "funding": { - "url": "https://paulmillr.com/funding/" + "engines": { + "node": ">=16.0.0" } }, - "node_modules/hardhat-gas-reporter/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "license": "MIT", "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "to-regex-range": "^5.0.1" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "node": ">=8" } }, - "node_modules/hardhat-gas-reporter/node_modules/ethereum-cryptography": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.2.1.tgz", - "integrity": "sha512-r/W8lkHSiTLxUxW8Rf3u4HGB0xQweG2RyETjywylKZSzLWoWAijRz8WCuOtJ6wah+avllXBqZuk29HCCvhEIRg==", + "node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "license": "MIT", "dependencies": { - "@noble/curves": "1.4.2", - "@noble/hashes": "1.4.0", - "@scure/bip32": "1.4.0", - "@scure/bip39": "1.3.0" + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" } }, - "node_modules/hardhat-gas-reporter/node_modules/glob": { - "version": "10.4.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", - "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", "dev": true, - "license": "ISC", - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^1.11.1" - }, + "license": "BSD-3-Clause", + "peer": true, "bin": { - "glob": "dist/esm/bin.mjs" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "flat": "cli.js" } }, - "node_modules/hardhat-gas-reporter/node_modules/jackspeak": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", - "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "node_modules/flat-cache": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", + "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", "dev": true, - "license": "BlueOak-1.0.0", + "license": "MIT", "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "flatted": "^3.2.9", + "keyv": "^4.5.4" }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" + "engines": { + "node": ">=16" } }, - "node_modules/hardhat-gas-reporter/node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "node_modules/flatted": { + "version": "3.4.4", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.4.tgz", + "integrity": "sha512-5+ybhBZANEJxaH3X5evAFatUxLfEHSr7n6kYJ+1Qd0mUqr4eu9gIf6GDbWHf8RJijHrjjO8G+la14SlL2SeS1Q==", "dev": true, "license": "ISC" }, - "node_modules/hardhat-gas-reporter/node_modules/path-scurry": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "node_modules/for-each": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz", + "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==", "dev": true, - "license": "BlueOak-1.0.0", + "license": "MIT", "dependencies": { - "lru-cache": "^10.2.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + "is-callable": "^1.2.7" }, "engines": { - "node": ">=16 || 14 >=14.18" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/hardhat-ignore-warnings": { - "version": "0.2.12", - "resolved": "https://registry.npmjs.org/hardhat-ignore-warnings/-/hardhat-ignore-warnings-0.2.12.tgz", - "integrity": "sha512-SaxCLKzYBMk3Rd1275TnanUmmxwgU+bu4Ekf2MKcqXxxt6xTGcPTtTaM+USrLgmejZHC4Itg/PaWITlOp4RL3g==", - "dev": true, - "license": "MIT", - "dependencies": { - "minimatch": "^5.1.0", - "node-interval-tree": "^2.0.1", - "solidity-comments": "^0.0.2" - } - }, - "node_modules/hardhat-ignore-warnings/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/hardhat-ignore-warnings/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "node_modules/foreground-child": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", + "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", "dev": true, "license": "ISC", + "peer": true, "dependencies": { - "brace-expansion": "^2.0.1" + "cross-spawn": "^7.0.6", + "signal-exit": "^4.0.1" }, "engines": { - "node": ">=10" - } - }, - "node_modules/hardhat-predeploy": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/hardhat-predeploy/-/hardhat-predeploy-0.4.1.tgz", - "integrity": "sha512-53Eoj5YECKNTkEezGByjKP5rVbYU0s1is8CtEbm0DPbqMgstNrPMQ0dfcDxA5Fu+hlZhc5w0T+RmJ/d/GAbB6g==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "@nomicfoundation/hardhat-ethers": "^3.0.8", - "hardhat": "^2.26.0" - } - }, - "node_modules/hardhat/node_modules/@ethereumjs/rlp": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@ethereumjs/rlp/-/rlp-5.0.2.tgz", - "integrity": "sha512-DziebCdg4JpGlEqEdGgXmjqcFoJi+JGulUXwEjsZGAscAQ7MyD/7LE/GVCP29vEQxKc7AAwjT3A2ywHp2xfoCA==", - "dev": true, - "license": "MPL-2.0", - "bin": { - "rlp": "bin/rlp.cjs" + "node": ">=14" }, - "engines": { - "node": ">=18" + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/hardhat/node_modules/@ethereumjs/util": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/@ethereumjs/util/-/util-9.1.0.tgz", - "integrity": "sha512-XBEKsYqLGXLah9PNJbgdkigthkG7TAGvlD/sH12beMXEyHDyigfcbdvHhmLyDWgDyOJn4QwiQUaF7yeuhnjdog==", + "node_modules/foreground-child/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "dev": true, - "license": "MPL-2.0", - "dependencies": { - "@ethereumjs/rlp": "^5.0.2", - "ethereum-cryptography": "^2.2.1" - }, + "license": "ISC", + "peer": true, "engines": { - "node": ">=18" + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/hardhat/node_modules/@ethereumjs/util/node_modules/@noble/hashes": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz", - "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==", + "node_modules/form-data-encoder": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz", + "integrity": "sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==", "dev": true, "license": "MIT", "engines": { - "node": ">= 16" - }, - "funding": { - "url": "https://paulmillr.com/funding/" + "node": ">= 14.17" } }, - "node_modules/hardhat/node_modules/@ethereumjs/util/node_modules/@scure/bip32": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz", - "integrity": "sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==", + "node_modules/fs-extra": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", "dev": true, "license": "MIT", "dependencies": { - "@noble/curves": "~1.4.0", - "@noble/hashes": "~1.4.0", - "@scure/base": "~1.1.6" + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" }, - "funding": { - "url": "https://paulmillr.com/funding/" + "engines": { + "node": ">=6 <7 || >=8" } }, - "node_modules/hardhat/node_modules/@ethereumjs/util/node_modules/@scure/bip39": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz", - "integrity": "sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==", + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, + "hasInstallScript": true, "license": "MIT", - "dependencies": { - "@noble/hashes": "~1.4.0", - "@scure/base": "~1.1.6" - }, - "funding": { - "url": "https://paulmillr.com/funding/" + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, - "node_modules/hardhat/node_modules/@ethereumjs/util/node_modules/ethereum-cryptography": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.2.1.tgz", - "integrity": "sha512-r/W8lkHSiTLxUxW8Rf3u4HGB0xQweG2RyETjywylKZSzLWoWAijRz8WCuOtJ6wah+avllXBqZuk29HCCvhEIRg==", + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", "dev": true, "license": "MIT", - "dependencies": { - "@noble/curves": "1.4.2", - "@noble/hashes": "1.4.0", - "@scure/bip32": "1.4.0", - "@scure/bip39": "1.3.0" + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/hardhat/node_modules/@noble/curves": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz", - "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==", + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true, - "license": "MIT", - "dependencies": { - "@noble/hashes": "1.4.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" } }, - "node_modules/hardhat/node_modules/@noble/curves/node_modules/@noble/hashes": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz", - "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==", + "node_modules/get-east-asian-width": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.6.0.tgz", + "integrity": "sha512-QRbvDIbx6YklUe6RxeTeleMR0yv3cYH6PsPZHcnVn7xv7zO1BHN8r0XETu8n6Ye3Q+ahtSarc3WgtNWmehIBfA==", "dev": true, "license": "MIT", "engines": { - "node": ">= 16" + "node": ">=18" }, "funding": { - "url": "https://paulmillr.com/funding/" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/hardhat/node_modules/@noble/hashes": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.2.0.tgz", - "integrity": "sha512-FZfhjEDbT5GRswV3C6uvLPHMiVD6lQBmpoX5+eSiPaMTXte/IKqI5dykDxzZB/WBeK/CDuQRBWarPdi3FNY2zQ==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], - "license": "MIT" - }, - "node_modules/hardhat/node_modules/@scure/base": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.9.tgz", - "integrity": "sha512-8YKhl8GHiNI/pU2VMaofa2Tor7PJRAjwQLBBuilkJ9L5+13yVbC7JO/wS7piioAvPSwR3JKM1IJ/u4xQzbcXKg==", + "node_modules/get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", "dev": true, "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, "funding": { - "url": "https://paulmillr.com/funding/" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/hardhat/node_modules/@scure/bip32": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.1.5.tgz", - "integrity": "sha512-XyNh1rB0SkEqd3tXcXMi+Xe1fvg+kUIcoRIEujP1Jgv7DqW2r9lg3Ah0NkFaCs9sTkQAQA8kw7xiRXzENi9Rtw==", + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], "license": "MIT", "dependencies": { - "@noble/hashes": "~1.2.0", - "@noble/secp256k1": "~1.7.0", - "@scure/base": "~1.1.0" + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" } }, - "node_modules/hardhat/node_modules/@scure/bip39": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.1.1.tgz", - "integrity": "sha512-t+wDck2rVkh65Hmv280fYdVdY25J9YeEUIgn2LG1WM6gxFkGzcksoDiUkWVpVp3Oex9xGC68JU2dSbUfwZ2jPg==", + "node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], "license": "MIT", - "dependencies": { - "@noble/hashes": "~1.2.0", - "@scure/base": "~1.1.0" + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/hardhat/node_modules/chokidar": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", - "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", + "node_modules/glob": { + "version": "13.0.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.6.tgz", + "integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==", "dev": true, - "license": "MIT", + "license": "BlueOak-1.0.0", "dependencies": { - "readdirp": "^4.0.1" + "minimatch": "^10.2.2", + "minipass": "^7.1.3", + "path-scurry": "^2.0.2" }, "engines": { - "node": ">= 14.16.0" + "node": "18 || 20 || >=22" }, "funding": { - "url": "https://paulmillr.com/funding/" + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/hardhat/node_modules/ci-info": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", - "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, - "license": "MIT" + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } }, - "node_modules/hardhat/node_modules/ethereum-cryptography": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-1.2.0.tgz", - "integrity": "sha512-6yFQC9b5ug6/17CQpCyE3k9eKBMdhyVjzUy1WkiuY/E4vj/SXDBbCw8QEIaXqf0Mf2SnY6RmpDcwlUmBSS0EJw==", + "node_modules/globals": { + "version": "17.11.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-17.11.0.tgz", + "integrity": "sha512-Z2I8hM+PbJDXQDq3Icgpzv+mPdwr68iZUU9d5WW4FuXfDUQfkZaZuvjMv42/5crNyw154+9+VWXbYrUgDXbxNw==", "dev": true, "license": "MIT", - "dependencies": { - "@noble/hashes": "1.2.0", - "@noble/secp256k1": "1.7.1", - "@scure/bip32": "1.1.5", - "@scure/bip39": "1.1.1" + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/hardhat/node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", "dev": true, "license": "MIT", "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" }, "engines": { "node": ">=10" @@ -6234,142 +4770,181 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/hardhat/node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", "dev": true, "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, "engines": { - "node": ">=0.10.0" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/hardhat/node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "node_modules/got": { + "version": "12.6.1", + "resolved": "https://registry.npmjs.org/got/-/got-12.6.1.tgz", + "integrity": "sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==", "dev": true, "license": "MIT", "dependencies": { - "p-locate": "^5.0.0" + "@sindresorhus/is": "^5.2.0", + "@szmarczak/http-timer": "^5.0.1", + "cacheable-lookup": "^7.0.0", + "cacheable-request": "^10.2.8", + "decompress-response": "^6.0.0", + "form-data-encoder": "^2.1.2", + "get-stream": "^6.0.1", + "http2-wrapper": "^2.1.10", + "lowercase-keys": "^3.0.0", + "p-cancelable": "^3.0.0", + "responselike": "^3.0.0" }, "engines": { - "node": ">=10" + "node": ">=14.16" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sindresorhus/got?sponsor=1" } }, - "node_modules/hardhat/node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/graphlib": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/graphlib/-/graphlib-2.1.8.tgz", + "integrity": "sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==", "dev": true, "license": "MIT", "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "lodash": "^4.17.15" } }, - "node_modules/hardhat/node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "node_modules/handlebars": { + "version": "4.7.9", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.9.tgz", + "integrity": "sha512-4E71E0rpOaQuJR2A3xDZ+GM1HyWYv1clR58tC8emQNeQe3RH7MAzSbat+V0wG78LQBo6m6bzSG/L4pBuCsgnUQ==", "dev": true, "license": "MIT", "dependencies": { - "p-limit": "^3.0.2" + "minimist": "^1.2.5", + "neo-async": "^2.6.2", + "source-map": "^0.6.1", + "wordwrap": "^1.0.0" + }, + "bin": { + "handlebars": "bin/handlebars" }, "engines": { - "node": ">=10" + "node": ">=0.4.7" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "optionalDependencies": { + "uglify-js": "^3.1.4" } }, - "node_modules/hardhat/node_modules/raw-body": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", - "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "node_modules/hardhat": { + "version": "3.14.0", + "resolved": "https://registry.npmjs.org/hardhat/-/hardhat-3.14.0.tgz", + "integrity": "sha512-6VlEaARXKtz2RUWhOlbTUMN2uM03oHxjsGJNfTpVDOokYMDL7/aFy3m/QfcXyaxYghUZLhW/0oJO4f6Xh34cHg==", "dev": true, "license": "MIT", "dependencies": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" + "@nomicfoundation/edr": "0.17.0", + "@nomicfoundation/hardhat-errors": "^3.0.17", + "@nomicfoundation/hardhat-utils": "^4.1.6", + "@nomicfoundation/hardhat-vendored": "^3.0.4", + "@nomicfoundation/hardhat-zod-utils": "^3.0.5", + "@nomicfoundation/solidity-analyzer": "^0.1.1", + "@sentry/core": "^9.4.0", + "adm-zip": "^0.6.0", + "chokidar": "^5.0.0", + "enquirer": "^2.3.0", + "ethereum-cryptography": "^2.2.1", + "micro-eth-signer": "^0.14.0", + "p-map": "^7.0.6", + "resolve.exports": "^2.0.3", + "semver": "^7.8.5", + "tsx": "^4.23.1", + "ws": "^8.21.1", + "zod": "^3.23.8" }, - "engines": { - "node": ">= 0.8" + "bin": { + "hardhat": "dist/src/cli.js" } }, - "node_modules/hardhat/node_modules/readdirp": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", - "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", + "node_modules/hardhat-ignore-warnings": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/hardhat-ignore-warnings/-/hardhat-ignore-warnings-0.3.0.tgz", + "integrity": "sha512-zpFICQhlRgN8NNq8WkQ0D86BfjrbwJOt+Tih1Mft0iXiqqlZoOI0cwcmc0bSb4wQZV4jWjfCk9g8x71Isp7MNA==", "dev": true, "license": "MIT", - "engines": { - "node": ">= 14.18.0" + "dependencies": { + "minimatch": "^10.1.1", + "node-interval-tree": "^2.0.1", + "solidity-comments": "^0.0.2" }, - "funding": { - "type": "individual", - "url": "https://paulmillr.com/funding/" + "peerDependencies": { + "hardhat": "^3.1.0" } }, - "node_modules/hardhat/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "node_modules/hardhat-predeploy": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/hardhat-predeploy/-/hardhat-predeploy-1.0.1.tgz", + "integrity": "sha512-PDrPNW5rfwgsYzycDIObzj38pAzbasV4yqI/vTwuxvIEyxsefffkMh1yl5nmBtkgq4eYxLwLT7dLEpoYPRSbug==", "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" + "license": "MIT", + "peerDependencies": { + "hardhat": "^3.0.0" } }, - "node_modules/hardhat/node_modules/undici": { - "version": "5.29.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-5.29.0.tgz", - "integrity": "sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==", + "node_modules/hardhat/node_modules/chokidar": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", + "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", "dev": true, "license": "MIT", "dependencies": { - "@fastify/busboy": "^2.0.0" + "readdirp": "^5.0.0" }, "engines": { - "node": ">=14.0" + "node": ">= 20.19.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" } }, - "node_modules/hardhat/node_modules/uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "node_modules/hardhat/node_modules/readdirp": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.1.1.tgz", + "integrity": "sha512-Kko+Y5XQ6fM+Ce3dq3m9YGxnacYZYl9cA1wZjaF3Vbry2L3i1qVg8+CAgNPsXRArPMUMCaOR7oa9Nqntc43JKA==", "dev": true, "license": "MIT", - "bin": { - "uuid": "dist/bin/uuid" + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" } }, "node_modules/hardhat/node_modules/ws": { - "version": "7.5.10", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", - "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==", + "version": "8.21.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.3.tgz", + "integrity": "sha512-201TZ/kPWxoPr/OKWjquZR1SWKXcvxdH+e1xrx89b3YbmzLMFCLfnaG1HFIgWzJOEWZ7MvpK++odZufgYR50Rw==", "dev": true, "license": "MIT", "engines": { - "node": ">=8.3.0" + "node": ">=10.0.0" }, "peerDependencies": { "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" + "utf-8-validate": ">=5.0.2" }, "peerDependenciesMeta": { "bufferutil": { @@ -6380,19 +4955,6 @@ } } }, - "node_modules/hardhat/node_modules/yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -6403,6 +4965,19 @@ "node": ">=8" } }, + "node_modules/has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/has-symbols": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", @@ -6433,18 +5008,19 @@ } }, "node_modules/hash-base": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz", - "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.2.tgz", + "integrity": "sha512-Bb33KbowVTIj5s7Ked1OsqHUeCpz//tPwR+E2zJgJKo9Z5XolZ9b6bdUgjmYlwnWhoOQKoTd1TYToZGn5mAYOg==", "dev": true, "license": "MIT", "dependencies": { "inherits": "^2.0.4", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" + "readable-stream": "^2.3.8", + "safe-buffer": "^5.2.1", + "to-buffer": "^1.2.1" }, "engines": { - "node": ">=4" + "node": ">= 0.8" } }, "node_modules/hash.js": { @@ -6459,9 +5035,9 @@ } }, "node_modules/hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz", + "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==", "dev": true, "license": "MIT", "dependencies": { @@ -6477,17 +5053,11 @@ "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", "dev": true, "license": "MIT", + "peer": true, "bin": { "he": "bin/he" } }, - "node_modules/heap": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/heap/-/heap-0.2.7.tgz", - "integrity": "sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg==", - "dev": true, - "license": "MIT" - }, "node_modules/hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", @@ -6501,28 +5071,11 @@ } }, "node_modules/http-cache-semantics": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", - "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", - "dev": true, - "license": "BSD-2-Clause" - }, - "node_modules/http-errors": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", - "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "depd": "2.0.0", - "inherits": "2.0.4", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "toidentifier": "1.0.1" - }, - "engines": { - "node": ">= 0.8" - } + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz", + "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==", + "dev": true, + "license": "BSD-2-Clause" }, "node_modules/http2-wrapper": { "version": "2.2.1", @@ -6538,24 +5091,10 @@ "node": ">=10.19.0" } }, - "node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dev": true, - "license": "MIT", - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/human-id": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/human-id/-/human-id-4.1.1.tgz", - "integrity": "sha512-3gKm/gCSUipeLsRYZbbdA1BD83lBoWUkZ7G9VFrhWPAU76KwYo5KR8V28bpoPm/ygy0x5/GCbpRQdY7VLYCoIg==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/human-id/-/human-id-4.2.1.tgz", + "integrity": "sha512-zPGsiS+dWoTZtZ4AtpA9Y+BdSFSNWvnouNlWNoUFyAM6xHOHmdCvqO3k8AIbdamCOv4gUFUVNPf6rJFfc4UiJw==", "dev": true, "license": "MIT", "bin": { @@ -6567,6 +5106,7 @@ "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz", "integrity": "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==", "dev": true, + "license": "MIT", "bin": { "husky": "bin.js" }, @@ -6578,9 +5118,9 @@ } }, "node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.3.tgz", + "integrity": "sha512-IKXpvIzjnC9XTAUbVBcMfGS0EPaIXtW6v+zr+RRp+hqULEpo0owZax6wyRwPOJbWbzjYspQwusTsfVr0ifh4uQ==", "dev": true, "license": "MIT", "dependencies": { @@ -6588,6 +5128,10 @@ }, "engines": { "node": ">=0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/ignore": { @@ -6600,13 +5144,6 @@ "node": ">= 4" } }, - "node_modules/immutable": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz", - "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==", - "dev": true, - "license": "MIT" - }, "node_modules/import-fresh": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", @@ -6644,28 +5181,6 @@ "node": ">=0.8.19" } }, - "node_modules/indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", - "dev": true, - "license": "ISC", - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", @@ -6692,34 +5207,80 @@ "typed-regex": "^0.0.8" } }, - "node_modules/interpret": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", - "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", + "node_modules/interoperable-addresses/node_modules/@noble/curves": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.9.0.tgz", + "integrity": "sha512-7YDlXiNMdO1YZeH6t/kvopHHbIZzlxrCV9WLqCY6QhcXOoXiNCMDqJIglZ9Yjx5+w7Dz30TITFrlTjnRg7sKEg==", "dev": true, "license": "MIT", + "dependencies": { + "@noble/hashes": "1.8.0" + }, "engines": { - "node": ">= 0.10" + "node": "^14.21.3 || >=16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/interoperable-addresses/node_modules/@noble/hashes": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz", + "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^14.21.3 || >=16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/interoperable-addresses/node_modules/@scure/bip32": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.7.0.tgz", + "integrity": "sha512-E4FFX/N3f4B80AKWp5dP6ow+flD1LQZo/w8UnLGYZO674jS6YnYeepycOOksv+vLPSpgN35wgKgy+ybfTb2SMw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@noble/curves": "~1.9.0", + "@noble/hashes": "~1.8.0", + "@scure/base": "~1.2.5" + }, + "funding": { + "url": "https://paulmillr.com/funding/" } }, - "node_modules/io-ts": { - "version": "1.10.4", - "resolved": "https://registry.npmjs.org/io-ts/-/io-ts-1.10.4.tgz", - "integrity": "sha512-b23PteSnYXSONJ6JQXRAlvJhuw8KOtkqa87W4wDtvMrud/DTJd5X+NpOOI+O/zZwVq6v0VLAaJ+1EDViKEuN9g==", + "node_modules/interoperable-addresses/node_modules/@scure/bip39": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.6.0.tgz", + "integrity": "sha512-+lF0BbLiJNwVlev4eKelw1WWLaiKXw7sSl8T6FvBlWkdX+94aGJ4o8XjUdlyhTCjd8c+B3KT3JfS8P0bLRNU6A==", "dev": true, "license": "MIT", "dependencies": { - "fp-ts": "^1.0.0" + "@noble/hashes": "~1.8.0", + "@scure/base": "~1.2.5" + }, + "funding": { + "url": "https://paulmillr.com/funding/" } }, - "node_modules/ipaddr.js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "node_modules/interoperable-addresses/node_modules/ethereum-cryptography": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-3.2.0.tgz", + "integrity": "sha512-Urr5YVsalH+Jo0sYkTkv1MyI9bLYZwW8BENZCeE1QYaTHETEYx0Nv/SVsWkSqpYrzweg6d8KMY1wTjH/1m/BIg==", "dev": true, "license": "MIT", + "dependencies": { + "@noble/ciphers": "1.3.0", + "@noble/curves": "1.9.0", + "@noble/hashes": "1.8.0", + "@scure/bip32": "1.7.0", + "@scure/bip39": "1.6.0" + }, "engines": { - "node": ">= 0.10" + "node": "^14.21.3 || >=16", + "npm": ">=9" } }, "node_modules/is-arrayish": { @@ -6742,6 +5303,19 @@ "node": ">=8" } }, + "node_modules/is-callable": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", @@ -6752,6 +5326,16 @@ "node": ">=0.10.0" } }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", @@ -6765,17 +5349,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-hex-prefixed": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz", - "integrity": "sha512-WvtOiug1VFrE9v1Cydwm+FnXd3+w9GaeVUss5W4v/SLy3UW00vP+6iNF2SdnfiBoLy4bTqVdkftNGTUeOFVsbA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.5.0", - "npm": ">=3" - } - }, "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", @@ -6786,12 +5359,24 @@ "node": ">=0.12.0" } }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=8" + } + }, "node_modules/is-plain-obj": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=8" } @@ -6806,12 +5391,18 @@ "node": ">=8" } }, - "node_modules/is-promise": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz", - "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==", + "node_modules/is-safe-filename": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-safe-filename/-/is-safe-filename-0.1.1.tgz", + "integrity": "sha512-4SrR7AdnY11LHfDKTZY1u6Ga3RuxZdl3YKWWShO5iyuG5h8QS4GD2tOb04peBJ5I7pXbR+CGBNEhTcwK+FzN3g==", "dev": true, - "license": "MIT" + "license": "MIT", + "engines": { + "node": ">=20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/is-subdir": { "version": "1.2.0", @@ -6826,12 +5417,29 @@ "node": ">=4" } }, + "node_modules/is-typed-array": { + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz", + "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "which-typed-array": "^1.1.16" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-unicode-supported": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=10" }, @@ -6849,6 +5457,13 @@ "node": ">=0.10.0" } }, + "node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "dev": true, + "license": "MIT" + }, "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -6856,45 +5471,23 @@ "dev": true, "license": "ISC" }, - "node_modules/isows": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/isows/-/isows-1.0.6.tgz", - "integrity": "sha512-lPHCayd40oW98/I0uvgaHKWCSvkzY27LjWLbtzOm64yQ+G3Q5npjjbdppU65iZXkK1Zt+kH9pfegli0AYfwYYw==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/wevm" - } - ], - "license": "MIT", - "peerDependencies": { - "ws": "*" - } - }, "node_modules/jackspeak": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.1.0.tgz", - "integrity": "sha512-9DDdhb5j6cpeitCbvLO7n7J4IxnbM6hoF6O1g4HQ5TfhvvKN8ywDM7668ZhMHRqVmxqhps/F6syWK2KcPxYlkw==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", "dev": true, "license": "BlueOak-1.0.0", + "peer": true, "dependencies": { "@isaacs/cliui": "^8.0.2" }, - "engines": { - "node": "20 || >=22" - }, "funding": { "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" } }, - "node_modules/js-sha3": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz", - "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==", - "dev": true, - "license": "MIT" - }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6903,14 +5496,23 @@ "license": "MIT" }, "node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.1.tgz", + "integrity": "sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/puzrin" + }, + { + "type": "github", + "url": "https://github.com/sponsors/nodeca" + } + ], "license": "MIT", "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" + "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" @@ -6945,9 +5547,9 @@ "license": "MIT" }, "node_modules/json-stream-stringify": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/json-stream-stringify/-/json-stream-stringify-3.1.6.tgz", - "integrity": "sha512-x7fpwxOkbhFCaJDJ8vb1fBY3DdSa4AlITaz+HHILQJzdPMnHEFjxPwVUi1ALIbcIxDE0PNe/0i7frnY8QnBQog==", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/json-stream-stringify/-/json-stream-stringify-3.1.7.tgz", + "integrity": "sha512-F4MWetLtY42YMaAKw5cV4e47zMD5aOT+tjjQWjX18ACtdkQ5Y/vrcfbcQ107Rh+MXjOCIx4KhW0wPmOvG8iQ5w==", "dev": true, "license": "MIT", "engines": { @@ -6974,16 +5576,6 @@ "node": ">=0.10.0" } }, - "node_modules/jsonschema": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.5.0.tgz", - "integrity": "sha512-K+A9hhqbn0f3pJX17Q/7H6yQfD/5OXgdrR5UE12gMXCiN9D5Xq2o5mddV2QEcX/bjla99ASsAAQUyMCCRWAEhw==", - "dev": true, - "license": "MIT", - "engines": { - "node": "*" - } - }, "node_modules/keccak": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/keccak/-/keccak-3.0.4.tgz", @@ -7000,6 +5592,21 @@ "node": ">=10.0.0" } }, + "node_modules/keccak/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "license": "MIT", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", @@ -7010,16 +5617,6 @@ "json-buffer": "3.0.1" } }, - "node_modules/kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/latest-version": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-7.0.0.tgz", @@ -7118,17 +5715,9 @@ } }, "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true, - "license": "MIT" - }, - "node_modules/lodash.isequal": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", - "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==", - "deprecated": "This package is deprecated. Use require('node:util').isDeepStrictEqual instead.", + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz", + "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==", "dev": true, "license": "MIT" }, @@ -7159,6 +5748,7 @@ "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "chalk": "^4.1.0", "is-unicode-supported": "^0.1.0" @@ -7176,6 +5766,7 @@ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -7188,14 +5779,11 @@ } }, "node_modules/loupe": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", - "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.2.1.tgz", + "integrity": "sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ==", "dev": true, - "license": "MIT", - "dependencies": { - "get-func-name": "^2.0.1" - } + "license": "MIT" }, "node_modules/lowercase-keys": { "version": "3.0.0", @@ -7210,37 +5798,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/lru_map": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz", - "integrity": "sha512-Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ==", - "dev": true, - "license": "MIT" - }, "node_modules/lru-cache": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.1.0.tgz", - "integrity": "sha512-QIXZUBJUx+2zHUdQujWejBkcD9+cs94tLn0+YL8UrCh+D5sCXZ4c7LaEH48pNwRY3MLDgqUFyhlCyjJPf1WP0A==", + "version": "11.0.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.2.tgz", + "integrity": "sha512-123qHRfJBmo2jXDbo/a5YOQrJoHF/GNQTLzQ5+IdK5pWpceK17yRc6ozlWd25FxvGKQbIUs91fDFkXmDHTKcyA==", "dev": true, "license": "ISC", "engines": { "node": "20 || >=22" } }, - "node_modules/markdown-table": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz", - "integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==", - "dev": true, - "license": "MIT", - "dependencies": { - "repeat-string": "^1.0.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/math-intrinsics": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", @@ -7260,39 +5827,7 @@ "dependencies": { "hash-base": "^3.0.0", "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" - } - }, - "node_modules/media-typer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz", - "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/memorystream": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz", - "integrity": "sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==", - "dev": true, - "engines": { - "node": ">= 0.10.0" - } - }, - "node_modules/merge-descriptors": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz", - "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "safe-buffer": "^5.1.2" } }, "node_modules/merge2": { @@ -7380,29 +5915,6 @@ "node": ">=8.6" } }, - "node_modules/mime-db": { - "version": "1.54.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", - "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz", - "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==", - "dev": true, - "license": "MIT", - "dependencies": { - "mime-db": "^1.54.0" - }, - "engines": { - "node": ">= 0.6" - } - }, "node_modules/mimic-response": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz", @@ -7431,31 +5943,21 @@ "license": "MIT" }, "node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "version": "10.2.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz", + "integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==", "dev": true, - "license": "ISC", + "license": "BlueOak-1.0.0", "dependencies": { - "brace-expansion": "^2.0.1" + "brace-expansion": "^5.0.8" }, "engines": { - "node": ">=16 || 14 >=14.17" + "node": "18 || 20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/minimatch/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, "node_modules/minimist": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", @@ -7467,64 +5969,43 @@ } }, "node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", + "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==", "dev": true, - "license": "ISC", + "license": "BlueOak-1.0.0", "engines": { "node": ">=16 || 14 >=14.17" } }, - "node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "license": "MIT", - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/mnemonist": { - "version": "0.38.5", - "resolved": "https://registry.npmjs.org/mnemonist/-/mnemonist-0.38.5.tgz", - "integrity": "sha512-bZTFT5rrPKtPJxj8KSV0WkPyNxl72vQepqqVUAW2ARUpUSF2qXMB6jZj7hW5/k7C1rtpzqbD/IIbJwLXUjCHeg==", - "dev": true, - "license": "MIT", - "dependencies": { - "obliterator": "^2.0.0" - } - }, "node_modules/mocha": { - "version": "10.8.2", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.8.2.tgz", - "integrity": "sha512-VZlYo/WE8t1tstuRmqgeyBgCbJc/lEdopaa+axcKzTBJ+UIdlAB9XnmvTCAH4pwR4ElNInaedhEBmZD8iCSVEg==", + "version": "11.8.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.8.0.tgz", + "integrity": "sha512-VyCeUdGN3A9lmCTTgG4yuvY9ixxaDk+xt2R/7/+1AP6EqNG+G9OKkzBwhVtVYoNX8YsxNSgAl8mOv3IAeOpFbw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { - "ansi-colors": "^4.1.3", "browser-stdout": "^1.3.1", - "chokidar": "^3.5.3", + "chokidar": "^4.0.1", "debug": "^4.3.5", - "diff": "^5.2.0", + "diff": "^7.0.0", "escape-string-regexp": "^4.0.0", "find-up": "^5.0.0", - "glob": "^8.1.0", + "glob": "^10.4.5", "he": "^1.2.0", + "is-path-inside": "^3.0.3", "js-yaml": "^4.1.0", "log-symbols": "^4.1.0", - "minimatch": "^5.1.6", + "minimatch": "^9.0.5", "ms": "^2.1.3", + "picocolors": "^1.1.1", "serialize-javascript": "^6.0.2", "strip-json-comments": "^3.1.1", "supports-color": "^8.1.1", - "workerpool": "^6.5.1", - "yargs": "^16.2.0", - "yargs-parser": "^20.2.9", + "workerpool": "^9.2.0", + "yargs": "^17.7.2", + "yargs-parser": "^21.1.1", "yargs-unparser": "^2.0.0" }, "bin": { @@ -7532,36 +6013,59 @@ "mocha": "bin/mocha.js" }, "engines": { - "node": ">= 14.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, - "node_modules/mocha/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "node_modules/mocha/node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true, - "license": "Python-2.0" + "license": "MIT", + "peer": true }, "node_modules/mocha/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.4.tgz", + "integrity": "sha512-hGfVzPxthbf3+2yjg/RBs60cB0FhqBS/zvdV/4wn4/BmN0bNMMHPc4V/BbFieqf1TKAGGAHnY4eSjajCl0f2Xg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "balanced-match": "^1.0.0" } }, + "node_modules/mocha/node_modules/chokidar": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", + "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "readdirp": "^4.0.1" + }, + "engines": { + "node": ">= 14.16.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/mocha/node_modules/cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", "dev": true, "license": "ISC", + "peer": true, "dependencies": { "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", + "strip-ansi": "^6.0.1", "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" } }, "node_modules/mocha/node_modules/find-up": { @@ -7570,6 +6074,7 @@ "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -7582,45 +6087,35 @@ } }, "node_modules/mocha/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "deprecated": "Glob versions prior to v9 are no longer supported", + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz", + "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==", + "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", "dev": true, "license": "ISC", + "peer": true, "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" }, - "engines": { - "node": ">=12" + "bin": { + "glob": "dist/esm/bin.mjs" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/mocha/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "license": "MIT", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, "node_modules/mocha/node_modules/locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "p-locate": "^5.0.0" }, @@ -7631,17 +6126,29 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/mocha/node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "dev": true, + "license": "ISC", + "peer": true + }, "node_modules/mocha/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "version": "9.0.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz", + "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==", "dev": true, "license": "ISC", + "peer": true, "dependencies": { - "brace-expansion": "^2.0.1" + "brace-expansion": "^2.0.2" }, "engines": { - "node": ">=10" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/mocha/node_modules/p-limit": { @@ -7650,6 +6157,7 @@ "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "yocto-queue": "^0.1.0" }, @@ -7666,6 +6174,7 @@ "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "p-limit": "^3.0.2" }, @@ -7676,12 +6185,46 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/mocha/node_modules/path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "dev": true, + "license": "BlueOak-1.0.0", + "peer": true, + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/mocha/node_modules/readdirp": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", + "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 14.18.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/mocha/node_modules/supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -7692,23 +6235,43 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/mocha/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/mocha/node_modules/yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "version": "17.7.3", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.3.tgz", + "integrity": "sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { - "cliui": "^7.0.2", + "cliui": "^8.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", - "string-width": "^4.2.0", + "string-width": "^4.2.3", "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" + "yargs-parser": "^21.1.1" }, "engines": { - "node": ">=10" + "node": ">=12" } }, "node_modules/mocha/node_modules/yocto-queue": { @@ -7717,6 +6280,7 @@ "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=10" }, @@ -7748,16 +6312,6 @@ "dev": true, "license": "MIT" }, - "node_modules/negotiator": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", - "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, "node_modules/neo-async": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", @@ -7772,16 +6326,6 @@ "dev": true, "license": "MIT" }, - "node_modules/node-emoji": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz", - "integrity": "sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==", - "dev": true, - "license": "MIT", - "dependencies": { - "lodash": "^4.17.21" - } - }, "node_modules/node-fetch": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", @@ -7838,19 +6382,6 @@ "node": ">=12.19" } }, - "node_modules/nopt": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "integrity": "sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==", - "dev": true, - "license": "ISC", - "dependencies": { - "abbrev": "1" - }, - "bin": { - "nopt": "bin/nopt.js" - } - }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -7862,9 +6393,9 @@ } }, "node_modules/normalize-url": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.1.tgz", - "integrity": "sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==", + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.1.1.tgz", + "integrity": "sha512-JYc0DPlpGWB40kH5g07gGTrYuMqV653k3uBKY6uITPWds3M0ov3GaWGp9lbE3Bzngx8+XkfzgvASb9vk9JDFXQ==", "dev": true, "license": "MIT", "engines": { @@ -7874,80 +6405,9 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/number-to-bn": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/number-to-bn/-/number-to-bn-1.7.0.tgz", - "integrity": "sha512-wsJ9gfSz1/s4ZsJN01lyonwuxA1tml6X1yBDnfpMglypcBRFZZkus26EdPSlqS5GJfYddVZa22p3VNb3z5m5Ig==", - "dev": true, - "license": "MIT", - "dependencies": { - "bn.js": "4.11.6", - "strip-hex-prefix": "1.0.0" - }, - "engines": { - "node": ">=6.5.0", - "npm": ">=3" - } - }, - "node_modules/number-to-bn/node_modules/bn.js": { - "version": "4.11.6", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", - "integrity": "sha512-XWwnNNFCuuSQ0m3r3C4LE3EiORltHd9M05pq6FOlVeiophzRbMo50Sbz1ehl8K3Z+jw9+vmgnXefY1hz8X+2wA==", - "dev": true, - "license": "MIT" - }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-inspect": { - "version": "1.13.4", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", - "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/obliterator": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/obliterator/-/obliterator-2.0.5.tgz", - "integrity": "sha512-42CPE9AhahZRsMNslczq0ctAEtqk8Eka26QofnqC346BZdHDySk3LWka23LI7ULIw11NmltpiLagIq8gBozxTw==", - "dev": true, - "license": "MIT" - }, - "node_modules/on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "dev": true, - "license": "MIT", - "dependencies": { - "ee-first": "1.1.1" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, - "license": "ISC", - "dependencies": { - "wrappy": "1" - } + "node_modules/openzeppelin-solidity": { + "resolved": "lib/@openzeppelin-contracts", + "link": true }, "node_modules/optionator": { "version": "0.9.4", @@ -7967,23 +6427,6 @@ "node": ">= 0.8.0" } }, - "node_modules/ordinal": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/ordinal/-/ordinal-1.0.3.tgz", - "integrity": "sha512-cMddMgb2QElm8G7vdaa02jhUNbTSrhsgAGUz1OokD83uJTwSUn+nKoNoKVVaRa08yF6sgfO7Maou1+bgLd9rdQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/outdent": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/outdent/-/outdent-0.5.0.tgz", @@ -7991,36 +6434,6 @@ "dev": true, "license": "MIT" }, - "node_modules/ox": { - "version": "0.6.9", - "resolved": "https://registry.npmjs.org/ox/-/ox-0.6.9.tgz", - "integrity": "sha512-wi5ShvzE4eOcTwQVsIPdFr+8ycyX+5le/96iAJutaZAvCes1J0+RvpEPg5QDPDiaR0XQQAvZVl7AwqQcINuUug==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/wevm" - } - ], - "license": "MIT", - "dependencies": { - "@adraffy/ens-normalize": "^1.10.1", - "@noble/curves": "^1.6.0", - "@noble/hashes": "^1.5.0", - "@scure/bip32": "^1.5.0", - "@scure/bip39": "^1.4.0", - "abitype": "^1.0.6", - "eventemitter3": "5.0.1" - }, - "peerDependencies": { - "typescript": ">=5.4.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, "node_modules/p-cancelable": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz", @@ -8055,9 +6468,9 @@ } }, "node_modules/p-limit": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-7.2.0.tgz", - "integrity": "sha512-ATHLtwoTNDloHRFFxFJdHnG6n2WUeFjaR8XQMFdKIv0xkXjrER8/iG9iu265jOM95zXHAfv9oTkqhrfbIzosrQ==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-7.3.1.tgz", + "integrity": "sha512-0trZaiG7Y7kN/Egy9a8j47t9osC0Tch4PaIWd9yGF6bvmlk7muExRvGNYb8sXBwEKMoNKsbNN9P8EefuQekE4Q==", "dev": true, "license": "MIT", "dependencies": { @@ -8100,16 +6513,13 @@ } }, "node_modules/p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.6.tgz", + "integrity": "sha512-I4Prw6ivkd6p8PiYR1tXASOAOBzIJwu0TB7fqaX0c/8c3QAehNYmX57EijyGGGBt3c/BIowGwV03RVBtXvHEVg==", "dev": true, "license": "MIT", - "dependencies": { - "aggregate-error": "^3.0.0" - }, "engines": { - "node": ">=10" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -8193,16 +6603,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -8213,16 +6613,6 @@ "node": ">=8" } }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", @@ -8233,17 +6623,10 @@ "node": ">=8" } }, - "node_modules/path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true, - "license": "MIT" - }, "node_modules/path-scurry": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz", - "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz", + "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -8251,22 +6634,12 @@ "minipass": "^7.1.2" }, "engines": { - "node": "20 || >=22" + "node": "18 || 20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/path-to-regexp": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz", - "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=16" - } - }, "node_modules/path-type": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", @@ -8278,30 +6651,31 @@ } }, "node_modules/pathval": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", - "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.1.tgz", + "integrity": "sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==", "dev": true, "license": "MIT", "engines": { - "node": "*" + "node": ">= 14.16" } }, "node_modules/pbkdf2": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz", - "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.6.tgz", + "integrity": "sha512-BT6eelPB1EyGHo8pC0o9Bl6k6SYVhKO1jEbd3lcTrtr7XHdjP8BW1YpfCV3G9Kwkxgattk+S5q2/RvuttCsS1g==", "dev": true, "license": "MIT", "dependencies": { - "create-hash": "^1.1.2", - "create-hmac": "^1.1.4", - "ripemd160": "^2.0.1", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" + "create-hash": "^1.2.0", + "create-hmac": "^1.1.7", + "ripemd160": "^2.0.3", + "safe-buffer": "^5.2.1", + "sha.js": "^2.4.12", + "to-buffer": "^1.2.2" }, "engines": { - "node": ">=0.12" + "node": ">= 0.10" } }, "node_modules/picocolors": { @@ -8312,9 +6686,9 @@ "license": "ISC" }, "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", "dev": true, "license": "MIT", "engines": { @@ -8334,16 +6708,6 @@ "node": ">=6" } }, - "node_modules/pkce-challenge": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-5.0.0.tgz", - "integrity": "sha512-ueGLflrrnvwB3xuo/uGob5pd5FN7l0MsLf0Z87o/UQmRtwjvfylfc9MurIxRAWywCYTgrvpXBcqjV4OfCYGCIQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=16.20.0" - } - }, "node_modules/pluralize": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz", @@ -8364,6 +6728,16 @@ "node": ">=12.0.0" } }, + "node_modules/possible-typed-array-names": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz", + "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -8375,9 +6749,9 @@ } }, "node_modules/prettier": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz", - "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==", + "version": "3.9.6", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.6.tgz", + "integrity": "sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g==", "dev": true, "license": "MIT", "bin": { @@ -8391,44 +6765,44 @@ } }, "node_modules/prettier-plugin-solidity": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prettier-plugin-solidity/-/prettier-plugin-solidity-2.0.0.tgz", - "integrity": "sha512-tis3SwLSrYKDzzRFle48fjPM4GQKBtkVBUajAkt4b75/cc6zojFP7qjz6fDxKfup+34q0jKeSM3QeP9flJFXWw==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/prettier-plugin-solidity/-/prettier-plugin-solidity-2.4.1.tgz", + "integrity": "sha512-12w85zZt9gXgGvLW7nK4h+U6sLY8qa688E+tFDP0Oic9zuM5TSQcWQdcE/RP3dLBuBAbA5yUl6lgXmSnjuRsGA==", "dev": true, "license": "MIT", "dependencies": { - "@nomicfoundation/slang": "1.1.0", - "@solidity-parser/parser": "^0.20.1", - "semver": "^7.7.1" + "@nomicfoundation/slang": "1.3.8", + "@solidity-parser/parser": "^0.20.2", + "semver": "^7.8.5" }, "engines": { - "node": ">=18" + "node": ">=20" }, "peerDependencies": { "prettier": ">=3.0.0" } }, "node_modules/prettier-plugin-solidity/node_modules/@bytecodealliance/preview2-shim": { - "version": "0.17.2", - "resolved": "https://registry.npmjs.org/@bytecodealliance/preview2-shim/-/preview2-shim-0.17.2.tgz", - "integrity": "sha512-mNm/lblgES8UkVle8rGImXOz4TtL3eU3inHay/7TVchkKrb/lgcVvTK0+VAw8p5zQ0rgQsXm1j5dOlAAd+MeoA==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@bytecodealliance/preview2-shim/-/preview2-shim-0.19.0.tgz", + "integrity": "sha512-OSUlcM62fXLuzYP0DjBn/SwjKMZ/y/2PMXZ8v5cRiiFcroauntlPRl/oCnx0xYjYiqdYvE0PY50VCNutll0xOw==", "dev": true, "license": "(Apache-2.0 WITH LLVM-exception)" }, "node_modules/prettier-plugin-solidity/node_modules/@nomicfoundation/slang": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@nomicfoundation/slang/-/slang-1.1.0.tgz", - "integrity": "sha512-g2BofMUq1qCP22L/ksOftScrCxjdHTxgg8ch5PYon2zfSSKGCMwE4TgIC64CuorMcSsvCmqNNFEWR/fwFcMeTw==", + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/@nomicfoundation/slang/-/slang-1.3.8.tgz", + "integrity": "sha512-it0o2vGb56kqOEUiIreLTqEwiWitWDDOiUCWCO3PfzBXD3kkIFLQ3Ly/4xNgCo0LF5xqGECr+DcCNbfspSClPA==", "dev": true, "license": "MIT", "dependencies": { - "@bytecodealliance/preview2-shim": "0.17.2" + "@bytecodealliance/preview2-shim": "^0.19.0" } }, - "node_modules/prettier-plugin-solidity/node_modules/@solidity-parser/parser": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.20.1.tgz", - "integrity": "sha512-58I2sRpzaQUN+jJmWbHfbWf9AKfzqCI8JAdFB0vbyY+u8tBRcuTt9LxzasvR0LGQpcRv97eyV7l61FQ3Ib7zVw==", + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", "dev": true, "license": "MIT" }, @@ -8444,13 +6818,6 @@ "signal-exit": "^3.0.2" } }, - "node_modules/proper-lockfile/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true, - "license": "ISC" - }, "node_modules/proto-list": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", @@ -8458,27 +6825,6 @@ "dev": true, "license": "ISC" }, - "node_modules/proxy-addr": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", - "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "dev": true, - "license": "MIT", - "dependencies": { - "forwarded": "0.2.0", - "ipaddr.js": "1.9.1" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", - "dev": true, - "license": "MIT" - }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", @@ -8489,26 +6835,10 @@ "node": ">=6" } }, - "node_modules/qs": { - "version": "6.14.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz", - "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "side-channel": "^1.1.0" - }, - "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/quansync": { - "version": "0.2.10", - "resolved": "https://registry.npmjs.org/quansync/-/quansync-0.2.10.tgz", - "integrity": "sha512-t41VRkMYbkHyCYmOvx/6URnN80H7k4X0lLdBMGsz+maAwrJQYB1djpV6vHrQIBE0WBSGqhtEHrK9U3DWWH8v7A==", + "version": "0.2.11", + "resolved": "https://registry.npmjs.org/quansync/-/quansync-0.2.11.tgz", + "integrity": "sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==", "dev": true, "funding": [ { @@ -8566,32 +6896,6 @@ "safe-buffer": "^5.1.0" } }, - "node_modules/range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/raw-body": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.0.tgz", - "integrity": "sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.6.3", - "unpipe": "1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/rc": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", @@ -8634,80 +6938,74 @@ "node": ">=6" } }, - "node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "node_modules/read-yaml-file/node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "license": "MIT", "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" + "sprintf-js": "~1.0.2" } }, - "node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "node_modules/read-yaml-file/node_modules/js-yaml": { + "version": "3.15.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.15.1.tgz", + "integrity": "sha512-S99WuO3HlhO3XN41EtYUNl9zzXjoJx7QvmipxsJVxtCBT0YHEFy+iOJhjSvrmV12nYhWpZaM8lPHkJm0yUMbag==", "dev": true, "license": "MIT", "dependencies": { - "picomatch": "^2.2.1" + "argparse": "^1.0.7", + "esprima": "^4.0.0" }, - "engines": { - "node": ">=8.10.0" + "bin": { + "js-yaml": "bin/js-yaml.js" } }, - "node_modules/rechoir": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", - "integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==", + "node_modules/readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, + "license": "MIT", "dependencies": { - "resolve": "^1.1.6" - }, - "engines": { - "node": ">= 0.10" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, - "node_modules/recursive-readdir": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz", - "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==", + "node_modules/readable-stream/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true, - "license": "MIT", - "dependencies": { - "minimatch": "^3.0.5" - }, - "engines": { - "node": ">=6.0.0" - } + "license": "MIT" }, - "node_modules/recursive-readdir/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "brace-expansion": "^1.1.7" + "picomatch": "^2.2.1" }, "engines": { - "node": "*" + "node": ">=8.10.0" } }, "node_modules/registry-auth-token": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-5.1.0.tgz", - "integrity": "sha512-GdekYuwLXLxMuFTwAPg5UKGLW/UXzQrZvH/Zj791BQif5T05T0RsaLfHc9q3ZOKi7n+BoprPD9mJ0O0k4xzUlw==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-5.1.1.tgz", + "integrity": "sha512-P7B4+jq8DeD2nMsAcdfaqHbssgHtZ7Z5+++a5ask90fvmJ8p5je4mOa+wzu+DB4vQ5tdJV/xywY+UnVFeQLV5Q==", "dev": true, "license": "MIT", "dependencies": { - "@pnpm/npm-conf": "^2.1.0" + "@pnpm/npm-conf": "^3.0.2" }, "engines": { "node": ">=14" @@ -8729,22 +7027,13 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10" - } - }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=0.10.0" } @@ -8759,19 +7048,6 @@ "node": ">=0.10.0" } }, - "node_modules/resolve": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", - "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", - "dev": true, - "license": "MIT", - "dependencies": { - "path-parse": "^1.0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/resolve-alpn": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", @@ -8789,6 +7065,16 @@ "node": ">=8" } }, + "node_modules/resolve.exports": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz", + "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + } + }, "node_modules/responselike": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz", @@ -8826,15 +7112,22 @@ "node": ">=0.10.0" } }, + "node_modules/rfdc": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz", + "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==", + "dev": true, + "license": "MIT" + }, "node_modules/rimraf": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.0.1.tgz", - "integrity": "sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A==", + "version": "6.1.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.1.3.tgz", + "integrity": "sha512-LKg+Cr2ZF61fkcaK1UdkH2yEBBKnYjTyWzTJT6KNPcSPaiT7HSdhtMXQuN5wkTX0Xu72KQ1l8S42rlmexS2hSA==", "dev": true, - "license": "ISC", + "license": "BlueOak-1.0.0", "dependencies": { - "glob": "^11.0.0", - "package-json-from-dist": "^1.0.0" + "glob": "^13.0.3", + "package-json-from-dist": "^1.0.1" }, "bin": { "rimraf": "dist/esm/bin.mjs" @@ -8847,14 +7140,17 @@ } }, "node_modules/ripemd160": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", - "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.3.tgz", + "integrity": "sha512-5Di9UC0+8h1L6ZD2d7awM7E/T4uA1fJRlx6zk/NvdCCVEoAnFqvHmCuNeIKoCeIixBX/q8uM+6ycDvF8woqosA==", "dev": true, "license": "MIT", "dependencies": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1" + "hash-base": "^3.1.2", + "inherits": "^2.0.4" + }, + "engines": { + "node": ">= 0.8" } }, "node_modules/rlp": { @@ -8870,23 +7166,6 @@ "rlp": "bin/rlp" } }, - "node_modules/router": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz", - "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "^4.4.0", - "depd": "^2.0.0", - "is-promise": "^4.0.0", - "parseurl": "^1.3.3", - "path-to-regexp": "^8.0.0" - }, - "engines": { - "node": ">= 18" - } - }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -8929,129 +7208,15 @@ "type": "consulting", "url": "https://feross.org/support" } - ], - "license": "MIT" - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true, - "license": "MIT" - }, - "node_modules/sc-istanbul": { - "version": "0.4.6", - "resolved": "https://registry.npmjs.org/sc-istanbul/-/sc-istanbul-0.4.6.tgz", - "integrity": "sha512-qJFF/8tW/zJsbyfh/iT/ZM5QNHE3CXxtLJbZsL+CzdJLBsPD7SedJZoUA4d8iAcN2IoMp/Dx80shOOd2x96X/g==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "abbrev": "1.0.x", - "async": "1.x", - "escodegen": "1.8.x", - "esprima": "2.7.x", - "glob": "^5.0.15", - "handlebars": "^4.0.1", - "js-yaml": "3.x", - "mkdirp": "0.5.x", - "nopt": "3.x", - "once": "1.x", - "resolve": "1.1.x", - "supports-color": "^3.1.0", - "which": "^1.1.1", - "wordwrap": "^1.0.0" - }, - "bin": { - "istanbul": "lib/cli.js" - } - }, - "node_modules/sc-istanbul/node_modules/esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha512-OarPfz0lFCiW4/AV2Oy1Rp9qu0iusTKqykwTspGCZtPxmF81JR4MmIebvF1F9+UOKth2ZubLQ4XGGaU+hSn99A==", - "dev": true, - "license": "BSD-2-Clause", - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/sc-istanbul/node_modules/glob": { - "version": "5.0.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "integrity": "sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - } - }, - "node_modules/sc-istanbul/node_modules/has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/sc-istanbul/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/sc-istanbul/node_modules/resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==", - "dev": true, + ], "license": "MIT" }, - "node_modules/sc-istanbul/node_modules/supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^1.0.0" - }, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/sc-istanbul/node_modules/which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true, - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "which": "bin/which" - } + "license": "MIT" }, "node_modules/scrypt-js": { "version": "3.0.1", @@ -9061,9 +7226,9 @@ "license": "MIT" }, "node_modules/secp256k1": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-4.0.4.tgz", - "integrity": "sha512-6JfvwvjUOn8F/jUoBY2Q1v5WY5XS+rj8qSe0v8Y4ezH4InLgTEeOOPQsRll9OV429Pvo6BCHGavIyJfr3TAhsw==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-4.0.5.tgz", + "integrity": "sha512-SQZi5+/uiJIFPYbeRrVuu77Sr3bFOTq0oCQs67CqYwdmg0lhnqi/8djSWhzNO3GKGOqxBYCdx8zJJv0zUwDDvw==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -9084,9 +7249,9 @@ "license": "MIT" }, "node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "version": "7.8.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", + "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", "dev": true, "license": "ISC", "bin": { @@ -9096,53 +7261,33 @@ "node": ">=10" } }, - "node_modules/send": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/send/-/send-1.2.0.tgz", - "integrity": "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "^4.3.5", - "encodeurl": "^2.0.0", - "escape-html": "^1.0.3", - "etag": "^1.8.1", - "fresh": "^2.0.0", - "http-errors": "^2.0.0", - "mime-types": "^3.0.1", - "ms": "^2.1.3", - "on-finished": "^2.4.1", - "range-parser": "^1.2.1", - "statuses": "^2.0.1" - }, - "engines": { - "node": ">= 18" - } - }, "node_modules/serialize-javascript": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", "dev": true, "license": "BSD-3-Clause", + "peer": true, "dependencies": { "randombytes": "^2.1.0" } }, - "node_modules/serve-static": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.0.tgz", - "integrity": "sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==", + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", "dev": true, "license": "MIT", "dependencies": { - "encodeurl": "^2.0.0", - "escape-html": "^1.0.3", - "parseurl": "^1.3.3", - "send": "^1.2.0" + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" }, "engines": { - "node": ">= 18" + "node": ">= 0.4" } }, "node_modules/setimmediate": { @@ -9152,39 +7297,25 @@ "dev": true, "license": "MIT" }, - "node_modules/setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "dev": true, - "license": "ISC" - }, "node_modules/sha.js": { - "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", - "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", + "version": "2.4.12", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.12.tgz", + "integrity": "sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==", "dev": true, "license": "(MIT AND BSD-3-Clause)", "dependencies": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "^2.0.4", + "safe-buffer": "^5.2.1", + "to-buffer": "^1.2.0" }, "bin": { "sha.js": "bin.js" - } - }, - "node_modules/sha1": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/sha1/-/sha1-1.1.1.tgz", - "integrity": "sha512-dZBS6OrMjtgVkopB1Gmo4RQCDKiZsqcpAQpkV/aaj+FCrCg8r4I4qMkDPQjBgLIxlmu9k4nUbWq6ohXahOneYA==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "charenc": ">= 0.0.1", - "crypt": ">= 0.0.1" }, "engines": { - "node": "*" + "node": ">= 0.10" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/shallowequal": { @@ -9214,384 +7345,104 @@ "dev": true, "license": "MIT", "engines": { - "node": ">=8" - } - }, - "node_modules/shelljs": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz", - "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "glob": "^7.0.0", - "interpret": "^1.0.0", - "rechoir": "^0.6.2" - }, - "bin": { - "shjs": "bin/shjs" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/shelljs/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/shelljs/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/side-channel": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", - "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", - "dev": true, - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "object-inspect": "^1.13.3", - "side-channel-list": "^1.0.0", - "side-channel-map": "^1.0.1", - "side-channel-weakmap": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/side-channel-list": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", - "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", - "dev": true, - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "object-inspect": "^1.13.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/side-channel-map": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", - "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bound": "^1.0.2", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.5", - "object-inspect": "^1.13.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/side-channel-weakmap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", - "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bound": "^1.0.2", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.5", - "object-inspect": "^1.13.3", - "side-channel-map": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/solc": { - "version": "0.8.26", - "resolved": "https://registry.npmjs.org/solc/-/solc-0.8.26.tgz", - "integrity": "sha512-yiPQNVf5rBFHwN6SIf3TUUvVAFKcQqmSUFeq+fb6pNRCo0ZCgpYOZDi3BVoezCPIAcKrVYd/qXlBLUP9wVrZ9g==", - "dev": true, - "license": "MIT", - "dependencies": { - "command-exists": "^1.2.8", - "commander": "^8.1.0", - "follow-redirects": "^1.12.1", - "js-sha3": "0.8.0", - "memorystream": "^0.3.1", - "semver": "^5.5.0", - "tmp": "0.0.33" - }, - "bin": { - "solcjs": "solc.js" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/solc/node_modules/commander": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", - "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 12" - } - }, - "node_modules/solc/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/solhint": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/solhint/-/solhint-6.0.1.tgz", - "integrity": "sha512-Lew5nhmkXqHPybzBzkMzvvWkpOJSSLTkfTZwRriWvfR2naS4YW2PsjVGaoX9tZFmHh7SuS+e2GEGo5FPYYmJ8g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@solidity-parser/parser": "^0.20.2", - "ajv": "^6.12.6", - "ajv-errors": "^1.0.1", - "antlr4": "^4.13.1-patch-1", - "ast-parents": "^0.0.1", - "better-ajv-errors": "^2.0.2", - "chalk": "^4.1.2", - "commander": "^10.0.0", - "cosmiconfig": "^8.0.0", - "fast-diff": "^1.2.0", - "glob": "^8.0.3", - "ignore": "^5.2.4", - "js-yaml": "^4.1.0", - "latest-version": "^7.0.0", - "lodash": "^4.17.21", - "pluralize": "^8.0.0", - "semver": "^7.5.2", - "table": "^6.8.1", - "text-table": "^0.2.0" - }, - "bin": { - "solhint": "solhint.js" - }, - "optionalDependencies": { - "prettier": "^2.8.3" - } - }, - "node_modules/solhint-plugin-openzeppelin": { - "resolved": "lib/@openzeppelin-contracts/scripts/solhint-custom", - "link": true - }, - "node_modules/solhint/node_modules/@solidity-parser/parser": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.20.2.tgz", - "integrity": "sha512-rbu0bzwNvMcwAjH86hiEAcOeRI2EeK8zCkHDrFykh/Al8mvJeFmjy3UrE7GYQjNwOgbGUUtCn5/k8CB8zIu7QA==", - "dev": true, - "license": "MIT" - }, - "node_modules/solhint/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/solhint/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true, - "license": "Python-2.0" - }, - "node_modules/solhint/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/solhint/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "node": ">=8" } }, - "node_modules/solhint/node_modules/commander": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", - "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true, "license": "MIT", "engines": { - "node": ">=14" + "node": ">=8" } }, - "node_modules/solhint/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "deprecated": "Glob versions prior to v9 are no longer supported", + "node_modules/slice-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", + "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" }, "engines": { - "node": ">=12" + "node": ">=10" }, "funding": { - "url": "https://github.com/sponsors/isaacs" + "url": "https://github.com/chalk/slice-ansi?sponsor=1" } }, - "node_modules/solhint/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "node_modules/solhint": { + "version": "6.2.4", + "resolved": "https://registry.npmjs.org/solhint/-/solhint-6.2.4.tgz", + "integrity": "sha512-2hCfsDGcCit/4Ue0Bf3HxalxEaHM/rfoSf3rMVAQQ5NWWcVPS0F+RSqQzMEPc8Ta7r5L3DeaKyzmbjD5B2fUdg==", "dev": true, "license": "MIT", "dependencies": { - "argparse": "^2.0.1" + "@solidity-parser/parser": "^0.20.2", + "ajv": "^8.18.0", + "ast-parents": "^0.0.1", + "better-ajv-errors": "^2.0.2", + "chalk": "^4.1.2", + "commander": "^10.0.0", + "cosmiconfig": "^8.0.0", + "fast-diff": "^1.2.0", + "glob": "^13.0.6", + "ignore": "^5.2.4", + "js-yaml": "^4.1.0", + "latest-version": "^7.0.0", + "lodash": "^4.17.21", + "pluralize": "^8.0.0", + "semver": "^7.5.2", + "table": "^6.8.1", + "text-table": "^0.2.0" }, "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/solhint/node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, - "license": "MIT" - }, - "node_modules/solhint/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" + "solhint": "solhint.js" }, "engines": { - "node": ">=10" + "node": ">=20" + }, + "optionalDependencies": { + "prettier": "^3.0.0" } }, - "node_modules/solhint/node_modules/prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "node_modules/solhint-plugin-openzeppelin": { + "resolved": "lib/@openzeppelin-contracts/scripts/solhint-custom", + "link": true + }, + "node_modules/solhint/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "license": "MIT", - "optional": true, - "bin": { - "prettier": "bin-prettier.js" + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" }, "engines": { - "node": ">=10.13.0" + "node": ">=10" }, "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" + "url": "https://github.com/chalk/chalk?sponsor=1" } }, "node_modules/solidity-ast": { - "version": "0.4.60", - "resolved": "https://registry.npmjs.org/solidity-ast/-/solidity-ast-0.4.60.tgz", - "integrity": "sha512-UwhasmQ37ji1ul8cIp0XlrQ/+SVQhy09gGqJH4jnwdo2TgI6YIByzi0PI5QvIGcIdFOs1pbSmJW1pnWB7AVh2w==", + "version": "0.4.62", + "resolved": "https://registry.npmjs.org/solidity-ast/-/solidity-ast-0.4.62.tgz", + "integrity": "sha512-jSC7msQCkJXIzM8LlDjRZ5cif5w40g6THlXHFk3zchbL5dm3YLoBETvqPGo5KndYkftjhcs5kz1fnTu4d34lVQ==", "dev": true, "license": "MIT" }, @@ -9676,6 +7527,9 @@ "arm64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -9693,6 +7547,9 @@ "arm64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -9710,6 +7567,9 @@ "x64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -9727,6 +7587,9 @@ "x64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -9787,227 +7650,7 @@ "node": ">= 10" } }, - "node_modules/solidity-coverage": { - "version": "0.8.15", - "resolved": "https://registry.npmjs.org/solidity-coverage/-/solidity-coverage-0.8.15.tgz", - "integrity": "sha512-qH7290NKww4/t/qFvnSEePEzON0k025IGVlwc8wo8Q6p+h1Tt6fV2M0k3yfsps3TomZYTROsfPXjx7MSnwD5uA==", - "dev": true, - "license": "ISC", - "dependencies": { - "@ethersproject/abi": "^5.0.9", - "@solidity-parser/parser": "^0.19.0", - "chalk": "^2.4.2", - "death": "^1.1.0", - "difflib": "^0.2.4", - "fs-extra": "^8.1.0", - "ghost-testrpc": "^0.0.2", - "global-modules": "^2.0.0", - "globby": "^10.0.1", - "jsonschema": "^1.2.4", - "lodash": "^4.17.21", - "mocha": "^10.2.0", - "node-emoji": "^1.10.0", - "pify": "^4.0.1", - "recursive-readdir": "^2.2.2", - "sc-istanbul": "^0.4.5", - "semver": "^7.3.4", - "shelljs": "^0.8.3", - "web3-utils": "^1.3.6" - }, - "bin": { - "solidity-coverage": "plugins/bin.js" - }, - "peerDependencies": { - "hardhat": "^2.11.0" - } - }, - "node_modules/solidity-coverage/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/solidity-coverage/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/solidity-coverage/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/solidity-coverage/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true, - "license": "MIT" - }, - "node_modules/solidity-coverage/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/solidity-coverage/node_modules/fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - }, - "engines": { - "node": ">=6 <7 || >=8" - } - }, - "node_modules/solidity-coverage/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/solidity-coverage/node_modules/globby": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz", - "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/glob": "^7.1.1", - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.0.3", - "glob": "^7.1.3", - "ignore": "^5.1.1", - "merge2": "^1.2.3", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/solidity-coverage/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/solidity-coverage/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/solidity-coverage/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/solidity-docgen": { - "version": "0.6.0-beta.36", - "resolved": "https://registry.npmjs.org/solidity-docgen/-/solidity-docgen-0.6.0-beta.36.tgz", - "integrity": "sha512-f/I5G2iJgU1h0XrrjRD0hHMr7C10u276vYvm//rw1TzFcYQ4xTOyAoi9oNAHRU0JU4mY9eTuxdVc2zahdMuhaQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "handlebars": "^4.7.7", - "solidity-ast": "^0.4.38" - }, - "peerDependencies": { - "hardhat": "^2.8.0" - } - }, "node_modules/source-map": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", - "integrity": "sha512-CBdZ2oa/BHhS4xj5DlhjWNHcan57/5YuvfdLf17iVmIpd9KRm+DFLmC6nBNj+6Ua7Kt3TmOjDpQT1aTYOQtoUA==", - "dev": true, - "optional": true, - "dependencies": { - "amdefine": ">=0.0.4" - }, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dev": true, - "license": "MIT", - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "node_modules/source-map-support/node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", @@ -10028,56 +7671,43 @@ "signal-exit": "^4.0.1" } }, - "node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true, - "license": "BSD-3-Clause" - }, - "node_modules/stacktrace-parser": { - "version": "0.1.11", - "resolved": "https://registry.npmjs.org/stacktrace-parser/-/stacktrace-parser-0.1.11.tgz", - "integrity": "sha512-WjlahMgHmCJpqzU8bIBy4qtsZdU9lRlcZE3Lvyej6t4tuOuv1vk57OW3MBrj6hXBFx/nNoC9MPMTcr5YA7NQbg==", - "dev": true, - "license": "MIT", - "dependencies": { - "type-fest": "^0.7.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/stacktrace-parser/node_modules/type-fest": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.7.1.tgz", - "integrity": "sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=8" - } - }, - "node_modules/statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "node_modules/spawndamnit/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "dev": true, - "license": "MIT", + "license": "ISC", "engines": { - "node": ">= 0.8" + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "dev": true, + "license": "BSD-3-Clause" + }, "node_modules/string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "license": "MIT", "dependencies": { - "safe-buffer": "~5.2.0" + "safe-buffer": "~5.1.0" } }, + "node_modules/string_decoder/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true, + "license": "MIT" + }, "node_modules/string-argv": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz", @@ -10110,6 +7740,7 @@ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -10119,26 +7750,6 @@ "node": ">=8" } }, - "node_modules/string-width-cjs/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/string-width/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -10159,6 +7770,7 @@ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "ansi-regex": "^5.0.1" }, @@ -10176,20 +7788,6 @@ "node": ">=4" } }, - "node_modules/strip-hex-prefix": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz", - "integrity": "sha512-q8d4ue7JGEiVcypji1bALTos+0pWtyGlivAWyPuTkHzuTCJqrK9sWxYQZUq6Nq3cuyv3bm734IhHvHtGGURU6A==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-hex-prefixed": "1.0.0" - }, - "engines": { - "node": ">=6.5.0", - "npm": ">=3" - } - }, "node_modules/strip-json-comments": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", @@ -10233,34 +7831,6 @@ "node": ">=10.0.0" } }, - "node_modules/table/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/table/node_modules/slice-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/slice-ansi?sponsor=1" - } - }, "node_modules/term-size": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz", @@ -10291,63 +7861,27 @@ "node": ">=18" } }, - "node_modules/tinyglobby": { - "version": "0.2.13", - "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz", - "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==", + "node_modules/to-buffer": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.2.2.tgz", + "integrity": "sha512-db0E3UJjcFhpDhAF4tLo03oli3pwl3dbnzXOUIlRKrp+ldk/VUxzpWYZENsw2SZiuBjHAk7DfB0VU7NKdpb6sw==", "dev": true, "license": "MIT", "dependencies": { - "fdir": "^6.4.4", - "picomatch": "^4.0.2" - }, - "engines": { - "node": ">=12.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/SuperchupuDev" - } - }, - "node_modules/tinyglobby/node_modules/fdir": { - "version": "6.4.4", - "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz", - "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "picomatch": "^3 || ^4" + "isarray": "^2.0.5", + "safe-buffer": "^5.2.1", + "typed-array-buffer": "^1.0.3" }, - "peerDependenciesMeta": { - "picomatch": { - "optional": true - } - } - }, - "node_modules/tinyglobby/node_modules/picomatch": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", - "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", - "dev": true, - "license": "MIT", "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" + "node": ">= 0.4" } }, - "node_modules/tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "node_modules/to-buffer/node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", "dev": true, - "license": "MIT", - "dependencies": { - "os-tmpdir": "~1.0.2" - }, - "engines": { - "node": ">=0.6.0" - } + "license": "MIT" }, "node_modules/to-regex-range": { "version": "5.0.1", @@ -10362,16 +7896,6 @@ "node": ">=8.0" } }, - "node_modules/toidentifier": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.6" - } - }, "node_modules/tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", @@ -10386,377 +7910,131 @@ "dev": true, "license": "0BSD" }, - "node_modules/tsort": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/tsort/-/tsort-0.0.1.tgz", - "integrity": "sha512-Tyrf5mxF8Ofs1tNoxA13lFeZ2Zrbd6cKbuH3V+MQ5sb6DtBj5FjrXVsRWT8YvNAQTqNoz66dz1WsbigI22aEnw==", - "dev": true, - "license": "MIT" - }, - "node_modules/type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, - "license": "MIT", - "dependencies": { - "prelude-ls": "^1.2.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/type-detect": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", - "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/type-is": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz", - "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==", - "dev": true, - "license": "MIT", - "dependencies": { - "content-type": "^1.0.5", - "media-typer": "^1.1.0", - "mime-types": "^3.0.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/typed-regex": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/typed-regex/-/typed-regex-0.0.8.tgz", - "integrity": "sha512-1XkGm1T/rUngbFROIOw9wPnMAKeMsRoc+c9O6GwOHz6aH/FrJFtcyd2sHASbT0OXeGLot5N1shPNpwHGTv9RdQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/uglify-js": { - "version": "3.19.3", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz", - "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==", - "dev": true, - "license": "BSD-2-Clause", - "optional": true, - "bin": { - "uglifyjs": "bin/uglifyjs" - }, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/undici": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-8.10.0.tgz", - "integrity": "sha512-HvltHd7avK13QIw/oLe4qoOLyoVSoafqJ2jYOrtMRBkbYT31eiBQ8O0ehRKZiEZCMEyLFQNIADpgCWC5fALvYQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=22.19.0" - } - }, - "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==", - "dev": true, - "license": "MIT" - }, - "node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "punycode": "^2.1.0" - } - }, - "node_modules/utf8": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz", - "integrity": "sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true, - "license": "MIT" - }, - "node_modules/uuid": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", - "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", - "dev": true, - "funding": [ - "https://github.com/sponsors/broofa", - "https://github.com/sponsors/ctavan" - ], - "license": "MIT", - "bin": { - "uuid": "dist/bin/uuid" - } - }, - "node_modules/vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/viem": { - "version": "2.29.0", - "resolved": "https://registry.npmjs.org/viem/-/viem-2.29.0.tgz", - "integrity": "sha512-N6GeIuuay/spDyw+5FbSuNIkVN0da+jGOjdlC0bdatIN+N0jtOf9Zfj0pbXgpIJGwnM9ocxzTRt0HZVbHBdL2Q==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/wevm" - } - ], - "license": "MIT", - "dependencies": { - "@noble/curves": "1.8.2", - "@noble/hashes": "1.7.2", - "@scure/bip32": "1.6.2", - "@scure/bip39": "1.5.4", - "abitype": "1.0.8", - "isows": "1.0.6", - "ox": "0.6.9", - "ws": "8.18.1" - }, - "peerDependencies": { - "typescript": ">=5.0.4" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/viem/node_modules/@noble/curves": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.8.2.tgz", - "integrity": "sha512-vnI7V6lFNe0tLAuJMu+2sX+FcL14TaCWy1qiczg1VwRmPrpQCdq5ESXQMqUc2tluRNf6irBXrWbl1mGN8uaU/g==", + "node_modules/tsx": { + "version": "4.23.12", + "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.23.12.tgz", + "integrity": "sha512-FDf4L4sYzKtzWYhU/Xm0AQFdTjdIxNo9ElTf2mxXM6k8YMHXzYUe4yODVaXP4V9uMFbVg8c0qyBccK2OOxb45Q==", "dev": true, "license": "MIT", "dependencies": { - "@noble/hashes": "1.7.2" + "esbuild": "~0.28.0" }, - "engines": { - "node": "^14.21.3 || >=16" + "bin": { + "tsx": "dist/cli.mjs" }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/viem/node_modules/@noble/hashes": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.7.2.tgz", - "integrity": "sha512-biZ0NUSxyjLLqo6KxEJ1b+C2NAx0wtDoFvCaXHGgUkeHzf3Xc1xKumFKREuT7f7DARNZ/slvYUwFG6B0f2b6hQ==", - "dev": true, - "license": "MIT", "engines": { - "node": "^14.21.3 || >=16" + "node": ">=18.0.0" }, - "funding": { - "url": "https://paulmillr.com/funding/" + "optionalDependencies": { + "fsevents": "~2.3.3" } }, - "node_modules/viem/node_modules/@scure/bip32": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.6.2.tgz", - "integrity": "sha512-t96EPDMbtGgtb7onKKqxRLfE5g05k7uHnHRM2xdE6BP/ZmxaLtPek4J4KfVn/90IQNrU1IOAqMgiDtUdtbe3nw==", + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", "dev": true, "license": "MIT", "dependencies": { - "@noble/curves": "~1.8.1", - "@noble/hashes": "~1.7.1", - "@scure/base": "~1.2.2" + "prelude-ls": "^1.2.1" }, - "funding": { - "url": "https://paulmillr.com/funding/" + "engines": { + "node": ">= 0.8.0" } }, - "node_modules/viem/node_modules/@scure/bip39": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.5.4.tgz", - "integrity": "sha512-TFM4ni0vKvCfBpohoh+/lY05i9gRbSwXWngAsF4CABQxoaOHijxuaZ2R6cStDQ5CHtHO9aGJTr4ksVJASRRyMA==", + "node_modules/typed-array-buffer": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz", + "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==", "dev": true, "license": "MIT", "dependencies": { - "@noble/hashes": "~1.7.1", - "@scure/base": "~1.2.4" + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.14" }, - "funding": { - "url": "https://paulmillr.com/funding/" + "engines": { + "node": ">= 0.4" } }, - "node_modules/viem/node_modules/ws": { - "version": "8.18.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz", - "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==", + "node_modules/typed-regex": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/typed-regex/-/typed-regex-0.0.8.tgz", + "integrity": "sha512-1XkGm1T/rUngbFROIOw9wPnMAKeMsRoc+c9O6GwOHz6aH/FrJFtcyd2sHASbT0OXeGLot5N1shPNpwHGTv9RdQ==", "dev": true, - "license": "MIT", - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": ">=5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } + "license": "MIT" }, - "node_modules/web3-utils": { - "version": "1.10.4", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.4.tgz", - "integrity": "sha512-tsu8FiKJLk2PzhDl9fXbGUWTkkVXYhtTA+SmEFkKft+9BgwLxfCRpU96sWv7ICC8zixBNd3JURVoiR3dUXgP8A==", + "node_modules/uglify-js": { + "version": "3.19.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz", + "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==", "dev": true, - "license": "LGPL-3.0", - "dependencies": { - "@ethereumjs/util": "^8.1.0", - "bn.js": "^5.2.1", - "ethereum-bloom-filters": "^1.0.6", - "ethereum-cryptography": "^2.1.2", - "ethjs-unit": "0.1.6", - "number-to-bn": "1.7.0", - "randombytes": "^2.1.0", - "utf8": "3.0.0" + "license": "BSD-2-Clause", + "optional": true, + "bin": { + "uglifyjs": "bin/uglifyjs" }, "engines": { - "node": ">=8.0.0" + "node": ">=0.8.0" } }, - "node_modules/web3-utils/node_modules/@noble/curves": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz", - "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==", + "node_modules/undici": { + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-8.10.0.tgz", + "integrity": "sha512-HvltHd7avK13QIw/oLe4qoOLyoVSoafqJ2jYOrtMRBkbYT31eiBQ8O0ehRKZiEZCMEyLFQNIADpgCWC5fALvYQ==", "dev": true, "license": "MIT", - "dependencies": { - "@noble/hashes": "1.4.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" + "engines": { + "node": ">=22.19.0" } }, - "node_modules/web3-utils/node_modules/@noble/hashes": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz", - "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==", + "node_modules/undici-types": { + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.24.6.tgz", + "integrity": "sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==", "dev": true, - "license": "MIT", - "engines": { - "node": ">= 16" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } + "license": "MIT" }, - "node_modules/web3-utils/node_modules/@scure/base": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.9.tgz", - "integrity": "sha512-8YKhl8GHiNI/pU2VMaofa2Tor7PJRAjwQLBBuilkJ9L5+13yVbC7JO/wS7piioAvPSwR3JKM1IJ/u4xQzbcXKg==", + "node_modules/universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", "dev": true, "license": "MIT", - "funding": { - "url": "https://paulmillr.com/funding/" + "engines": { + "node": ">= 4.0.0" } }, - "node_modules/web3-utils/node_modules/@scure/bip32": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz", - "integrity": "sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==", + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "dev": true, - "license": "MIT", + "license": "BSD-2-Clause", "dependencies": { - "@noble/curves": "~1.4.0", - "@noble/hashes": "~1.4.0", - "@scure/base": "~1.1.6" - }, - "funding": { - "url": "https://paulmillr.com/funding/" + "punycode": "^2.1.0" } }, - "node_modules/web3-utils/node_modules/@scure/bip39": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz", - "integrity": "sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==", + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", "dev": true, - "license": "MIT", - "dependencies": { - "@noble/hashes": "~1.4.0", - "@scure/base": "~1.1.6" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } + "license": "MIT" }, - "node_modules/web3-utils/node_modules/ethereum-cryptography": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.2.1.tgz", - "integrity": "sha512-r/W8lkHSiTLxUxW8Rf3u4HGB0xQweG2RyETjywylKZSzLWoWAijRz8WCuOtJ6wah+avllXBqZuk29HCCvhEIRg==", + "node_modules/uuid": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "deprecated": "uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).", "dev": true, + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], "license": "MIT", - "dependencies": { - "@noble/curves": "1.4.2", - "@noble/hashes": "1.4.0", - "@scure/bip32": "1.4.0", - "@scure/bip39": "1.3.0" + "bin": { + "uuid": "dist/bin/uuid" } }, "node_modules/webidl-conversions": { @@ -10793,17 +8071,26 @@ "node": ">= 8" } }, - "node_modules/widest-line": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", - "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==", + "node_modules/which-typed-array": { + "version": "1.1.22", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.22.tgz", + "integrity": "sha512-fvO4ExWMFsqyhG3AiPAObMuY1lxaqgYcxbc49CNdWDDECOJNgQyvsOWVwbZc+qf3rzRtxojBK+CMEv0Ld5CYpw==", "dev": true, "license": "MIT", "dependencies": { - "string-width": "^4.0.0" + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.9", + "call-bound": "^1.0.4", + "for-each": "^0.3.5", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2" }, "engines": { - "node": ">=8" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/word-wrap": { @@ -10824,25 +8111,26 @@ "license": "MIT" }, "node_modules/workerpool": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", - "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==", + "version": "9.3.4", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-9.3.4.tgz", + "integrity": "sha512-TmPRQYYSAnnDiEB0P/Ytip7bFGvqnSU6I2BcuSw7Hx+JSg/DsUi5ebYfc8GYaSdpuvOcEs6dXxPurOYpe9QFwg==", "dev": true, - "license": "Apache-2.0" + "license": "Apache-2.0", + "peer": true }, "node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz", + "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==", "dev": true, "license": "MIT", "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" + "ansi-styles": "^6.2.1", + "string-width": "^7.0.0", + "strip-ansi": "^7.1.0" }, "engines": { - "node": ">=10" + "node": ">=18" }, "funding": { "url": "https://github.com/chalk/wrap-ansi?sponsor=1" @@ -10855,6 +8143,7 @@ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -10867,17 +8156,77 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "node_modules/wrap-ansi/node_modules/ansi-regex": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.3.0.tgz", + "integrity": "sha512-WpDfL7NO6j7tH88IDBNVdUJxDh9nmCteAVW9dsep846XdwF4naCBK+/tGLX3KJgcpgMRXCFlTM2hKGoK9FsdrQ==", "dev": true, - "license": "ISC" + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-styles": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/wrap-ansi/node_modules/emoji-regex": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", + "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==", + "dev": true, + "license": "MIT" + }, + "node_modules/wrap-ansi/node_modules/string-width": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", + "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/wrap-ansi/node_modules/strip-ansi": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", + "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.2.2" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } }, "node_modules/ws": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", - "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", + "version": "8.21.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.0.tgz", + "integrity": "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==", "dev": true, "license": "MIT", "engines": { @@ -10924,16 +8273,16 @@ } }, "node_modules/yargs": { - "version": "18.0.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.0.0.tgz", - "integrity": "sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==", + "version": "18.1.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.1.0.tgz", + "integrity": "sha512-2rAgRKu54VsHkqI0/tYkmluGXHD4KW7yZoycuqDQ15QOTnc2VVfy0nN/1eMhnQLO00A+dwtK20xuCnc1YGeUyg==", "dev": true, "license": "MIT", "dependencies": { "cliui": "^9.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", - "string-width": "^7.2.0", + "string-width": "^8.2.1", "y18n": "^5.0.5", "yargs-parser": "^22.0.0" }, @@ -10942,13 +8291,14 @@ } }, "node_modules/yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", "dev": true, "license": "ISC", + "peer": true, "engines": { - "node": ">=10" + "node": ">=12" } }, "node_modules/yargs-unparser": { @@ -10957,6 +8307,7 @@ "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "camelcase": "^6.0.0", "decamelize": "^4.0.0", @@ -10968,9 +8319,9 @@ } }, "node_modules/yargs/node_modules/ansi-regex": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", - "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.3.0.tgz", + "integrity": "sha512-WpDfL7NO6j7tH88IDBNVdUJxDh9nmCteAVW9dsep846XdwF4naCBK+/tGLX3KJgcpgMRXCFlTM2hKGoK9FsdrQ==", "dev": true, "license": "MIT", "engines": { @@ -10980,39 +8331,31 @@ "url": "https://github.com/chalk/ansi-regex?sponsor=1" } }, - "node_modules/yargs/node_modules/emoji-regex": { - "version": "10.4.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", - "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", - "dev": true, - "license": "MIT" - }, "node_modules/yargs/node_modules/string-width": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", - "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.2.2.tgz", + "integrity": "sha512-GaPUh5gfdrYzqeVNZvUfT23vYYxXzKYidUcnMtJg/3rxRV63EFZy3k6xfKlmfeJD0176lnUV/Usr3XcwSvFzpg==", "dev": true, "license": "MIT", "dependencies": { - "emoji-regex": "^10.3.0", - "get-east-asian-width": "^1.0.0", - "strip-ansi": "^7.1.0" + "get-east-asian-width": "^1.5.0", + "strip-ansi": "^7.1.2" }, "engines": { - "node": ">=18" + "node": ">=20" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/yargs/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", + "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", "dev": true, "license": "MIT", "dependencies": { - "ansi-regex": "^6.0.1" + "ansi-regex": "^6.2.2" }, "engines": { "node": ">=12" @@ -11032,9 +8375,9 @@ } }, "node_modules/yocto-queue": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.2.1.tgz", - "integrity": "sha512-AyeEbWOu/TAXdxlV9wmGcR0+yh2j3vYPGOECcIj2S7MkrLyC7ne+oye2BKTItt0ii2PHk4cDy+95+LshzbXnGg==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.2.2.tgz", + "integrity": "sha512-4LCcse/U2MHZ63HAJVE+v71o7yOdIe4cZ70Wpf8D/IyjDKYQLV5GD46B+hSTjJsvV5PztjvHoU580EftxjDZFQ==", "dev": true, "license": "MIT", "engines": { @@ -11045,24 +8388,14 @@ } }, "node_modules/zod": { - "version": "3.24.4", - "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.4.tgz", - "integrity": "sha512-OdqJE9UDRPwWsrHjLN2F8bPxvwJBK22EHLWtanu0LSYr5YqzsaaW3RMgmjwr8Rypg5k+meEJdSPXJZXE/yqOMg==", + "version": "3.25.76", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz", + "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==", "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/colinhacks" } - }, - "node_modules/zod-to-json-schema": { - "version": "3.24.5", - "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.5.tgz", - "integrity": "sha512-/AuWwMP+YqiPbsJx5D6TfgRTc4kTLjsh5SOcd4bLsfUg2RcEXrFMJl1DGgdHy2aCfsIA/cr/1JM0xcB2GZji8g==", - "dev": true, - "license": "ISC", - "peerDependencies": { - "zod": "^3.24.1" - } } } } diff --git a/package.json b/package.json index fc9c65377..e14032fad 100644 --- a/package.json +++ b/package.json @@ -19,15 +19,15 @@ "lint:fix": "npm run lint:js:fix && npm run lint:sol:fix", "lint:js": "prettier --log-level warn '**/*.{js,ts}' --check && eslint . --ignore-pattern lib/", "lint:js:fix": "prettier --log-level warn '**/*.{js,ts}' --write && eslint . --fix --ignore-pattern lib/", - "lint:sol": "prettier --log-level warn '{contracts,test}/**/*.sol' --check && solhint '{contracts,test}/**/*.sol'", + "lint:sol": "prettier --log-level warn '{contracts,test}/**/*.sol' --check && solhint --config solhint.config.cjs --noPoster '{contracts,test}/**/*.sol'", "lint:sol:fix": "prettier --log-level warn '{contracts,test}/**/*.sol' --write", - "coverage": "scripts/checks/coverage.sh", "generate": "scripts/generate/run.js", "test": "hardhat test", "test:generation": "scripts/checks/generation.sh", "test:inheritance": "scripts/checks/inheritance-ordering.js artifacts/build-info/*", "test:pragma": "scripts/checks/pragma-validity.js artifacts/build-info/*", - "gas-report": "env ENABLE_GAS_REPORT=true npm run test" + "coverage": "hardhat test --coverage", + "gas-report": "hardhat test --gas-stats" }, "homepage": "https://openzeppelin.com/contracts/", "repository": { @@ -47,7 +47,8 @@ ], "devDependencies": { "@openzeppelin/contracts": "file:lib/@openzeppelin-contracts", - "husky": "^9.1.7" + "husky": "^9.1.7", + "openzeppelin-solidity": "file:lib/@openzeppelin-contracts" }, "lint-staged": { "*.{js,ts}": [ @@ -56,7 +57,8 @@ ], "*.sol": [ "prettier --log-level warn --ignore-path .gitignore --check", - "solhint" + "solhint --config solhint.config.cjs --noPoster" ] - } + }, + "type": "module" } diff --git a/remappings.txt b/remappings.txt index 0ffaddd8e..be729580f 100644 --- a/remappings.txt +++ b/remappings.txt @@ -1,7 +1,8 @@ -@openzeppelin/contracts/=lib/@openzeppelin-contracts/contracts/ +@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/contracts/ @openzeppelin/contracts-upgradeable/=lib/@openzeppelin-contracts-upgradeable/contracts/ @openzeppelin/community-contracts/=contracts/ @axelar-network/axelar-gmp-sdk-solidity/=lib/axelar-gmp-sdk-solidity/ @zk-email/email-tx-builder/=lib/email-tx-builder/packages/contracts/ @zk-email/contracts/=lib/zk-email-verify/packages/contracts/ wormhole-solidity-sdk/=lib/wormhole-solidity-sdk/src/ +forge-std=lib/forge-std/src diff --git a/scripts/generate/run.js b/scripts/generate/run.js index 639e94785..23a228bea 100755 --- a/scripts/generate/run.js +++ b/scripts/generate/run.js @@ -1,20 +1,20 @@ #!/usr/bin/env node -const cp = require('child_process'); -const fs = require('fs'); -const path = require('path'); -const format = require('@openzeppelin/contracts/scripts/generate/format-lines'); +import cp from 'child_process'; +import fs from 'fs'; +import path from 'path'; +import format from '@openzeppelin/contracts/scripts/generate/format-lines.js'; function getVersion(path) { try { - return fs.readFileSync(path, 'utf8').match(/\/\/ OpenZeppelin Community Contracts \(last updated v[^)]+\)/)[0]; + return fs.readFileSync(path, 'utf8').match(/\/\/ OpenZeppelin Contracts \(last updated v[^)]+\)/)[0]; } catch { return null; } } -function generateFromTemplate(file, template, outputPrefix = '') { - const script = path.relative(path.join(__dirname, '../..'), __filename); +async function generateFromTemplate(file, template, outputPrefix = '', lint = false) { + const script = path.relative(path.join(import.meta.dirname, '../..'), import.meta.filename); const input = path.join(path.dirname(script), template); const output = path.join(outputPrefix, file); const version = getVersion(output); @@ -23,16 +23,21 @@ function generateFromTemplate(file, template, outputPrefix = '') { ...(version ? [version + ` (${file})`] : []), `// This file was procedurally generated from ${input}.`, '', - require(template).trimEnd(), + (await import(template)).default.trimEnd(), ); + + fs.mkdirSync(path.dirname(output), { recursive: true }); fs.writeFileSync(output, content); - cp.execFileSync('prettier', ['--write', output]); + lint && cp.execFileSync('prettier', ['--write', output]); } +// Some templates needs to go through the linter after generation +const needsLinter = ['utils/structs/EnumerableMapExtended.sol']; + // Contracts for (const [file, template] of Object.entries({ 'utils/structs/EnumerableSetExtended.sol': './templates/EnumerableSetExtended.js', 'utils/structs/EnumerableMapExtended.sol': './templates/EnumerableMapExtended.js', })) { - generateFromTemplate(file, template, './contracts/'); + await generateFromTemplate(file, template, './contracts/', needsLinter.includes(file)); } diff --git a/scripts/generate/templates/Enumerable.opts.js b/scripts/generate/templates/Enumerable.opts.js index 24ba12ed5..fef3f1d28 100644 --- a/scripts/generate/templates/Enumerable.opts.js +++ b/scripts/generate/templates/Enumerable.opts.js @@ -1,6 +1,6 @@ -const { capitalize, mapValues } = require('@openzeppelin/contracts/scripts/helpers'); +import { capitalize, mapValues } from '@openzeppelin/contracts/scripts/helpers.js'; -const typeDescr = ({ type, size = 0, memory = false }) => { +export const typeDescr = ({ type, size = 0, memory = false }) => { memory |= size > 0; const name = [type == 'uint256' ? 'Uint' : capitalize(type), size].filter(Boolean).join('x'); @@ -10,31 +10,23 @@ const typeDescr = ({ type, size = 0, memory = false }) => { return { name, type: typeFull, typeLoc, base, size, memory }; }; -const toSetTypeDescr = value => ({ +export const toSetTypeDescr = value => ({ name: value.name + 'Set', value, }); -const toMapTypeDescr = ({ key, value }) => ({ +export const toMapTypeDescr = ({ key, value }) => ({ name: `${key.name}To${value.name}Map`, keySet: toSetTypeDescr(key), key, value, }); -const SET_TYPES = [{ type: 'bytes32', size: 2 }].map(typeDescr).map(toSetTypeDescr); +export const SET_TYPES = [{ type: 'bytes32', size: 2 }].map(typeDescr).map(toSetTypeDescr); -const MAP_TYPES = [ +export const MAP_TYPES = [ { key: { type: 'bytes', memory: true }, value: { type: 'uint256' } }, { key: { type: 'string', memory: true }, value: { type: 'string', memory: true } }, ] .map(entry => mapValues(entry, typeDescr)) .map(toMapTypeDescr); - -module.exports = { - SET_TYPES, - MAP_TYPES, - typeDescr, - toSetTypeDescr, - toMapTypeDescr, -}; diff --git a/scripts/generate/templates/EnumerableMapExtended.js b/scripts/generate/templates/EnumerableMapExtended.js index bf5ad0e03..cb85302ef 100644 --- a/scripts/generate/templates/EnumerableMapExtended.js +++ b/scripts/generate/templates/EnumerableMapExtended.js @@ -1,5 +1,5 @@ -const format = require('@openzeppelin/contracts/scripts/generate/format-lines'); -const { SET_TYPES, MAP_TYPES } = require('./Enumerable.opts'); +import format from '@openzeppelin/contracts/scripts/generate/format-lines.js'; +import { SET_TYPES, MAP_TYPES } from './Enumerable.opts.js'; const header = `\ pragma solidity ^0.8.24; @@ -181,7 +181,7 @@ function keys(${name} storage map, uint256 start, uint256 end) internal view ret `; // GENERATE -module.exports = format( +export default format( header.trimEnd(), 'library EnumerableMapExtended {', format( diff --git a/scripts/generate/templates/EnumerableSetExtended.js b/scripts/generate/templates/EnumerableSetExtended.js index a59ea73a4..bf24282a4 100644 --- a/scripts/generate/templates/EnumerableSetExtended.js +++ b/scripts/generate/templates/EnumerableSetExtended.js @@ -1,5 +1,5 @@ -const format = require('@openzeppelin/contracts/scripts/generate/format-lines'); -const { SET_TYPES } = require('./Enumerable.opts'); +import format from '@openzeppelin/contracts/scripts/generate/format-lines.js'; +import { SET_TYPES } from './Enumerable.opts.js'; const header = `\ pragma solidity ^0.8.24; @@ -351,7 +351,7 @@ function _hash(bytes32[2] memory value) private pure returns (bytes32) { `; // GENERATE -module.exports = format( +export default format( header.trimEnd(), 'library EnumerableSetExtended {', format( diff --git a/solhint.config.cjs b/solhint.config.cjs new file mode 120000 index 000000000..14804fbc7 --- /dev/null +++ b/solhint.config.cjs @@ -0,0 +1 @@ +lib/@openzeppelin-contracts/solhint.config.cjs \ No newline at end of file diff --git a/solhint.config.js b/solhint.config.js deleted file mode 120000 index 5c14714b0..000000000 --- a/solhint.config.js +++ /dev/null @@ -1 +0,0 @@ -lib/@openzeppelin-contracts/solhint.config.js \ No newline at end of file diff --git a/test/access/manager/AccessManagerLight.test.js b/test/access/manager/AccessManagerLight.test.js index 56353d0b5..aa00d0e69 100644 --- a/test/access/manager/AccessManagerLight.test.js +++ b/test/access/manager/AccessManagerLight.test.js @@ -1,7 +1,11 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); -const { mapValues } = require('@openzeppelin/contracts/test/helpers/iterate'); +import { network } from 'hardhat'; +import { expect } from 'chai'; +import { mapValues } from '@openzeppelin/contracts/test/helpers/iterate'; + +const { + ethers, + networkHelpers: { loadFixture }, +} = await network.create(); // Mask helpers const toHexString = i => '0x' + i.toString(16).padStart(64, 0); @@ -37,7 +41,7 @@ describe('AccessManaged', function () { const groups = [13n, 69n, 128n]; describe('canCall', function () { - describe('simple case: one group', async function () { + describe('simple case: one group', function () { it('Requirements set and Permissions set', async function () { this.withRequirements = true; this.withPermission = true; @@ -71,7 +75,7 @@ describe('AccessManaged', function () { }); }); - describe('complexe case: one of many groups', async function () { + describe('complexe case: one of many groups', function () { it('some intersection', async function () { this.userGroups = [32, 42, 94, 128]; // User has all these groups this.targetGroups = [17, 35, 42, 69, 91]; // Target accepts any of these groups diff --git a/test/account/AccountERC7913.test.js b/test/account/AccountERC7913.test.js index b198fb5b5..bec6a49aa 100644 --- a/test/account/AccountERC7913.test.js +++ b/test/account/AccountERC7913.test.js @@ -1,17 +1,21 @@ -const { ethers, predeploy } = require('hardhat'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); - -const { getDomain, PackedUserOperation } = require('@openzeppelin/contracts/test/helpers/eip712'); -const { ERC4337Helper } = require('@openzeppelin/contracts/test/helpers/erc4337'); -const { NonNativeSigner } = require('@openzeppelin/contracts/test/helpers/signers'); -const { ZKEmailSigningKey } = require('../helpers/signers'); - -const { +import { network } from 'hardhat'; +import { getDomain } from '@openzeppelin/contracts/test/helpers/eip712'; +import { ERC4337Helper } from '@openzeppelin/contracts/test/helpers/erc4337'; +import { PackedUserOperation } from '@openzeppelin/contracts/test/helpers/eip712-types'; +import { NonNativeSigner } from '@openzeppelin/contracts/test/helpers/signers'; +import { shouldBehaveLikeAccountCore, shouldBehaveLikeAccountHolder, -} = require('@openzeppelin/contracts/test/account/Account.behavior'); -const { shouldBehaveLikeERC1271 } = require('@openzeppelin/contracts/test/utils/cryptography/ERC1271.behavior'); -const { shouldBehaveLikeERC7821 } = require('@openzeppelin/contracts/test/account/extensions/ERC7821.behavior'); +} from '@openzeppelin/contracts/test/account/Account.behavior'; +import { shouldBehaveLikeERC1271 } from '@openzeppelin/contracts/test/utils/cryptography/ERC1271.behavior'; +import { shouldBehaveLikeERC7821 } from '@openzeppelin/contracts/test/account/extensions/ERC7821.behavior'; +import { ZKEmailSigningKey } from '../helpers/signers'; + +const connection = await network.create(); +const { + ethers, + networkHelpers: { loadFixture }, +} = connection; // Constants for ZKEmail const accountSalt = '0x046582bce36cdd0a8953b9d40b8f20d58302bacf3bcecffeb6741c98a52725e2'; // keccak256("test@example.com") @@ -47,9 +51,9 @@ async function fixture() { const verifierZKEmail = await ethers.deployContract('$ERC7913ZKEmailVerifier'); // ERC-4337 env - const helper = new ERC4337Helper(); + const helper = new ERC4337Helper(connection); await helper.wait(); - const entrypointDomain = await getDomain(predeploy.entrypoint.v09); + const entrypointDomain = await getDomain(ethers.predeploy.entrypoint.v09); const domain = { name: 'AccountERC7913', version: '1', chainId: entrypointDomain.chainId }; // Missing verifyingContract const makeMock = signer => @@ -80,7 +84,7 @@ async function fixture() { describe('AccountERC7913', function () { beforeEach(async function () { - Object.assign(this, await loadFixture(fixture)); + Object.assign(this, connection, await loadFixture(fixture)); }); // Using ZKEmail with an ERC-7913 verifier diff --git a/test/account/AccountZKEmail.test.js b/test/account/AccountZKEmail.test.js index 26f731a15..6b884dbaa 100644 --- a/test/account/AccountZKEmail.test.js +++ b/test/account/AccountZKEmail.test.js @@ -1,16 +1,19 @@ -const { ethers } = require('hardhat'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); - -const { ERC4337Helper } = require('@openzeppelin/contracts/test/helpers/erc4337'); -const { NonNativeSigner } = require('@openzeppelin/contracts/test/helpers/signers'); -const { ZKEmailSigningKey } = require('../helpers/signers'); - -const { +import { network } from 'hardhat'; +import { ERC4337Helper } from '@openzeppelin/contracts/test/helpers/erc4337'; +import { NonNativeSigner } from '@openzeppelin/contracts/test/helpers/signers'; +import { shouldBehaveLikeAccountCore, shouldBehaveLikeAccountHolder, -} = require('@openzeppelin/contracts/test/account/Account.behavior'); -const { shouldBehaveLikeERC7821 } = require('@openzeppelin/contracts/test/account/extensions/ERC7821.behavior'); -const { shouldBehaveLikeERC1271 } = require('@openzeppelin/contracts/test/utils/cryptography/ERC1271.behavior'); +} from '@openzeppelin/contracts/test/account/Account.behavior'; +import { shouldBehaveLikeERC1271 } from '@openzeppelin/contracts/test/utils/cryptography/ERC1271.behavior'; +import { shouldBehaveLikeERC7821 } from '@openzeppelin/contracts/test/account/extensions/ERC7821.behavior'; +import { ZKEmailSigningKey } from '../helpers/signers'; + +const connection = await network.create(); +const { + ethers, + networkHelpers: { loadFixture }, +} = connection; const accountSalt = '0x046582bce36cdd0a8953b9d40b8f20d58302bacf3bcecffeb6741c98a52725e2'; // keccak256("test@example.com") const selector = '12345'; @@ -40,7 +43,7 @@ async function fixture() { const signer = new NonNativeSigner(new ZKEmailSigningKey(domainName, publicKeyHash, emailNullifier, accountSalt)); // ERC-4337 account - const helper = new ERC4337Helper(); + const helper = new ERC4337Helper(connection); const mock = await helper.newAccount('$AccountZKEmailMock', [accountSalt, dkim.target, verifier.target]); const signUserOp = async userOp => { @@ -80,7 +83,7 @@ async function fixture() { describe('AccountZKEmail', function () { beforeEach(async function () { - Object.assign(this, await loadFixture(fixture)); + Object.assign(this, connection, await loadFixture(fixture)); }); shouldBehaveLikeAccountCore(); diff --git a/test/account/RoleAccount.test.js b/test/account/RoleAccount.test.js index 17c9c3a4e..1fd18e9b2 100644 --- a/test/account/RoleAccount.test.js +++ b/test/account/RoleAccount.test.js @@ -1,5 +1,7 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); +import { network } from 'hardhat'; +import { expect } from 'chai'; + +const { ethers } = await network.create(); // Note that most tests related to RoleAccount are in test/account/RoleAccountFactory.test.js describe('RoleAccount', function () { diff --git a/test/account/RoleAccountFactory.test.js b/test/account/RoleAccountFactory.test.js index 3f3cdafc2..2c7bc07e8 100644 --- a/test/account/RoleAccountFactory.test.js +++ b/test/account/RoleAccountFactory.test.js @@ -1,10 +1,14 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); -const { getDomain } = require('@openzeppelin/contracts/test/helpers/eip712'); -const { ERC7739Signer } = require('@openzeppelin/contracts/test/helpers/erc7739'); -const { encodeMode, encodeBatch, CALL_TYPE_BATCH } = require('@openzeppelin/contracts/test/helpers/erc7579'); -const { shouldBehaveLikeERC1271 } = require('@openzeppelin/contracts/test/utils/cryptography/ERC1271.behavior'); +import { network } from 'hardhat'; +import { expect } from 'chai'; +import { getDomain } from '@openzeppelin/contracts/test/helpers/eip712'; +import { ERC7739Signer } from '@openzeppelin/contracts/test/helpers/erc7739'; +import { encodeMode, encodeBatch, CALL_TYPE_BATCH } from '@openzeppelin/contracts/test/helpers/erc7579'; +import { shouldBehaveLikeERC1271 } from '@openzeppelin/contracts/test/utils/cryptography/ERC1271.behavior'; + +const { + ethers, + networkHelpers: { loadFixture }, +} = await network.create(); const ERC1271_MAGIC_VALUE = '0x1626ba7e'; const ROLE = 42n; @@ -123,7 +127,7 @@ describe('RoleAccountFactory', function () { }); it('reverts when deploying the same role twice', async function () { - await expect(this.factory.deployRoleAccount(this.manager, ROLE)).to.be.reverted; + await expect(this.factory.deployRoleAccount(this.manager, ROLE)).to.revert(ethers); }); }); diff --git a/test/account/modules/ERC7579DelayedExecutor.test.js b/test/account/modules/ERC7579DelayedExecutor.test.js index 1082da992..32faefc5d 100644 --- a/test/account/modules/ERC7579DelayedExecutor.test.js +++ b/test/account/modules/ERC7579DelayedExecutor.test.js @@ -1,19 +1,22 @@ -const { ethers, predeploy } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture, time } = require('@nomicfoundation/hardhat-network-helpers'); - -const { impersonate } = require('@openzeppelin/contracts/test/helpers/account'); -const { ERC4337Helper } = require('@openzeppelin/contracts/test/helpers/erc4337'); -const { +import { network } from 'hardhat'; +import { expect } from 'chai'; +import { ERC4337Helper } from '@openzeppelin/contracts/test/helpers/erc4337'; +import { MODULE_TYPE_EXECUTOR, CALL_TYPE_CALL, EXEC_TYPE_DEFAULT, encodeMode, encodeSingle, -} = require('@openzeppelin/contracts/test/helpers/erc7579'); -const { OperationState } = require('../../helpers/enums'); +} from '@openzeppelin/contracts/test/helpers/erc7579'; +import { OperationState } from '../../helpers/enums'; +import { shouldBehaveLikeERC7579Module } from './ERC7579Module.behavior'; -const { shouldBehaveLikeERC7579Module } = require('./ERC7579Module.behavior'); +const connection = await network.create(); +const { + ethers, + helpers: { time, impersonate }, + networkHelpers: { loadFixture }, +} = connection; async function fixture() { const [other] = await ethers.getSigners(); @@ -23,7 +26,7 @@ async function fixture() { const target = await ethers.deployContract('CallReceiverMock'); // ERC-4337 env - const helper = new ERC4337Helper(); + const helper = new ERC4337Helper(connection); await helper.wait(); // Prepare module installation data @@ -34,7 +37,7 @@ async function fixture() { // ERC-7579 account const mockAccount = await helper.newAccount('$AccountERC7579'); const mockFromAccount = await impersonate(mockAccount.address).then(asAccount => mock.connect(asAccount)); - const mockAccountFromEntrypoint = await impersonate(predeploy.entrypoint.v09.target).then(asEntrypoint => + const mockAccountFromEntrypoint = await impersonate(ethers.predeploy.entrypoint.v09.target).then(asEntrypoint => mockAccount.connect(asEntrypoint), ); @@ -69,7 +72,7 @@ describe('ERC7579DelayedExecutor', function () { const salt = ethers.ZeroHash; beforeEach(async function () { - Object.assign(this, await loadFixture(fixture)); + Object.assign(this, connection, await loadFixture(fixture)); }); shouldBehaveLikeERC7579Module(); @@ -83,7 +86,7 @@ describe('ERC7579DelayedExecutor', function () { await expect(this.mock.state(this.mockAccount.address, salt, this.mode, this.calldata)).to.eventually.eq( OperationState.Scheduled, ); - await time.increase(this.delay); + await time.increaseBy.timestamp(this.delay); await expect(this.mock.state(this.mockAccount.address, salt, this.mode, this.calldata)).to.eventually.eq( OperationState.Ready, ); @@ -102,11 +105,11 @@ describe('ERC7579DelayedExecutor', function () { await expect(this.mock.state(this.mockAccount.address, salt, this.mode, this.calldata)).to.eventually.eq( OperationState.Scheduled, ); - await time.increase(this.delay); + await time.increaseBy.timestamp(this.delay); await expect(this.mock.state(this.mockAccount.address, salt, this.mode, this.calldata)).to.eventually.eq( OperationState.Ready, ); - await time.increase(this.expiration); + await time.increaseBy.timestamp(this.expiration); await expect(this.mock.state(this.mockAccount.address, salt, this.mode, this.calldata)).to.eventually.eq( OperationState.Expired, ); @@ -121,7 +124,7 @@ describe('ERC7579DelayedExecutor', function () { await expect(this.mock.state(this.mockAccount.address, salt, this.mode, this.calldata)).to.eventually.eq( OperationState.Scheduled, ); - await time.increase(this.delay); + await time.increaseBy.timestamp(this.delay); await expect(this.mock.state(this.mockAccount.address, salt, this.mode, this.calldata)).to.eventually.eq( OperationState.Ready, ); @@ -133,7 +136,7 @@ describe('ERC7579DelayedExecutor', function () { it('sets an initial delay and expiration on installation', async function () { const tx = await this.mockAccountFromEntrypoint.installModule(this.moduleType, this.mock.target, this.installData); - const now = await time.latest(); + const now = await time.clock.timestamp(); await expect(tx) .to.emit(this.mock, 'ERC7579ExecutorDelayUpdated') .withArgs(this.mockAccount.address, this.delay, now) @@ -149,7 +152,7 @@ describe('ERC7579DelayedExecutor', function () { it('sets default delay and expiration on installation', async function () { const tx = await this.mockAccountFromEntrypoint.installModule(this.moduleType, this.mock.target, '0x'); - const now = await time.latest(); + const now = await time.clock.timestamp(); await expect(tx) .to.emit(this.mock, 'ERC7579ExecutorDelayUpdated') .withArgs(this.mockAccount.address, time.duration.days(5), now) @@ -160,7 +163,7 @@ describe('ERC7579DelayedExecutor', function () { it('schedule delay unset and unsets expiration on uninstallation', async function () { await this.mockAccountFromEntrypoint.installModule(this.moduleType, this.mock.target, this.installData); const tx = await this.mockAccountFromEntrypoint.uninstallModule(this.moduleType, this.mock.target, '0x'); - const now = await time.latest(); + const now = await time.clock.timestamp(); await expect(tx) .to.emit(this.mock, 'ERC7579ExecutorDelayUpdated') .withArgs(this.mockAccount.address, 0, now + this.delay) // Old delay @@ -173,7 +176,7 @@ describe('ERC7579DelayedExecutor', function () { const newDelay = time.duration.days(5); const tx = await this.mockFromAccount.setDelay(newDelay); - const now = await time.latest(); + const now = await time.clock.timestamp(); const effect = now + this.delay - newDelay; // Delay is scheduled, will take effect later @@ -183,7 +186,7 @@ describe('ERC7579DelayedExecutor', function () { await expect(this.mock.getDelay(this.mockAccount.target)).to.eventually.deep.equal([this.delay, newDelay, effect]); // Later, it takes effect - await time.increaseTo(effect); + await time.increaseTo.timestamp(effect); await expect(this.mock.getDelay(this.mockAccount.target)).to.eventually.deep.equal([newDelay, 0, 0]); }); @@ -205,7 +208,7 @@ describe('ERC7579DelayedExecutor', function () { it('schedules an operation if called by the account', async function () { const id = this.mock.hashOperation(this.mockAccount.address, salt, this.mode, this.calldata); const tx = await this.mockFromAccount.schedule(this.mockAccount.address, salt, this.mode, this.calldata); - const now = await time.latest(); + const now = await time.clock.timestamp(); await expect(tx) .to.emit(this.mock, 'ERC7579ExecutorOperationScheduled') .withArgs(this.mockAccount.address, id, salt, this.mode, this.calldata, now + this.delay); @@ -227,7 +230,7 @@ describe('ERC7579DelayedExecutor', function () { describe('execution', function () { beforeEach(async function () { await this.mockAccountFromEntrypoint.installModule(this.moduleType, this.mock.target, this.installData); - const now = await time.latest(); + const now = await time.clock.timestamp(); const [delay] = await this.mock.getDelay(this.mockAccount.address); await this.mock.$_scheduleAt(this.mockAccount.address, salt, this.mode, this.calldata, now, delay); }); @@ -245,7 +248,7 @@ describe('ERC7579DelayedExecutor', function () { }); it('executes if called by the account when delay passes but has not expired with any caller', async function () { - await time.increase(this.delay); + await time.increaseBy.timestamp(this.delay); await expect(this.mock.execute(this.mockAccount.address, salt, this.mode, this.calldata)) .to.emit(this.target, 'MockFunctionCalledWithArgs') .withArgs(...this.args); @@ -255,7 +258,7 @@ describe('ERC7579DelayedExecutor', function () { }); it('executes if called by the account when delay passes but has not expired with the account as caller', async function () { - await time.increase(this.delay); + await time.increaseBy.timestamp(this.delay); await expect(this.mockFromAccount.execute(this.mockAccount.address, salt, this.mode, this.calldata)) .to.emit(this.target, 'MockFunctionCalledWithArgs') .withArgs(...this.args); @@ -265,14 +268,14 @@ describe('ERC7579DelayedExecutor', function () { }); it('reverts with ERC7579ExecutorUnexpectedOperationState if the operation was expired with any caller', async function () { - await time.increase(this.delay + this.expiration); + await time.increaseBy.timestamp(this.delay + this.expiration); await expect( this.mock.execute(this.mockAccount.address, salt, this.mode, this.calldata), ).to.be.revertedWithCustomError(this.mock, 'ERC7579ExecutorUnexpectedOperationState'); }); it('reverts if the operation was expired with the account as caller', async function () { - await time.increase(this.delay + this.expiration); + await time.increaseBy.timestamp(this.delay + this.expiration); await expect( this.mockFromAccount.execute(this.mockAccount.address, salt, this.mode, this.calldata), ).to.be.revertedWithCustomError(this.mock, 'ERC7579ExecutorUnexpectedOperationState'); // Allowed, expired @@ -282,7 +285,7 @@ describe('ERC7579DelayedExecutor', function () { describe('cancelling', function () { beforeEach(async function () { await this.mockAccountFromEntrypoint.installModule(this.moduleType, this.mock.target, this.installData); - const now = await time.latest(); + const now = await time.clock.timestamp(); const [delay] = await this.mock.getDelay(this.mockAccount.address); await this.mock.$_scheduleAt(this.mockAccount.address, salt, this.mode, this.calldata, now, delay); }); diff --git a/test/account/modules/ERC7579Executor.test.js b/test/account/modules/ERC7579Executor.test.js index ce87d1eab..90a1ecbce 100644 --- a/test/account/modules/ERC7579Executor.test.js +++ b/test/account/modules/ERC7579Executor.test.js @@ -1,18 +1,21 @@ -const { ethers, predeploy } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); - -const { impersonate } = require('@openzeppelin/contracts/test/helpers/account'); -const { ERC4337Helper } = require('@openzeppelin/contracts/test/helpers/erc4337'); -const { +import { network } from 'hardhat'; +import { expect } from 'chai'; +import { ERC4337Helper } from '@openzeppelin/contracts/test/helpers/erc4337'; +import { MODULE_TYPE_EXECUTOR, - encodeSingle, - encodeMode, CALL_TYPE_CALL, EXEC_TYPE_DEFAULT, -} = require('@openzeppelin/contracts/test/helpers/erc7579'); + encodeMode, + encodeSingle, +} from '@openzeppelin/contracts/test/helpers/erc7579'; +import { shouldBehaveLikeERC7579Module } from './ERC7579Module.behavior'; -const { shouldBehaveLikeERC7579Module } = require('./ERC7579Module.behavior'); +const connection = await network.create(); +const { + ethers, + helpers: { impersonate }, + networkHelpers: { loadFixture }, +} = connection; async function fixture() { // Deploy ERC-7579 validator module @@ -20,7 +23,7 @@ async function fixture() { const target = await ethers.deployContract('CallReceiverMock'); // ERC-4337 env - const helper = new ERC4337Helper(); + const helper = new ERC4337Helper(connection); await helper.wait(); // Prepare module installation data @@ -33,7 +36,7 @@ async function fixture() { const moduleType = MODULE_TYPE_EXECUTOR; await mockAccount.deploy(); - await impersonate(predeploy.entrypoint.v09.target).then(asEntrypoint => + await impersonate(ethers.predeploy.entrypoint.v09.target).then(asEntrypoint => mockAccount.connect(asEntrypoint).installModule(moduleType, mock.target, installData), ); @@ -58,7 +61,7 @@ async function fixture() { describe('ERC7579Executor', function () { beforeEach(async function () { - Object.assign(this, await loadFixture(fixture)); + Object.assign(this, connection, await loadFixture(fixture)); }); describe('execute', function () { diff --git a/test/account/modules/ERC7579Module.behavior.js b/test/account/modules/ERC7579Module.behavior.js index 7645c4ba7..3bfe14ad1 100644 --- a/test/account/modules/ERC7579Module.behavior.js +++ b/test/account/modules/ERC7579Module.behavior.js @@ -1,8 +1,8 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); -const { SIG_VALIDATION_SUCCESS, SIG_VALIDATION_FAILURE } = require('@openzeppelin/contracts/test/helpers/erc4337'); +import { ethers } from 'ethers'; +import { expect } from 'chai'; +import { SIG_VALIDATION_SUCCESS, SIG_VALIDATION_FAILURE } from '@openzeppelin/contracts/test/helpers/erc4337'; -function shouldBehaveLikeERC7579Module() { +export function shouldBehaveLikeERC7579Module() { describe('behaves like ERC7579Module', function () { it('identifies its module type correctly', async function () { await expect(this.mock.isModuleType(this.moduleType)).to.eventually.be.true; @@ -10,14 +10,14 @@ function shouldBehaveLikeERC7579Module() { }); it('handles installation, uninstallation, and re-installation', async function () { - await expect(this.mockFromAccount.onInstall(this.installData || '0x')).to.not.be.reverted; - await expect(this.mockFromAccount.onUninstall(this.uninstallData || '0x')).to.not.be.reverted; - await expect(this.mockFromAccount.onInstall(this.installData || '0x')).to.not.be.reverted; + await expect(this.mockFromAccount.onInstall(this.installData || '0x')).to.not.revert(this.ethers); + await expect(this.mockFromAccount.onUninstall(this.uninstallData || '0x')).to.not.revert(this.ethers); + await expect(this.mockFromAccount.onInstall(this.installData || '0x')).to.not.revert(this.ethers); }); }); } -function shouldBehaveLikeERC7579Validator() { +export function shouldBehaveLikeERC7579Validator() { describe('behaves like ERC7579Validator', function () { const MAGIC_VALUE = '0x1626ba7e'; const INVALID_VALUE = '0xffffffff'; @@ -63,8 +63,3 @@ function shouldBehaveLikeERC7579Validator() { }); }); } - -module.exports = { - shouldBehaveLikeERC7579Module, - shouldBehaveLikeERC7579Validator, -}; diff --git a/test/account/modules/ERC7579Multisig.test.js b/test/account/modules/ERC7579Multisig.test.js index 90f73208e..b1ba6f311 100644 --- a/test/account/modules/ERC7579Multisig.test.js +++ b/test/account/modules/ERC7579Multisig.test.js @@ -1,20 +1,23 @@ -const { ethers, predeploy } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); - -const { impersonate } = require('@openzeppelin/contracts/test/helpers/account'); -const { ERC4337Helper } = require('@openzeppelin/contracts/test/helpers/erc4337'); -const { +import { network } from 'hardhat'; +import { expect } from 'chai'; +import { ERC4337Helper } from '@openzeppelin/contracts/test/helpers/erc4337'; +import { MODULE_TYPE_EXECUTOR, CALL_TYPE_CALL, EXEC_TYPE_DEFAULT, encodeMode, encodeSingle, -} = require('@openzeppelin/contracts/test/helpers/erc7579'); -const { NonNativeSigner, MultiERC7913SigningKey } = require('@openzeppelin/contracts/test/helpers/signers'); -const { MAX_UINT64 } = require('@openzeppelin/contracts/test/helpers/constants'); +} from '@openzeppelin/contracts/test/helpers/erc7579'; +import { MAX_UINT64 } from '@openzeppelin/contracts/test/helpers/constants'; +import { NonNativeSigner, MultiERC7913SigningKey } from '@openzeppelin/contracts/test/helpers/signers'; +import { shouldBehaveLikeERC7579Module } from './ERC7579Module.behavior'; -const { shouldBehaveLikeERC7579Module } = require('./ERC7579Module.behavior'); +const connection = await network.create(); +const { + ethers, + helpers: { impersonate }, + networkHelpers: { loadFixture }, +} = connection; // Prepare signers in advance const signerECDSA1 = ethers.Wallet.createRandom(); @@ -28,7 +31,7 @@ async function fixture() { const target = await ethers.deployContract('CallReceiverMock'); // ERC-4337 env - const helper = new ERC4337Helper(); + const helper = new ERC4337Helper(connection); await helper.wait(); // Prepare signers @@ -42,7 +45,7 @@ async function fixture() { // ERC-7579 account const mockAccount = await helper.newAccount('$AccountERC7579'); const mockFromAccount = await impersonate(mockAccount.address).then(asAccount => mock.connect(asAccount)); - const mockAccountFromEntrypoint = await impersonate(predeploy.entrypoint.v09.target).then(asEntrypoint => + const mockAccountFromEntrypoint = await impersonate(ethers.predeploy.entrypoint.v09.target).then(asEntrypoint => mockAccount.connect(asEntrypoint), ); @@ -75,7 +78,7 @@ async function fixture() { describe('ERC7579Multisig', function () { beforeEach(async function () { - Object.assign(this, await loadFixture(fixture)); + Object.assign(this, connection, await loadFixture(fixture)); }); shouldBehaveLikeERC7579Module(); diff --git a/test/account/modules/ERC7579MultisigConfirmation.test.js b/test/account/modules/ERC7579MultisigConfirmation.test.js index 4b234bb0d..82e7555ef 100644 --- a/test/account/modules/ERC7579MultisigConfirmation.test.js +++ b/test/account/modules/ERC7579MultisigConfirmation.test.js @@ -1,14 +1,17 @@ -const { ethers, predeploy } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture, time } = require('@nomicfoundation/hardhat-network-helpers'); - -const { impersonate } = require('@openzeppelin/contracts/test/helpers/account'); -const { getDomain } = require('@openzeppelin/contracts/test/helpers/eip712'); -const { ERC4337Helper } = require('@openzeppelin/contracts/test/helpers/erc4337'); -const { MODULE_TYPE_EXECUTOR } = require('@openzeppelin/contracts/test/helpers/erc7579'); -const { MultisigConfirmation } = require('../../helpers/eip712-types'); - -const { shouldBehaveLikeERC7579Module } = require('./ERC7579Module.behavior'); +import { network } from 'hardhat'; +import { expect } from 'chai'; +import { getDomain } from '@openzeppelin/contracts/test/helpers/eip712'; +import { ERC4337Helper } from '@openzeppelin/contracts/test/helpers/erc4337'; +import { MODULE_TYPE_EXECUTOR } from '@openzeppelin/contracts/test/helpers/erc7579'; +import { shouldBehaveLikeERC7579Module } from './ERC7579Module.behavior'; +import { MultisigConfirmation } from '../../helpers/eip712-types'; + +const connection = await network.create(); +const { + ethers, + helpers: { time, impersonate }, + networkHelpers: { loadFixture }, +} = connection; // Prepare signers in advance const initialSigner = ethers.Wallet.createRandom(); @@ -22,13 +25,13 @@ async function fixture() { ]); // ERC-4337 env - const helper = new ERC4337Helper(); + const helper = new ERC4337Helper(connection); await helper.wait(); // ERC-7579 account const mockAccount = await helper.newAccount('$AccountERC7579'); const mockFromAccount = await impersonate(mockAccount.address).then(asAccount => mock.connect(asAccount)); - const mockAccountFromEntrypoint = await impersonate(predeploy.entrypoint.v09.target).then(asEntrypoint => + const mockAccountFromEntrypoint = await impersonate(ethers.predeploy.entrypoint.v09.target).then(asEntrypoint => mockAccount.connect(asEntrypoint), ); @@ -40,7 +43,7 @@ async function fixture() { const signers = abiCoder.encode( ['uint256', 'bytes', 'bytes'], [ - (await time.latest()) + time.duration.days(1), + (await time.clock.timestamp()) + time.duration.days(1), initialSigner.address, await initialSigner.signTypedData( domain, @@ -48,7 +51,7 @@ async function fixture() { { account: mockAccount.address, module: mock.target, - deadline: (await time.latest()) + time.duration.days(1), + deadline: (await time.clock.timestamp()) + time.duration.days(1), }, ), ], @@ -71,7 +74,7 @@ async function fixture() { describe('ERC7579MultisigConfirmation', function () { beforeEach(async function () { - Object.assign(this, await loadFixture(fixture)); + Object.assign(this, connection, await loadFixture(fixture)); }); shouldBehaveLikeERC7579Module(); @@ -79,7 +82,7 @@ describe('ERC7579MultisigConfirmation', function () { describe('signer confirmation', function () { it('can add a signer with valid confirmation signature', async function () { // Create future deadline for signature validity - const deadline = (await time.latest()) + time.duration.days(1); + const deadline = (await time.clock.timestamp()) + time.duration.days(1); // Generate the typed data hash for confirmation const typedData = { @@ -108,7 +111,7 @@ describe('ERC7579MultisigConfirmation', function () { it('rejects adding a signer with expired deadline', async function () { // Create expired deadline - const deadline = (await time.latest()) - 1; + const deadline = (await time.clock.timestamp()) - 1n; // Generate the typed data hash for confirmation const typedData = { @@ -134,7 +137,7 @@ describe('ERC7579MultisigConfirmation', function () { it('rejects adding a signer with invalid signature', async function () { // Create future deadline for signature validity - const deadline = (await time.latest()) + time.duration.days(1); + const deadline = (await time.clock.timestamp()) + time.duration.days(1); // Generate typed data for a different account (invalid for our target) const typedData = { @@ -160,7 +163,7 @@ describe('ERC7579MultisigConfirmation', function () { it('can add multiple signers with valid confirmation signatures', async function () { // Create future deadline for signature validity - const deadline = (await time.latest()) + time.duration.days(1); + const deadline = (await time.clock.timestamp()) + time.duration.days(1); // Create another signer to add const anotherSigner = ethers.Wallet.createRandom(); @@ -201,7 +204,7 @@ describe('ERC7579MultisigConfirmation', function () { it('fails to add multiple signers if any signature is invalid', async function () { // Create future deadline for signature validity - const deadline = (await time.latest()) + time.duration.days(1); + const deadline = (await time.clock.timestamp()) + time.duration.days(1); // Create another signer to add const anotherSigner = ethers.Wallet.createRandom(); @@ -251,7 +254,7 @@ describe('ERC7579MultisigConfirmation', function () { it('still allows removing signers without confirmation', async function () { // First, add a signer with valid confirmation - const deadline = (await time.latest()) + time.duration.days(1); + const deadline = (await time.clock.timestamp()) + time.duration.days(1); const typedData = { account: this.mockAccount.address, module: this.mock.target, diff --git a/test/account/modules/ERC7579MultisigStorage.test.js b/test/account/modules/ERC7579MultisigStorage.test.js index 36c985dcc..459b5c4ca 100644 --- a/test/account/modules/ERC7579MultisigStorage.test.js +++ b/test/account/modules/ERC7579MultisigStorage.test.js @@ -1,18 +1,22 @@ -const { ethers, predeploy } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); -const { impersonate } = require('@openzeppelin/contracts/test/helpers/account'); -const { ERC4337Helper } = require('@openzeppelin/contracts/test/helpers/erc4337'); -const { NonNativeSigner, MultiERC7913SigningKey } = require('@openzeppelin/contracts/test/helpers/signers'); - -const { +import { network } from 'hardhat'; +import { expect } from 'chai'; +import { ERC4337Helper } from '@openzeppelin/contracts/test/helpers/erc4337'; +import { MODULE_TYPE_EXECUTOR, CALL_TYPE_CALL, EXEC_TYPE_DEFAULT, encodeMode, encodeSingle, -} = require('@openzeppelin/contracts/test/helpers/erc7579'); -const { shouldBehaveLikeERC7579Module } = require('./ERC7579Module.behavior'); +} from '@openzeppelin/contracts/test/helpers/erc7579'; +import { NonNativeSigner, MultiERC7913SigningKey } from '@openzeppelin/contracts/test/helpers/signers'; +import { shouldBehaveLikeERC7579Module } from './ERC7579Module.behavior'; + +const connection = await network.create(); +const { + ethers, + helpers: { impersonate }, + networkHelpers: { loadFixture }, +} = connection; // Prepare signers in advance const signerECDSA1 = ethers.Wallet.createRandom(); @@ -26,7 +30,7 @@ async function fixture() { const target = await ethers.deployContract('CallReceiverMock'); // ERC-4337 env - const helper = new ERC4337Helper(); + const helper = new ERC4337Helper(connection); await helper.wait(); // Prepare signers @@ -40,7 +44,7 @@ async function fixture() { // ERC-7579 account const mockAccount = await helper.newAccount('$AccountERC7579'); const mockFromAccount = await impersonate(mockAccount.address).then(asAccount => mock.connect(asAccount)); - const mockAccountFromEntrypoint = await impersonate(predeploy.entrypoint.v09.target).then(asEntrypoint => + const mockAccountFromEntrypoint = await impersonate(ethers.predeploy.entrypoint.v09.target).then(asEntrypoint => mockAccount.connect(asEntrypoint), ); @@ -73,7 +77,7 @@ async function fixture() { describe('ERC7579MultisigStorage', function () { beforeEach(async function () { - Object.assign(this, await loadFixture(fixture)); + Object.assign(this, connection, await loadFixture(fixture)); await this.mockAccountFromEntrypoint.installModule(this.moduleType, this.mock.target, this.installData); }); diff --git a/test/account/modules/ERC7579MultisigWeighted.test.js b/test/account/modules/ERC7579MultisigWeighted.test.js index 9cec54414..54c2b88bf 100644 --- a/test/account/modules/ERC7579MultisigWeighted.test.js +++ b/test/account/modules/ERC7579MultisigWeighted.test.js @@ -1,20 +1,23 @@ -const { ethers, predeploy } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); - -const { impersonate } = require('@openzeppelin/contracts/test/helpers/account'); -const { ERC4337Helper } = require('@openzeppelin/contracts/test/helpers/erc4337'); -const { +import { network } from 'hardhat'; +import { expect } from 'chai'; +import { ERC4337Helper } from '@openzeppelin/contracts/test/helpers/erc4337'; +import { MODULE_TYPE_EXECUTOR, CALL_TYPE_CALL, EXEC_TYPE_DEFAULT, encodeMode, encodeSingle, -} = require('@openzeppelin/contracts/test/helpers/erc7579'); -const { NonNativeSigner, MultiERC7913SigningKey } = require('@openzeppelin/contracts/test/helpers/signers'); -const { MAX_UINT64 } = require('@openzeppelin/contracts/test/helpers/constants'); +} from '@openzeppelin/contracts/test/helpers/erc7579'; +import { MAX_UINT64 } from '@openzeppelin/contracts/test/helpers/constants'; +import { NonNativeSigner, MultiERC7913SigningKey } from '@openzeppelin/contracts/test/helpers/signers'; +import { shouldBehaveLikeERC7579Module } from './ERC7579Module.behavior'; -const { shouldBehaveLikeERC7579Module } = require('./ERC7579Module.behavior'); +const connection = await network.create(); +const { + ethers, + helpers: { impersonate }, + networkHelpers: { loadFixture }, +} = connection; // Prepare signers in advance const signerECDSA1 = ethers.Wallet.createRandom(); @@ -28,7 +31,7 @@ async function fixture() { const target = await ethers.deployContract('CallReceiverMock'); // ERC-4337 env - const helper = new ERC4337Helper(); + const helper = new ERC4337Helper(connection); await helper.wait(); // Prepare signers with weights @@ -50,7 +53,7 @@ async function fixture() { // ERC-7579 account const mockAccount = await helper.newAccount('$AccountERC7579'); const mockFromAccount = await impersonate(mockAccount.address).then(asAccount => mock.connect(asAccount)); - const mockAccountFromEntrypoint = await impersonate(predeploy.entrypoint.v09.target).then(asEntrypoint => + const mockAccountFromEntrypoint = await impersonate(ethers.predeploy.entrypoint.v09.target).then(asEntrypoint => mockAccount.connect(asEntrypoint), ); @@ -84,7 +87,7 @@ async function fixture() { describe('ERC7579MultisigWeighted', function () { beforeEach(async function () { - Object.assign(this, await loadFixture(fixture)); + Object.assign(this, connection, await loadFixture(fixture)); }); shouldBehaveLikeERC7579Module(); diff --git a/test/account/modules/ERC7579SelectorExecutor.test.js b/test/account/modules/ERC7579SelectorExecutor.test.js index 200d045e0..c02df8dfd 100644 --- a/test/account/modules/ERC7579SelectorExecutor.test.js +++ b/test/account/modules/ERC7579SelectorExecutor.test.js @@ -1,17 +1,21 @@ -const { ethers, predeploy } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); -const { impersonate } = require('@openzeppelin/contracts/test/helpers/account'); -const { ERC4337Helper } = require('@openzeppelin/contracts/test/helpers/erc4337'); - -const { +import { network } from 'hardhat'; +import { expect } from 'chai'; +import { ERC4337Helper } from '@openzeppelin/contracts/test/helpers/erc4337'; +import { MODULE_TYPE_EXECUTOR, - encodeSingle, - encodeMode, CALL_TYPE_CALL, EXEC_TYPE_DEFAULT, -} = require('@openzeppelin/contracts/test/helpers/erc7579'); -const { shouldBehaveLikeERC7579Module } = require('./ERC7579Module.behavior'); + encodeMode, + encodeSingle, +} from '@openzeppelin/contracts/test/helpers/erc7579'; +import { shouldBehaveLikeERC7579Module } from './ERC7579Module.behavior'; + +const connection = await network.create(); +const { + ethers, + helpers: { impersonate }, + networkHelpers: { loadFixture }, +} = connection; async function fixture() { // Deploy ERC-7579 selector executor module @@ -19,13 +23,13 @@ async function fixture() { const target = await ethers.deployContract('CallReceiverMock'); // ERC-4337 env - const helper = new ERC4337Helper(); + const helper = new ERC4337Helper(connection); await helper.wait(); // ERC-7579 account const mockAccount = await helper.newAccount('$AccountERC7579'); const mockFromAccount = await impersonate(mockAccount.address).then(asAccount => mock.connect(asAccount)); - const mockAccountFromEntrypoint = await impersonate(predeploy.entrypoint.v09.target).then(asEntrypoint => + const mockAccountFromEntrypoint = await impersonate(ethers.predeploy.entrypoint.v09.target).then(asEntrypoint => mockAccount.connect(asEntrypoint), ); @@ -63,7 +67,7 @@ async function fixture() { describe('ERC7579SelectorExecutor', function () { beforeEach(async function () { - Object.assign(this, await loadFixture(fixture)); + Object.assign(this, connection, await loadFixture(fixture)); }); shouldBehaveLikeERC7579Module(); @@ -304,8 +308,9 @@ describe('ERC7579SelectorExecutor', function () { // This should revert when trying to extract the selector, but behavior depends on how account handles it // The test verifies that our module doesn't crash with malformed data - await expect(this.mockFromAccount.execute(this.mockAccount.address, ethers.ZeroHash, this.mode, shortCalldata)).to - .be.reverted; // Could be various revert reasons depending on account implementation + await expect( + this.mockFromAccount.execute(this.mockAccount.address, ethers.ZeroHash, this.mode, shortCalldata), + ).to.revert(ethers); // Could be various revert reasons depending on account implementation }); }); diff --git a/test/account/modules/ERC7579SignatureValidator.test.js b/test/account/modules/ERC7579SignatureValidator.test.js index bee5c3e58..6a81da2c1 100644 --- a/test/account/modules/ERC7579SignatureValidator.test.js +++ b/test/account/modules/ERC7579SignatureValidator.test.js @@ -1,18 +1,17 @@ -const { ethers, predeploy } = require('hardhat'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); -const { expect } = require('chai'); - -const { impersonate } = require('@openzeppelin/contracts/test/helpers/account'); -const { getDomain, PackedUserOperation } = require('@openzeppelin/contracts/test/helpers/eip712'); -const { ERC4337Helper } = require('@openzeppelin/contracts/test/helpers/erc4337'); -const { MODULE_TYPE_VALIDATOR } = require('@openzeppelin/contracts/test/helpers/erc7579'); +import { network } from 'hardhat'; +import { expect } from 'chai'; +import { ERC4337Helper } from '@openzeppelin/contracts/test/helpers/erc4337'; +import { getDomain, PackedUserOperation } from '@openzeppelin/contracts/test/helpers/eip712'; +import { MODULE_TYPE_VALIDATOR } from '@openzeppelin/contracts/test/helpers/erc7579'; +import { NonNativeSigner, P256SigningKey, RSASHA256SigningKey } from '@openzeppelin/contracts/test/helpers/signers'; +import { shouldBehaveLikeERC7579Module, shouldBehaveLikeERC7579Validator } from './ERC7579Module.behavior'; + +const connection = await network.create(); const { - NonNativeSigner, - P256SigningKey, - RSASHA256SigningKey, -} = require('@openzeppelin/contracts/test/helpers/signers'); - -const { shouldBehaveLikeERC7579Module, shouldBehaveLikeERC7579Validator } = require('./ERC7579Module.behavior'); + ethers, + helpers: { impersonate }, + networkHelpers: { loadFixture }, +} = connection; // Prepare signers in advance (RSA are long to initialize) const signerECDSA = ethers.Wallet.createRandom(); @@ -30,9 +29,9 @@ async function fixture() { const verifierRSA = await ethers.deployContract('ERC7913RSAVerifier'); // ERC-4337 env - const helper = new ERC4337Helper(); + const helper = new ERC4337Helper(connection); await helper.wait(); - const entrypointDomain = await getDomain(predeploy.entrypoint.v09); + const entrypointDomain = await getDomain(ethers.predeploy.entrypoint.v09); // ERC-7579 account const mockAccount = await helper.newAccount('$AccountERC7579'); @@ -59,7 +58,7 @@ function prepareSigner(prototype) { describe('ERC7579Signature', function () { beforeEach(async function () { - Object.assign(this, await loadFixture(fixture)); + Object.assign(this, connection, await loadFixture(fixture)); }); it('reverts with ERC7579SignatureInvalidSignerLength when signer length is less than 20 bytes', async function () { @@ -73,7 +72,7 @@ describe('ERC7579Signature', function () { it('behaves as a noop when the validator is already installed for an account', async function () { // First installation should succeed const signerData = ethers.solidityPacked(['address'], [signerECDSA.address]); - await expect(this.mockFromAccount.onInstall(signerData)).to.not.be.reverted; + await expect(this.mockFromAccount.onInstall(signerData)).to.not.revert(ethers); // Second installation should behave as a no-op await this.mockFromAccount.onInstall(ethers.solidityPacked(['address'], [ethers.Wallet.createRandom().address])); // Not revert diff --git a/test/account/modules/ERC7579Validator.test.js b/test/account/modules/ERC7579Validator.test.js index ffc19a3fa..1196cded5 100644 --- a/test/account/modules/ERC7579Validator.test.js +++ b/test/account/modules/ERC7579Validator.test.js @@ -1,12 +1,15 @@ -const { ethers, predeploy } = require('hardhat'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); - -const { impersonate } = require('@openzeppelin/contracts/test/helpers/account'); -const { getDomain, PackedUserOperation } = require('@openzeppelin/contracts/test/helpers/eip712'); -const { ERC4337Helper } = require('@openzeppelin/contracts/test/helpers/erc4337'); -const { MODULE_TYPE_VALIDATOR } = require('@openzeppelin/contracts/test/helpers/erc7579'); - -const { shouldBehaveLikeERC7579Module, shouldBehaveLikeERC7579Validator } = require('./ERC7579Module.behavior'); +import { network } from 'hardhat'; +import { ERC4337Helper } from '@openzeppelin/contracts/test/helpers/erc4337'; +import { getDomain, PackedUserOperation } from '@openzeppelin/contracts/test/helpers/eip712'; +import { MODULE_TYPE_VALIDATOR } from '@openzeppelin/contracts/test/helpers/erc7579'; +import { shouldBehaveLikeERC7579Module, shouldBehaveLikeERC7579Validator } from './ERC7579Module.behavior'; + +const connection = await network.create(); +const { + ethers, + helpers: { impersonate }, + networkHelpers: { loadFixture }, +} = connection; async function fixture() { const [other] = await ethers.getSigners(); @@ -15,9 +18,9 @@ async function fixture() { const mock = await ethers.deployContract('$ERC7579Signature'); // ERC-4337 env - const helper = new ERC4337Helper(); + const helper = new ERC4337Helper(connection); await helper.wait(); - const entrypointDomain = await getDomain(predeploy.entrypoint.v09); + const entrypointDomain = await getDomain(ethers.predeploy.entrypoint.v09); // Prepare signer const signer = ethers.Wallet.createRandom(); @@ -47,7 +50,7 @@ async function fixture() { describe('ERC7579Validator', function () { beforeEach(async function () { - Object.assign(this, await loadFixture(fixture)); + Object.assign(this, connection, await loadFixture(fixture)); }); describe('ECDSA key', function () { diff --git a/test/crosschain/ERC7786OpenBridge.test.js b/test/crosschain/ERC7786OpenBridge.test.js index 87fc48dff..a786e1e22 100644 --- a/test/crosschain/ERC7786OpenBridge.test.js +++ b/test/crosschain/ERC7786OpenBridge.test.js @@ -1,18 +1,21 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); -const { anyValue } = require('@nomicfoundation/hardhat-chai-matchers/withArgs'); -const { getLocalChain } = require('@openzeppelin/contracts/test/helpers/chains'); +import { network } from 'hardhat'; +import { expect } from 'chai'; +import { anyValue } from '@nomicfoundation/hardhat-ethers-chai-matchers/withArgs'; const getAddress = account => ethers.getAddress(account.target ?? account.address ?? account); const N = 3; const M = 5; +const { + ethers, + helpers: { chain }, + networkHelpers: { loadFixture }, +} = await network.create(); + async function fixture() { const [owner, sender, ...accounts] = await ethers.getSigners(); - const chain = await getLocalChain(); const protocoles = await Promise.all( Array(M) .fill() @@ -24,7 +27,7 @@ async function fixture() { await bridgeA.registerRemoteBridge(chain.toErc7930(bridgeB)); await bridgeB.registerRemoteBridge(chain.toErc7930(bridgeA)); - return { owner, sender, accounts, chain, protocoles, bridgeA, bridgeB }; + return { owner, sender, accounts, protocoles, bridgeA, bridgeB }; } describe('ERC7786OpenBridge', function () { @@ -35,15 +38,11 @@ describe('ERC7786OpenBridge', function () { it('initial setup', async function () { await expect(this.bridgeA.getGateways()).to.eventually.deep.equal(this.protocoles.map(getAddress)); await expect(this.bridgeA.getThreshold()).to.eventually.equal(N); - await expect(this.bridgeA.getRemoteBridge(this.chain.erc7930)).to.eventually.equal( - this.chain.toErc7930(this.bridgeB), - ); + await expect(this.bridgeA.getRemoteBridge(chain.erc7930)).to.eventually.equal(chain.toErc7930(this.bridgeB)); await expect(this.bridgeB.getGateways()).to.eventually.deep.equal(this.protocoles.map(getAddress)); await expect(this.bridgeB.getThreshold()).to.eventually.equal(N); - await expect(this.bridgeB.getRemoteBridge(this.chain.erc7930)).to.eventually.equal( - this.chain.toErc7930(this.bridgeA), - ); + await expect(this.bridgeB.getRemoteBridge(chain.erc7930)).to.eventually.equal(chain.toErc7930(this.bridgeA)); }); describe('cross chain call', function () { @@ -102,7 +101,7 @@ describe('ERC7786OpenBridge', function () { afterEach(async function () { const txPromise = this.bridgeA .connect(this.sender) - .sendMessage(this.chain.toErc7930(this.destination), this.payload, this.attributes, this.opts ?? {}); + .sendMessage(chain.toErc7930(this.destination), this.payload, this.attributes, this.opts ?? {}); switch (typeof this.outcome) { case 'string': { @@ -118,8 +117,8 @@ describe('ERC7786OpenBridge', function () { .to.emit(this.bridgeA, 'MessageSent') .withArgs( ethers.ZeroHash, - this.chain.toErc7930(this.sender), - this.chain.toErc7930(this.destination), + chain.toErc7930(this.sender), + chain.toErc7930(this.destination), this.payload, 0n, this.attributes, @@ -131,8 +130,8 @@ describe('ERC7786OpenBridge', function () { .to.emit(gateway, 'MessageSent') .withArgs( ethers.ZeroHash, - this.chain.toErc7930(this.bridgeA), - this.chain.toErc7930(this.bridgeB), + chain.toErc7930(this.bridgeA), + chain.toErc7930(this.bridgeB), anyValue, 0n, anyValue, @@ -144,7 +143,7 @@ describe('ERC7786OpenBridge', function () { if (this.outcome) { await expect(txPromise) .to.emit(this.destination, 'MessageReceived') - .withArgs(this.bridgeB, anyValue, this.chain.toErc7930(this.sender), this.payload, 0n) + .withArgs(this.bridgeB, anyValue, chain.toErc7930(this.sender), this.payload, 0n) .to.emit(this.bridgeB, 'ExecutionSuccess') .withArgs(resultId) .to.not.emit(this.bridgeB, 'ExecutionFailed'); @@ -182,11 +181,9 @@ describe('ERC7786OpenBridge', function () { // The outbox lists all gateways, including the one that returned a zero id (with its address, not address(0)) const sendId = ethers.keccak256(ethers.AbiCoder.defaultAbiCoder().encode(['(address,bytes32)[]'], [outbox])); - await expect( - this.bridgeA.connect(this.sender).sendMessage(this.chain.toErc7930(destination), payload, attributes), - ) + await expect(this.bridgeA.connect(this.sender).sendMessage(chain.toErc7930(destination), payload, attributes)) .to.emit(this.bridgeA, 'MessageSent') - .withArgs(sendId, this.chain.toErc7930(this.sender), this.chain.toErc7930(destination), payload, 0n, []) + .withArgs(sendId, chain.toErc7930(this.sender), chain.toErc7930(destination), payload, 0n, []) .to.emit(this.bridgeA, 'OutboxDetails') .withArgs(sendId, outbox); }); @@ -196,18 +193,9 @@ describe('ERC7786OpenBridge', function () { const payload = ethers.randomBytes(128); const attributes = []; - await expect( - this.bridgeA.connect(this.sender).sendMessage(this.chain.toErc7930(destination), payload, attributes), - ) + await expect(this.bridgeA.connect(this.sender).sendMessage(chain.toErc7930(destination), payload, attributes)) .to.emit(this.bridgeA, 'MessageSent') - .withArgs( - ethers.ZeroHash, - this.chain.toErc7930(this.sender), - this.chain.toErc7930(destination), - payload, - 0n, - [], - ) + .withArgs(ethers.ZeroHash, chain.toErc7930(this.sender), chain.toErc7930(destination), payload, 0n, []) .to.not.emit(this.bridgeA, 'OutboxDetails'); }); }); @@ -221,8 +209,8 @@ describe('ERC7786OpenBridge', function () { ]); const bridgeA = await ethers.deployContract('ERC7786OpenBridge', [this.owner, gateways, 1]); const bridgeB = await ethers.deployContract('ERC7786OpenBridge', [this.owner, gateways, 1]); - await bridgeA.registerRemoteBridge(this.chain.toErc7930(bridgeB)); - await bridgeB.registerRemoteBridge(this.chain.toErc7930(bridgeA)); + await bridgeA.registerRemoteBridge(chain.toErc7930(bridgeB)); + await bridgeB.registerRemoteBridge(chain.toErc7930(bridgeA)); const destination = await ethers.deployContract('$ERC7786RecipientMock', [bridgeB]); const payload = ethers.randomBytes(128); @@ -231,14 +219,14 @@ describe('ERC7786OpenBridge', function () { await gateways[0].setRevertOnSent(true); // The message is still delivered through the second gateway, and a failure event is emitted for the first one - await expect(bridgeA.connect(this.sender).sendMessage(this.chain.toErc7930(destination), payload, [])) + await expect(bridgeA.connect(this.sender).sendMessage(chain.toErc7930(destination), payload, [])) .to.emit(bridgeA, 'ERC7786OpenBridgeSendMessageFailed') .withArgs(gateways[0]) .to.emit(bridgeA, 'MessageSent') .to.emit(bridgeB, 'Received') .to.emit(bridgeB, 'ExecutionSuccess') .to.emit(destination, 'MessageReceived') - .withArgs(bridgeB, anyValue, this.chain.toErc7930(this.sender), payload, 0n); + .withArgs(bridgeB, anyValue, chain.toErc7930(this.sender), payload, 0n); }); }); }); diff --git a/test/crosschain/axelar/AxelarGatewayAdapter.test.js b/test/crosschain/axelar/AxelarGatewayAdapter.test.js index ce3d30434..8456eb82a 100644 --- a/test/crosschain/axelar/AxelarGatewayAdapter.test.js +++ b/test/crosschain/axelar/AxelarGatewayAdapter.test.js @@ -1,19 +1,25 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); -const { anyValue } = require('@nomicfoundation/hardhat-chai-matchers/withArgs'); +import { network } from 'hardhat'; +import { expect } from 'chai'; +import { anyValue } from '@nomicfoundation/hardhat-ethers-chai-matchers/withArgs'; -const AxelarHelper = require('./AxelarHelper'); +import * as AxelarHelper from './AxelarHelper'; + +const connection = await network.create(); +const { + ethers, + helpers: { chain }, + networkHelpers: { loadFixture }, +} = connection; async function fixture() { const [owner, sender, ...accounts] = await ethers.getSigners(); - const { chain, axelar, gatewayA, gatewayB } = await AxelarHelper.deploy(owner); + const { axelar, gatewayA, gatewayB } = await AxelarHelper.deploy(connection, owner); const recipient = await ethers.deployContract('$ERC7786RecipientMock', [gatewayB]); const invalidRecipient = await ethers.deployContract('$ERC7786RecipientInvalidMock'); - return { owner, sender, accounts, chain, axelar, gatewayA, gatewayB, recipient, invalidRecipient }; + return { owner, sender, accounts, axelar, gatewayA, gatewayB, recipient, invalidRecipient }; } describe('AxelarGatewayAdapter', function () { @@ -23,23 +29,19 @@ describe('AxelarGatewayAdapter', function () { it('initial setup', async function () { await expect(this.gatewayA.gateway()).to.eventually.equal(this.axelar); - await expect(this.gatewayA.getAxelarChain(this.chain.erc7930)).to.eventually.equal('local'); - await expect(this.gatewayA.getErc7930Chain('local')).to.eventually.equal(this.chain.erc7930); - await expect(this.gatewayA.getRemoteGateway(this.chain.erc7930)).to.eventually.equal( - this.gatewayB.target.toLowerCase(), - ); + await expect(this.gatewayA.getAxelarChain(chain.erc7930)).to.eventually.equal('local'); + await expect(this.gatewayA.getErc7930Chain('local')).to.eventually.equal(chain.erc7930); + await expect(this.gatewayA.getRemoteGateway(chain.erc7930)).to.eventually.equal(this.gatewayB.target.toLowerCase()); await expect(this.gatewayB.gateway()).to.eventually.equal(this.axelar); - await expect(this.gatewayB.getAxelarChain(this.chain.erc7930)).to.eventually.equal('local'); - await expect(this.gatewayB.getErc7930Chain('local')).to.eventually.equal(this.chain.erc7930); - await expect(this.gatewayB.getRemoteGateway(this.chain.erc7930)).to.eventually.equal( - this.gatewayA.target.toLowerCase(), - ); + await expect(this.gatewayB.getAxelarChain(chain.erc7930)).to.eventually.equal('local'); + await expect(this.gatewayB.getErc7930Chain('local')).to.eventually.equal(chain.erc7930); + await expect(this.gatewayB.getRemoteGateway(chain.erc7930)).to.eventually.equal(this.gatewayA.target.toLowerCase()); }); it('workflow', async function () { - const erc7930Sender = this.chain.toErc7930(this.sender); - const erc7930Recipient = this.chain.toErc7930(this.recipient); + const erc7930Sender = chain.toErc7930(this.sender); + const erc7930Recipient = chain.toErc7930(this.recipient); const payload = ethers.randomBytes(128); const attributes = []; const encoded = ethers.AbiCoder.defaultAbiCoder().encode( @@ -62,15 +64,13 @@ describe('AxelarGatewayAdapter', function () { await expect( this.gatewayA .connect(this.sender) - .sendMessage(this.chain.toErc7930(this.invalidRecipient), ethers.randomBytes(128), []), + .sendMessage(chain.toErc7930(this.invalidRecipient), ethers.randomBytes(128), []), ).to.be.revertedWithCustomError(this.gatewayB, 'RecipientExecutionFailed'); }); it('invalid recipient - EOA', async function () { await expect( - this.gatewayA - .connect(this.sender) - .sendMessage(this.chain.toErc7930(this.accounts[0]), ethers.randomBytes(128), []), + this.gatewayA.connect(this.sender).sendMessage(chain.toErc7930(this.accounts[0]), ethers.randomBytes(128), []), ).to.be.revertedWithoutReason(); }); }); diff --git a/test/crosschain/axelar/AxelarHelper.js b/test/crosschain/axelar/AxelarHelper.js index 1db56c329..6cbb17cdc 100644 --- a/test/crosschain/axelar/AxelarHelper.js +++ b/test/crosschain/axelar/AxelarHelper.js @@ -1,23 +1,14 @@ -const { ethers } = require('hardhat'); -const { getLocalChain } = require('@openzeppelin/contracts/test/helpers/chains'); - -async function deploy(owner) { - const chain = await getLocalChain(); - - const axelar = await ethers.deployContract('AxelarGatewayMock'); - const gatewayA = await ethers.deployContract('AxelarGatewayAdapter', [axelar, owner]); - const gatewayB = await ethers.deployContract('AxelarGatewayAdapter', [axelar, owner]); +export async function deploy(connection, owner) { + const axelar = await connection.ethers.deployContract('AxelarGatewayMock'); + const gatewayA = await connection.ethers.deployContract('AxelarGatewayAdapter', [axelar, owner]); + const gatewayB = await connection.ethers.deployContract('AxelarGatewayAdapter', [axelar, owner]); await Promise.all([ - gatewayA.connect(owner).registerChainEquivalence(chain.erc7930, 'local'), - gatewayB.connect(owner).registerChainEquivalence(chain.erc7930, 'local'), - gatewayA.connect(owner).registerRemoteGateway(chain.toErc7930(gatewayB)), - gatewayB.connect(owner).registerRemoteGateway(chain.toErc7930(gatewayA)), + gatewayA.connect(owner).registerChainEquivalence(connection.helpers.chain.erc7930, 'local'), + gatewayB.connect(owner).registerChainEquivalence(connection.helpers.chain.erc7930, 'local'), + gatewayA.connect(owner).registerRemoteGateway(connection.helpers.chain.toErc7930(gatewayB)), + gatewayB.connect(owner).registerRemoteGateway(connection.helpers.chain.toErc7930(gatewayA)), ]); - return { chain, axelar, gatewayA, gatewayB }; + return { axelar, gatewayA, gatewayB }; } - -module.exports = { - deploy, -}; diff --git a/test/crosschain/utils/ERC7786Attributes.test.js b/test/crosschain/utils/ERC7786Attributes.test.js index a7c878e8c..f7543eab5 100644 --- a/test/crosschain/utils/ERC7786Attributes.test.js +++ b/test/crosschain/utils/ERC7786Attributes.test.js @@ -1,8 +1,11 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); - -const ERC7786Attributes = require('../../helpers/erc7786attributes'); +import { network } from 'hardhat'; +import { expect } from 'chai'; +import ERC7786Attributes from '../../helpers/erc7786attributes'; + +const { + ethers, + networkHelpers: { loadFixture }, +} = await network.create(); async function fixture() { const mock = await ethers.deployContract('$ERC7786Attributes'); diff --git a/test/crosschain/wormhole/WormholeGatewayAdapter.test.js b/test/crosschain/wormhole/WormholeGatewayAdapter.test.js index 578ccb99d..80fb50d58 100644 --- a/test/crosschain/wormhole/WormholeGatewayAdapter.test.js +++ b/test/crosschain/wormhole/WormholeGatewayAdapter.test.js @@ -1,17 +1,22 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); -const { anyValue } = require('@nomicfoundation/hardhat-chai-matchers/withArgs'); - -const ERC7786Attributes = require('../../helpers/erc7786attributes'); -const WormholeHelper = require('./WormholeHelper'); +import { network } from 'hardhat'; +import { expect } from 'chai'; +import { anyValue } from '@nomicfoundation/hardhat-ethers-chai-matchers/withArgs'; +import ERC7786Attributes from '../../helpers/erc7786attributes'; +import * as WormholeHelper from './WormholeHelper'; const value = 1_000n; +const connection = await network.create(); +const { + ethers, + helpers: { chain }, + networkHelpers: { loadFixture }, +} = connection; + async function fixture() { const [owner, sender, ...accounts] = await ethers.getSigners(); - const { chain, wormholeChainId, wormhole, gatewayA, gatewayB } = await WormholeHelper.deploy(owner); + const { wormholeChainId, wormhole, gatewayA, gatewayB } = await WormholeHelper.deploy(connection, owner); const recipient = await ethers.deployContract('$ERC7786RecipientMock', [gatewayB]); const invalidRecipient = await ethers.deployContract('$ERC7786RecipientInvalidMock'); diff --git a/test/crosschain/wormhole/WormholeHelper.js b/test/crosschain/wormhole/WormholeHelper.js index 2a4a8173b..04d5d91e2 100644 --- a/test/crosschain/wormhole/WormholeHelper.js +++ b/test/crosschain/wormhole/WormholeHelper.js @@ -1,26 +1,21 @@ -const { ethers } = require('hardhat'); -const { getLocalChain } = require('@openzeppelin/contracts/test/helpers/chains'); +import { ethers } from 'ethers'; -const toUniversalAddress = addr => ethers.zeroPadValue(addr.target ?? addr.address ?? addr, 32); -const fromUniversalAddress = addr => ethers.getAddress(ethers.hexlify(ethers.getBytes(addr).slice(-20))); +export const toUniversalAddress = addr => ethers.zeroPadValue(addr.target ?? addr.address ?? addr, 32); +export const fromUniversalAddress = addr => ethers.getAddress(ethers.hexlify(ethers.getBytes(addr).slice(-20))); -async function deploy(owner, wormholeChainId = 23600) { - const chain = await getLocalChain(); +export async function deploy(connection, owner, wormholeChainId = 23600) { + const wormhole = await connection.ethers.deployContract('WormholeRelayerMock', [wormholeChainId]); + const gatewayA = await connection.ethers.deployContract('WormholeGatewayAdapter', [wormhole, wormholeChainId, owner]); + const gatewayB = await connection.ethers.deployContract('WormholeGatewayAdapter', [wormhole, wormholeChainId, owner]); - const wormhole = await ethers.deployContract('WormholeRelayerMock', [wormholeChainId]); - const gatewayA = await ethers.deployContract('WormholeGatewayAdapter', [wormhole, wormholeChainId, owner]); - const gatewayB = await ethers.deployContract('WormholeGatewayAdapter', [wormhole, wormholeChainId, owner]); + await gatewayA + .connect(owner) + .registerChainEquivalence(ethers.Typed.bytes(connection.helpers.chain.erc7930), wormholeChainId); + await gatewayB + .connect(owner) + .registerChainEquivalence(ethers.Typed.bytes(connection.helpers.chain.erc7930), wormholeChainId); + await gatewayA.connect(owner).registerRemoteGateway(ethers.Typed.bytes(connection.helpers.chain.toErc7930(gatewayB))); + await gatewayB.connect(owner).registerRemoteGateway(ethers.Typed.bytes(connection.helpers.chain.toErc7930(gatewayA))); - await gatewayA.connect(owner).registerChainEquivalence(ethers.Typed.bytes(chain.erc7930), wormholeChainId); - await gatewayB.connect(owner).registerChainEquivalence(ethers.Typed.bytes(chain.erc7930), wormholeChainId); - await gatewayA.connect(owner).registerRemoteGateway(ethers.Typed.bytes(chain.toErc7930(gatewayB))); - await gatewayB.connect(owner).registerRemoteGateway(ethers.Typed.bytes(chain.toErc7930(gatewayA))); - - return { chain, wormholeChainId, wormhole, gatewayA, gatewayB }; + return { wormholeChainId, wormhole, gatewayA, gatewayB }; } - -module.exports = { - deploy, - toUniversalAddress, - fromUniversalAddress, -}; diff --git a/test/governance/TimelockControllerEnumerable.t.sol b/test/governance/TimelockControllerEnumerable.t.sol index 182e2b40a..61a485709 100644 --- a/test/governance/TimelockControllerEnumerable.t.sol +++ b/test/governance/TimelockControllerEnumerable.t.sol @@ -4,9 +4,7 @@ pragma solidity ^0.8.20; import {Test} from "forge-std/Test.sol"; import {TimelockControllerEnumerableMock} from "./TimelockControllerEnumerableMock.t.sol"; -import { - TimelockControllerEnumerable -} from "@openzeppelin/community-contracts/governance/TimelockControllerEnumerable.sol"; +import {TimelockControllerEnumerable} from "@openzeppelin/community-contracts/governance/TimelockControllerEnumerable.sol"; contract TimelockControllerEnumerableTest is Test { TimelockControllerEnumerableMock public timelockControllerEnumerable; @@ -26,7 +24,7 @@ contract TimelockControllerEnumerableTest is Test { emit Call(); } - function test_schedule() public { + function testSchedule() public { timelockControllerEnumerable.schedule( address(this), 0, @@ -59,8 +57,8 @@ contract TimelockControllerEnumerableTest is Test { assertEq(operation.delay, 1 days); } - function test_operations() public { - test_schedule(); + function testOperations() public { + testSchedule(); TimelockControllerEnumerable.Operation[] memory operations = timelockControllerEnumerable.operations(0, 1); assertEq(operations.length, 1); assertEq(operations[0].target, address(this)); @@ -82,8 +80,8 @@ contract TimelockControllerEnumerableTest is Test { assertEq(operations[0].delay, 1 days); } - function test_schedule_execute() public { - test_schedule(); + function testScheduleExecute() public { + testSchedule(); TimelockControllerEnumerable.Operation memory operation = timelockControllerEnumerable.operation(uint256(0)); bytes32 id = timelockControllerEnumerable.hashOperation( operation.target, @@ -104,7 +102,7 @@ contract TimelockControllerEnumerableTest is Test { assertEq(timelockControllerEnumerable.isOperationPending(id), false); } - function test_scheduleBatch() public { + function testScheduleBatch() public { address[] memory targets = new address[](1); uint256[] memory values = new uint256[](1); bytes[] memory payloads = new bytes[](1); @@ -132,8 +130,8 @@ contract TimelockControllerEnumerableTest is Test { assertEq(operationBatch.delay, 1 days); } - function test_operationsBatch() public { - test_scheduleBatch(); + function testOperationsBatch() public { + testScheduleBatch(); TimelockControllerEnumerable.OperationBatch[] memory operationBatches = timelockControllerEnumerable .operationsBatch(0, 1); assertEq(operationBatches.length, 1); @@ -156,8 +154,8 @@ contract TimelockControllerEnumerableTest is Test { assertEq(operationBatches[0].delay, 1 days); } - function test_scheduleBatch_execute() public { - test_scheduleBatch(); + function testScheduleBatchExecute() public { + testScheduleBatch(); TimelockControllerEnumerable.OperationBatch memory operationBatch = timelockControllerEnumerable.operationBatch( uint256(0) ); @@ -180,7 +178,7 @@ contract TimelockControllerEnumerableTest is Test { assertEq(timelockControllerEnumerable.isOperationPending(id), false); } - function test_cancel_schedule() public { + function testCancelSchedule() public { timelockControllerEnumerable.schedule( address(this), 0, @@ -205,7 +203,7 @@ contract TimelockControllerEnumerableTest is Test { timelockControllerEnumerable.operation(uint256(0)); } - function test_cancel_scheduleBatch() public { + function testCancelScheduleBatch() public { address[] memory targets = new address[](1); uint256[] memory values = new uint256[](1); bytes[] memory payloads = new bytes[](1); diff --git a/test/governance/TimelockControllerEnumerableMock.t.sol b/test/governance/TimelockControllerEnumerableMock.t.sol index cbe072110..d99263dbc 100644 --- a/test/governance/TimelockControllerEnumerableMock.t.sol +++ b/test/governance/TimelockControllerEnumerableMock.t.sol @@ -2,9 +2,7 @@ pragma solidity ^0.8.20; -import { - TimelockControllerEnumerable -} from "@openzeppelin/community-contracts/governance/TimelockControllerEnumerable.sol"; +import {TimelockControllerEnumerable} from "@openzeppelin/community-contracts/governance/TimelockControllerEnumerable.sol"; import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol"; contract TimelockControllerEnumerableMock is TimelockControllerEnumerable { diff --git a/test/helpers/eip712-types.js b/test/helpers/eip712-types.js index 0f130d806..f2319ca4d 100644 --- a/test/helpers/eip712-types.js +++ b/test/helpers/eip712-types.js @@ -1,13 +1,7 @@ -const { formatType } = require('@openzeppelin/contracts/test/helpers/eip712-types'); -const { mapValues } = require('@openzeppelin/contracts/test/helpers/iterate'); +import { formatType } from '@openzeppelin/contracts/test/helpers/eip712-types'; -module.exports = mapValues( - { - MultisigConfirmation: { - account: 'address', - module: 'address', - deadline: 'uint256', - }, - }, - formatType, -); +export const MultisigConfirmation = formatType({ + account: 'address', + module: 'address', + deadline: 'uint256', +}); diff --git a/test/helpers/enums.js b/test/helpers/enums.js index a9377a195..e931fceba 100644 --- a/test/helpers/enums.js +++ b/test/helpers/enums.js @@ -1,15 +1,16 @@ -const enums = require('@openzeppelin/contracts/test/helpers/enums'); - -module.exports = { - ...enums, - EmailProofError: enums.Enum( - 'NoError', - 'DKIMPublicKeyHash', - 'MaskedCommandLength', - 'MismatchedCommand', - 'InvalidFieldPoint', - 'EmailProof', - ), - Case: enums.EnumTyped('CHECKSUM', 'LOWERCASE', 'UPPERCASE', 'ANY'), - OperationState: enums.Enum('Unknown', 'Scheduled', 'Ready', 'Expired', 'Executed', 'Canceled'), -}; +import { Enum, EnumTyped } from '@openzeppelin/contracts/test/helpers/enums'; + +export * from '@openzeppelin/contracts/test/helpers/enums'; + +export const EmailProofError = Enum( + 'NoError', + 'DKIMPublicKeyHash', + 'MaskedCommandLength', + 'MismatchedCommand', + 'InvalidFieldPoint', + 'EmailProof', +); + +export const Case = EnumTyped('CHECKSUM', 'LOWERCASE', 'UPPERCASE', 'ANY'); + +export const OperationState = Enum('Unknown', 'Scheduled', 'Ready', 'Expired', 'Executed', 'Canceled'); diff --git a/test/helpers/erc7786attributes.js b/test/helpers/erc7786attributes.js index a7d836fbf..fc827b8ac 100644 --- a/test/helpers/erc7786attributes.js +++ b/test/helpers/erc7786attributes.js @@ -1,3 +1,3 @@ -const { Interface } = require('ethers'); +import { Interface } from 'ethers'; -module.exports = Interface.from(['function requestRelay(uint256 value, uint256 gasLimit, address refundRecipient)']); +export default Interface.from(['function requestRelay(uint256 value, uint256 gasLimit, address refundRecipient)']); diff --git a/test/helpers/signers.js b/test/helpers/signers.js index 119377694..8bf32b39a 100644 --- a/test/helpers/signers.js +++ b/test/helpers/signers.js @@ -1,6 +1,6 @@ -const { assertArgument, dataLength, toBigInt, AbiCoder } = require('ethers'); +import { assertArgument, dataLength, toBigInt, AbiCoder } from 'ethers'; -class ZKEmailSigningKey { +export class ZKEmailSigningKey { #domainName; #publicKeyHash; #emailNullifier; @@ -64,7 +64,3 @@ class ZKEmailSigningKey { }; } } - -module.exports = { - ZKEmailSigningKey, -}; diff --git a/test/proxy/HybridProxy.test.js b/test/proxy/HybridProxy.test.js index b617cb153..27c8aafa6 100644 --- a/test/proxy/HybridProxy.test.js +++ b/test/proxy/HybridProxy.test.js @@ -1,6 +1,10 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); +import { network } from 'hardhat'; +import { expect } from 'chai'; + +const { + ethers, + networkHelpers: { loadFixture }, +} = await network.create(); async function fixture() { const [admin] = await ethers.getSigners(); diff --git a/test/token/ERC20/extensions/ERC20Allowlist.test.js b/test/token/ERC20/extensions/ERC20Allowlist.test.js index aefc935b2..de8596e35 100644 --- a/test/token/ERC20/extensions/ERC20Allowlist.test.js +++ b/test/token/ERC20/extensions/ERC20Allowlist.test.js @@ -1,6 +1,10 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); +import { network } from 'hardhat'; +import { expect } from 'chai'; + +const { + ethers, + networkHelpers: { loadFixture }, +} = await network.create(); const name = 'My Token'; const symbol = 'MTKN'; @@ -26,6 +30,7 @@ describe('ERC20Allowlist', function () { describe('transfer', function () { it('allows to transfer when allowed', async function () { await expect(this.token.connect(this.holder).transfer(this.recipient, initialSupply)).to.changeTokenBalances( + ethers, this.token, [this.holder, this.recipient], [-initialSupply, initialSupply], @@ -37,6 +42,7 @@ describe('ERC20Allowlist', function () { await this.token.$_allowUser(this.holder); await expect(this.token.connect(this.holder).transfer(this.recipient, initialSupply)).to.changeTokenBalances( + ethers, this.token, [this.holder, this.recipient], [-initialSupply, initialSupply], @@ -62,7 +68,7 @@ describe('ERC20Allowlist', function () { it('allows to transfer from when allowed', async function () { await expect( this.token.connect(this.approved).transferFrom(this.holder, this.recipient, allowance), - ).to.changeTokenBalances(this.token, [this.holder, this.recipient], [-allowance, allowance]); + ).to.changeTokenBalances(ethers, this.token, [this.holder, this.recipient], [-allowance, allowance]); }); it('allows to transfer when disallowed and then allowed', async function () { @@ -71,7 +77,7 @@ describe('ERC20Allowlist', function () { await expect( this.token.connect(this.approved).transferFrom(this.holder, this.recipient, allowance), - ).to.changeTokenBalances(this.token, [this.holder, this.recipient], [-allowance, allowance]); + ).to.changeTokenBalances(ethers, this.token, [this.holder, this.recipient], [-allowance, allowance]); }); it('reverts when trying to transfer from when disallowed', async function () { @@ -87,14 +93,24 @@ describe('ERC20Allowlist', function () { const value = 42n; it('allows to mint when allowed', async function () { - await expect(this.token.$_mint(this.recipient, value)).to.changeTokenBalance(this.token, this.recipient, value); + await expect(this.token.$_mint(this.recipient, value)).to.changeTokenBalance( + ethers, + this.token, + this.recipient, + value, + ); }); it('allows to mint when disallowed and then allowed', async function () { await this.token.$_disallowUser(this.recipient); await this.token.$_allowUser(this.recipient); - await expect(this.token.$_mint(this.recipient, value)).to.changeTokenBalance(this.token, this.recipient, value); + await expect(this.token.$_mint(this.recipient, value)).to.changeTokenBalance( + ethers, + this.token, + this.recipient, + value, + ); }); it('reverts when trying to mint when disallowed', async function () { @@ -111,14 +127,24 @@ describe('ERC20Allowlist', function () { const value = 42n; it('allows to burn when allowed', async function () { - await expect(this.token.$_burn(this.holder, value)).to.changeTokenBalance(this.token, this.holder, -value); + await expect(this.token.$_burn(this.holder, value)).to.changeTokenBalance( + ethers, + this.token, + this.holder, + -value, + ); }); it('allows to burn when disallowed and then allowed', async function () { await this.token.$_disallowUser(this.holder); await this.token.$_allowUser(this.holder); - await expect(this.token.$_burn(this.holder, value)).to.changeTokenBalance(this.token, this.holder, -value); + await expect(this.token.$_burn(this.holder, value)).to.changeTokenBalance( + ethers, + this.token, + this.holder, + -value, + ); }); it('reverts when trying to burn when disallowed', async function () { diff --git a/test/token/ERC20/extensions/ERC20Blocklist.test.js b/test/token/ERC20/extensions/ERC20Blocklist.test.js index a4135ef23..51c408b2b 100644 --- a/test/token/ERC20/extensions/ERC20Blocklist.test.js +++ b/test/token/ERC20/extensions/ERC20Blocklist.test.js @@ -1,6 +1,10 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); +import { network } from 'hardhat'; +import { expect } from 'chai'; + +const { + ethers, + networkHelpers: { loadFixture }, +} = await network.create(); const name = 'My Token'; const symbol = 'MTKN'; @@ -24,6 +28,7 @@ describe('ERC20Blocklist', function () { describe('transfer', function () { it('allows to transfer when not blocked', async function () { await expect(this.token.connect(this.holder).transfer(this.recipient, initialSupply)).to.changeTokenBalances( + ethers, this.token, [this.holder, this.recipient], [-initialSupply, initialSupply], @@ -35,6 +40,7 @@ describe('ERC20Blocklist', function () { await this.token.$_unblockUser(this.holder); await expect(this.token.connect(this.holder).transfer(this.recipient, initialSupply)).to.changeTokenBalances( + ethers, this.token, [this.holder, this.recipient], [-initialSupply, initialSupply], @@ -60,7 +66,7 @@ describe('ERC20Blocklist', function () { it('allows to transfer from when unblocked', async function () { await expect( this.token.connect(this.approved).transferFrom(this.holder, this.recipient, allowance), - ).to.changeTokenBalances(this.token, [this.holder, this.recipient], [-allowance, allowance]); + ).to.changeTokenBalances(ethers, this.token, [this.holder, this.recipient], [-allowance, allowance]); }); it('allows to transfer when blocked and then unblocked', async function () { @@ -69,7 +75,7 @@ describe('ERC20Blocklist', function () { await expect( this.token.connect(this.approved).transferFrom(this.holder, this.recipient, allowance), - ).to.changeTokenBalances(this.token, [this.holder, this.recipient], [-allowance, allowance]); + ).to.changeTokenBalances(ethers, this.token, [this.holder, this.recipient], [-allowance, allowance]); }); it('reverts when trying to transfer from when blocked', async function () { @@ -85,14 +91,24 @@ describe('ERC20Blocklist', function () { const value = 42n; it('allows to mint when unblocked', async function () { - await expect(this.token.$_mint(this.recipient, value)).to.changeTokenBalance(this.token, this.recipient, value); + await expect(this.token.$_mint(this.recipient, value)).to.changeTokenBalance( + ethers, + this.token, + this.recipient, + value, + ); }); it('allows to mint when blocked and then unblocked', async function () { await this.token.$_blockUser(this.holder); await this.token.$_unblockUser(this.holder); - await expect(this.token.$_mint(this.recipient, value)).to.changeTokenBalance(this.token, this.recipient, value); + await expect(this.token.$_mint(this.recipient, value)).to.changeTokenBalance( + ethers, + this.token, + this.recipient, + value, + ); }); it('reverts when trying to mint when blocked', async function () { @@ -109,14 +125,24 @@ describe('ERC20Blocklist', function () { const value = 42n; it('allows to burn when unblocked', async function () { - await expect(this.token.$_burn(this.holder, value)).to.changeTokenBalance(this.token, this.holder, -value); + await expect(this.token.$_burn(this.holder, value)).to.changeTokenBalance( + ethers, + this.token, + this.holder, + -value, + ); }); it('allows to burn when blocked and then unblocked', async function () { await this.token.$_blockUser(this.holder); await this.token.$_unblockUser(this.holder); - await expect(this.token.$_burn(this.holder, value)).to.changeTokenBalance(this.token, this.holder, -value); + await expect(this.token.$_burn(this.holder, value)).to.changeTokenBalance( + ethers, + this.token, + this.holder, + -value, + ); }); it('reverts when trying to burn when blocked', async function () { diff --git a/test/token/ERC20/extensions/ERC20Collateral.test.js b/test/token/ERC20/extensions/ERC20Collateral.test.js index f6961ed65..7c26ca7cb 100644 --- a/test/token/ERC20/extensions/ERC20Collateral.test.js +++ b/test/token/ERC20/extensions/ERC20Collateral.test.js @@ -1,7 +1,11 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); -const { time } = require('@nomicfoundation/hardhat-network-helpers'); +import { network } from 'hardhat'; +import { expect } from 'chai'; + +const { + ethers, + helpers: { time }, + networkHelpers: { loadFixture }, +} = await network.create(); const name = 'My Token'; const symbol = 'MTKN'; @@ -26,6 +30,7 @@ describe('ERC20Collateral', function () { it('mint all of collateral amount', async function () { await expect(this.token.$_mint(this.holder, MAX_UINT128 - initialSupply)).to.changeTokenBalance( + ethers, this.token, this.holder, MAX_UINT128 - initialSupply, @@ -43,6 +48,7 @@ describe('ERC20Collateral', function () { describe('expiration', function () { it('mint before expiration', async function () { await expect(this.token.$_mint(this.holder, initialSupply)).to.changeTokenBalance( + ethers, this.token, this.holder, initialSupply, @@ -50,7 +56,7 @@ describe('ERC20Collateral', function () { }); it('reverts when minting after expiration', async function () { - await time.increase(await this.token.liveness()); + await time.increaseBy.timestamp(await this.token.liveness()); await expect(this.token.$_mint(this.holder, initialSupply)).to.be.revertedWithCustomError( this.token, 'ERC20ExpiredCollateral', diff --git a/test/token/ERC20/extensions/ERC20Custodian.test.js b/test/token/ERC20/extensions/ERC20Custodian.test.js index 1e14a064e..57d2b5511 100644 --- a/test/token/ERC20/extensions/ERC20Custodian.test.js +++ b/test/token/ERC20/extensions/ERC20Custodian.test.js @@ -1,6 +1,10 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); +import { network } from 'hardhat'; +import { expect } from 'chai'; + +const { + ethers, + networkHelpers: { loadFixture }, +} = await network.create(); const name = 'My Token'; const symbol = 'MTKN'; @@ -24,6 +28,7 @@ describe('ERC20CustodianMock', function () { describe('transfer', function () { it('allows to transfer with available balance', async function () { await expect(this.token.connect(this.holder).transfer(this.recipient, initialSupply)).to.changeTokenBalances( + ethers, this.token, [this.holder, this.recipient], [-initialSupply, initialSupply], @@ -35,6 +40,7 @@ describe('ERC20CustodianMock', function () { await this.token.freeze(this.holder, 0); await expect(this.token.connect(this.holder).transfer(this.recipient, initialSupply)).to.changeTokenBalances( + ethers, this.token, [this.holder, this.recipient], [-initialSupply, initialSupply], @@ -60,7 +66,7 @@ describe('ERC20CustodianMock', function () { it('allows to transfer with available balance', async function () { await expect( this.token.connect(this.approved).transferFrom(this.holder, this.recipient, allowance), - ).to.changeTokenBalances(this.token, [this.holder, this.recipient], [-allowance, allowance]); + ).to.changeTokenBalances(ethers, this.token, [this.holder, this.recipient], [-allowance, allowance]); }); it('allows to transfer when frozen and then unfrozen', async function () { @@ -69,7 +75,7 @@ describe('ERC20CustodianMock', function () { await expect( this.token.connect(this.approved).transferFrom(this.holder, this.recipient, allowance), - ).to.changeTokenBalances(this.token, [this.holder, this.recipient], [-allowance, allowance]); + ).to.changeTokenBalances(ethers, this.token, [this.holder, this.recipient], [-allowance, allowance]); }); it('reverts when trying to transfer when frozen', async function () { @@ -85,7 +91,12 @@ describe('ERC20CustodianMock', function () { const value = 42n; it('allows to mint when unfrozen', async function () { - await expect(this.token.$_mint(this.recipient, value)).to.changeTokenBalance(this.token, this.recipient, value); + await expect(this.token.$_mint(this.recipient, value)).to.changeTokenBalance( + ethers, + this.token, + this.recipient, + value, + ); }); }); @@ -93,12 +104,22 @@ describe('ERC20CustodianMock', function () { const value = 42n; it('allows to burn when unfrozen', async function () { - await expect(this.token.$_burn(this.holder, value)).to.changeTokenBalance(this.token, this.holder, -value); + await expect(this.token.$_burn(this.holder, value)).to.changeTokenBalance( + ethers, + this.token, + this.holder, + -value, + ); }); it('allows to burn when frozen', async function () { await this.token.freeze(this.holder, value); - await expect(this.token.$_burn(this.holder, value)).to.changeTokenBalance(this.token, this.holder, -value); + await expect(this.token.$_burn(this.holder, value)).to.changeTokenBalance( + ethers, + this.token, + this.holder, + -value, + ); }); }); diff --git a/test/token/ERC20/extensions/ERC20Freezable.test.js b/test/token/ERC20/extensions/ERC20Freezable.test.js index f590d3118..0a8b65c87 100644 --- a/test/token/ERC20/extensions/ERC20Freezable.test.js +++ b/test/token/ERC20/extensions/ERC20Freezable.test.js @@ -1,6 +1,10 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); +import { network } from 'hardhat'; +import { expect } from 'chai'; + +const { + ethers, + networkHelpers: { loadFixture }, +} = await network.create(); const name = 'My Token'; const symbol = 'MTKN'; @@ -70,6 +74,7 @@ describe('ERC20Freezable', function () { describe('transfer', function () { it('allows transfer when no tokens are frozen', async function () { await expect(this.token.connect(this.holder).transfer(this.recipient, initialSupply)).to.changeTokenBalances( + ethers, this.token, [this.holder, this.recipient], [-initialSupply, initialSupply], @@ -82,6 +87,7 @@ describe('ERC20Freezable', function () { await this.token.$_setFrozen(this.holder, frozenAmount); await expect(this.token.connect(this.holder).transfer(this.recipient, transferAmount)).to.changeTokenBalances( + ethers, this.token, [this.holder, this.recipient], [-transferAmount, transferAmount], @@ -114,6 +120,7 @@ describe('ERC20Freezable', function () { await this.token.$_setFrozen(this.holder, 0n); // Unfreeze await expect(this.token.connect(this.holder).transfer(this.recipient, initialSupply)).to.changeTokenBalances( + ethers, this.token, [this.holder, this.recipient], [-initialSupply, initialSupply], @@ -134,7 +141,7 @@ describe('ERC20Freezable', function () { await expect( this.token.connect(this.approved).transferFrom(this.holder, this.recipient, allowance), - ).to.changeTokenBalances(this.token, [this.holder, this.recipient], [-allowance, allowance]); + ).to.changeTokenBalances(ethers, this.token, [this.holder, this.recipient], [-allowance, allowance]); }); it('reverts when trying to transferFrom more than available unfrozen balance', async function () { @@ -153,7 +160,7 @@ describe('ERC20Freezable', function () { await expect( this.token.connect(this.approved).transferFrom(this.holder, this.recipient, allowance), - ).to.changeTokenBalances(this.token, [this.holder, this.recipient], [-allowance, allowance]); + ).to.changeTokenBalances(ethers, this.token, [this.holder, this.recipient], [-allowance, allowance]); }); }); @@ -164,7 +171,12 @@ describe('ERC20Freezable', function () { const frozenAmount = 50n; await this.token.$_setFrozen(this.recipient, frozenAmount); - await expect(this.token.$_mint(this.recipient, value)).to.changeTokenBalance(this.token, this.recipient, value); + await expect(this.token.$_mint(this.recipient, value)).to.changeTokenBalance( + ethers, + this.token, + this.recipient, + value, + ); }); it('updates available balance correctly after minting to frozen account', async function () { @@ -184,7 +196,12 @@ describe('ERC20Freezable', function () { const frozenAmount = 20n; await this.token.$_setFrozen(this.holder, frozenAmount); - await expect(this.token.$_burn(this.holder, value)).to.changeTokenBalance(this.token, this.holder, -value); + await expect(this.token.$_burn(this.holder, value)).to.changeTokenBalance( + ethers, + this.token, + this.holder, + -value, + ); }); it('reverts when trying to burn more than available unfrozen balance', async function () { @@ -202,6 +219,7 @@ describe('ERC20Freezable', function () { await this.token.$_setFrozen(this.holder, frozenAmount); await expect(this.token.$_burn(this.holder, availableBalance)).to.changeTokenBalance( + ethers, this.token, this.holder, -availableBalance, diff --git a/test/token/ERC20/extensions/ERC20Restricted.test.js b/test/token/ERC20/extensions/ERC20Restricted.test.js index a2cec7fdc..21b57d130 100644 --- a/test/token/ERC20/extensions/ERC20Restricted.test.js +++ b/test/token/ERC20/extensions/ERC20Restricted.test.js @@ -1,6 +1,10 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); +import { network } from 'hardhat'; +import { expect } from 'chai'; + +const { + ethers, + networkHelpers: { loadFixture }, +} = await network.create(); const name = 'My Token'; const symbol = 'MTKN'; @@ -72,6 +76,7 @@ describe('ERC20Restricted', function () { describe('transfer', function () { it('allows transfer when sender and recipient have DEFAULT restriction', async function () { await expect(this.token.connect(this.holder).transfer(this.recipient, initialSupply)).to.changeTokenBalances( + ethers, this.token, [this.holder, this.recipient], [-initialSupply, initialSupply], @@ -83,6 +88,7 @@ describe('ERC20Restricted', function () { await this.token.$_allowUser(this.recipient); // Sets to ALLOWED await expect(this.token.connect(this.holder).transfer(this.recipient, initialSupply)).to.changeTokenBalances( + ethers, this.token, [this.holder, this.recipient], [-initialSupply, initialSupply], @@ -110,6 +116,7 @@ describe('ERC20Restricted', function () { await this.token.$_resetUser(this.holder); // Sets back to DEFAULT await expect(this.token.connect(this.holder).transfer(this.recipient, initialSupply)).to.changeTokenBalances( + ethers, this.token, [this.holder, this.recipient], [-initialSupply, initialSupply], @@ -127,7 +134,7 @@ describe('ERC20Restricted', function () { it('allows transferFrom when sender and recipient are allowed', async function () { await expect( this.token.connect(this.approved).transferFrom(this.holder, this.recipient, allowance), - ).to.changeTokenBalances(this.token, [this.holder, this.recipient], [-allowance, allowance]); + ).to.changeTokenBalances(ethers, this.token, [this.holder, this.recipient], [-allowance, allowance]); }); it('reverts when sender is BLOCKED', async function () { @@ -152,7 +159,7 @@ describe('ERC20Restricted', function () { await expect( this.token.connect(this.approved).transferFrom(this.holder, this.recipient, allowance), - ).to.changeTokenBalances(this.token, [this.holder, this.recipient], [-allowance, allowance]); + ).to.changeTokenBalances(ethers, this.token, [this.holder, this.recipient], [-allowance, allowance]); }); }); @@ -160,13 +167,23 @@ describe('ERC20Restricted', function () { const value = 42n; it('allows minting to DEFAULT users', async function () { - await expect(this.token.$_mint(this.recipient, value)).to.changeTokenBalance(this.token, this.recipient, value); + await expect(this.token.$_mint(this.recipient, value)).to.changeTokenBalance( + ethers, + this.token, + this.recipient, + value, + ); }); it('allows minting to ALLOWED users', async function () { await this.token.$_allowUser(this.recipient); // Sets to ALLOWED - await expect(this.token.$_mint(this.recipient, value)).to.changeTokenBalance(this.token, this.recipient, value); + await expect(this.token.$_mint(this.recipient, value)).to.changeTokenBalance( + ethers, + this.token, + this.recipient, + value, + ); }); it('reverts when trying to mint to BLOCKED user', async function () { @@ -181,7 +198,12 @@ describe('ERC20Restricted', function () { await this.token.$_blockUser(this.recipient); // Sets to BLOCKED await this.token.$_resetUser(this.recipient); // Sets back to DEFAULT - await expect(this.token.$_mint(this.recipient, value)).to.changeTokenBalance(this.token, this.recipient, value); + await expect(this.token.$_mint(this.recipient, value)).to.changeTokenBalance( + ethers, + this.token, + this.recipient, + value, + ); }); }); @@ -189,13 +211,23 @@ describe('ERC20Restricted', function () { const value = 42n; it('allows burning from DEFAULT users', async function () { - await expect(this.token.$_burn(this.holder, value)).to.changeTokenBalance(this.token, this.holder, -value); + await expect(this.token.$_burn(this.holder, value)).to.changeTokenBalance( + ethers, + this.token, + this.holder, + -value, + ); }); it('allows burning from ALLOWED users', async function () { await this.token.$_allowUser(this.holder); // Sets to ALLOWED - await expect(this.token.$_burn(this.holder, value)).to.changeTokenBalance(this.token, this.holder, -value); + await expect(this.token.$_burn(this.holder, value)).to.changeTokenBalance( + ethers, + this.token, + this.holder, + -value, + ); }); it('reverts when trying to burn from BLOCKED user', async function () { @@ -210,7 +242,12 @@ describe('ERC20Restricted', function () { await this.token.$_blockUser(this.holder); // Sets to BLOCKED await this.token.$_allowUser(this.holder); // Sets to ALLOWED - await expect(this.token.$_burn(this.holder, value)).to.changeTokenBalance(this.token, this.holder, -value); + await expect(this.token.$_burn(this.holder, value)).to.changeTokenBalance( + ethers, + this.token, + this.holder, + -value, + ); }); }); diff --git a/test/token/ERC20/extensions/ERC20uRWA.test.js b/test/token/ERC20/extensions/ERC20uRWA.test.js index b7c8a677e..f1c59887b 100644 --- a/test/token/ERC20/extensions/ERC20uRWA.test.js +++ b/test/token/ERC20/extensions/ERC20uRWA.test.js @@ -1,9 +1,11 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); +import { network } from 'hardhat'; +import { expect } from 'chai'; +import { shouldSupportInterfaces } from '@openzeppelin/contracts/test/utils/introspection/SupportsInterface.behavior'; + const { - shouldSupportInterfaces, -} = require('@openzeppelin/contracts/test/utils/introspection/SupportsInterface.behavior'); + ethers, + networkHelpers: { loadFixture }, +} = await network.create(); const name = 'My uRWA Token'; const symbol = 'uRWA'; @@ -41,6 +43,7 @@ describe('ERC20uRWA', function () { const transferAmount = 30n; await expect(this.token.connect(this.holder).transfer(this.recipient, transferAmount)).to.changeTokenBalances( + ethers, this.token, [this.holder, this.recipient], [-transferAmount, transferAmount], @@ -83,6 +86,7 @@ describe('ERC20uRWA', function () { await this.token.$_allowUser(this.recipient); // Sets to ALLOWED await expect(this.token.connect(this.holder).transfer(this.recipient, transferAmount)).to.changeTokenBalances( + ethers, this.token, [this.holder, this.recipient], [-transferAmount, transferAmount], @@ -160,6 +164,7 @@ describe('ERC20uRWA', function () { // recipient can still receive await expect(this.token.connect(this.holder).transfer(this.recipient, 10n)).to.changeTokenBalances( + ethers, this.token, [this.holder, this.recipient], [-10n, 10n], @@ -250,6 +255,7 @@ describe('ERC20uRWA', function () { const tx = this.token.connect(this.enforcer).forcedTransfer(this.holder, this.recipient, transferAmount); await expect(tx).to.emit(this.token, 'ForcedTransfer').withArgs(this.holder, this.recipient, transferAmount); await expect(tx).to.changeTokenBalances( + ethers, this.token, [this.holder, this.recipient], [-transferAmount, transferAmount], @@ -284,7 +290,7 @@ describe('ERC20uRWA', function () { await expect( this.token.connect(this.enforcer).forcedTransfer(this.holder, this.recipient, transferAmount), - ).to.changeTokenBalances(this.token, [this.holder, this.recipient], [-transferAmount, transferAmount]); + ).to.changeTokenBalances(ethers, this.token, [this.holder, this.recipient], [-transferAmount, transferAmount]); }); it('allows force transfer from restricted sender', async function () { @@ -294,6 +300,7 @@ describe('ERC20uRWA', function () { const tx = this.token.connect(this.enforcer).forcedTransfer(this.holder, this.recipient, transferAmount); await expect(tx).to.emit(this.token, 'ForcedTransfer').withArgs(this.holder, this.recipient, transferAmount); await expect(tx).to.changeTokenBalances( + ethers, this.token, [this.holder, this.recipient], [-transferAmount, transferAmount], @@ -309,6 +316,7 @@ describe('ERC20uRWA', function () { const tx = this.token.connect(this.enforcer).forcedTransfer(this.holder, this.recipient, transferAmount); await expect(tx).to.emit(this.token, 'ForcedTransfer').withArgs(this.holder, this.recipient, transferAmount); await expect(tx).to.changeTokenBalances( + ethers, this.token, [this.holder, this.recipient], [-transferAmount, transferAmount], @@ -376,7 +384,7 @@ describe('ERC20uRWA', function () { const tx = this.token.connect(this.enforcer).forcedTransfer(this.holder, this.holder, transferAmount); await expect(tx).to.emit(this.token, 'ForcedTransfer').withArgs(this.holder, this.holder, transferAmount); - await expect(tx).to.changeTokenBalance(this.token, this.holder, 0n); + await expect(tx).to.changeTokenBalance(ethers, this.token, this.holder, 0n); await expect(this.token.frozen(this.holder)).to.eventually.equal(frozenAmount); }); }); @@ -387,7 +395,12 @@ describe('ERC20uRWA', function () { const value = 42n; it('allows minting to allowed users', async function () { - await expect(this.token.$_mint(this.recipient, value)).to.changeTokenBalance(this.token, this.recipient, value); + await expect(this.token.$_mint(this.recipient, value)).to.changeTokenBalance( + ethers, + this.token, + this.recipient, + value, + ); }); it('reverts when minting to restricted user', async function () { @@ -402,7 +415,12 @@ describe('ERC20uRWA', function () { await this.token.$_mint(this.recipient, 20n); await this.token.connect(this.freezer).setFrozenTokens(this.recipient, 20n); - await expect(this.token.$_mint(this.recipient, value)).to.changeTokenBalance(this.token, this.recipient, value); + await expect(this.token.$_mint(this.recipient, value)).to.changeTokenBalance( + ethers, + this.token, + this.recipient, + value, + ); }); }); @@ -410,7 +428,12 @@ describe('ERC20uRWA', function () { const value = 42n; it('allows burning from users with sufficient unfrozen balance', async function () { - await expect(this.token.$_burn(this.holder, value)).to.changeTokenBalance(this.token, this.holder, -value); + await expect(this.token.$_burn(this.holder, value)).to.changeTokenBalance( + ethers, + this.token, + this.holder, + -value, + ); }); it('reverts when burning from restricted user', async function () { @@ -451,7 +474,7 @@ describe('ERC20uRWA', function () { it('allows transferFrom when all conditions are met', async function () { await expect( this.token.connect(this.approved).transferFrom(this.holder, this.recipient, allowance), - ).to.changeTokenBalances(this.token, [this.holder, this.recipient], [-allowance, allowance]); + ).to.changeTokenBalances(ethers, this.token, [this.holder, this.recipient], [-allowance, allowance]); }); it('reverts transferFrom when sender is restricted', async function () { diff --git a/test/token/ERC20/extensions/ERC4626.behavior.js b/test/token/ERC20/extensions/ERC4626.behavior.js index d2bd797a6..733afa73c 100644 --- a/test/token/ERC20/extensions/ERC4626.behavior.js +++ b/test/token/ERC20/extensions/ERC4626.behavior.js @@ -1,7 +1,7 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); +import { ethers } from 'ethers'; +import { expect } from 'chai'; -function shouldBehaveLikeERC4626Deposit({ initialAssets, initialShares, balance, isERC7540 } = {}) { +export function shouldBehaveLikeERC4626Deposit({ initialAssets, initialShares, balance, isERC7540 } = {}) { initialAssets ??= ethers.parseEther('17000000'); initialShares ??= ethers.parseEther('42000000'); balance ??= ethers.parseEther('1000'); @@ -9,7 +9,7 @@ function shouldBehaveLikeERC4626Deposit({ initialAssets, initialShares, balance, describe('Should behave like ERC4626 deposit', function () { before(async function () { - [this.owner, this.controller, this.receiver, this.operator, this.other] = await ethers.getSigners(); + [this.owner, this.controller, this.receiver, this.operator, this.other] = await this.ethers.getSigners(); }); beforeEach(async function () { @@ -38,27 +38,27 @@ function shouldBehaveLikeERC4626Deposit({ initialAssets, initialShares, balance, describe('Internal async deposit hooks revert', function () { it('_pendingDepositRequest', async function () { - await expect(this.mock.$_pendingDepositRequest(0n, this.owner)).to.be.reverted; + await expect(this.mock.$_pendingDepositRequest(0n, this.owner)).to.revert(this.ethers); }); it('_claimableDepositRequest', async function () { - await expect(this.mock.$_claimableDepositRequest(0n, this.owner)).to.be.reverted; + await expect(this.mock.$_claimableDepositRequest(0n, this.owner)).to.revert(this.ethers); }); it('_consumeClaimableDeposit', async function () { - await expect(this.mock.$_consumeClaimableDeposit(0n, this.owner)).to.be.reverted; + await expect(this.mock.$_consumeClaimableDeposit(0n, this.owner)).to.revert(this.ethers); }); it('_consumeClaimableMint', async function () { - await expect(this.mock.$_consumeClaimableMint(0n, this.owner)).to.be.reverted; + await expect(this.mock.$_consumeClaimableMint(0n, this.owner)).to.revert(this.ethers); }); it('_asyncMaxDeposit', async function () { - await expect(this.mock.$_asyncMaxDeposit(this.owner)).to.be.reverted; + await expect(this.mock.$_asyncMaxDeposit(this.owner)).to.revert(this.ethers); }); it('_asyncMaxMint', async function () { - await expect(this.mock.$_asyncMaxMint(this.owner)).to.be.reverted; + await expect(this.mock.$_asyncMaxMint(this.owner)).to.revert(this.ethers); }); }); }); @@ -67,11 +67,11 @@ function shouldBehaveLikeERC4626Deposit({ initialAssets, initialShares, balance, const assets = ethers.parseEther('100'); it('previewDeposit', async function () { - await expect(this.mock.previewDeposit(0n)).to.not.be.reverted; + await expect(this.mock.previewDeposit(0n)).to.not.revert(this.ethers); }); it('previewMint', async function () { - await expect(this.mock.previewMint(0n)).to.not.be.reverted; + await expect(this.mock.previewMint(0n)).to.not.revert(this.ethers); }); describe('deposit', function () { @@ -81,8 +81,8 @@ function shouldBehaveLikeERC4626Deposit({ initialAssets, initialShares, balance, const tx = this.mock.connect(this.owner).deposit(assets, this.receiver); await expect(tx).to.emit(this.mock, 'Deposit').withArgs(this.owner, this.receiver, assets, shares); - await expect(tx).to.changeTokenBalances(this.token, [this.owner, this.mock], [-assets, assets]); - await expect(tx).to.changeTokenBalance(this.mock, this.receiver, shares); + await expect(tx).to.changeTokenBalances(this.ethers, this.token, [this.owner, this.mock], [-assets, assets]); + await expect(tx).to.changeTokenBalance(this.ethers, this.mock, this.receiver, shares); }); it('maxDeposit returns unlimited', async function () { @@ -99,11 +99,12 @@ function shouldBehaveLikeERC4626Deposit({ initialAssets, initialShares, balance, await expect(tx).to.emit(this.mock, 'Deposit').withArgs(this.owner, this.receiver, requiredAssets, shares); await expect(tx).to.changeTokenBalances( + this.ethers, this.token, [this.owner, this.mock], [-requiredAssets, requiredAssets], ); - await expect(tx).to.changeTokenBalance(this.mock, this.receiver, shares); + await expect(tx).to.changeTokenBalance(this.ethers, this.mock, this.receiver, shares); }); it('maxMint returns unlimited', async function () { @@ -114,7 +115,7 @@ function shouldBehaveLikeERC4626Deposit({ initialAssets, initialShares, balance, }); } -function shouldBehaveLikeERC4626Redeem({ initialAssets, initialShares, balance, isERC7540 } = {}) { +export function shouldBehaveLikeERC4626Redeem({ initialAssets, initialShares, balance, isERC7540 } = {}) { initialAssets ??= ethers.parseEther('17000000'); initialShares ??= ethers.parseEther('42000000'); balance ??= ethers.parseEther('1000'); @@ -122,7 +123,7 @@ function shouldBehaveLikeERC4626Redeem({ initialAssets, initialShares, balance, describe('Should behave like ERC4626 redeem', function () { before(async function () { - [this.owner, this.controller, this.receiver, this.operator, this.other] = await ethers.getSigners(); + [this.owner, this.controller, this.receiver, this.operator, this.other] = await this.ethers.getSigners(); }); beforeEach(async function () { @@ -151,27 +152,27 @@ function shouldBehaveLikeERC4626Redeem({ initialAssets, initialShares, balance, describe('Internal async redeem hooks revert', function () { it('_pendingRedeemRequest', async function () { - await expect(this.mock.$_pendingRedeemRequest(0n, this.owner)).to.be.reverted; + await expect(this.mock.$_pendingRedeemRequest(0n, this.owner)).to.revert(this.ethers); }); it('_claimableRedeemRequest', async function () { - await expect(this.mock.$_claimableRedeemRequest(0n, this.owner)).to.be.reverted; + await expect(this.mock.$_claimableRedeemRequest(0n, this.owner)).to.revert(this.ethers); }); it('_consumeClaimableWithdraw', async function () { - await expect(this.mock.$_consumeClaimableWithdraw(0n, this.owner)).to.be.reverted; + await expect(this.mock.$_consumeClaimableWithdraw(0n, this.owner)).to.revert(this.ethers); }); it('_consumeClaimableRedeem', async function () { - await expect(this.mock.$_consumeClaimableRedeem(0n, this.owner)).to.be.reverted; + await expect(this.mock.$_consumeClaimableRedeem(0n, this.owner)).to.revert(this.ethers); }); it('_asyncMaxWithdraw', async function () { - await expect(this.mock.$_asyncMaxWithdraw(this.owner)).to.be.reverted; + await expect(this.mock.$_asyncMaxWithdraw(this.owner)).to.revert(this.ethers); }); it('_asyncMaxRedeem', async function () { - await expect(this.mock.$_asyncMaxRedeem(this.owner)).to.be.reverted; + await expect(this.mock.$_asyncMaxRedeem(this.owner)).to.revert(this.ethers); }); }); }); @@ -180,11 +181,11 @@ function shouldBehaveLikeERC4626Redeem({ initialAssets, initialShares, balance, const shares = ethers.parseEther('100'); it('previewWithdraw', async function () { - await expect(this.mock.previewWithdraw(0n)).to.not.be.reverted; + await expect(this.mock.previewWithdraw(0n)).to.not.revert(this.ethers); }); it('previewRedeem', async function () { - await expect(this.mock.previewRedeem(0n)).to.not.be.reverted; + await expect(this.mock.previewRedeem(0n)).to.not.revert(this.ethers); }); describe('redeem', function () { @@ -196,8 +197,13 @@ function shouldBehaveLikeERC4626Redeem({ initialAssets, initialShares, balance, await expect(tx) .to.emit(this.mock, 'Withdraw') .withArgs(this.owner, this.receiver, this.owner, assets, shares); - await expect(tx).to.changeTokenBalances(this.token, [this.mock, this.receiver], [-assets, assets]); - await expect(tx).to.changeTokenBalance(this.mock, this.owner, -shares); + await expect(tx).to.changeTokenBalances( + this.ethers, + this.token, + [this.mock, this.receiver], + [-assets, assets], + ); + await expect(tx).to.changeTokenBalance(this.ethers, this.mock, this.owner, -shares); }); it('allows spending allowance', async function () { @@ -209,7 +215,12 @@ function shouldBehaveLikeERC4626Redeem({ initialAssets, initialShares, balance, await expect(tx) .to.emit(this.mock, 'Withdraw') .withArgs(this.other, this.receiver, this.owner, assets, shares); - await expect(tx).to.changeTokenBalances(this.token, [this.mock, this.receiver], [-assets, assets]); + await expect(tx).to.changeTokenBalances( + this.ethers, + this.token, + [this.mock, this.receiver], + [-assets, assets], + ); await expect(this.mock.allowance(this.owner, this.other)).to.eventually.equal(0n); }); @@ -243,8 +254,13 @@ function shouldBehaveLikeERC4626Redeem({ initialAssets, initialShares, balance, await expect(tx) .to.emit(this.mock, 'Withdraw') .withArgs(this.owner, this.receiver, this.owner, assets, expectedShares); - await expect(tx).to.changeTokenBalances(this.token, [this.mock, this.receiver], [-assets, assets]); - await expect(tx).to.changeTokenBalance(this.mock, this.owner, -expectedShares); + await expect(tx).to.changeTokenBalances( + this.ethers, + this.token, + [this.mock, this.receiver], + [-assets, assets], + ); + await expect(tx).to.changeTokenBalance(this.ethers, this.mock, this.owner, -expectedShares); }); it('allows spending allowance', async function () { @@ -257,7 +273,12 @@ function shouldBehaveLikeERC4626Redeem({ initialAssets, initialShares, balance, await expect(tx) .to.emit(this.mock, 'Withdraw') .withArgs(this.other, this.receiver, this.owner, assets, expectedShares); - await expect(tx).to.changeTokenBalances(this.token, [this.mock, this.receiver], [-assets, assets]); + await expect(tx).to.changeTokenBalances( + this.ethers, + this.token, + [this.mock, this.receiver], + [-assets, assets], + ); }); it('reverts when caller has no allowance', async function () { @@ -277,8 +298,3 @@ function shouldBehaveLikeERC4626Redeem({ initialAssets, initialShares, balance, }); }); } - -module.exports = { - shouldBehaveLikeERC4626Deposit, - shouldBehaveLikeERC4626Redeem, -}; diff --git a/test/token/ERC20/extensions/ERC4626.test.js b/test/token/ERC20/extensions/ERC4626.test.js index 8f9a9ea9b..2cb9febdf 100644 --- a/test/token/ERC20/extensions/ERC4626.test.js +++ b/test/token/ERC20/extensions/ERC4626.test.js @@ -1,6 +1,10 @@ -const { ethers } = require('hardhat'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); -const { shouldBehaveLikeERC4626Deposit, shouldBehaveLikeERC4626Redeem } = require('./ERC4626.behavior'); +import { network } from 'hardhat'; +import { shouldBehaveLikeERC4626Deposit, shouldBehaveLikeERC4626Redeem } from './ERC4626.behavior'; + +const { + ethers, + networkHelpers: { loadFixture }, +} = await network.create(); const name = 'Vault Shares'; const symbol = 'vSHR'; @@ -14,6 +18,10 @@ async function fixture() { } describe('ERC4626 behavior is compatible with reference implementation', function () { + before(async function () { + Object.assign(this, { ethers }); + }); + beforeEach(async function () { Object.assign(this, await loadFixture(fixture)); }); diff --git a/test/token/ERC20/extensions/ERC7540.behavior.js b/test/token/ERC20/extensions/ERC7540.behavior.js index fe52fb59b..961dee109 100644 --- a/test/token/ERC20/extensions/ERC7540.behavior.js +++ b/test/token/ERC20/extensions/ERC7540.behavior.js @@ -1,11 +1,9 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); +import { ethers } from 'ethers'; +import { expect } from 'chai'; -const { batchInBlock } = require('@openzeppelin/contracts/test/helpers/txpool'); -const { interfaceId } = require('@openzeppelin/contracts/test/helpers/methods'); -const { - shouldSupportInterfaces, -} = require('@openzeppelin/contracts/test/utils/introspection/SupportsInterface.behavior'); +import { batchInBlock } from '@openzeppelin/contracts/test/helpers/txpool'; +import { interfaceId } from '@openzeppelin/contracts/test/helpers/methods'; +import { shouldSupportInterfaces } from '@openzeppelin/contracts/test/utils/introspection/SupportsInterface.behavior'; const ERC7540Operator = ['setOperator(address,bool)', 'isOperator(address,address)']; const ERC7540Deposit = [ @@ -21,10 +19,10 @@ const ERC7540Redeem = [ 'claimableRedeemRequest(uint256,address)', ]; -function shouldBehaveLikeERC7540Operator() { +export function shouldBehaveLikeERC7540Operator() { describe('Should behave like ERC7540Operator', function () { before(async function () { - [this.owner, this.controller, this.receiver, this.operator, this.other] = await ethers.getSigners(); + [this.owner, this.controller, this.receiver, this.operator, this.other] = await this.ethers.getSigners(); }); describe('supports ERC-7540 operator interface', function () { @@ -44,7 +42,7 @@ function shouldBehaveLikeERC7540Operator() { }); } -function shouldBehaveLikeERC7540Deposit({ +export function shouldBehaveLikeERC7540Deposit({ initialAssets, initialShares, balance, @@ -58,7 +56,7 @@ function shouldBehaveLikeERC7540Deposit({ describe('Should behave like ERC7540Deposit', function () { before(async function () { - [this.owner, this.controller, this.receiver, this.operator, this.other] = await ethers.getSigners(); + [this.owner, this.controller, this.receiver, this.operator, this.other] = await this.ethers.getSigners(); }); beforeEach(async function () { @@ -103,8 +101,8 @@ function shouldBehaveLikeERC7540Deposit({ await expect(tx) .to.emit(this.mock, 'DepositRequest') .withArgs(this.controller, this.owner, requestId, this.owner, assets); - await expect(tx).to.changeTokenBalances(this.token, [this.owner, this.mock], [-assets, assets]); - await expect(tx).to.changeTokenBalances(this.mock, [this.controller], [0n]); + await expect(tx).to.changeTokenBalances(this.ethers, this.token, [this.owner, this.mock], [-assets, assets]); + await expect(tx).to.changeTokenBalances(this.ethers, this.mock, [this.controller], [0n]); await expect(this.mock.totalAssets()).to.eventually.equal(assetsBefore); await expect(this.mock.totalSupply()).to.eventually.equal(supplyBefore); @@ -130,8 +128,8 @@ function shouldBehaveLikeERC7540Deposit({ await expect(tx) .to.emit(this.mock, 'DepositRequest') .withArgs(this.controller, this.owner, requestId, this.operator, assets); - await expect(tx).to.changeTokenBalances(this.token, [this.owner, this.mock], [-assets, assets]); - await expect(tx).to.changeTokenBalances(this.mock, [this.controller], [0n]); + await expect(tx).to.changeTokenBalances(this.ethers, this.token, [this.owner, this.mock], [-assets, assets]); + await expect(tx).to.changeTokenBalances(this.ethers, this.mock, [this.controller], [0n]); }); it('reverts when caller is neither owner nor operator of owner', async function () { @@ -148,7 +146,7 @@ function shouldBehaveLikeERC7540Deposit({ () => this.mock.connect(this.owner).requestDeposit(42n, this.controller, this.owner, { gasLimit: 200000n }), ], - ethers.provider, + this.ethers.provider, ); const requestId1 = await this.getRequestId(tx1); @@ -244,11 +242,11 @@ function shouldBehaveLikeERC7540Deposit({ describe('claim', function () { beforeEach(async function () { - (this.requestId = await this.mock + ((this.requestId = await this.mock .connect(this.owner) .requestDeposit(assets, this.controller, this.owner) .then(this.getRequestId)), - await this.fulfillDeposit(this.requestId, assets, shares, this.controller); + await this.fulfillDeposit(this.requestId, assets, shares, this.controller)); }); describe('via deposit()', function () { @@ -267,7 +265,7 @@ function shouldBehaveLikeERC7540Deposit({ .deposit(assets, this.receiver, ethers.Typed.address(this.controller)); await expect(tx).to.emit(this.mock, 'Deposit').withArgs(this.controller, this.receiver, assets, shares); - await expect(tx).to.changeTokenBalance(this.mock, this.receiver, shares); + await expect(tx).to.changeTokenBalance(this.ethers, this.mock, this.receiver, shares); await expect(this.mock.pendingDepositRequest(this.requestId, this.controller)).to.eventually.equal(0n); await expect(this.mock.claimableDepositRequest(this.requestId, this.controller)).to.eventually.equal(0n); @@ -286,7 +284,7 @@ function shouldBehaveLikeERC7540Deposit({ .deposit(assets, this.receiver, ethers.Typed.address(this.controller)); await expect(tx).to.emit(this.mock, 'Deposit').withArgs(this.controller, this.receiver, assets, shares); - await expect(tx).to.changeTokenBalance(this.mock, this.receiver, shares); + await expect(tx).to.changeTokenBalance(this.ethers, this.mock, this.receiver, shares); }); it('reverts when trying to deposit more than what is claimable', async function () { @@ -312,7 +310,7 @@ function shouldBehaveLikeERC7540Deposit({ .connect(this.controller) .deposit(0n, this.receiver, ethers.Typed.address(this.controller)); await expect(tx).to.emit(this.mock, 'Deposit').withArgs(this.controller, this.receiver, 0n, 0n); - await expect(tx).to.changeTokenBalance(this.mock, this.receiver, 0n); + await expect(tx).to.changeTokenBalance(this.ethers, this.mock, this.receiver, 0n); }); }); @@ -333,7 +331,7 @@ function shouldBehaveLikeERC7540Deposit({ await expect(tx).to.emit(this.mock, 'Deposit').withArgs(this.controller, this.receiver, assets, shares); - await expect(tx).to.changeTokenBalance(this.mock, this.receiver, shares); + await expect(tx).to.changeTokenBalance(this.ethers, this.mock, this.receiver, shares); await expect(this.mock.pendingDepositRequest(this.requestId, this.controller)).to.eventually.equal(0n); await expect(this.mock.claimableDepositRequest(this.requestId, this.controller)).to.eventually.equal(0n); @@ -352,7 +350,7 @@ function shouldBehaveLikeERC7540Deposit({ .mint(shares, this.receiver, ethers.Typed.address(this.controller)); await expect(tx).to.emit(this.mock, 'Deposit').withArgs(this.controller, this.receiver, assets, shares); - await expect(tx).to.changeTokenBalance(this.mock, this.receiver, shares); + await expect(tx).to.changeTokenBalance(this.ethers, this.mock, this.receiver, shares); }); it('reverts when trying to mint more than what is claimable', async function () { @@ -378,7 +376,7 @@ function shouldBehaveLikeERC7540Deposit({ .connect(this.controller) .mint(0n, this.receiver, ethers.Typed.address(this.controller)); await expect(tx).to.emit(this.mock, 'Deposit').withArgs(this.controller, this.receiver, 0n, 0n); - await expect(tx).to.changeTokenBalance(this.mock, this.receiver, 0n); + await expect(tx).to.changeTokenBalance(this.ethers, this.mock, this.receiver, 0n); }); }); }); @@ -386,7 +384,7 @@ function shouldBehaveLikeERC7540Deposit({ }); } -function shouldBehaveLikeERC7540Redeem({ initialAssets, initialShares, balance, supportCustomFulfill } = {}) { +export function shouldBehaveLikeERC7540Redeem({ initialAssets, initialShares, balance, supportCustomFulfill } = {}) { initialAssets ??= ethers.parseEther('17000000'); initialShares ??= ethers.parseEther('42000000'); balance ??= ethers.parseEther('1000'); @@ -394,7 +392,7 @@ function shouldBehaveLikeERC7540Redeem({ initialAssets, initialShares, balance, describe('Should behave like ERC7540Redeem', function () { before(async function () { - [this.owner, this.controller, this.receiver, this.operator, this.other] = await ethers.getSigners(); + [this.owner, this.controller, this.receiver, this.operator, this.other] = await this.ethers.getSigners(); }); beforeEach(async function () { @@ -441,8 +439,8 @@ function shouldBehaveLikeERC7540Redeem({ initialAssets, initialShares, balance, await expect(tx) .to.emit(this.mock, 'RedeemRequest') .withArgs(this.controller, this.owner, requestId, this.owner, shares); - await expect(tx).to.changeTokenBalances(this.token, [this.controller, this.mock], [0n, 0n]); - await expect(tx).to.changeTokenBalances(this.mock, [this.owner], [-shares]); + await expect(tx).to.changeTokenBalances(this.ethers, this.token, [this.controller, this.mock], [0n, 0n]); + await expect(tx).to.changeTokenBalances(this.ethers, this.mock, [this.owner], [-shares]); // totalSupply includes shares for in-flight redeem await expect(this.mock.totalAssets()).to.eventually.equal(assetsBefore); @@ -470,8 +468,8 @@ function shouldBehaveLikeERC7540Redeem({ initialAssets, initialShares, balance, await expect(tx) .to.emit(this.mock, 'RedeemRequest') .withArgs(this.controller, this.owner, requestId, this.operator, shares); - await expect(tx).to.changeTokenBalances(this.token, [this.controller, this.mock], [0n, 0n]); - await expect(tx).to.changeTokenBalances(this.mock, [this.owner], [-shares]); + await expect(tx).to.changeTokenBalances(this.ethers, this.token, [this.controller, this.mock], [0n, 0n]); + await expect(tx).to.changeTokenBalances(this.ethers, this.mock, [this.owner], [-shares]); }); it('spends allowance when caller is neither owner nor operator', async function () { @@ -501,7 +499,7 @@ function shouldBehaveLikeERC7540Redeem({ initialAssets, initialShares, balance, () => this.mock.connect(this.operator).requestRedeem(42n, this.controller, this.owner, { gasLimit: 200000n }), ], - ethers.provider, + this.ethers.provider, ); const requestId1 = await this.getRequestId(tx1); @@ -612,7 +610,12 @@ function shouldBehaveLikeERC7540Redeem({ initialAssets, initialShares, balance, await expect(tx) .to.emit(this.mock, 'Withdraw') .withArgs(this.controller, this.receiver, this.controller, assets, shares); - await expect(tx).to.changeTokenBalances(this.token, [this.mock, this.receiver], [-assets, assets]); + await expect(tx).to.changeTokenBalances( + this.ethers, + this.token, + [this.mock, this.receiver], + [-assets, assets], + ); await expect(this.mock.pendingRedeemRequest(this.requestId, this.controller)).to.eventually.equal(0n); await expect(this.mock.claimableRedeemRequest(this.requestId, this.controller)).to.eventually.equal(0n); @@ -627,7 +630,12 @@ function shouldBehaveLikeERC7540Redeem({ initialAssets, initialShares, balance, await expect(tx) .to.emit(this.mock, 'Withdraw') .withArgs(this.operator, this.receiver, this.controller, assets, shares); - await expect(tx).to.changeTokenBalances(this.token, [this.mock, this.receiver], [-assets, assets]); + await expect(tx).to.changeTokenBalances( + this.ethers, + this.token, + [this.mock, this.receiver], + [-assets, assets], + ); }); it('reverts when trying to redeem more than what is claimable', async function () { @@ -647,7 +655,7 @@ function shouldBehaveLikeERC7540Redeem({ initialAssets, initialShares, balance, await expect(tx) .to.emit(this.mock, 'Withdraw') .withArgs(this.controller, this.receiver, this.controller, 0n, 0n); - await expect(tx).to.changeTokenBalances(this.token, [this.mock, this.receiver], [0n, 0n]); + await expect(tx).to.changeTokenBalances(this.ethers, this.token, [this.mock, this.receiver], [0n, 0n]); }); }); @@ -665,7 +673,12 @@ function shouldBehaveLikeERC7540Redeem({ initialAssets, initialShares, balance, await expect(tx) .to.emit(this.mock, 'Withdraw') .withArgs(this.controller, this.receiver, this.controller, assets, shares); - await expect(tx).to.changeTokenBalances(this.token, [this.mock, this.receiver], [-assets, assets]); + await expect(tx).to.changeTokenBalances( + this.ethers, + this.token, + [this.mock, this.receiver], + [-assets, assets], + ); await expect(this.mock.pendingRedeemRequest(this.requestId, this.controller)).to.eventually.equal(0n); await expect(this.mock.claimableRedeemRequest(this.requestId, this.controller)).to.eventually.equal(0n); @@ -680,7 +693,12 @@ function shouldBehaveLikeERC7540Redeem({ initialAssets, initialShares, balance, await expect(tx) .to.emit(this.mock, 'Withdraw') .withArgs(this.operator, this.receiver, this.controller, assets, shares); - await expect(tx).to.changeTokenBalances(this.token, [this.mock, this.receiver], [-assets, assets]); + await expect(tx).to.changeTokenBalances( + this.ethers, + this.token, + [this.mock, this.receiver], + [-assets, assets], + ); }); it('reverts when trying to withdraw more than what is claimable', async function () { @@ -700,16 +718,10 @@ function shouldBehaveLikeERC7540Redeem({ initialAssets, initialShares, balance, await expect(tx) .to.emit(this.mock, 'Withdraw') .withArgs(this.controller, this.receiver, this.controller, 0n, 0n); - await expect(tx).to.changeTokenBalances(this.token, [this.mock, this.receiver], [0n, 0n]); + await expect(tx).to.changeTokenBalances(this.ethers, this.token, [this.mock, this.receiver], [0n, 0n]); }); }); }); }); }); } - -module.exports = { - shouldBehaveLikeERC7540Operator, - shouldBehaveLikeERC7540Deposit, - shouldBehaveLikeERC7540Redeem, -}; diff --git a/test/token/ERC20/extensions/ERC7540Admin.test.js b/test/token/ERC20/extensions/ERC7540Admin.test.js index 411df5f58..f160271dc 100644 --- a/test/token/ERC20/extensions/ERC7540Admin.test.js +++ b/test/token/ERC20/extensions/ERC7540Admin.test.js @@ -1,13 +1,16 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); - -const { +import { network } from 'hardhat'; +import { expect } from 'chai'; +import { shouldBehaveLikeERC7540Operator, shouldBehaveLikeERC7540Deposit, shouldBehaveLikeERC7540Redeem, -} = require('./ERC7540.behavior'); -const { shouldBehaveLikeERC7575 } = require('./ERC7575.behavior'); +} from './ERC7540.behavior'; +import { shouldBehaveLikeERC7575 } from './ERC7575.behavior'; + +const { + ethers, + networkHelpers: { loadFixture }, +} = await network.create(); const name = 'Vault Shares'; const symbol = 'vSHR'; @@ -15,6 +18,10 @@ const tokenName = 'Asset Token'; const tokenSymbol = 'AST'; describe('ERC7540Admin', function () { + before(async function () { + Object.assign(this, { ethers }); + }); + for (const withTmpHolder of [false, true]) { describe(withTmpHolder ? 'With a temporary share holder' : 'With direct share operations', function () { async function fixture() { diff --git a/test/token/ERC20/extensions/ERC7540Delay.test.js b/test/token/ERC20/extensions/ERC7540Delay.test.js index 8af7028fe..5a89258b1 100644 --- a/test/token/ERC20/extensions/ERC7540Delay.test.js +++ b/test/token/ERC20/extensions/ERC7540Delay.test.js @@ -1,14 +1,17 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); - -const time = require('@openzeppelin/contracts/test/helpers/time'); -const { +import { network } from 'hardhat'; +import { expect } from 'chai'; +import { shouldBehaveLikeERC7540Operator, shouldBehaveLikeERC7540Deposit, shouldBehaveLikeERC7540Redeem, -} = require('./ERC7540.behavior'); -const { shouldBehaveLikeERC7575 } = require('./ERC7575.behavior'); +} from './ERC7540.behavior'; +import { shouldBehaveLikeERC7575 } from './ERC7575.behavior'; + +const { + ethers, + helpers: { time }, + networkHelpers: { loadFixture }, +} = await network.create(); const name = 'Vault Shares'; const symbol = 'vSHR'; @@ -23,6 +26,10 @@ async function fixture() { } describe('ERC7540Delay', function () { + before(async function () { + Object.assign(this, { ethers }); + }); + beforeEach(async function () { Object.assign(this, await loadFixture(fixture)); diff --git a/test/token/ERC20/extensions/ERC7540Sync.test.js b/test/token/ERC20/extensions/ERC7540Sync.test.js index 3dcc8aa00..8401157e5 100644 --- a/test/token/ERC20/extensions/ERC7540Sync.test.js +++ b/test/token/ERC20/extensions/ERC7540Sync.test.js @@ -1,5 +1,7 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); +import { network } from 'hardhat'; +import { expect } from 'chai'; + +const { ethers } = await network.create(); const name = 'Vault Shares'; const symbol = 'vSHR'; diff --git a/test/token/ERC20/extensions/ERC7540SyncDeposit.test.js b/test/token/ERC20/extensions/ERC7540SyncDeposit.test.js index c8f90a281..14224e69e 100644 --- a/test/token/ERC20/extensions/ERC7540SyncDeposit.test.js +++ b/test/token/ERC20/extensions/ERC7540SyncDeposit.test.js @@ -1,10 +1,13 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); +import { network } from 'hardhat'; +import { expect } from 'chai'; +import { shouldBehaveLikeERC4626Deposit } from './ERC4626.behavior'; +import { shouldBehaveLikeERC7540Operator, shouldBehaveLikeERC7540Redeem } from './ERC7540.behavior'; +import { shouldBehaveLikeERC7575 } from './ERC7575.behavior'; -const { shouldBehaveLikeERC4626Deposit } = require('./ERC4626.behavior'); -const { shouldBehaveLikeERC7540Operator, shouldBehaveLikeERC7540Redeem } = require('./ERC7540.behavior'); -const { shouldBehaveLikeERC7575 } = require('./ERC7575.behavior'); +const { + ethers, + networkHelpers: { loadFixture }, +} = await network.create(); const name = 'Vault Shares'; const symbol = 'vSHR'; @@ -18,6 +21,10 @@ async function fixture() { } describe('ERC7540SyncDeposit', function () { + before(async function () { + Object.assign(this, { ethers }); + }); + beforeEach(async function () { Object.assign(this, await loadFixture(fixture)); diff --git a/test/token/ERC20/extensions/ERC7540SyncRedeem.test.js b/test/token/ERC20/extensions/ERC7540SyncRedeem.test.js index 8f1ca8545..da5626800 100644 --- a/test/token/ERC20/extensions/ERC7540SyncRedeem.test.js +++ b/test/token/ERC20/extensions/ERC7540SyncRedeem.test.js @@ -1,10 +1,13 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); -const { shouldBehaveLikeERC4626Redeem } = require('./ERC4626.behavior'); -const { shouldBehaveLikeERC7540Operator, shouldBehaveLikeERC7540Deposit } = require('./ERC7540.behavior'); -const { shouldBehaveLikeERC7575 } = require('./ERC7575.behavior'); - +import { network } from 'hardhat'; +import { expect } from 'chai'; +import { shouldBehaveLikeERC4626Redeem } from './ERC4626.behavior'; +import { shouldBehaveLikeERC7540Operator, shouldBehaveLikeERC7540Deposit } from './ERC7540.behavior'; +import { shouldBehaveLikeERC7575 } from './ERC7575.behavior'; + +const { + ethers, + networkHelpers: { loadFixture }, +} = await network.create(); const name = 'Vault Shares'; const symbol = 'vSHR'; const tokenName = 'Asset Token'; @@ -17,6 +20,10 @@ async function fixture() { } describe('ERC7540SyncRedeem', function () { + before(async function () { + Object.assign(this, { ethers }); + }); + beforeEach(async function () { Object.assign(this, await loadFixture(fixture)); diff --git a/test/token/ERC20/extensions/ERC7575.behavior.js b/test/token/ERC20/extensions/ERC7575.behavior.js index 81bcafbc3..08acd8a96 100644 --- a/test/token/ERC20/extensions/ERC7575.behavior.js +++ b/test/token/ERC20/extensions/ERC7575.behavior.js @@ -1,8 +1,6 @@ -const { expect } = require('chai'); -const { interfaceId } = require('@openzeppelin/contracts/test/helpers/methods'); -const { - shouldSupportInterfaces, -} = require('@openzeppelin/contracts/test/utils/introspection/SupportsInterface.behavior'); +import { expect } from 'chai'; +import { interfaceId } from '@openzeppelin/contracts/test/helpers/methods'; +import { shouldSupportInterfaces } from '@openzeppelin/contracts/test/utils/introspection/SupportsInterface.behavior'; const ERC7575 = [ 'asset()', @@ -25,7 +23,7 @@ const ERC7575 = [ ]; const ERC7575Share = ['vault(address)']; -function shouldBehaveLikeERC7575({ selfAsset } = {}) { +export function shouldBehaveLikeERC7575({ selfAsset } = {}) { selfAsset ??= true; describe('Should behave like ERC7575', function () { @@ -45,7 +43,3 @@ function shouldBehaveLikeERC7575({ selfAsset } = {}) { }); }); } - -module.exports = { - shouldBehaveLikeERC7575, -}; diff --git a/test/utils/Masks.test.js b/test/utils/Masks.test.js index b846e8082..903aa8601 100644 --- a/test/utils/Masks.test.js +++ b/test/utils/Masks.test.js @@ -1,6 +1,10 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); +import { network } from 'hardhat'; +import { expect } from 'chai'; + +const { + ethers, + networkHelpers: { loadFixture }, +} = await network.create(); async function fixture() { const mock = await ethers.deployContract('$Masks'); diff --git a/test/utils/cryptography/DKIMRegistry.test.js b/test/utils/cryptography/DKIMRegistry.test.js index 3d4a71256..f2c9ed8f7 100644 --- a/test/utils/cryptography/DKIMRegistry.test.js +++ b/test/utils/cryptography/DKIMRegistry.test.js @@ -1,6 +1,10 @@ -const { expect } = require('chai'); -const { ethers } = require('hardhat'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); +import { network } from 'hardhat'; +import { expect } from 'chai'; + +const { + ethers, + networkHelpers: { loadFixture }, +} = await network.create(); const DOMAIN_EXAMPLE_COM = ethers.keccak256(ethers.toUtf8Bytes('example.com')); const DOMAIN_EXAMPLE_ORG = ethers.keccak256(ethers.toUtf8Bytes('example.org')); diff --git a/test/utils/cryptography/ZKEmailUtils.test.js b/test/utils/cryptography/ZKEmailUtils.test.js index dc26d8827..6cddcad7e 100644 --- a/test/utils/cryptography/ZKEmailUtils.test.js +++ b/test/utils/cryptography/ZKEmailUtils.test.js @@ -1,7 +1,11 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); -const { EmailProofError, Case } = require('../../helpers/enums'); +import { network } from 'hardhat'; +import { expect } from 'chai'; +import { EmailProofError, Case } from '../../helpers/enums'; + +const { + ethers, + networkHelpers: { loadFixture }, +} = await network.create(); const accountSalt = '0x046582bce36cdd0a8953b9d40b8f20d58302bacf3bcecffeb6741c98a52725e2'; // keccak256("test@example.com") diff --git a/test/utils/cryptography/signers/SignerAccessManaged.test.js b/test/utils/cryptography/signers/SignerAccessManaged.test.js index 683a193a4..c4576b183 100644 --- a/test/utils/cryptography/signers/SignerAccessManaged.test.js +++ b/test/utils/cryptography/signers/SignerAccessManaged.test.js @@ -1,6 +1,10 @@ -const { ethers } = require('hardhat'); -const { expect } = require('chai'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); +import { network } from 'hardhat'; +import { expect } from 'chai'; + +const { + ethers, + networkHelpers: { loadFixture }, +} = await network.create(); const ROLE = 42n; diff --git a/test/utils/structs/EnumerableMapExtended.test.js b/test/utils/structs/EnumerableMapExtended.test.js index fcd7703cc..03f721114 100644 --- a/test/utils/structs/EnumerableMapExtended.test.js +++ b/test/utils/structs/EnumerableMapExtended.test.js @@ -1,11 +1,17 @@ -const { ethers } = require('hardhat'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); +import { network } from 'hardhat'; +import { mapValues } from '@openzeppelin/contracts/test/helpers/iterate'; +import * as random from '@openzeppelin/contracts/test/helpers/random'; +import { shouldBehaveLikeMap } from '@openzeppelin/contracts/test/utils/structs/EnumerableMap.behavior'; -const { mapValues } = require('@openzeppelin/contracts/test/helpers/iterate'); -const { generators } = require('@openzeppelin/contracts/test/helpers/random'); -const { MAP_TYPES } = require('../../../scripts/generate/templates/Enumerable.opts'); +import { MAP_TYPES } from '../../../scripts/generate/templates/Enumerable.opts'; -const { shouldBehaveLikeMap } = require('@openzeppelin/contracts/test/utils/structs/EnumerableMap.behavior'); +const { + ethers, + networkHelpers: { loadFixture }, +} = await network.create(); + +// Chai matchers expect hexadecimal data when dealing with bytes +const randomOf = type => random[type === 'bytes' ? 'hexBytes' : type]; async function fixture() { const mock = await ethers.deployContract('$EnumerableMapExtended'); @@ -16,9 +22,9 @@ async function fixture() { { key, value, - keys: Array.from({ length: 3 }, generators[key.type]), - values: Array.from({ length: 3 }, generators[value.type]), - zeroValue: generators[value.type].zero, + keys: Array.from({ length: 3 }, randomOf(key.type)), + values: Array.from({ length: 3 }, randomOf(value.type)), + zeroValue: randomOf(value.type).zero, methods: mapValues( { set: `$set(uint256,${key.type},${value.type})`, diff --git a/test/utils/structs/EnumerableSetExtended.test.js b/test/utils/structs/EnumerableSetExtended.test.js index 681b68aa0..374999f77 100644 --- a/test/utils/structs/EnumerableSetExtended.test.js +++ b/test/utils/structs/EnumerableSetExtended.test.js @@ -1,11 +1,17 @@ -const { ethers } = require('hardhat'); -const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); +import { network } from 'hardhat'; +import { mapValues } from '@openzeppelin/contracts/test/helpers/iterate'; +import * as random from '@openzeppelin/contracts/test/helpers/random'; +import { shouldBehaveLikeSet } from '@openzeppelin/contracts/test/utils/structs/EnumerableSet.behavior'; -const { mapValues } = require('@openzeppelin/contracts/test/helpers/iterate'); -const { generators } = require('@openzeppelin/contracts/test/helpers/random'); -const { SET_TYPES } = require('../../../scripts/generate/templates/Enumerable.opts'); +import { SET_TYPES } from '../../../scripts/generate/templates/Enumerable.opts'; -const { shouldBehaveLikeSet } = require('@openzeppelin/contracts/test/utils/structs/EnumerableSet.behavior'); +const { + ethers, + networkHelpers: { loadFixture }, +} = await network.create(); + +// Chai matchers expect hexadecimal data when dealing with bytes +const randomOf = type => random[type === 'bytes' ? 'hexBytes' : type]; async function fixture() { const mock = await ethers.deployContract('$EnumerableSetExtended'); @@ -17,7 +23,7 @@ async function fixture() { value, values: Array.from( { length: 3 }, - value.size ? () => Array.from({ length: value.size }, generators[value.base]) : generators[value.type], + value.size ? () => Array.from({ length: value.size }, randomOf(value.base)) : randomOf(value.type), ), methods: mapValues( { From 34024d9d4127fdfac282108e929df377ff37aa31 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Wed, 16 Sep 2026 13:07:23 +0200 Subject: [PATCH 02/51] update dependency --- lib/@openzeppelin-contracts | 2 +- lib/@openzeppelin-contracts-upgradeable | 2 +- package-lock.json | 21 +++++++++++++++------ package.json | 25 +++++++++++++------------ 4 files changed, 30 insertions(+), 20 deletions(-) diff --git a/lib/@openzeppelin-contracts b/lib/@openzeppelin-contracts index b72fb0095..1f2665e8d 160000 --- a/lib/@openzeppelin-contracts +++ b/lib/@openzeppelin-contracts @@ -1 +1 @@ -Subproject commit b72fb00951a3fe068011ef75d6234c3706cfd31d +Subproject commit 1f2665e8d52677fd61f8daedc41ca77e1c64259d diff --git a/lib/@openzeppelin-contracts-upgradeable b/lib/@openzeppelin-contracts-upgradeable index d8c717774..bd75161ea 160000 --- a/lib/@openzeppelin-contracts-upgradeable +++ b/lib/@openzeppelin-contracts-upgradeable @@ -1 +1 @@ -Subproject commit d8c717774cfa3a0396dd3e94db58b7580218651e +Subproject commit bd75161ea5eabd0019cced7ce5b0cc74c9b11ce9 diff --git a/package-lock.json b/package-lock.json index 85c3090d2..bca7e7c4d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,8 +10,7 @@ "license": "MIT", "devDependencies": { "@openzeppelin/contracts": "file:lib/@openzeppelin-contracts", - "husky": "^9.1.7", - "openzeppelin-solidity": "file:lib/@openzeppelin-contracts" + "husky": "^9.1.7" } }, "lib/@openzeppelin-contracts": { @@ -41,6 +40,7 @@ "eslint": "^9.0.0", "eslint-config-prettier": "^10.0.0", "eslint-plugin-mocha": "^11.3.0", + "eta": "^4.6.0", "ethers": "^6.16.0", "glob": "^13.0.0", "globals": "^17.0.0", @@ -4208,6 +4208,19 @@ "node": ">=0.10.0" } }, + "node_modules/eta": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/eta/-/eta-4.6.0.tgz", + "integrity": "sha512-lW6is4T1NFOYnmqGZIfvixqj7A7sSvScF+DN8EK6K58xI5MZ5UvYe0GjopxOXQtZvUn4eDdVuZ8XSoYWTMEKwA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=20" + }, + "funding": { + "url": "https://github.com/bgub/eta?sponsor=1" + } + }, "node_modules/ethereum-cryptography": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.2.1.tgz", @@ -6405,10 +6418,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/openzeppelin-solidity": { - "resolved": "lib/@openzeppelin-contracts", - "link": true - }, "node_modules/optionator": { "version": "0.9.4", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", diff --git a/package.json b/package.json index e14032fad..b2e901720 100644 --- a/package.json +++ b/package.json @@ -10,17 +10,19 @@ ], "scripts": { "compile": "hardhat compile", - "clean": "hardhat clean && rimraf build contracts/build", "docs": "npm run prepare-docs && oz-docs", "docs:watch": "oz-docs watch contracts docs/templates docs/config.js", "prepare": "husky", "prepare-docs": "scripts/prepare-docs.sh", "lint": "npm run lint:js && npm run lint:sol", "lint:fix": "npm run lint:js:fix && npm run lint:sol:fix", - "lint:js": "prettier --log-level warn '**/*.{js,ts}' --check && eslint . --ignore-pattern lib/", - "lint:js:fix": "prettier --log-level warn '**/*.{js,ts}' --write && eslint . --fix --ignore-pattern lib/", - "lint:sol": "prettier --log-level warn '{contracts,test}/**/*.sol' --check && solhint --config solhint.config.cjs --noPoster '{contracts,test}/**/*.sol'", - "lint:sol:fix": "prettier --log-level warn '{contracts,test}/**/*.sol' --write", + "lint:js": "npm run prettier -- '**/*.{js,ts}' --check && eslint .", + "lint:js:fix": "npm run prettier -- '**/*.{js,ts}' --write && eslint . --fix", + "lint:sol": "npm run prettier -- '{contracts,test}/**/*.sol' --check && npm run solhint -- '{contracts,test}/**/*.sol'", + "lint:sol:fix": "npm run prettier -- '{contracts,test}/**/*.sol' --write && npm run solhint -- '{contracts,test}/**/*.sol' --fix", + "prettier": "prettier --log-level warn --ignore-path .gitignore", + "solhint": "solhint --config solhint.config.cjs --noPoster --noPrompt --disc", + "clean": "hardhat clean && rimraf build contracts/build", "generate": "scripts/generate/run.js", "test": "hardhat test", "test:generation": "scripts/checks/generation.sh", @@ -47,17 +49,16 @@ ], "devDependencies": { "@openzeppelin/contracts": "file:lib/@openzeppelin-contracts", - "husky": "^9.1.7", - "openzeppelin-solidity": "file:lib/@openzeppelin-contracts" + "husky": "^9.1.7" }, "lint-staged": { - "*.{js,ts}": [ - "prettier --log-level warn --ignore-path .gitignore --check", + "**/*.{js,ts}": [ + "npm run prettier -- --check", "eslint" ], - "*.sol": [ - "prettier --log-level warn --ignore-path .gitignore --check", - "solhint --config solhint.config.cjs --noPoster" + "{contracts,test}/**/*.sol": [ + "npm run prettier -- --check", + "npm run solhint --" ] }, "type": "module" From a022e26d995d26b8843b3904b6a5e7c9c0a46636 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Wed, 16 Sep 2026 13:13:46 +0200 Subject: [PATCH 03/51] update imports --- contracts/crosschain/ERC7786OpenBridge.sol | 2 +- contracts/crosschain/axelar/AxelarGatewayAdapter.sol | 2 +- contracts/crosschain/wormhole/WormholeGatewayAdapter.sol | 2 +- contracts/mocks/crosschain/ERC7786GatewayMock.sol | 2 +- contracts/mocks/crosschain/ERC7786RecipientInvalidMock.sol | 2 +- contracts/mocks/crosschain/ERC7786RecipientRevertMock.sol | 2 +- contracts/mocks/docs/crosschain/MyERC7786GatewaySource.sol | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contracts/crosschain/ERC7786OpenBridge.sol b/contracts/crosschain/ERC7786OpenBridge.sol index 09dd23456..c2c552282 100644 --- a/contracts/crosschain/ERC7786OpenBridge.sol +++ b/contracts/crosschain/ERC7786OpenBridge.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.27; import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol"; -import {IERC7786GatewaySource, IERC7786Recipient} from "@openzeppelin/contracts/interfaces/draft-IERC7786.sol"; +import {IERC7786GatewaySource, IERC7786Recipient} from "@openzeppelin/contracts/interfaces/IERC7786.sol"; import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; import {Address} from "@openzeppelin/contracts/utils/Address.sol"; import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol"; diff --git a/contracts/crosschain/axelar/AxelarGatewayAdapter.sol b/contracts/crosschain/axelar/AxelarGatewayAdapter.sol index 7160a3a0d..94d55117b 100644 --- a/contracts/crosschain/axelar/AxelarGatewayAdapter.sol +++ b/contracts/crosschain/axelar/AxelarGatewayAdapter.sol @@ -5,7 +5,7 @@ pragma solidity ^0.8.27; import {IAxelarGateway} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IAxelarGateway.sol"; import {AxelarExecutable} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/executable/AxelarExecutable.sol"; import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol"; -import {IERC7786GatewaySource, IERC7786Recipient} from "@openzeppelin/contracts/interfaces/draft-IERC7786.sol"; +import {IERC7786GatewaySource, IERC7786Recipient} from "@openzeppelin/contracts/interfaces/IERC7786.sol"; import {InteroperableAddress} from "@openzeppelin/contracts/utils/draft-InteroperableAddress.sol"; import {Strings} from "@openzeppelin/contracts/utils/Strings.sol"; diff --git a/contracts/crosschain/wormhole/WormholeGatewayAdapter.sol b/contracts/crosschain/wormhole/WormholeGatewayAdapter.sol index ea0a313c4..0915c3e31 100644 --- a/contracts/crosschain/wormhole/WormholeGatewayAdapter.sol +++ b/contracts/crosschain/wormhole/WormholeGatewayAdapter.sol @@ -7,7 +7,7 @@ import {IWormholeReceiver} from "wormhole-solidity-sdk/interfaces/IWormholeRecei import {VaaKey} from "wormhole-solidity-sdk/interfaces/IWormholeRelayer.sol"; import {fromUniversalAddress, toUniversalAddress} from "wormhole-solidity-sdk/utils/UniversalAddress.sol"; import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol"; -import {IERC7786GatewaySource, IERC7786Recipient} from "@openzeppelin/contracts/interfaces/draft-IERC7786.sol"; +import {IERC7786GatewaySource, IERC7786Recipient} from "@openzeppelin/contracts/interfaces/IERC7786.sol"; import {BitMaps} from "@openzeppelin/contracts/utils/structs/BitMaps.sol"; import {InteroperableAddress} from "@openzeppelin/contracts/utils/draft-InteroperableAddress.sol"; import {Strings} from "@openzeppelin/contracts/utils/Strings.sol"; diff --git a/contracts/mocks/crosschain/ERC7786GatewayMock.sol b/contracts/mocks/crosschain/ERC7786GatewayMock.sol index 814214751..c5a3f2709 100644 --- a/contracts/mocks/crosschain/ERC7786GatewayMock.sol +++ b/contracts/mocks/crosschain/ERC7786GatewayMock.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.24; -import {IERC7786GatewaySource, IERC7786Recipient} from "@openzeppelin/contracts/interfaces/draft-IERC7786.sol"; +import {IERC7786GatewaySource, IERC7786Recipient} from "@openzeppelin/contracts/interfaces/IERC7786.sol"; import {BitMaps} from "@openzeppelin/contracts/utils/structs/BitMaps.sol"; import {InteroperableAddress} from "@openzeppelin/contracts/utils/draft-InteroperableAddress.sol"; diff --git a/contracts/mocks/crosschain/ERC7786RecipientInvalidMock.sol b/contracts/mocks/crosschain/ERC7786RecipientInvalidMock.sol index db2d33f78..d7f559456 100644 --- a/contracts/mocks/crosschain/ERC7786RecipientInvalidMock.sol +++ b/contracts/mocks/crosschain/ERC7786RecipientInvalidMock.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.0; -import {IERC7786Recipient} from "@openzeppelin/contracts/interfaces/draft-IERC7786.sol"; +import {IERC7786Recipient} from "@openzeppelin/contracts/interfaces/IERC7786.sol"; contract ERC7786RecipientInvalidMock is IERC7786Recipient { function receiveMessage(bytes32, bytes calldata, bytes calldata) public payable virtual returns (bytes4) { diff --git a/contracts/mocks/crosschain/ERC7786RecipientRevertMock.sol b/contracts/mocks/crosschain/ERC7786RecipientRevertMock.sol index 5c9ed61c1..b070a7a3a 100644 --- a/contracts/mocks/crosschain/ERC7786RecipientRevertMock.sol +++ b/contracts/mocks/crosschain/ERC7786RecipientRevertMock.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.0; -import {IERC7786Recipient} from "@openzeppelin/contracts/interfaces/draft-IERC7786.sol"; +import {IERC7786Recipient} from "@openzeppelin/contracts/interfaces/IERC7786.sol"; contract ERC7786RecipientRevertMock is IERC7786Recipient { function receiveMessage(bytes32, bytes calldata, bytes calldata) public payable virtual returns (bytes4) { diff --git a/contracts/mocks/docs/crosschain/MyERC7786GatewaySource.sol b/contracts/mocks/docs/crosschain/MyERC7786GatewaySource.sol index b643b4da2..21aaef606 100644 --- a/contracts/mocks/docs/crosschain/MyERC7786GatewaySource.sol +++ b/contracts/mocks/docs/crosschain/MyERC7786GatewaySource.sol @@ -2,7 +2,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.24; -import {IERC7786GatewaySource} from "@openzeppelin/contracts/interfaces/draft-IERC7786.sol"; +import {IERC7786GatewaySource} from "@openzeppelin/contracts/interfaces/IERC7786.sol"; import {InteroperableAddress} from "@openzeppelin/contracts/utils/draft-InteroperableAddress.sol"; abstract contract MyERC7786GatewaySource is IERC7786GatewaySource { From 8bd17a10ce04d3e07fdcdba41abb211093df72a1 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Wed, 16 Sep 2026 13:15:56 +0200 Subject: [PATCH 04/51] reorder imports --- contracts/account/RoleAccount.sol | 2 +- contracts/account/modules/ERC7579DelayedExecutor.sol | 2 +- .../account/modules/ERC7579MultisigConfirmation.sol | 2 +- contracts/account/modules/ERC7579MultisigStorage.sol | 2 +- .../account/modules/ERC7579SelectorExecutor.sol | 4 ++-- contracts/account/modules/ERC7579Validator.sol | 4 ++-- contracts/crosschain/ERC7786OpenBridge.sol | 4 ++-- contracts/crosschain/axelar/AxelarGatewayAdapter.sol | 2 +- .../crosschain/wormhole/WormholeGatewayAdapter.sol | 12 ++++++------ .../cryptography/ZKEmailGroth16VerifierMock.sol | 8 ++++---- contracts/token/ERC20/extensions/ERC20Collateral.sol | 2 +- contracts/token/ERC20/extensions/ERC20uRWA.sol | 2 +- contracts/token/ERC20/extensions/ERC4626Fees.sol | 2 +- contracts/token/ERC20/extensions/ERC7540.sol | 4 ++-- .../token/ERC20/extensions/ERC7540DelayDeposit.sol | 2 +- .../token/ERC20/extensions/ERC7540DelayRedeem.sol | 2 +- contracts/utils/cryptography/ZKEmailUtils.sol | 2 +- .../cryptography/signers/SignerAccessManaged.sol | 2 +- .../utils/cryptography/signers/SignerZKEmail.sol | 2 +- 19 files changed, 31 insertions(+), 31 deletions(-) diff --git a/contracts/account/RoleAccount.sol b/contracts/account/RoleAccount.sol index 8cb838139..40318a20a 100644 --- a/contracts/account/RoleAccount.sol +++ b/contracts/account/RoleAccount.sol @@ -5,8 +5,8 @@ pragma solidity ^0.8.27; import {IAccessManager} from "@openzeppelin/contracts/access/manager/IAccessManager.sol"; import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol"; import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol"; -import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol"; import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol"; +import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol"; import {SignerAccessManaged} from "../utils/cryptography/signers/SignerAccessManaged.sol"; /** diff --git a/contracts/account/modules/ERC7579DelayedExecutor.sol b/contracts/account/modules/ERC7579DelayedExecutor.sol index e800fa793..c85977fa8 100644 --- a/contracts/account/modules/ERC7579DelayedExecutor.sol +++ b/contracts/account/modules/ERC7579DelayedExecutor.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.27; -import {Time} from "@openzeppelin/contracts/utils/types/Time.sol"; import {IERC7579ModuleConfig, MODULE_TYPE_EXECUTOR} from "@openzeppelin/contracts/interfaces/draft-IERC7579.sol"; +import {Time} from "@openzeppelin/contracts/utils/types/Time.sol"; import {ERC7579Executor} from "./ERC7579Executor.sol"; /** diff --git a/contracts/account/modules/ERC7579MultisigConfirmation.sol b/contracts/account/modules/ERC7579MultisigConfirmation.sol index 83caab11c..3991b6a4d 100644 --- a/contracts/account/modules/ERC7579MultisigConfirmation.sol +++ b/contracts/account/modules/ERC7579MultisigConfirmation.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.27; -import {SignatureChecker} from "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol"; import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol"; +import {SignatureChecker} from "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol"; import {ERC7579Multisig} from "./ERC7579Multisig.sol"; /** diff --git a/contracts/account/modules/ERC7579MultisigStorage.sol b/contracts/account/modules/ERC7579MultisigStorage.sol index 728354eef..e8c07e748 100644 --- a/contracts/account/modules/ERC7579MultisigStorage.sol +++ b/contracts/account/modules/ERC7579MultisigStorage.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.27; -import {ERC7579Multisig} from "./ERC7579Multisig.sol"; import {SignatureChecker} from "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol"; +import {ERC7579Multisig} from "./ERC7579Multisig.sol"; /** * @dev Extension of {ERC7579Multisig} that allows storing presigned approvals in storage. diff --git a/contracts/account/modules/ERC7579SelectorExecutor.sol b/contracts/account/modules/ERC7579SelectorExecutor.sol index 53d60380d..676e477a4 100644 --- a/contracts/account/modules/ERC7579SelectorExecutor.sol +++ b/contracts/account/modules/ERC7579SelectorExecutor.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.27; -import {IERC7579Module, MODULE_TYPE_EXECUTOR} from "@openzeppelin/contracts/interfaces/draft-IERC7579.sol"; -import {ERC7579Executor} from "./ERC7579Executor.sol"; import {ERC7579Utils} from "@openzeppelin/contracts/account/utils/draft-ERC7579Utils.sol"; +import {IERC7579Module, MODULE_TYPE_EXECUTOR} from "@openzeppelin/contracts/interfaces/draft-IERC7579.sol"; import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; +import {ERC7579Executor} from "./ERC7579Executor.sol"; /** * @dev Implementation of an {ERC7579Executor} that allows authorizing specific function selectors diff --git a/contracts/account/modules/ERC7579Validator.sol b/contracts/account/modules/ERC7579Validator.sol index 44dcc49b0..c9fe0e9b7 100644 --- a/contracts/account/modules/ERC7579Validator.sol +++ b/contracts/account/modules/ERC7579Validator.sol @@ -2,14 +2,14 @@ pragma solidity ^0.8.27; +import {ERC4337Utils} from "@openzeppelin/contracts/account/utils/ERC4337Utils.sol"; import { IERC7579Module, IERC7579Validator, MODULE_TYPE_VALIDATOR } from "@openzeppelin/contracts/interfaces/draft-IERC7579.sol"; -import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/IERC4337.sol"; -import {ERC4337Utils} from "@openzeppelin/contracts/account/utils/ERC4337Utils.sol"; import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol"; +import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/IERC4337.sol"; /** * @dev Abstract validator module for ERC-7579 accounts. diff --git a/contracts/crosschain/ERC7786OpenBridge.sol b/contracts/crosschain/ERC7786OpenBridge.sol index c2c552282..d2b4c70ac 100644 --- a/contracts/crosschain/ERC7786OpenBridge.sol +++ b/contracts/crosschain/ERC7786OpenBridge.sol @@ -4,10 +4,10 @@ pragma solidity ^0.8.27; import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol"; import {IERC7786GatewaySource, IERC7786Recipient} from "@openzeppelin/contracts/interfaces/IERC7786.sol"; -import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; import {Address} from "@openzeppelin/contracts/utils/Address.sol"; -import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol"; import {InteroperableAddress} from "@openzeppelin/contracts/utils/draft-InteroperableAddress.sol"; +import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol"; +import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; /** * @dev N of M gateway: Sends your message through M independent gateways. It will be delivered to the recipient by an diff --git a/contracts/crosschain/axelar/AxelarGatewayAdapter.sol b/contracts/crosschain/axelar/AxelarGatewayAdapter.sol index 94d55117b..04c99cb42 100644 --- a/contracts/crosschain/axelar/AxelarGatewayAdapter.sol +++ b/contracts/crosschain/axelar/AxelarGatewayAdapter.sol @@ -2,8 +2,8 @@ pragma solidity ^0.8.27; -import {IAxelarGateway} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IAxelarGateway.sol"; import {AxelarExecutable} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/executable/AxelarExecutable.sol"; +import {IAxelarGateway} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IAxelarGateway.sol"; import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol"; import {IERC7786GatewaySource, IERC7786Recipient} from "@openzeppelin/contracts/interfaces/IERC7786.sol"; import {InteroperableAddress} from "@openzeppelin/contracts/utils/draft-InteroperableAddress.sol"; diff --git a/contracts/crosschain/wormhole/WormholeGatewayAdapter.sol b/contracts/crosschain/wormhole/WormholeGatewayAdapter.sol index 0915c3e31..c4e49d40e 100644 --- a/contracts/crosschain/wormhole/WormholeGatewayAdapter.sol +++ b/contracts/crosschain/wormhole/WormholeGatewayAdapter.sol @@ -2,17 +2,17 @@ pragma solidity ^0.8.27; -import {IWormholeRelayer} from "wormhole-solidity-sdk/interfaces/IWormholeRelayer.sol"; -import {IWormholeReceiver} from "wormhole-solidity-sdk/interfaces/IWormholeReceiver.sol"; -import {VaaKey} from "wormhole-solidity-sdk/interfaces/IWormholeRelayer.sol"; -import {fromUniversalAddress, toUniversalAddress} from "wormhole-solidity-sdk/utils/UniversalAddress.sol"; import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol"; import {IERC7786GatewaySource, IERC7786Recipient} from "@openzeppelin/contracts/interfaces/IERC7786.sol"; -import {BitMaps} from "@openzeppelin/contracts/utils/structs/BitMaps.sol"; import {InteroperableAddress} from "@openzeppelin/contracts/utils/draft-InteroperableAddress.sol"; import {Strings} from "@openzeppelin/contracts/utils/Strings.sol"; -import {ERC7786Attributes} from "../utils/ERC7786Attributes.sol"; +import {BitMaps} from "@openzeppelin/contracts/utils/structs/BitMaps.sol"; +import {IWormholeReceiver} from "wormhole-solidity-sdk/interfaces/IWormholeReceiver.sol"; +import {IWormholeRelayer} from "wormhole-solidity-sdk/interfaces/IWormholeRelayer.sol"; +import {VaaKey} from "wormhole-solidity-sdk/interfaces/IWormholeRelayer.sol"; +import {fromUniversalAddress, toUniversalAddress} from "wormhole-solidity-sdk/utils/UniversalAddress.sol"; import {IERC7786Attributes} from "../../interfaces/IERC7786Attributes.sol"; +import {ERC7786Attributes} from "../utils/ERC7786Attributes.sol"; /** * @dev An ERC-7786 compliant adapter to send and receive messages via Wormhole. diff --git a/contracts/mocks/utils/cryptography/ZKEmailGroth16VerifierMock.sol b/contracts/mocks/utils/cryptography/ZKEmailGroth16VerifierMock.sol index 00bb80d46..d3af53616 100644 --- a/contracts/mocks/utils/cryptography/ZKEmailGroth16VerifierMock.sol +++ b/contracts/mocks/utils/cryptography/ZKEmailGroth16VerifierMock.sol @@ -6,10 +6,10 @@ import {IGroth16Verifier} from "@zk-email/email-tx-builder/src/interfaces/IGroth contract ZKEmailGroth16VerifierMock is IGroth16Verifier { function verifyProof( - uint[2] calldata _pA, - uint[2][2] calldata _pB, - uint[2] calldata _pC, - uint[34] calldata /* _pubSignals */ + uint256[2] calldata _pA, + uint256[2][2] calldata _pB, + uint256[2] calldata _pC, + uint256[34] calldata /* _pubSignals */ ) public pure returns (bool) { return _pA[0] == 1 && diff --git a/contracts/token/ERC20/extensions/ERC20Collateral.sol b/contracts/token/ERC20/extensions/ERC20Collateral.sol index 21b3ef457..54004290a 100644 --- a/contracts/token/ERC20/extensions/ERC20Collateral.sol +++ b/contracts/token/ERC20/extensions/ERC20Collateral.sol @@ -2,8 +2,8 @@ pragma solidity ^0.8.20; -import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import {IERC6372} from "@openzeppelin/contracts/interfaces/IERC6372.sol"; +import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; /** * @dev Extension of {ERC20} that limits the supply of tokens based diff --git a/contracts/token/ERC20/extensions/ERC20uRWA.sol b/contracts/token/ERC20/extensions/ERC20uRWA.sol index a602a83e9..7c433de68 100644 --- a/contracts/token/ERC20/extensions/ERC20uRWA.sol +++ b/contracts/token/ERC20/extensions/ERC20uRWA.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.26; -import {IERC7943Fungible} from "../../../interfaces/IERC7943.sol"; import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import {ERC165, IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol"; import {TransientSlot} from "@openzeppelin/contracts/utils/TransientSlot.sol"; +import {IERC7943Fungible} from "../../../interfaces/IERC7943.sol"; import {ERC20Freezable} from "./ERC20Freezable.sol"; import {ERC20Restricted} from "./ERC20Restricted.sol"; diff --git a/contracts/token/ERC20/extensions/ERC4626Fees.sol b/contracts/token/ERC20/extensions/ERC4626Fees.sol index 5780001a6..57a37d87a 100644 --- a/contracts/token/ERC20/extensions/ERC4626Fees.sol +++ b/contracts/token/ERC20/extensions/ERC4626Fees.sol @@ -2,8 +2,8 @@ pragma solidity ^0.8.24; -import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import {ERC4626} from "@openzeppelin/contracts/token/ERC20/extensions/ERC4626.sol"; +import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; import {Math} from "@openzeppelin/contracts/utils/math/Math.sol"; diff --git a/contracts/token/ERC20/extensions/ERC7540.sol b/contracts/token/ERC20/extensions/ERC7540.sol index df9734994..5107caa47 100644 --- a/contracts/token/ERC20/extensions/ERC7540.sol +++ b/contracts/token/ERC20/extensions/ERC7540.sol @@ -2,12 +2,12 @@ pragma solidity ^0.8.27; +import {IERC4626} from "@openzeppelin/contracts/interfaces/IERC4626.sol"; import {IERC20, IERC20Metadata, ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; -import {IERC4626} from "@openzeppelin/contracts/interfaces/IERC4626.sol"; import {IERC165, ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol"; -import {Math} from "@openzeppelin/contracts/utils/math/Math.sol"; import {LowLevelCall} from "@openzeppelin/contracts/utils/LowLevelCall.sol"; +import {Math} from "@openzeppelin/contracts/utils/math/Math.sol"; import {Memory} from "@openzeppelin/contracts/utils/Memory.sol"; import {IERC7540, IERC7540Operator, IERC7540Deposit, IERC7540Redeem} from "../../../interfaces/IERC7540.sol"; import {IERC7575, IERC7575Share} from "../../../interfaces/IERC7575.sol"; diff --git a/contracts/token/ERC20/extensions/ERC7540DelayDeposit.sol b/contracts/token/ERC20/extensions/ERC7540DelayDeposit.sol index f5e1ba7a6..d8bd40f68 100644 --- a/contracts/token/ERC20/extensions/ERC7540DelayDeposit.sol +++ b/contracts/token/ERC20/extensions/ERC7540DelayDeposit.sol @@ -3,11 +3,11 @@ pragma solidity ^0.8.27; import {IERC6372} from "@openzeppelin/contracts/interfaces/IERC6372.sol"; +import {ERC6372Utils} from "@openzeppelin/contracts/utils/ERC6372Utils.sol"; import {Math} from "@openzeppelin/contracts/utils/math/Math.sol"; import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol"; import {Checkpoints} from "@openzeppelin/contracts/utils/structs/Checkpoints.sol"; import {Time} from "@openzeppelin/contracts/utils/types/Time.sol"; -import {ERC6372Utils} from "@openzeppelin/contracts/utils/ERC6372Utils.sol"; import {ERC7540} from "./ERC7540.sol"; /** diff --git a/contracts/token/ERC20/extensions/ERC7540DelayRedeem.sol b/contracts/token/ERC20/extensions/ERC7540DelayRedeem.sol index 4972284ff..f567323ae 100644 --- a/contracts/token/ERC20/extensions/ERC7540DelayRedeem.sol +++ b/contracts/token/ERC20/extensions/ERC7540DelayRedeem.sol @@ -3,11 +3,11 @@ pragma solidity ^0.8.27; import {IERC6372} from "@openzeppelin/contracts/interfaces/IERC6372.sol"; +import {ERC6372Utils} from "@openzeppelin/contracts/utils/ERC6372Utils.sol"; import {Math} from "@openzeppelin/contracts/utils/math/Math.sol"; import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol"; import {Checkpoints} from "@openzeppelin/contracts/utils/structs/Checkpoints.sol"; import {Time} from "@openzeppelin/contracts/utils/types/Time.sol"; -import {ERC6372Utils} from "@openzeppelin/contracts/utils/ERC6372Utils.sol"; import {ERC7540} from "./ERC7540.sol"; /** diff --git a/contracts/utils/cryptography/ZKEmailUtils.sol b/contracts/utils/cryptography/ZKEmailUtils.sol index 0440ea5da..dddc18f75 100644 --- a/contracts/utils/cryptography/ZKEmailUtils.sol +++ b/contracts/utils/cryptography/ZKEmailUtils.sol @@ -5,8 +5,8 @@ pragma solidity ^0.8.24; import {Bytes} from "@openzeppelin/contracts/utils/Bytes.sol"; import {Strings} from "@openzeppelin/contracts/utils/Strings.sol"; import {IDKIMRegistry} from "@zk-email/contracts/DKIMRegistry.sol"; -import {IGroth16Verifier} from "@zk-email/email-tx-builder/src/interfaces/IGroth16Verifier.sol"; import {EmailProof} from "@zk-email/email-tx-builder/src/interfaces/IEmailTypes.sol"; +import {IGroth16Verifier} from "@zk-email/email-tx-builder/src/interfaces/IGroth16Verifier.sol"; import {CommandUtils} from "@zk-email/email-tx-builder/src/libraries/CommandUtils.sol"; /** diff --git a/contracts/utils/cryptography/signers/SignerAccessManaged.sol b/contracts/utils/cryptography/signers/SignerAccessManaged.sol index a66ccde5f..8f711b99a 100644 --- a/contracts/utils/cryptography/signers/SignerAccessManaged.sol +++ b/contracts/utils/cryptography/signers/SignerAccessManaged.sol @@ -3,8 +3,8 @@ pragma solidity ^0.8.27; import {IAccessManager} from "@openzeppelin/contracts/access/manager/IAccessManager.sol"; -import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol"; import {SignatureChecker} from "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol"; +import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol"; /** * @dev Implementation of {AbstractSigner} whose authority is delegated to the members of a role diff --git a/contracts/utils/cryptography/signers/SignerZKEmail.sol b/contracts/utils/cryptography/signers/SignerZKEmail.sol index 7c196d002..088446648 100644 --- a/contracts/utils/cryptography/signers/SignerZKEmail.sol +++ b/contracts/utils/cryptography/signers/SignerZKEmail.sol @@ -2,10 +2,10 @@ pragma solidity ^0.8.24; +import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol"; import {IDKIMRegistry} from "@zk-email/contracts/DKIMRegistry.sol"; import {IGroth16Verifier} from "@zk-email/email-tx-builder/src/interfaces/IGroth16Verifier.sol"; import {EmailProof} from "@zk-email/email-tx-builder/src/interfaces/IVerifier.sol"; -import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol"; import {ZKEmailUtils} from "../ZKEmailUtils.sol"; /** From 774104b5905444ae83fd543d1d7d42d1bfa74dec Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Wed, 16 Sep 2026 13:20:53 +0200 Subject: [PATCH 05/51] fix sol linting --- contracts/mocks/token/ERC7540DelayMock.sol | 1 + contracts/token/ERC20/extensions/ERC20Custodian.sol | 2 +- contracts/token/ERC20/extensions/ERC20uRWA.sol | 2 +- test/token/ERC20/extensions/ERC20uRWA.t.sol | 2 ++ test/utils/cryptography/ZKEmailUtils.t.sol | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/contracts/mocks/token/ERC7540DelayMock.sol b/contracts/mocks/token/ERC7540DelayMock.sol index 44ee2a6c1..8a60b5a7a 100644 --- a/contracts/mocks/token/ERC7540DelayMock.sol +++ b/contracts/mocks/token/ERC7540DelayMock.sol @@ -11,6 +11,7 @@ abstract contract ERC7540DelayMock is ERC7540DelayDeposit, ERC7540DelayRedeem { return super.clock(); } + // solhint-disable-next-line func-name-mixedcase function CLOCK_MODE() public view diff --git a/contracts/token/ERC20/extensions/ERC20Custodian.sol b/contracts/token/ERC20/extensions/ERC20Custodian.sol index 8acbf85b6..f8a8683b6 100644 --- a/contracts/token/ERC20/extensions/ERC20Custodian.sol +++ b/contracts/token/ERC20/extensions/ERC20Custodian.sol @@ -78,7 +78,7 @@ abstract contract ERC20Custodian is ERC20 { * * - The user must have sufficient unfrozen balance. */ - function freeze(address user, uint256 amount) external virtual onlyCustodian { + function freeze(address user, uint256 amount) public virtual onlyCustodian { if (availableBalance(user) < amount) revert ERC20InsufficientUnfrozenBalance(user); _frozen[user] = amount; emit TokensFrozen(user, amount); diff --git a/contracts/token/ERC20/extensions/ERC20uRWA.sol b/contracts/token/ERC20/extensions/ERC20uRWA.sol index 7c433de68..10fe5c4bc 100644 --- a/contracts/token/ERC20/extensions/ERC20uRWA.sol +++ b/contracts/token/ERC20/extensions/ERC20uRWA.sol @@ -62,7 +62,7 @@ abstract contract ERC20uRWA is ERC20, ERC165, ERC20Freezable, ERC20Restricted, I * checks to the internal {_update} function, which enforces {canSend}, {canReceive} and the * unfrozen balance directly. Consider overriding {_update} accordingly to keep both in sync. */ - function canTransfer(address from, address to, uint256 amount) external view virtual returns (bool) { + function canTransfer(address from, address to, uint256 amount) public view virtual returns (bool) { return canSend(from) && canReceive(to) && (amount > balanceOf(from) || amount <= available(from)); } diff --git a/test/token/ERC20/extensions/ERC20uRWA.t.sol b/test/token/ERC20/extensions/ERC20uRWA.t.sol index 79174ced4..05f5b302d 100644 --- a/test/token/ERC20/extensions/ERC20uRWA.t.sol +++ b/test/token/ERC20/extensions/ERC20uRWA.t.sol @@ -2,6 +2,8 @@ pragma solidity ^0.8.26; +// solhint-disable func-name-mixedcase + import {Test} from "forge-std/Test.sol"; import {IERC7943Fungible} from "@openzeppelin/community-contracts/interfaces/IERC7943.sol"; import {ERC20uRWAMock} from "./ERC20uRWAMock.t.sol"; diff --git a/test/utils/cryptography/ZKEmailUtils.t.sol b/test/utils/cryptography/ZKEmailUtils.t.sol index 2ccbcd853..254d8c075 100644 --- a/test/utils/cryptography/ZKEmailUtils.t.sol +++ b/test/utils/cryptography/ZKEmailUtils.t.sol @@ -598,6 +598,7 @@ contract ZKEmailUtilsTest is Test { uint256[2][2] memory pB, uint256[2] memory pC ) private pure returns (uint256[2] memory, uint256[2][2] memory, uint256[2] memory) { + // solhint-disable-next-line var-name-mixedcase uint256 Q = ZKEmailUtils.Q; pA[0] = bound(pA[0], 1, Q - 1); pA[1] = bound(pA[1], 1, Q - 1); From 3955d22361b0f0dedbfdebf9e71c9dd5df61e057 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Wed, 16 Sep 2026 13:56:45 +0200 Subject: [PATCH 06/51] fix enumerable set & map (missing removeAt) --- .../utils/structs/EnumerableMapExtended.sol | 45 +++++ .../utils/structs/EnumerableSetExtended.sol | 79 +++++--- scripts/generate/format-lines.js | 14 ++ scripts/generate/run.js | 2 +- .../templates/EnumerableMapExtended.js | 23 ++- .../templates/EnumerableSetExtended.js | 169 ++++++++++++------ .../structs/EnumerableMapExtended.test.js | 8 +- .../structs/EnumerableSetExtended.test.js | 6 +- 8 files changed, 261 insertions(+), 85 deletions(-) create mode 100644 scripts/generate/format-lines.js diff --git a/contracts/utils/structs/EnumerableMapExtended.sol b/contracts/utils/structs/EnumerableMapExtended.sol index e6d46887b..89c3e71ad 100644 --- a/contracts/utils/structs/EnumerableMapExtended.sol +++ b/contracts/utils/structs/EnumerableMapExtended.sol @@ -82,6 +82,27 @@ library EnumerableMapExtended { return map._keys.remove(key); } + /** + * @dev Removes the key-value pair stored at position `index` in the map. O(1). + * + * Returns the removed key and its associated value. + * + * This is cheaper than {remove} when the caller already knows the index, because it skips the position lookup + * that {remove} performs. + * + * Note that there are no guarantees on the ordering of the entries inside the map, and it may change when more + * entries are added or removed. + * + * Requirements: + * + * - `index` must be strictly less than {length}. + */ + function removeAt(BytesToUintMap storage map, uint256 index) internal returns (bytes memory key, uint256 value) { + key = map._keys.removeAt(index); + value = map._values[key]; + delete map._values[key]; + } + /** * @dev Removes all the entries from a map. O(n). * @@ -206,6 +227,30 @@ library EnumerableMapExtended { return map._keys.remove(key); } + /** + * @dev Removes the key-value pair stored at position `index` in the map. O(1). + * + * Returns the removed key and its associated value. + * + * This is cheaper than {remove} when the caller already knows the index, because it skips the position lookup + * that {remove} performs. + * + * Note that there are no guarantees on the ordering of the entries inside the map, and it may change when more + * entries are added or removed. + * + * Requirements: + * + * - `index` must be strictly less than {length}. + */ + function removeAt( + StringToStringMap storage map, + uint256 index + ) internal returns (string memory key, string memory value) { + key = map._keys.removeAt(index); + value = map._values[key]; + delete map._values[key]; + } + /** * @dev Removes all the entries from a map. O(n). * diff --git a/contracts/utils/structs/EnumerableSetExtended.sol b/contracts/utils/structs/EnumerableSetExtended.sol index b9d14fdc7..68058f4db 100644 --- a/contracts/utils/structs/EnumerableSetExtended.sol +++ b/contracts/utils/structs/EnumerableSetExtended.sol @@ -83,33 +83,64 @@ library EnumerableSetExtended { uint256 position = self._positions[valueHash]; if (position != 0) { - // Equivalent to contains(self, value) - // To delete an element from the _values array in O(1), we swap the element to delete with the last one in - // the array, and then remove the last element (sometimes called as 'swap and pop'). - // This modifies the order of the array, as noted in {at}. + _removeValueAt(self, value, position - 1); + return true; + } else { + return false; + } + } - uint256 valueIndex = position - 1; - uint256 lastIndex = self._values.length - 1; + /** + * @dev Removes the value stored at position `index` from a set. O(1). + * + * Returns the removed value. + * + * This is cheaper than {remove} when the caller already knows the index, because it skips the position lookup + * that {remove} performs. + * + * Note that there are no guarantees on the ordering of values inside the array, and it may change when more + * values are added or removed. + * + * Requirements: + * + * - `index` must be strictly less than {length}. + */ + function removeAt(Bytes32x2Set storage self, uint256 index) internal returns (bytes32[2] memory value) { + value = self._values[index]; + _removeValueAt(self, value, index); + } - if (valueIndex != lastIndex) { - bytes32[2] memory lastValue = self._values[lastIndex]; + /** + * @dev Removes the value stored at position `index` from a set. O(1). + * + * To delete an element from the `_values` array in O(1), we swap the element to delete with the last one in the + * array, and then remove the last element (sometimes called as 'swap and pop'). This modifies the order of the + * array, as noted in {at}. + * + * IMPORTANT: This does not verify that `value` is the value currently stored at `index`. Callers must ensure + * both arguments are consistent, otherwise the set is left in a corrupted state. + * + * Requirements: + * + * - `index` must be strictly less than {length}. + */ + function _removeValueAt(Bytes32x2Set storage self, bytes32[2] memory value, uint256 index) private { + uint256 lastIndex = self._values.length - 1; - // Move the lastValue to the index where the value to delete is - self._values[valueIndex] = lastValue; - // Update the tracked position of the lastValue (that was just moved) - self._positions[_hash(lastValue)] = position; - } + if (index != lastIndex) { + bytes32[2] memory lastValue = self._values[lastIndex]; - // Delete the slot where the moved value was stored - self._values.pop(); + // Move the lastValue to the index where the value to delete is + self._values[index] = lastValue; + // Update the tracked position of the lastValue (that was just moved) + self._positions[_hash(lastValue)] = index + 1; + } - // Delete the tracked position for the deleted slot - delete self._positions[valueHash]; + // Delete the slot where the moved value was stored + self._values.pop(); - return true; - } else { - return false; - } + // Delete the tracked position for the deleted slot + delete self._positions[_hash(value)]; } /** @@ -178,15 +209,15 @@ library EnumerableSetExtended { * this function has an unbounded cost, and using it as part of a state-changing function may render the function * uncallable if the set grows to a point where copying to memory consumes too much gas to fit in a block. */ - function values(Bytes32x2Set storage set, uint256 start, uint256 end) internal view returns (bytes32[2][] memory) { + function values(Bytes32x2Set storage self, uint256 start, uint256 end) internal view returns (bytes32[2][] memory) { unchecked { - end = Math.min(end, length(set)); + end = Math.min(end, length(self)); start = Math.min(start, end); uint256 len = end - start; bytes32[2][] memory result = new bytes32[2][](len); for (uint256 i = 0; i < len; ++i) { - result[i] = set._values[start + i]; + result[i] = self._values[start + i]; } return result; } diff --git a/scripts/generate/format-lines.js b/scripts/generate/format-lines.js new file mode 100644 index 000000000..8a5516f7c --- /dev/null +++ b/scripts/generate/format-lines.js @@ -0,0 +1,14 @@ +export default function formatLines(...lines) { + return [...indentEach(0, lines)].join('\n') + '\n'; +} + +function* indentEach(indent, lines) { + for (const line of lines) { + if (Array.isArray(line)) { + yield* indentEach(indent + 1, line); + } else { + const padding = ' '.repeat(indent); + yield* line.split('\n').map(subline => (subline === '' ? '' : padding + subline)); + } + } +} diff --git a/scripts/generate/run.js b/scripts/generate/run.js index 23a228bea..71ae69883 100755 --- a/scripts/generate/run.js +++ b/scripts/generate/run.js @@ -3,7 +3,7 @@ import cp from 'child_process'; import fs from 'fs'; import path from 'path'; -import format from '@openzeppelin/contracts/scripts/generate/format-lines.js'; +import format from './format-lines.js'; function getVersion(path) { try { diff --git a/scripts/generate/templates/EnumerableMapExtended.js b/scripts/generate/templates/EnumerableMapExtended.js index cb85302ef..6d4312107 100644 --- a/scripts/generate/templates/EnumerableMapExtended.js +++ b/scripts/generate/templates/EnumerableMapExtended.js @@ -1,4 +1,4 @@ -import format from '@openzeppelin/contracts/scripts/generate/format-lines.js'; +import format from '../format-lines.js'; import { SET_TYPES, MAP_TYPES } from './Enumerable.opts.js'; const header = `\ @@ -82,6 +82,27 @@ function remove(${name} storage map, ${key.typeLoc} key) internal returns (bool) return map._keys.remove(key); } +/** + * @dev Removes the key-value pair stored at position \`index\` in the map. O(1). + * + * Returns the removed key and its associated value. + * + * This is cheaper than {remove} when the caller already knows the index, because it skips the position lookup + * that {remove} performs. + * + * Note that there are no guarantees on the ordering of the entries inside the map, and it may change when more + * entries are added or removed. + * + * Requirements: + * + * - \`index\` must be strictly less than {length}. + */ +function removeAt(${name} storage map, uint256 index) internal returns (${key.typeLoc} key, ${value.typeLoc} value) { + key = map._keys.removeAt(index); + value = map._values[key]; + delete map._values[key]; +} + /** * @dev Removes all the entries from a map. O(n). * diff --git a/scripts/generate/templates/EnumerableSetExtended.js b/scripts/generate/templates/EnumerableSetExtended.js index bf24282a4..40dd673cd 100644 --- a/scripts/generate/templates/EnumerableSetExtended.js +++ b/scripts/generate/templates/EnumerableSetExtended.js @@ -1,4 +1,4 @@ -import format from '@openzeppelin/contracts/scripts/generate/format-lines.js'; +import format from '../format-lines.js'; import { SET_TYPES } from './Enumerable.opts.js'; const header = `\ @@ -81,37 +81,67 @@ function add(${name} storage self, ${value.type} memory value) internal returns * present. */ function remove(${name} storage self, ${value.type} memory value) internal returns (bool) { - // We cache the value's position to prevent multiple reads from the same storage slot uint256 position = self._positions[value]; if (position != 0) { - // Equivalent to contains(self, value) - // To delete an element from the _values array in O(1), we swap the element to delete with the last one in - // the array, and then remove the last element (sometimes called as 'swap and pop'). - // This modifies the order of the array, as noted in {at}. + _removeValueAt(self, value, position - 1); + return true; + } else { + return false; + } +} - uint256 valueIndex = position - 1; - uint256 lastIndex = self._values.length - 1; +/** + * @dev Removes the value stored at position \`index\` from a set. O(1). + * + * Returns the removed value. + * + * This is cheaper than {remove} when the caller already knows the index, because it skips the position lookup + * that {remove} performs. + * + * Note that there are no guarantees on the ordering of values inside the array, and it may change when more + * values are added or removed. + * + * Requirements: + * + * - \`index\` must be strictly less than {length}. + */ +function removeAt(${name} storage self, uint256 index) internal returns (${value.type} memory value) { + value = self._values[index]; + _removeValueAt(self, value, index); +} - if (valueIndex != lastIndex) { - ${value.type} memory lastValue = self._values[lastIndex]; +/** + * @dev Removes the value stored at position \`index\` from a set. O(1). + * + * To delete an element from the \`_values\` array in O(1), we swap the element to delete with the last one in the + * array, and then remove the last element (sometimes called as 'swap and pop'). This modifies the order of the + * array, as noted in {at}. + * + * IMPORTANT: This does not verify that \`value\` is the value currently stored at \`index\`. Callers must ensure + * both arguments are consistent, otherwise the set is left in a corrupted state. + * + * Requirements: + * + * - \`index\` must be strictly less than {length}. + */ +function _removeValueAt(${name} storage self, ${value.type} memory value, uint256 index) private { + uint256 lastIndex = self._values.length - 1; - // Move the lastValue to the index where the value to delete is - self._values[valueIndex] = lastValue; - // Update the tracked position of the lastValue (that was just moved) - self._positions[lastValue] = position; - } + if (index != lastIndex) { + ${value.type} memory lastValue = self._values[lastIndex]; - // Delete the slot where the moved value was stored - self._values.pop(); + // Move the lastValue to the index where the value to delete is + self._values[index] = lastValue; + // Update the tracked position of the lastValue (that was just moved) + self._positions[lastValue] = index + 1; + } - // Delete the tracked position for the deleted slot - delete self._positions[value]; + // Delete the slot where the moved value was stored + self._values.pop(); - return true; - } else { - return false; - } + // Delete the tracked position for the deleted slot + delete self._positions[value]; } /** @@ -120,13 +150,13 @@ function remove(${name} storage self, ${value.type} memory value) internal retur * WARNING: Developers should keep in mind that this function has an unbounded cost and using it may render the * function uncallable if the set grows to the point where clearing it consumes too much gas to fit in a block. */ -function clear(${name} storage set) internal { - uint256 len = length(set); +function clear(${name} storage self) internal { + uint256 len = length(self); for (uint256 i = 0; i < len; ++i) { - delete set._positions[set._values[i]]; + delete self._positions[self._values[i]]; } // Replace when these are available in Arrays.sol - ${value.type}[] storage array = set._values; + ${value.type}[] storage array = self._values; assembly ("memory-safe") { sstore(array.slot, 0) } @@ -180,15 +210,15 @@ function values(${name} storage self) internal view returns (${value.type}[] mem * this function has an unbounded cost, and using it as part of a state-changing function may render the function * uncallable if the set grows to a point where copying to memory consumes too much gas to fit in a block. */ -function values(${name} storage set, uint256 start, uint256 end) internal view returns (${value.type}[] memory) { +function values(${name} storage self, uint256 start, uint256 end) internal view returns (${value.type}[] memory) { unchecked { - end = Math.min(end, length(set)); + end = Math.min(end, length(self)); start = Math.min(start, end); uint256 len = end - start; ${value.type}[] memory result = new ${value.type}[](len); for (uint256 i = 0; i < len; ++i) { - result[i] = Arrays.unsafeAccess(set._values, start + i).value; + result[i] = Arrays.unsafeAccess(self._values, start + i).value; } return result; } @@ -234,33 +264,64 @@ function remove(${name} storage self, ${value.type} memory value) internal retur uint256 position = self._positions[valueHash]; if (position != 0) { - // Equivalent to contains(self, value) - // To delete an element from the _values array in O(1), we swap the element to delete with the last one in - // the array, and then remove the last element (sometimes called as 'swap and pop'). - // This modifies the order of the array, as noted in {at}. + _removeValueAt(self, value, position - 1); + return true; + } else { + return false; + } +} - uint256 valueIndex = position - 1; - uint256 lastIndex = self._values.length - 1; +/** + * @dev Removes the value stored at position \`index\` from a set. O(1). + * + * Returns the removed value. + * + * This is cheaper than {remove} when the caller already knows the index, because it skips the position lookup + * that {remove} performs. + * + * Note that there are no guarantees on the ordering of values inside the array, and it may change when more + * values are added or removed. + * + * Requirements: + * + * - \`index\` must be strictly less than {length}. + */ +function removeAt(${name} storage self, uint256 index) internal returns (${value.type} memory value) { + value = self._values[index]; + _removeValueAt(self, value, index); +} - if (valueIndex != lastIndex) { - ${value.type} memory lastValue = self._values[lastIndex]; +/** + * @dev Removes the value stored at position \`index\` from a set. O(1). + * + * To delete an element from the \`_values\` array in O(1), we swap the element to delete with the last one in the + * array, and then remove the last element (sometimes called as 'swap and pop'). This modifies the order of the + * array, as noted in {at}. + * + * IMPORTANT: This does not verify that \`value\` is the value currently stored at \`index\`. Callers must ensure + * both arguments are consistent, otherwise the set is left in a corrupted state. + * + * Requirements: + * + * - \`index\` must be strictly less than {length}. + */ +function _removeValueAt(${name} storage self, ${value.type} memory value, uint256 index) private { + uint256 lastIndex = self._values.length - 1; - // Move the lastValue to the index where the value to delete is - self._values[valueIndex] = lastValue; - // Update the tracked position of the lastValue (that was just moved) - self._positions[_hash(lastValue)] = position; - } + if (index != lastIndex) { + ${value.type} memory lastValue = self._values[lastIndex]; - // Delete the slot where the moved value was stored - self._values.pop(); + // Move the lastValue to the index where the value to delete is + self._values[index] = lastValue; + // Update the tracked position of the lastValue (that was just moved) + self._positions[_hash(lastValue)] = index + 1; + } - // Delete the tracked position for the deleted slot - delete self._positions[valueHash]; + // Delete the slot where the moved value was stored + self._values.pop(); - return true; - } else { - return false; - } + // Delete the tracked position for the deleted slot + delete self._positions[_hash(value)]; } /** @@ -329,15 +390,15 @@ function values(${name} storage self) internal view returns (${value.type}[] mem * this function has an unbounded cost, and using it as part of a state-changing function may render the function * uncallable if the set grows to a point where copying to memory consumes too much gas to fit in a block. */ -function values(${name} storage set, uint256 start, uint256 end) internal view returns (${value.type}[] memory) { +function values(${name} storage self, uint256 start, uint256 end) internal view returns (${value.type}[] memory) { unchecked { - end = Math.min(end, length(set)); + end = Math.min(end, length(self)); start = Math.min(start, end); uint256 len = end - start; ${value.type}[] memory result = new ${value.type}[](len); for (uint256 i = 0; i < len; ++i) { - result[i] = set._values[start + i]; + result[i] = self._values[start + i]; } return result; } diff --git a/test/utils/structs/EnumerableMapExtended.test.js b/test/utils/structs/EnumerableMapExtended.test.js index 03f721114..a5bbdb702 100644 --- a/test/utils/structs/EnumerableMapExtended.test.js +++ b/test/utils/structs/EnumerableMapExtended.test.js @@ -31,16 +31,18 @@ async function fixture() { get: `$get(uint256,${key.type})`, tryGet: `$tryGet(uint256,${key.type})`, remove: `$remove(uint256,${key.type})`, + removeAt: `$removeAt_EnumerableMapExtended_${name}(uint256,uint256)`, + contains: `$contains(uint256,${key.type})`, clear: `$clear_EnumerableMapExtended_${name}(uint256)`, length: `$length_EnumerableMapExtended_${name}(uint256)`, at: `$at_EnumerableMapExtended_${name}(uint256,uint256)`, - contains: `$contains(uint256,${key.type})`, keys: `$keys_EnumerableMapExtended_${name}(uint256)`, keysPage: `$keys_EnumerableMapExtended_${name}(uint256,uint256,uint256)`, }, fnSig => - (...args) => - mock.getFunction(fnSig)(0, ...args), + Object.assign((...args) => mock.getFunction(fnSig)(0, ...args), { + staticCall: (...args) => mock.getFunction(fnSig).staticCall(0, ...args), + }), ), events: { setReturn: `return$set_EnumerableMapExtended_${name}_${key.type}_${value.type}`, diff --git a/test/utils/structs/EnumerableSetExtended.test.js b/test/utils/structs/EnumerableSetExtended.test.js index 374999f77..b34317703 100644 --- a/test/utils/structs/EnumerableSetExtended.test.js +++ b/test/utils/structs/EnumerableSetExtended.test.js @@ -29,6 +29,7 @@ async function fixture() { { add: `$add(uint256,${value.type})`, remove: `$remove(uint256,${value.type})`, + removeAt: `$removeAt(uint256,uint256)`, contains: `$contains(uint256,${value.type})`, clear: `$clear(uint256)`, // `$clear_EnumerableSetExtended_${name}(uint256)` when more types are added length: `$length(uint256)`, // `$length_EnumerableSetExtended_${name}(uint256)` when more types are added @@ -37,8 +38,9 @@ async function fixture() { valuesPage: `$values(uint256,uint256,uint256)`, // `$values_EnumerableSetExtended_${name}(uint256,uint256,uint256)` when more types are added }, fnSig => - (...args) => - mock.getFunction(fnSig)(0, ...args), + Object.assign((...args) => mock.getFunction(fnSig)(0, ...args), { + staticCall: (...args) => mock.getFunction(fnSig).staticCall(0, ...args), + }), ), events: { addReturn: 'return$add', // `return$add_EnumerableSetExtended_${name}_${value.type.replace(/[[\]]/g, '_')}`, From d7b34ccc2b7cf2360d8ae629698e917f4dbe3b98 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Wed, 16 Sep 2026 14:08:39 +0200 Subject: [PATCH 07/51] Bound ERC7786OpenBridge recipient return data copy A recipient can pad its return buffer to force the bridge to run out of gas copying it back. Only the first word is ever inspected, so use LowLevelCall.callReturn64Bytes to bound the copy, and check returndatasize() before comparing against the magic value. --- CHANGELOG.md | 4 ++++ contracts/crosschain/ERC7786OpenBridge.sol | 10 ++++++-- .../ERC7786RecipientReturnBombMock.sol | 19 +++++++++++++++ test/crosschain/ERC7786OpenBridge.test.js | 23 +++++++++++++++++++ 4 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 contracts/mocks/crosschain/ERC7786RecipientReturnBombMock.sol diff --git a/CHANGELOG.md b/CHANGELOG.md index 05cc4f42c..adee7f9ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 10-09-2026 + +- `ERC7786OpenBridge`: Read only the first word of the recipient's return buffer in `receiveMessage`, so a recipient cannot pad its return data to exhaust the caller's gas on the copy. + ## 04-08-2026 - `SignerAccessManaged`: Add an `AbstractSigner` whose authority is delegated to the members of a role tracked by an `IAccessManager`. A signature is accepted only when its `[signer][inner signature]` payload is valid and the signer currently holds the bound role. diff --git a/contracts/crosschain/ERC7786OpenBridge.sol b/contracts/crosschain/ERC7786OpenBridge.sol index d2b4c70ac..4030cabe2 100644 --- a/contracts/crosschain/ERC7786OpenBridge.sol +++ b/contracts/crosschain/ERC7786OpenBridge.sol @@ -6,6 +6,7 @@ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol"; import {IERC7786GatewaySource, IERC7786Recipient} from "@openzeppelin/contracts/interfaces/IERC7786.sol"; import {Address} from "@openzeppelin/contracts/utils/Address.sol"; import {InteroperableAddress} from "@openzeppelin/contracts/utils/draft-InteroperableAddress.sol"; +import {LowLevelCall} from "@openzeppelin/contracts/utils/LowLevelCall.sol"; import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol"; import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; @@ -230,13 +231,18 @@ contract ERC7786OpenBridge is IERC7786GatewaySource, IERC7786Recipient, Ownable, ); // slither-disable-next-line reentrancy-no-eth (, address target) = recipient.parseEvmV1(); - (bool success, bytes memory returndata) = target.call(call); + // A malicious recipient can pad its return buffer to force the caller to run out of gas copying it back. + // Only the first 32 bytes are inspected, so bound the copy to that window. + (bool success, bytes32 returndata, ) = LowLevelCall.callReturn64Bytes(target, call); if (!success) { // rollback to enable retry tracker.executed = false; emit ExecutionFailed(id); - } else if (bytes32(returndata) == bytes32(IERC7786Recipient.receiveMessage.selector)) { + } else if ( + LowLevelCall.returnDataSize() >= 0x20 && + returndata == bytes32(IERC7786Recipient.receiveMessage.selector) + ) { // call successful and correct value returned emit ExecutionSuccess(id); } else { diff --git a/contracts/mocks/crosschain/ERC7786RecipientReturnBombMock.sol b/contracts/mocks/crosschain/ERC7786RecipientReturnBombMock.sol new file mode 100644 index 000000000..ae910aac2 --- /dev/null +++ b/contracts/mocks/crosschain/ERC7786RecipientReturnBombMock.sol @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.8.27; + +import {IERC7786Recipient} from "@openzeppelin/contracts/interfaces/IERC7786.sol"; + +/// @dev Returns the correct ERC-7786 magic value followed by a large amount of padding, so a caller that copies +/// the full return buffer runs out of gas on the copy. +contract ERC7786RecipientReturnBombMock is IERC7786Recipient { + function receiveMessage(bytes32, bytes calldata, bytes calldata) external payable returns (bytes4) { + assembly ("memory-safe") { + // First 32 bytes: ABI-encoded `IERC7786Recipient.receiveMessage.selector`. + mstore(0x00, shl(224, 0x2432ef26)) + // Pay for a 1 MiB return buffer. + mstore(0x0ffffc, 0) + return(0x00, 0x100000) + } + } +} diff --git a/test/crosschain/ERC7786OpenBridge.test.js b/test/crosschain/ERC7786OpenBridge.test.js index a786e1e22..126dba52a 100644 --- a/test/crosschain/ERC7786OpenBridge.test.js +++ b/test/crosschain/ERC7786OpenBridge.test.js @@ -228,5 +228,28 @@ describe('ERC7786OpenBridge', function () { .to.emit(destination, 'MessageReceived') .withArgs(bridgeB, anyValue, chain.toErc7930(this.sender), payload, 0n); }); + + it('delivers to a recipient that returns the correct magic value followed by large padding', async function () { + // A recipient that returns the ERC-7786 magic in the first word and pads the return buffer to 1 MiB does not + // cause the bridge to run out of gas copying the response; only the first word is read. + const gateway = await ethers.deployContract('ERC7786GatewayMock'); + const bridgeA = await ethers.deployContract('ERC7786OpenBridge', [this.owner, [gateway], 1]); + const bridgeB = await ethers.deployContract('ERC7786OpenBridge', [this.owner, [gateway], 1]); + await bridgeA.registerRemoteBridge(chain.toErc7930(bridgeB)); + await bridgeB.registerRemoteBridge(chain.toErc7930(bridgeA)); + + const destination = await ethers.deployContract('ERC7786RecipientReturnBombMock'); + const payload = ethers.randomBytes(128); + + // An explicit gas limit is required: the bridge catches a failing delivery (emitting ExecutionFailed), so the + // transaction succeeds either way and gas estimation settles on the cheapest path, which is the one where the + // recipient runs out of gas while allocating its return buffer. + await expect( + bridgeA.connect(this.sender).sendMessage(chain.toErc7930(destination), payload, [], { gasLimit: 5_000_000n }), + ) + .to.emit(bridgeB, 'Received') + .to.emit(bridgeB, 'ExecutionSuccess') + .to.not.emit(bridgeB, 'ExecutionFailed'); + }); }); }); From 97f1049e896008955d3a892ee3b9a0805c37e27e Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Wed, 16 Sep 2026 14:08:49 +0200 Subject: [PATCH 08/51] Drop unused _wormholeChainId from WormholeGatewayAdapter The immutable was set from a constructor argument but never read. --- contracts/crosschain/wormhole/WormholeGatewayAdapter.sol | 4 +--- test/crosschain/wormhole/WormholeHelper.js | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/contracts/crosschain/wormhole/WormholeGatewayAdapter.sol b/contracts/crosschain/wormhole/WormholeGatewayAdapter.sol index c4e49d40e..3a9e30492 100644 --- a/contracts/crosschain/wormhole/WormholeGatewayAdapter.sol +++ b/contracts/crosschain/wormhole/WormholeGatewayAdapter.sol @@ -25,7 +25,6 @@ contract WormholeGatewayAdapter is IERC7786GatewaySource, IWormholeReceiver, Own using InteroperableAddress for bytes; IWormholeRelayer internal immutable _wormholeRelayer; - uint16 internal immutable _wormholeChainId; uint24 private constant EVM_ID_FLAG = 1 << 16; // Remote gateway. @@ -76,9 +75,8 @@ contract WormholeGatewayAdapter is IERC7786GatewaySource, IWormholeReceiver, Own } /// @dev Initializes the contract with the Wormhole gateway and the initial owner. - constructor(IWormholeRelayer wormholeRelayer, uint16 wormholeChainId, address initialOwner) Ownable(initialOwner) { + constructor(IWormholeRelayer wormholeRelayer, address initialOwner) Ownable(initialOwner) { _wormholeRelayer = wormholeRelayer; - _wormholeChainId = wormholeChainId; } /// @dev Returns the local Wormhole relayer diff --git a/test/crosschain/wormhole/WormholeHelper.js b/test/crosschain/wormhole/WormholeHelper.js index 04d5d91e2..21cc4a567 100644 --- a/test/crosschain/wormhole/WormholeHelper.js +++ b/test/crosschain/wormhole/WormholeHelper.js @@ -5,8 +5,8 @@ export const fromUniversalAddress = addr => ethers.getAddress(ethers.hexlify(eth export async function deploy(connection, owner, wormholeChainId = 23600) { const wormhole = await connection.ethers.deployContract('WormholeRelayerMock', [wormholeChainId]); - const gatewayA = await connection.ethers.deployContract('WormholeGatewayAdapter', [wormhole, wormholeChainId, owner]); - const gatewayB = await connection.ethers.deployContract('WormholeGatewayAdapter', [wormhole, wormholeChainId, owner]); + const gatewayA = await connection.ethers.deployContract('WormholeGatewayAdapter', [wormhole, owner]); + const gatewayB = await connection.ethers.deployContract('WormholeGatewayAdapter', [wormhole, owner]); await gatewayA .connect(owner) From 07142768804c36680ea66471976783a611f89296 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Wed, 16 Sep 2026 14:18:44 +0200 Subject: [PATCH 09/51] Deduplicate ERC7786OpenBridge return bomb test Merging origin/master brought in #278, which adds the same test as d7b34cc. The two copies differed only by the explicit gas limit, so the merge kept both. Drop the copy without the gas limit: without it, gas estimation settles on the path where the recipient runs out of gas allocating its return buffer, and the test fails. --- test/crosschain/ERC7786OpenBridge.test.js | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/test/crosschain/ERC7786OpenBridge.test.js b/test/crosschain/ERC7786OpenBridge.test.js index 07aa95afe..126dba52a 100644 --- a/test/crosschain/ERC7786OpenBridge.test.js +++ b/test/crosschain/ERC7786OpenBridge.test.js @@ -251,22 +251,5 @@ describe('ERC7786OpenBridge', function () { .to.emit(bridgeB, 'ExecutionSuccess') .to.not.emit(bridgeB, 'ExecutionFailed'); }); - - it('delivers to a recipient that returns the correct magic value followed by large padding', async function () { - // A recipient that returns the ERC-7786 magic in the first word and pads the return buffer to 1 MiB does not - // cause the bridge to run out of gas copying the response; only the first word is read. - const gateway = await ethers.deployContract('ERC7786GatewayMock'); - const bridgeA = await ethers.deployContract('ERC7786OpenBridge', [this.owner, [gateway], 1]); - const bridgeB = await ethers.deployContract('ERC7786OpenBridge', [this.owner, [gateway], 1]); - await bridgeA.registerRemoteBridge(this.chain.toErc7930(bridgeB)); - await bridgeB.registerRemoteBridge(this.chain.toErc7930(bridgeA)); - - const destination = await ethers.deployContract('ERC7786RecipientReturnBombMock'); - const payload = ethers.randomBytes(128); - - await expect(bridgeA.connect(this.sender).sendMessage(this.chain.toErc7930(destination), payload, [])) - .to.emit(bridgeB, 'Received') - .to.emit(bridgeB, 'ExecutionSuccess'); - }); }); }); From 09c91672a3a42e19e5b5a6f7ac90deb547118336 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Wed, 16 Sep 2026 14:23:00 +0200 Subject: [PATCH 10/51] Restore lib/ exclusion in the js linting scripts 34024d9 dropped eslint's --ignore-pattern lib/ and routed prettier through a shared script passing --ignore-path .gitignore. In prettier 3 --ignore-path replaces .prettierignore rather than adding to it, so the existing `lib` entry there stopped applying. Both linters were walking the submodules under lib/, leaving `yarn lint` permanently red. --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index b2e901720..1af72bd52 100644 --- a/package.json +++ b/package.json @@ -16,11 +16,11 @@ "prepare-docs": "scripts/prepare-docs.sh", "lint": "npm run lint:js && npm run lint:sol", "lint:fix": "npm run lint:js:fix && npm run lint:sol:fix", - "lint:js": "npm run prettier -- '**/*.{js,ts}' --check && eslint .", - "lint:js:fix": "npm run prettier -- '**/*.{js,ts}' --write && eslint . --fix", + "lint:js": "npm run prettier -- '**/*.{js,ts}' --check && eslint . --ignore-pattern lib/", + "lint:js:fix": "npm run prettier -- '**/*.{js,ts}' --write && eslint . --fix --ignore-pattern lib/", "lint:sol": "npm run prettier -- '{contracts,test}/**/*.sol' --check && npm run solhint -- '{contracts,test}/**/*.sol'", "lint:sol:fix": "npm run prettier -- '{contracts,test}/**/*.sol' --write && npm run solhint -- '{contracts,test}/**/*.sol' --fix", - "prettier": "prettier --log-level warn --ignore-path .gitignore", + "prettier": "prettier --log-level warn --ignore-path .gitignore --ignore-path .prettierignore", "solhint": "solhint --config solhint.config.cjs --noPoster --noPrompt --disc", "clean": "hardhat clean && rimraf build contracts/build", "generate": "scripts/generate/run.js", From 26d1c4b02a05b2c68a1df92d5402ff6b213a4c85 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Wed, 16 Sep 2026 18:00:10 +0200 Subject: [PATCH 11/51] Apply suggestion from @Amxx Signed-off-by: Hadrien Croubois --- test/utils/structs/EnumerableSetExtended.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/utils/structs/EnumerableSetExtended.test.js b/test/utils/structs/EnumerableSetExtended.test.js index b34317703..b822b3f24 100644 --- a/test/utils/structs/EnumerableSetExtended.test.js +++ b/test/utils/structs/EnumerableSetExtended.test.js @@ -29,7 +29,7 @@ async function fixture() { { add: `$add(uint256,${value.type})`, remove: `$remove(uint256,${value.type})`, - removeAt: `$removeAt(uint256,uint256)`, + removeAt: `$removeAt(uint256,uint256)`, // `$removeAt_EnumerableSetExtended_${name}(uint256,uint256)` when more types are added contains: `$contains(uint256,${value.type})`, clear: `$clear(uint256)`, // `$clear_EnumerableSetExtended_${name}(uint256)` when more types are added length: `$length(uint256)`, // `$length_EnumerableSetExtended_${name}(uint256)` when more types are added From 4ad13184c27a8f3a49e72b006e12c1a32381869d Mon Sep 17 00:00:00 2001 From: James Toussaint <33313130+james-toussaint@users.noreply.github.com> Date: Mon, 21 Sep 2026 11:16:30 +0200 Subject: [PATCH 12/51] Fix inheritance ordering --- contracts/interfaces/IERC7575.sol | 2 +- contracts/token/ERC20/extensions/ERC7540.sol | 2 +- package.json | 2 +- scripts/checks/inheritance-ordering.js | 32 ++++++++++++++------ 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/contracts/interfaces/IERC7575.sol b/contracts/interfaces/IERC7575.sol index fd898e589..43b678153 100644 --- a/contracts/interfaces/IERC7575.sol +++ b/contracts/interfaces/IERC7575.sol @@ -6,7 +6,7 @@ import {IERC165} from "@openzeppelin/contracts/interfaces/IERC165.sol"; import {IERC4626} from "@openzeppelin/contracts/interfaces/IERC4626.sol"; /// @dev Multi-Asset ERC-4626 Vaults, as defined in https://eips.ethereum.org/EIPS/eip-7575 -interface IERC7575 is IERC165, IERC4626 { +interface IERC7575 is IERC4626, IERC165 { /// @dev The address of the underlying share received on deposit into the vault. function share() external view returns (address shareTokenAddress); } diff --git a/contracts/token/ERC20/extensions/ERC7540.sol b/contracts/token/ERC20/extensions/ERC7540.sol index 5107caa47..f23e47671 100644 --- a/contracts/token/ERC20/extensions/ERC7540.sol +++ b/contracts/token/ERC20/extensions/ERC7540.sol @@ -65,7 +65,7 @@ import {IERC7575, IERC7575Share} from "../../../interfaces/IERC7575.sol"; * accounting (notably {totalAssets}) can revert and freeze claim paths that depend on live conversions. * ==== */ -abstract contract ERC7540 is ERC165, ERC20, IERC4626, IERC7540, IERC7575Share { +abstract contract ERC7540 is ERC20, IERC4626, ERC165, IERC7540, IERC7575Share { using Math for uint256; IERC20 private immutable _asset; diff --git a/package.json b/package.json index 1af72bd52..df6511e8e 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "generate": "scripts/generate/run.js", "test": "hardhat test", "test:generation": "scripts/checks/generation.sh", - "test:inheritance": "scripts/checks/inheritance-ordering.js artifacts/build-info/*", + "test:inheritance": "scripts/checks/inheritance-ordering.js artifacts/build-info/*.output.json", "test:pragma": "scripts/checks/pragma-validity.js artifacts/build-info/*", "coverage": "hardhat test --coverage", "gas-report": "hardhat test --gas-stats" diff --git a/scripts/checks/inheritance-ordering.js b/scripts/checks/inheritance-ordering.js index e0c8149e4..e83f6463d 100755 --- a/scripts/checks/inheritance-ordering.js +++ b/scripts/checks/inheritance-ordering.js @@ -1,25 +1,37 @@ #!/usr/bin/env node -const path = require('path'); -const graphlib = require('graphlib'); -const match = require('micromatch'); -const { findAll } = require('solidity-ast/utils'); -const { _: artifacts } = require('yargs/yargs')().argv; +import fs from 'fs'; +import path from 'path'; +import graphlib from 'graphlib'; +import match from 'micromatch'; +import { findAll } from 'solidity-ast/utils.js'; +import yargs from 'yargs'; +import { hideBin } from 'yargs/helpers'; + +const { _: artifacts } = yargs(hideBin(process.argv)).argv; // files to skip -const skipPatterns = ['contracts-exposed/**', 'contracts/mocks/**']; +const skipPatterns = ['contracts-exposed/**', 'contracts/mocks/**', 'test/**']; +const isChecked = source => !source.startsWith('npm/') && !match.any(source.replace(/^project\//, ''), skipPatterns); for (const artifact of artifacts) { - const { output: solcOutput } = require(path.resolve(__dirname, '../..', artifact)); + const { output: solcOutput } = JSON.parse( + fs.readFileSync(path.resolve(import.meta.dirname, '../..', artifact), 'utf-8'), + ); const graph = new graphlib.Graph({ directed: true }); const names = {}; const linearized = []; - for (const source in solcOutput.contracts) { - if (match.any(source, skipPatterns)) continue; + for (const source in solcOutput.sources) { + for (const contractDef of findAll('ContractDefinition', solcOutput.sources[source].ast)) { + names[contractDef.id] = contractDef.name; // include any source needed for resolution (e.g. external IERC165) + } + } + + for (const source in solcOutput.sources) { + if (!isChecked(source)) continue; // skip non-production/non-project sources (e.g. external IERC165) for (const contractDef of findAll('ContractDefinition', solcOutput.sources[source].ast)) { - names[contractDef.id] = contractDef.name; linearized.push(contractDef.linearizedBaseContracts); contractDef.linearizedBaseContracts.forEach((c1, i, contracts) => From 1f7b30d625a0f43992ad81f9d7ea5035c30be645 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Tue, 22 Sep 2026 16:47:54 +0200 Subject: [PATCH 13/51] update scripts --- scripts/checks/compare-gas-reports.js | 139 +++++++++++++------------ scripts/checks/inheritance-ordering.js | 40 ++++--- scripts/checks/pragma-validity.js | 14 ++- scripts/gen-nav.js | 21 +++- scripts/get-contracts-metadata.js | 30 +++--- scripts/prepare-docs.sh | 6 +- scripts/solc-versions.js | 25 +++-- scripts/update-docs-branch.js | 24 ++--- 8 files changed, 163 insertions(+), 136 deletions(-) diff --git a/scripts/checks/compare-gas-reports.js b/scripts/checks/compare-gas-reports.js index 20fe96909..13cf19b29 100755 --- a/scripts/checks/compare-gas-reports.js +++ b/scripts/checks/compare-gas-reports.js @@ -1,10 +1,12 @@ #!/usr/bin/env node -const fs = require('fs'); -const chalk = require('chalk'); +import fs from 'fs'; +import chalk from 'chalk'; -const { hideBin } = require('yargs/helpers'); -const { argv } = require('yargs/yargs')(hideBin(process.argv)) +import { hideBin } from 'yargs/helpers'; +import yargs from 'yargs/yargs'; + +const { argv } = yargs(hideBin(process.argv)) .env('') .options({ style: { @@ -20,27 +22,33 @@ const { argv } = require('yargs/yargs')(hideBin(process.argv)) type: 'boolean', default: false, }, + // JSON array of source files the change reaches (from `scripts/list-dependencies.js`); absent = report all. + filtered: { + type: 'string', + }, }); // Deduce base tx cost from the percentage denominator const BASE_TX_COST = 21000; // Utilities -function sum(...args) { - return args.reduce((a, b) => a + b, 0); -} - -function average(...args) { - return sum(...args) / args.length; -} - -function variation(current, previous, offset = 0) { - return { - value: current, - delta: current - previous, - prcnt: (100 * (current - previous)) / (previous - offset), - }; -} +const variation = (current, previous, offset = 0) => ({ + value: current - offset, + delta: current - previous, + prcnt: (100 * (current - previous)) / (previous - offset), +}); + +const variations = (current, previous, offset = 0) => + current.min == current.max && previous.min == previous.max + ? { + avg: variation(current.avg, previous.avg, offset), + } + : { + min: variation(current.min, previous.min, offset), + max: variation(current.max, previous.max, offset), + avg: variation(current.avg, previous.avg, offset), + median: variation(current.median, previous.median, offset), + }; // Report class class Report { @@ -51,54 +59,38 @@ class Report { // Compare two reports static compare(update, ref, opts = { hideEqual: true, strictTesting: false }) { - if (JSON.stringify(update.options?.solcInfo) !== JSON.stringify(ref.options?.solcInfo)) { - console.warn('WARNING: Reports produced with non matching metadata'); - } - - // gasReporter 1.0.0 uses ".info", but 2.0.0 uses ".data" - const updateInfo = update.info ?? update.data; - const refInfo = ref.info ?? ref.data; - - const deployments = updateInfo.deployments - .map(contract => - Object.assign(contract, { previousVersion: refInfo.deployments.find(({ name }) => name === contract.name) }), - ) - .filter(contract => contract.gasData?.length && contract.previousVersion?.gasData?.length) - .flatMap(contract => [ - { - contract: contract.name, - method: '[bytecode length]', - avg: variation(contract.bytecode.length / 2 - 1, contract.previousVersion.bytecode.length / 2 - 1), - }, - { - contract: contract.name, - method: '[construction cost]', - avg: variation( - ...[contract.gasData, contract.previousVersion.gasData].map(x => Math.round(average(...x))), - BASE_TX_COST, - ), - }, - ]) - .sort((a, b) => `${a.contract}:${a.method}`.localeCompare(`${b.contract}:${b.method}`)); - - const methods = Object.keys(updateInfo.methods) - .filter(key => refInfo.methods[key]) - .filter(key => updateInfo.methods[key].numberOfCalls > 0) - .filter( - key => !opts.strictTesting || updateInfo.methods[key].numberOfCalls === refInfo.methods[key].numberOfCalls, - ) - .map(key => ({ - contract: refInfo.methods[key].contract, - method: refInfo.methods[key].fnSig, - min: variation(...[updateInfo, refInfo].map(x => Math.min(...x.methods[key].gasData)), BASE_TX_COST), - max: variation(...[updateInfo, refInfo].map(x => Math.max(...x.methods[key].gasData)), BASE_TX_COST), - avg: variation(...[updateInfo, refInfo].map(x => Math.round(average(...x.methods[key].gasData))), BASE_TX_COST), - })) - .sort((a, b) => `${a.contract}:${a.method}`.localeCompare(`${b.contract}:${b.method}`)); - - return [] - .concat(deployments, methods) - .filter(row => !opts.hideEqual || row.min?.delta || row.max?.delta || row.avg?.delta); + const refContracts = ref.contracts ?? {}; + const updateContracts = update.contracts ?? {}; + // Drop contracts the change cannot reach: their min/max/avg/median only move with test-suite + // churn, not a real change. `sourceName` is the path `filtered` is expressed in. + return Object.entries(updateContracts) + .filter(([key]) => key in refContracts) + .filter(([, contract]) => !opts.filtered || opts.filtered.has(contract.sourceName)) + .flatMap(([key, contract]) => { + const refContract = refContracts[key]; + const refFunctions = refContracts[key]?.functions ?? {}; + return [ + ...(contract.deployment && refContract.deployment + ? [ + { + contract: contract.contractName, + method: '[constructor]', + ...variations(contract.deployment, refContract.deployment, BASE_TX_COST), + }, + ] + : []), + ...Object.entries(contract.functions ?? {}) + .filter(([method]) => method in refFunctions) + .filter(([method, data]) => !opts.strictTesting || data.count === refFunctions[method].count) + .map(([method, currentData]) => ({ + contract: contract.contractName, + method, + ...variations(currentData, refFunctions[method], BASE_TX_COST), + })), + ]; + }) + .sort((a, b) => `${a.contract}:${a.method}`.localeCompare(`${b.contract}:${b.method}`)) + .filter(row => !opts.hideEqual || row.min?.delta || row.max?.delta || row.avg?.delta || row.median?.delta); } } @@ -130,6 +122,7 @@ function formatCmpShell(rows) { { txt: 'Method', length: methodLength }, { txt: 'Min', length: 30 }, { txt: 'Max', length: 30 }, + { txt: 'Median', length: 30 }, { txt: 'Avg', length: 30 }, { txt: '', length: 0 }, ]; @@ -150,6 +143,7 @@ function formatCmpShell(rows) { entry.method.padEnd(methodLength), ...formatCellShell(entry.min), ...formatCellShell(entry.max), + ...formatCellShell(entry.median), ...formatCellShell(entry.avg), '', ] @@ -197,6 +191,9 @@ function formatCmpMarkdown(rows) { { txt: 'Max', align: 'right' }, { txt: '(+/-)', align: 'right' }, { txt: '%', align: 'right' }, + { txt: 'Median', align: 'right' }, + { txt: '(+/-)', align: 'right' }, + { txt: '%', align: 'right' }, { txt: 'Avg', align: 'right' }, { txt: '(+/-)', align: 'right' }, { txt: '%', align: 'right' }, @@ -222,6 +219,7 @@ function formatCmpMarkdown(rows) { entry.method, ...formatCellMarkdown(entry.min), ...formatCellMarkdown(entry.max), + ...formatCellMarkdown(entry.median), ...formatCellMarkdown(entry.avg), '', ] @@ -236,11 +234,14 @@ function formatCmpMarkdown(rows) { } // MAIN -const report = Report.compare(Report.load(argv._[0]), Report.load(argv._[1]), argv); +const filtered = argv.filtered && new Set(Report.load(argv.filtered)); +const report = Report.compare(Report.load(argv._[0]), Report.load(argv._[1]), { ...argv, filtered }); switch (argv.style) { case 'markdown': - console.log(formatCmpMarkdown(report)); + // Empty output (no reachable contract changed cost) rather than a bare header: gas-comment.yml + // deletes the comment when the body is empty. + if (report.length > 0) console.log(formatCmpMarkdown(report)); break; case 'shell': default: diff --git a/scripts/checks/inheritance-ordering.js b/scripts/checks/inheritance-ordering.js index e0c8149e4..be11f701a 100755 --- a/scripts/checks/inheritance-ordering.js +++ b/scripts/checks/inheritance-ordering.js @@ -1,27 +1,43 @@ #!/usr/bin/env node -const path = require('path'); -const graphlib = require('graphlib'); -const match = require('micromatch'); -const { findAll } = require('solidity-ast/utils'); -const { _: artifacts } = require('yargs/yargs')().argv; +import fs from 'fs'; +import path from 'path'; +import graphlib from 'graphlib'; +import match from 'micromatch'; +import { findAll } from 'solidity-ast/utils.js'; +import yargs from 'yargs'; +import { hideBin } from 'yargs/helpers'; -// files to skip -const skipPatterns = ['contracts-exposed/**', 'contracts/mocks/**']; +const { _: artifacts } = yargs(hideBin(process.argv)).argv; + +// only consider files in the package: take pattern from package.json +// npm `files` entries are rooted (`/contracts/**/*.sol`); solc source keys are not +const patterns = JSON.parse( + fs.readFileSync(path.resolve(import.meta.dirname, '../../', 'package.json'), 'utf-8'), +).files.map(p => p.replace(/^(!?)\/+/, '$1')); for (const artifact of artifacts) { - const { output: solcOutput } = require(path.resolve(__dirname, '../..', artifact)); + const { output: solcOutput } = JSON.parse( + fs.readFileSync(path.resolve(import.meta.dirname, '../..', artifact), 'utf-8'), + ); const graph = new graphlib.Graph({ directed: true }); const names = {}; const linearized = []; - for (const source in solcOutput.contracts) { - if (match.any(source, skipPatterns)) continue; - for (const contractDef of findAll('ContractDefinition', solcOutput.sources[source].ast)) { + // Rebuild solcOutput?.sources by removing the "project" prefix from the keys, so that we can match them against the patterns in package.json + const sources = Object.fromEntries( + Object.entries(solcOutput?.sources ?? {}).map(([key, value]) => [key.replace(/^project\//, ''), value]), + ); + + // For each source file that matches the patterns ... + for (const file of match(Object.keys(sources), patterns)) { + // ... find all ContractDefinition in this file ... + for (const contractDef of findAll('ContractDefinition', sources[file].ast)) { + // ... record the details for that contracts ... names[contractDef.id] = contractDef.name; linearized.push(contractDef.linearizedBaseContracts); - + // ... and add edges to the graph for each pair of contracts in the linearized base contracts. contractDef.linearizedBaseContracts.forEach((c1, i, contracts) => contracts.slice(i + 1).forEach(c2 => { graph.setEdge(c1, c2); diff --git a/scripts/checks/pragma-validity.js b/scripts/checks/pragma-validity.js index 491f650bc..73e66cfd5 100755 --- a/scripts/checks/pragma-validity.js +++ b/scripts/checks/pragma-validity.js @@ -1,13 +1,11 @@ #!/usr/bin/env node -const semver = require('semver'); -const pLimit = require('p-limit').default; - -const { hideBin } = require('yargs/helpers'); -const yargs = require('yargs/yargs'); - -const getContractsMetadata = require('../get-contracts-metadata'); -const { compile } = require('../solc-versions'); +import semver from 'semver'; +import pLimit from 'p-limit'; +import yargs from 'yargs'; +import { hideBin } from 'yargs/helpers'; +import { getContractsMetadata } from '../get-contracts-metadata.js'; +import { compile } from '../solc-versions.js'; const { argv: { pattern, skipPatterns, verbose, concurrency, _: artifacts }, diff --git a/scripts/gen-nav.js b/scripts/gen-nav.js index 6ac44560e..df872b1ce 100644 --- a/scripts/gen-nav.js +++ b/scripts/gen-nav.js @@ -1,8 +1,8 @@ #!/usr/bin/env node -const path = require('path'); -const glob = require('glob'); -const startCase = require('lodash.startcase'); +import path from 'node:path'; +import { glob } from 'glob'; +import startCase from 'lodash.startcase'; const baseDir = process.argv[2]; @@ -11,7 +11,12 @@ const files = glob.sync(baseDir + '/**/*.adoc').map(f => path.relative(baseDir, console.log('.API'); function getPageTitle(directory) { - return startCase(directory); + switch (directory) { + case 'metatx': + return 'Meta Transactions'; + default: + return startCase(directory); + } } const menuItems = files.reduce( @@ -36,7 +41,13 @@ const menuItems = files.reduce( return acc; }, { - items: {}, + items: { + token: { + name: 'tokens', + dir: '', + items: {}, + }, + }, }, ); diff --git a/scripts/get-contracts-metadata.js b/scripts/get-contracts-metadata.js index 030ab5a3d..6099ee271 100644 --- a/scripts/get-contracts-metadata.js +++ b/scripts/get-contracts-metadata.js @@ -1,10 +1,10 @@ -const fs = require('fs'); -const glob = require('glob'); -const match = require('micromatch'); -const path = require('path'); -const { findAll } = require('solidity-ast/utils'); +import fs from 'fs'; +import path from 'path'; +import { glob } from 'glob'; +import match from 'micromatch'; +import { findAll } from 'solidity-ast/utils.js'; -module.exports = function ( +export function getContractsMetadata( pattern = 'contracts/**/*.sol', skipPatterns = ['contracts/mocks/**/*.sol'], artifacts = [], @@ -13,18 +13,22 @@ module.exports = function ( // definitions with minimal IO operations. const metadata = Object.fromEntries( artifacts.flatMap(artifact => { - const { output: solcOutput } = require(path.resolve(__dirname, '..', artifact)); - return Object.keys(solcOutput.contracts) - .filter(source => match.all(source, pattern) && !match.any(source, skipPatterns)) + const { output: solcOutput } = JSON.parse(fs.readFileSync(path.resolve(import.meta.dirname, '..', artifact))); + return Object.keys(solcOutput?.contracts ?? {}) + .filter( + source => + match.all(source.replace(/^project\//, ''), pattern) && + !match.any(source.replace(/^project\//, ''), skipPatterns), + ) .map(source => [ - source, + source.replace(/^project\//, ''), { pragma: Array.from(findAll('PragmaDirective', solcOutput.sources[source].ast)) .find(({ literals }) => literals.at(0) == 'solidity') .literals.slice(1) .join(''), - sources: Array.from(findAll('ImportDirective', solcOutput.sources[source].ast)).map( - ({ absolutePath }) => absolutePath, + sources: Array.from(findAll('ImportDirective', solcOutput.sources[source].ast)).map(({ absolutePath }) => + absolutePath.replace(/^project\//, ''), ), interface: Array.from(findAll('ContractDefinition', solcOutput.sources[source].ast)).every( ({ contractKind }) => contractKind === 'interface', @@ -52,4 +56,4 @@ module.exports = function ( }); return metadata; -}; +} diff --git a/scripts/prepare-docs.sh b/scripts/prepare-docs.sh index cc1fe3764..912054a64 100755 --- a/scripts/prepare-docs.sh +++ b/scripts/prepare-docs.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s globstar -OUTDIR="$(node -p 'require("./docs/config.js").outputDir')" +OUTDIR="$(node -e 'import("./docs/config.mjs").then(m => console.log(m.default.outputDir))')" if [ ! -d node_modules ]; then npm ci @@ -18,9 +18,9 @@ examples_source_dir="contracts/mocks/docs" examples_target_dir="docs/modules/api/examples" for f in "$examples_source_dir"/**/*.sol; do - name="${f/#"$examples_source_dir/"/}" + name="${f/#"$examples_source_dir"/}" mkdir -p "$examples_target_dir/$(dirname "$name")" - sed -Ee '/^import/s|"(\.\./)+|"@openzeppelin/community-contracts/|' "$f" > "$examples_target_dir/$name" + sed -Ee '/^import/s|"(\.\./)+|"@openzeppelin/contracts/|' "$f" > "$examples_target_dir/$name" done node scripts/gen-nav.js "$OUTDIR" > "$OUTDIR/../nav.adoc" diff --git a/scripts/solc-versions.js b/scripts/solc-versions.js index cd27a3621..abffda515 100644 --- a/scripts/solc-versions.js +++ b/scripts/solc-versions.js @@ -1,15 +1,14 @@ -const { exec } = require('child_process'); -const semver = require('semver'); -const { range } = require('./helpers'); +import { execFile } from 'child_process'; +import semver from 'semver'; +import { range } from './helpers.js'; -module.exports = { - versions: ['0.4.26', '0.5.16', '0.6.12', '0.7.6', '0.8.30'] - .map(semver.parse) - .flatMap(({ major, minor, patch }) => range(patch + 1).map(p => `${major}.${minor}.${p}`)), - compile: (source, version) => - new Promise((resolve, reject) => - exec(`forge build ${source} --use ${version} --out out/solc-${version}`, error => - error ? reject(error) : resolve(), - ), +export const versions = ['0.4.26', '0.5.16', '0.6.12', '0.7.6', '0.8.33'] + .map(semver.parse) + .flatMap(({ major, minor, patch }) => range(patch + 1).map(p => `${major}.${minor}.${p}`)); + +export const compile = (source, version) => + new Promise((resolve, reject) => + execFile('forge', ['build', source, '--use', version, '--out', `out/solc-${version}`], error => + error ? reject(error) : resolve(), ), -}; + ); diff --git a/scripts/update-docs-branch.js b/scripts/update-docs-branch.js index 766452b09..67f25fb3e 100644 --- a/scripts/update-docs-branch.js +++ b/scripts/update-docs-branch.js @@ -1,4 +1,7 @@ -const proc = require('child_process'); +import proc from 'child_process'; +import fs from 'fs'; +import path from 'path'; + const read = cmd => proc.execSync(cmd, { encoding: 'utf8' }).trim(); const run = cmd => { proc.execSync(cmd, { stdio: 'inherit' }); @@ -11,20 +14,17 @@ const tryRead = cmd => { } }; -// The community contracts currently don't have a defined release process. -// The master branch is used for development, and the docs are updated from there. -// Use /^release-v(?(?\d+)\.(?\d+)(?:\.(?\d+))?)$/ for a release branch -const masterBranch = /^master$/; +const releaseBranchRegex = /^release-v(?(?\d+)\.(?\d+)(?:\.(?\d+))?)$/; const currentBranch = read('git rev-parse --abbrev-ref HEAD'); -const match = currentBranch.match(masterBranch); +const match = currentBranch.match(releaseBranchRegex); if (!match) { - console.error('Not currently on master branch'); + console.error('Not currently on a release branch'); process.exit(1); } -const pkgVersion = require('../package.json').version; +const pkgVersion = JSON.parse(fs.readFileSync(path.resolve(import.meta.dirname, '../package.json'), 'utf8')).version; if (pkgVersion.includes('-') && !pkgVersion.includes('.0.0-')) { console.error('Refusing to update docs: non-major prerelease detected'); @@ -32,9 +32,7 @@ if (pkgVersion.includes('-') && !pkgVersion.includes('.0.0-')) { } const current = match.groups; -const major = current?.major ?? pkgVersion.split('.')[0]; -const minor = current?.minor ?? pkgVersion.split('.')[1]; -const docsBranch = `docs-v${major}.x`; +const docsBranch = `docs-v${current.major}.x`; // Fetch remotes and find the docs branch if it exists run('git fetch --all --no-tags'); @@ -54,7 +52,7 @@ if (!matchingDocsBranches) { } const publishedVersion = JSON.parse(read(`git show ${publishedRef}:package.json`)).version; const publishedMinor = publishedVersion.match(/\d+\.(?\d+)\.\d+/).groups.minor; - if (minor < publishedMinor) { + if (current.minor < publishedMinor) { console.error('Refusing to update docs: newer version is published'); process.exit(0); } @@ -66,5 +64,5 @@ if (!matchingDocsBranches) { run('npm run prepare-docs'); run('git add -f docs'); // --force needed because generated docs files are gitignored -run('git commit --no-verify -m "Update docs"'); +run('git commit -m "Update docs"'); run(`git checkout ${currentBranch}`); From 3b5b37e46440afdb595d7b33e5c88cf27e4b2e12 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Tue, 22 Sep 2026 17:40:01 +0200 Subject: [PATCH 14/51] fix inheritance ordering script --- package.json | 2 +- scripts/checks/inheritance-ordering.js | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 1af72bd52..df6511e8e 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "generate": "scripts/generate/run.js", "test": "hardhat test", "test:generation": "scripts/checks/generation.sh", - "test:inheritance": "scripts/checks/inheritance-ordering.js artifacts/build-info/*", + "test:inheritance": "scripts/checks/inheritance-ordering.js artifacts/build-info/*.output.json", "test:pragma": "scripts/checks/pragma-validity.js artifacts/build-info/*", "coverage": "hardhat test --coverage", "gas-report": "hardhat test --gas-stats" diff --git a/scripts/checks/inheritance-ordering.js b/scripts/checks/inheritance-ordering.js index be11f701a..063929172 100755 --- a/scripts/checks/inheritance-ordering.js +++ b/scripts/checks/inheritance-ordering.js @@ -30,19 +30,22 @@ for (const artifact of artifacts) { Object.entries(solcOutput?.sources ?? {}).map(([key, value]) => [key.replace(/^project\//, ''), value]), ); - // For each source file that matches the patterns ... - for (const file of match(Object.keys(sources), patterns)) { + // For each source file ... + for (const file of Object.keys(sources)) { // ... find all ContractDefinition in this file ... for (const contractDef of findAll('ContractDefinition', sources[file].ast)) { - // ... record the details for that contracts ... + // ... record the name for that contracts ... names[contractDef.id] = contractDef.name; - linearized.push(contractDef.linearizedBaseContracts); - // ... and add edges to the graph for each pair of contracts in the linearized base contracts. - contractDef.linearizedBaseContracts.forEach((c1, i, contracts) => - contracts.slice(i + 1).forEach(c2 => { - graph.setEdge(c1, c2); - }), - ); + // ... consider inheritance ordering of contracts in files that matches the patterns + if (match(file, patterns)) { + linearized.push(contractDef.linearizedBaseContracts); + // ... and add edges to the graph for each pair of contracts in the linearized base contracts. + contractDef.linearizedBaseContracts.forEach((c1, i, contracts) => + contracts.slice(i + 1).forEach(c2 => { + graph.setEdge(c1, c2); + }), + ); + } } } From f264fe6b27de366d9d71272bf51cb01c97afd61f Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Tue, 22 Sep 2026 17:50:56 +0200 Subject: [PATCH 15/51] Derive inheritance-ordering check scope from package.json files Replace the hardcoded skip list with the npm `files` patterns so the check covers exactly what gets published, and merge the two AST passes into one. --- scripts/checks/inheritance-ordering.js | 43 +++++++++++++++----------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/scripts/checks/inheritance-ordering.js b/scripts/checks/inheritance-ordering.js index e83f6463d..e07d070fc 100755 --- a/scripts/checks/inheritance-ordering.js +++ b/scripts/checks/inheritance-ordering.js @@ -10,9 +10,11 @@ import { hideBin } from 'yargs/helpers'; const { _: artifacts } = yargs(hideBin(process.argv)).argv; -// files to skip -const skipPatterns = ['contracts-exposed/**', 'contracts/mocks/**', 'test/**']; -const isChecked = source => !source.startsWith('npm/') && !match.any(source.replace(/^project\//, ''), skipPatterns); +// only consider files in the package: take pattern from package.json +// npm `files` entries are rooted (`/contracts/**/*.sol`); solc source keys are not +const patterns = JSON.parse( + fs.readFileSync(path.resolve(import.meta.dirname, '../../', 'package.json'), 'utf-8'), +).files.map(p => p.replace(/^(!?)\/+/, '$1')); for (const artifact of artifacts) { const { output: solcOutput } = JSON.parse( @@ -23,22 +25,27 @@ for (const artifact of artifacts) { const names = {}; const linearized = []; - for (const source in solcOutput.sources) { - for (const contractDef of findAll('ContractDefinition', solcOutput.sources[source].ast)) { - names[contractDef.id] = contractDef.name; // include any source needed for resolution (e.g. external IERC165) - } - } - - for (const source in solcOutput.sources) { - if (!isChecked(source)) continue; // skip non-production/non-project sources (e.g. external IERC165) - for (const contractDef of findAll('ContractDefinition', solcOutput.sources[source].ast)) { - linearized.push(contractDef.linearizedBaseContracts); + // Rebuild solcOutput?.sources by removing the "project" prefix from the keys, so that we can match them against the patterns in package.json + const sources = Object.fromEntries( + Object.entries(solcOutput?.sources ?? {}).map(([key, value]) => [key.replace(/^project\//, ''), value]), + ); - contractDef.linearizedBaseContracts.forEach((c1, i, contracts) => - contracts.slice(i + 1).forEach(c2 => { - graph.setEdge(c1, c2); - }), - ); + // For each source file ... + for (const file of Object.keys(sources)) { + // ... find all ContractDefinition in this file ... + for (const contractDef of findAll('ContractDefinition', sources[file].ast)) { + // ... record the name for that contracts ... + names[contractDef.id] = contractDef.name; + // ... consider inheritance ordering of contracts in files that matches the patterns + if (match(file, patterns).length > 0) { + linearized.push(contractDef.linearizedBaseContracts); + // ... and add edges to the graph for each pair of contracts in the linearized base contracts. + contractDef.linearizedBaseContracts.forEach((c1, i, contracts) => + contracts.slice(i + 1).forEach(c2 => { + graph.setEdge(c1, c2); + }), + ); + } } } From ce2ac7ccdd554137f2a1796946a1a9f93fae3e37 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Wed, 23 Sep 2026 13:50:33 +0200 Subject: [PATCH 16/51] dependency update --- lib/@openzeppelin-contracts | 2 +- lib/@openzeppelin-contracts-upgradeable | 2 +- scripts/checks/inheritance-ordering.js | 75 +------------------------ 3 files changed, 3 insertions(+), 76 deletions(-) mode change 100755 => 120000 scripts/checks/inheritance-ordering.js diff --git a/lib/@openzeppelin-contracts b/lib/@openzeppelin-contracts index 1f2665e8d..8d03dee9b 160000 --- a/lib/@openzeppelin-contracts +++ b/lib/@openzeppelin-contracts @@ -1 +1 @@ -Subproject commit 1f2665e8d52677fd61f8daedc41ca77e1c64259d +Subproject commit 8d03dee9b880c2aa7403c224847fcd9d0073bd33 diff --git a/lib/@openzeppelin-contracts-upgradeable b/lib/@openzeppelin-contracts-upgradeable index bd75161ea..c15fd56a7 160000 --- a/lib/@openzeppelin-contracts-upgradeable +++ b/lib/@openzeppelin-contracts-upgradeable @@ -1 +1 @@ -Subproject commit bd75161ea5eabd0019cced7ce5b0cc74c9b11ce9 +Subproject commit c15fd56a7042fa99411c5eeffe0baeddb88695b0 diff --git a/scripts/checks/inheritance-ordering.js b/scripts/checks/inheritance-ordering.js deleted file mode 100755 index e07d070fc..000000000 --- a/scripts/checks/inheritance-ordering.js +++ /dev/null @@ -1,74 +0,0 @@ -#!/usr/bin/env node - -import fs from 'fs'; -import path from 'path'; -import graphlib from 'graphlib'; -import match from 'micromatch'; -import { findAll } from 'solidity-ast/utils.js'; -import yargs from 'yargs'; -import { hideBin } from 'yargs/helpers'; - -const { _: artifacts } = yargs(hideBin(process.argv)).argv; - -// only consider files in the package: take pattern from package.json -// npm `files` entries are rooted (`/contracts/**/*.sol`); solc source keys are not -const patterns = JSON.parse( - fs.readFileSync(path.resolve(import.meta.dirname, '../../', 'package.json'), 'utf-8'), -).files.map(p => p.replace(/^(!?)\/+/, '$1')); - -for (const artifact of artifacts) { - const { output: solcOutput } = JSON.parse( - fs.readFileSync(path.resolve(import.meta.dirname, '../..', artifact), 'utf-8'), - ); - - const graph = new graphlib.Graph({ directed: true }); - const names = {}; - const linearized = []; - - // Rebuild solcOutput?.sources by removing the "project" prefix from the keys, so that we can match them against the patterns in package.json - const sources = Object.fromEntries( - Object.entries(solcOutput?.sources ?? {}).map(([key, value]) => [key.replace(/^project\//, ''), value]), - ); - - // For each source file ... - for (const file of Object.keys(sources)) { - // ... find all ContractDefinition in this file ... - for (const contractDef of findAll('ContractDefinition', sources[file].ast)) { - // ... record the name for that contracts ... - names[contractDef.id] = contractDef.name; - // ... consider inheritance ordering of contracts in files that matches the patterns - if (match(file, patterns).length > 0) { - linearized.push(contractDef.linearizedBaseContracts); - // ... and add edges to the graph for each pair of contracts in the linearized base contracts. - contractDef.linearizedBaseContracts.forEach((c1, i, contracts) => - contracts.slice(i + 1).forEach(c2 => { - graph.setEdge(c1, c2); - }), - ); - } - } - } - - /// graphlib.alg.findCycles will not find minimal cycles. - /// We are only interested in cycles of lengths 2 (needs proof) - graph.nodes().forEach((x, i, nodes) => - nodes - .slice(i + 1) - .filter(y => graph.hasEdge(x, y) && graph.hasEdge(y, x)) - .forEach(y => { - console.log(`Conflict between ${names[x]} and ${names[y]} detected in the following dependency chains:`); - linearized - .filter(chain => chain.includes(parseInt(x)) && chain.includes(parseInt(y))) - .forEach(chain => { - const comp = chain.indexOf(parseInt(x)) < chain.indexOf(parseInt(y)) ? '>' : '<'; - console.log(`- ${names[x]} ${comp} ${names[y]} in ${names[chain.find(Boolean)]}`); - // console.log(`- ${names[x]} ${comp} ${names[y]}: ${chain.reverse().map(id => names[id]).join(', ')}`); - }); - process.exitCode = 1; - }), - ); -} - -if (!process.exitCode) { - console.log('Contract ordering is consistent.'); -} diff --git a/scripts/checks/inheritance-ordering.js b/scripts/checks/inheritance-ordering.js new file mode 120000 index 000000000..1236a0751 --- /dev/null +++ b/scripts/checks/inheritance-ordering.js @@ -0,0 +1 @@ +../../lib/@openzeppelin-contracts/scripts/checks/inheritance-ordering.js \ No newline at end of file From 09efe3db91eff77d26724c210b471ddff5931f0e Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Wed, 23 Sep 2026 14:17:22 +0200 Subject: [PATCH 17/51] update .github actions and workflows --- .github/actions/gas-compare/action.yml | 33 ++++++- .github/actions/setup/action.yml | 117 +++++++++++++++++++++++-- .github/workflows/checks.yml | 48 +++++----- .github/workflows/docs.yml | 4 +- 4 files changed, 159 insertions(+), 43 deletions(-) diff --git a/.github/actions/gas-compare/action.yml b/.github/actions/gas-compare/action.yml index 755390cd4..b9d541751 100644 --- a/.github/actions/gas-compare/action.yml +++ b/.github/actions/gas-compare/action.yml @@ -29,14 +29,39 @@ runs: GITHUB_TOKEN: ${{ inputs.token }} shell: bash continue-on-error: true - id: reference - name: Compare reports - if: steps.reference.outcome == 'success' && github.event_name == 'pull_request' + if: github.event_name == 'pull_request' && hashFiles(inputs.ref_report) != '' run: | - node scripts/checks/compare-gas-reports.js ${{ inputs.report }} ${{ inputs.ref_report }} >> $GITHUB_STEP_SUMMARY + gh pr diff '${{ github.event.number }}' --repo '${{ github.repository }}' --name-only > changed.txt + # Produce small report if the diff touches any contracts, otherwise fall back to full report + if [ -s changed.txt ]; then + node scripts/list-dependencies.js --src=contracts,contracts-exposed --ext=.sol < changed.txt > diff.json + filter=(--filtered diff.json) + else + filter=() + fi + node scripts/checks/compare-gas-reports.js ${{ inputs.report }} ${{ inputs.ref_report }} "${filter[@]}" | tee gas-report.md >> $GITHUB_STEP_SUMMARY + # The comparison is posted from another workflow, which only gets the artifact: it needs the number too. + echo '${{ github.event.number }}' > pr-number.txt env: + GITHUB_TOKEN: ${{ inputs.token }} STYLE: markdown shell: bash + id: comparison + # NOTE: the comment itself is NOT posted here. This job runs with a read-only + # GITHUB_TOKEN whenever the PR comes from a fork, so any write to the issues + # API fails with "Resource not accessible by integration". Instead we hand the + # rendered comment off as an artifact; .github/workflows/gas-comment.yml picks + # it up via `workflow_run` and posts it with a writable token. + - name: Upload comparison + if: steps.comparison.outcome == 'success' && github.event_name == 'pull_request' + uses: actions/upload-artifact@v7 + with: + name: gas-comparison + overwrite: true + path: | + gas-report.md + pr-number.txt - name: Rename report for upload if: github.event_name != 'pull_request' run: | @@ -44,7 +69,7 @@ runs: shell: bash - name: Save report if: github.event_name != 'pull_request' - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: gasreport overwrite: true diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 4ce9f219a..9d86065d7 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -1,22 +1,123 @@ name: Setup description: Common environment setup +inputs: + node: + description: Whether to set up node + required: false + default: 'on' # 'off' | 'on' | + foundry: + description: Whether to set up Foundry + required: false + default: 'off' # 'off' | 'on' | + java: + description: Whether to set up Java + required: false + default: 'off' # 'off' | 'on' | + python: + description: Whether to set up Python + required: false + default: 'off' # 'off' | 'on' | + python-requirements: + description: Path to Python requirements file (if python is true) + required: false + default: 'requirements.txt' + cache: + description: How this job may use the shared dependency cache + required: false + # 'restore' reads the cache but never writes it back. A job that runs untrusted code MUST use it: + # the cache scope is keyed on the branch, so a write from such a job lands where every other + # workflow reads from. + default: 'on' # 'off' | 'restore' | 'on' + solc: + description: Whether to set up solc + required: false + default: 'off' # 'off' | 'on' | runs: using: composite steps: - - uses: actions/setup-node@v4 + - name: "Determine versions to install" + id: versions + shell: bash + run: | + ( + [[ "${{ inputs.node }}" = "on" ]] \ + && echo "node=$NODE_DEFAULT_VERSION" \ + || echo "node=${{ inputs.node }}" + [[ "${{ inputs.foundry }}" = "on" ]] \ + && echo "foundry=$FOUNDRY_DEFAULT_VERSION" \ + || echo "foundry=${{ inputs.foundry }}" + [[ "${{ inputs.java }}" = "on" ]] \ + && echo "java=$JAVA_DEFAULT_VERSION" \ + || echo "java=${{ inputs.java }}" + [[ "${{ inputs.python }}" = "on" ]] \ + && echo "python=$PYTHON_DEFAULT_VERSION" \ + || echo "python=${{ inputs.python }}" + [[ "${{ inputs.solc }}" = "on" ]] \ + && echo "solc=$SOLC_DEFAULT_VERSION" \ + || echo "solc=${{ inputs.solc }}" + ) > $GITHUB_OUTPUT + env: + NODE_DEFAULT_VERSION: "24.x" + FOUNDRY_DEFAULT_VERSION: "stable" + JAVA_DEFAULT_VERSION: "21" + PYTHON_DEFAULT_VERSION: "3.13" + SOLC_DEFAULT_VERSION: "0.8.35" + # Node & npm setup + - name: Install Node (${{ steps.versions.outputs.node }}) + if: inputs.node != 'off' + uses: actions/setup-node@v7 with: - node-version: 22.x - - uses: actions/cache@v4 + node-version: ${{ steps.versions.outputs.node }} + - name: Try fetch node modules from cache id: cache + if: inputs.node != 'off' && inputs.cache == 'on' + uses: actions/cache@v6 + with: + path: '**/node_modules' + key: npm-${{ steps.versions.outputs.node }}-${{ hashFiles('**/package-lock.json') }} + - name: Try fetch node modules from cache (read only) + id: cache-restore + if: inputs.node != 'off' && inputs.cache == 'restore' + uses: actions/cache/restore@v6 with: path: '**/node_modules' - key: npm-v3-${{ hashFiles('**/package-lock.json') }} + key: npm-${{ steps.versions.outputs.node }}-${{ hashFiles('**/package-lock.json') }} - name: Install dependencies - run: npm ci + if: inputs.node != 'off' && steps.cache.outputs.cache-hit != 'true' && steps.cache-restore.outputs.cache-hit != 'true' shell: bash - if: steps.cache.outputs.cache-hit != 'true' - - name: Install Foundry + run: npm ci + # Foundry setup + - name: Install Foundry (${{ steps.versions.outputs.foundry }}) + if: inputs.foundry != 'off' uses: foundry-rs/foundry-toolchain@v1 with: - version: stable + version: ${{ steps.versions.outputs.foundry }} + # Java setup + - name: Install java (${{ steps.versions.outputs.java }}) + if: ${{ inputs.java != 'off' }} + uses: actions/setup-java@v5 + with: + distribution: temurin + java-version: ${{ steps.versions.outputs.java }} + # Python setup + - name: Install python (${{ steps.versions.outputs.python }}) + if: inputs.python != 'off' + uses: actions/setup-python@v7 + with: + python-version: ${{ steps.versions.outputs.python }} + # `setup-python` has no read-only mode, so any caller that cannot write the cache goes without + cache: ${{ inputs.cache == 'on' && 'pip' || '' }} + cache-dependency-path: ${{ inputs.python-requirements }} + - name: Install python packages + if: inputs.python != 'off' + shell: bash + run: pip install -r ${{ inputs.python-requirements }} + # Solc setup + - name: Install solc (${{ steps.versions.outputs.solc }}) + if: inputs.solc != 'off' + shell: bash + run: | + wget -q https://github.com/argotorg/solidity/releases/download/v${{ steps.versions.outputs.solc }}/solc-static-linux + chmod +x solc-static-linux + sudo mv solc-static-linux /usr/local/bin/solc diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 675db16ca..c8cfd6b27 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -11,6 +11,11 @@ concurrency: group: checks-${{ github.ref }} cancel-in-progress: true +permissions: + contents: read # actions/checkout + actions: read # gas-compare: gh run list / gh run download + pull-requests: read # gas-compare: gh pr diff + env: NODE_OPTIONS: --max_old_space_size=8192 @@ -18,29 +23,28 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - with: - submodules: recursive + - uses: actions/checkout@v7 - name: Set up environment uses: ./.github/actions/setup + with: + foundry: 'on' - run: npm run lint + - run: forge compile && forge lint --deny notes --only-lint unused-import tests: runs-on: ubuntu-latest env: FORCE_COLOR: 1 - # Needed for "eth-gas-reporter" to produce a "gasReporterOutput.json" as documented in - # https://github.com/cgewecke/eth-gas-reporter/blob/v0.2.27/docs/gasReporterOutput.md - CI: true - GAS: true steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: submodules: recursive - name: Set up environment uses: ./.github/actions/setup + with: + foundry: 'on' # needed by npm run test:pragma - name: Run tests and generate gas report - run: npm run test + run: npm run test -- --gas-stats-json gasReport.json - name: Check linearisation of the inheritance graph run: npm run test:inheritance - name: Check pragma validity @@ -51,38 +55,26 @@ jobs: uses: ./.github/actions/gas-compare with: token: ${{ github.token }} - - tests-foundry: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - submodules: recursive - - name: Set up environment - uses: ./.github/actions/setup - - name: Run tests - run: forge test -vvv + report: gasReport.json coverage: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: submodules: recursive - name: Set up environment uses: ./.github/actions/setup - name: Run coverage run: npm run coverage - - uses: codecov/codecov-action@v5 + - uses: codecov/codecov-action@v7 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} slither: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - with: - submodules: recursive + - uses: actions/checkout@v7 - name: Set up environment uses: ./.github/actions/setup - uses: crytic/slither-action@v0.4.1 @@ -90,10 +82,10 @@ jobs: codespell: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Run CodeSpell - uses: codespell-project/actions-codespell@v2.1 + uses: codespell-project/actions-codespell@v2.4.3 with: check_hidden: true check_filenames: true - skip: package-lock.json + skip: package-lock.json,*.pdf,vendor diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 66e9852ea..721133abd 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -11,9 +11,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - with: - submodules: recursive + - uses: actions/checkout@v7 - name: Set up environment uses: ./.github/actions/setup - run: bash scripts/git-user-config.sh From 88eac6755bd113157230c83f4ecfa641a82aafb4 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Wed, 23 Sep 2026 15:24:55 +0200 Subject: [PATCH 18/51] checkout submodules in the lint and slither jobs --- .github/workflows/checks.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index c8cfd6b27..34095fcc6 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -24,6 +24,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v7 + with: + submodules: recursive - name: Set up environment uses: ./.github/actions/setup with: @@ -75,6 +77,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v7 + with: + submodules: recursive - name: Set up environment uses: ./.github/actions/setup - uses: crytic/slither-action@v0.4.1 From ef4b8ff4cf5589c1f071bb2f29187fb13f68ce58 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Wed, 23 Sep 2026 15:28:38 +0200 Subject: [PATCH 19/51] add missing workflows --- .github/workflows/actionlint.yml | 18 ++++++++ .github/workflows/fv-halmos.yml | 28 ++++++++++++ .github/workflows/gas-comment.yml | 75 +++++++++++++++++++++++++++++++ 3 files changed, 121 insertions(+) create mode 100644 .github/workflows/actionlint.yml create mode 100644 .github/workflows/fv-halmos.yml create mode 100644 .github/workflows/gas-comment.yml diff --git a/.github/workflows/actionlint.yml b/.github/workflows/actionlint.yml new file mode 100644 index 000000000..031ff47d2 --- /dev/null +++ b/.github/workflows/actionlint.yml @@ -0,0 +1,18 @@ +name: lint workflows + +on: + pull_request: + paths: + - '.github/**/*.ya?ml' + +jobs: + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v7 + - name: Add problem matchers + run: | + # https://github.com/rhysd/actionlint/blob/3a2f2c7/docs/usage.md#problem-matchers + curl -LO https://raw.githubusercontent.com/rhysd/actionlint/main/.github/actionlint-matcher.json + echo "::add-matcher::actionlint-matcher.json" + - uses: docker://rhysd/actionlint:latest diff --git a/.github/workflows/fv-halmos.yml b/.github/workflows/fv-halmos.yml new file mode 100644 index 000000000..5bfa5174a --- /dev/null +++ b/.github/workflows/fv-halmos.yml @@ -0,0 +1,28 @@ +name: Formal verification - Halmos + +on: + pull_request: + types: + - opened + - reopened + - synchronize + - labeled + workflow_dispatch: {} + +concurrency: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + +jobs: + halmos: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v7 + - name: Set up environment + uses: ./.github/actions/setup + with: + foundry: 'on' + python: 'on' + python-requirements: 'fv-requirements.txt' + - name: Run Halmos + run: halmos --match-test '^symbolic|^testSymbolic' -vv + env: + HALMOS_ALLOW_DOWNLOAD: 1 diff --git a/.github/workflows/gas-comment.yml b/.github/workflows/gas-comment.yml new file mode 100644 index 000000000..f58623595 --- /dev/null +++ b/.github/workflows/gas-comment.yml @@ -0,0 +1,75 @@ +name: gas-comment + +# Posts the gas comparison produced by the `checks` workflow as a sticky PR comment. +# +# This has to live in a separate `workflow_run` workflow: the `checks` workflow is +# triggered by `pull_request`, and for PRs opened from a fork GitHub hands that run a +# read-only GITHUB_TOKEN -- a job-level `permissions: pull-requests: write` is silently +# ignored there, which is what produces +# Error: Resource not accessible by integration +# A `workflow_run` workflow always runs in the context of the base repository, from the +# default branch, with a token that can actually be granted write scopes. + +on: + workflow_run: + workflows: [checks] + types: [completed] + +concurrency: + group: gas-comment-${{ github.event.workflow_run.head_repository.full_name }}-${{ github.event.workflow_run.head_branch }} + cancel-in-progress: true + +jobs: + comment: + # Not gated on workflow_run.conclusion: `checks` has several jobs, and we still want + # the gas comparison posted when an unrelated job failed. + if: >- + github.event.workflow_run.event == 'pull_request' && + github.event.workflow_run.conclusion != 'cancelled' + runs-on: ubuntu-latest + permissions: + actions: read # download the artifact from the triggering run + pull-requests: write # required by step-security/sticky-pull-request-comment + steps: + - name: Download comparison + id: download + continue-on-error: true # no artifact => nothing to compare, not an error + uses: actions/download-artifact@v8 + with: + name: gas-comparison + github-token: ${{ github.token }} + run-id: ${{ github.event.workflow_run.id }} + + - name: Read PR number + if: steps.download.outcome == 'success' + id: pr_number + # pr-number.txt comes from a run that executed untrusted PR code: keep digits + # only, so it cannot inject extra lines into GITHUB_OUTPUT. + run: echo "number=$(head -c 16 pr-number.txt | tr -dc '0-9')" >> "$GITHUB_OUTPUT" + + - name: Read comparison + if: steps.download.outcome == 'success' + id: gas_report + run: | + if [ -f gas-report.md ] && [ -s gas-report.md ]; then + { + echo 'markdown<<__GAS_REPORT_EOF__' + echo '
' + echo 'view gas comparison' + echo '' + cat gas-report.md + echo '' + echo '
' + echo '__GAS_REPORT_EOF__' + } >> "$GITHUB_OUTPUT" + fi + + - name: Comment comparison + if: steps.download.outcome == 'success' + uses: step-security/sticky-pull-request-comment@v3 + with: + header: gas-comparison + number: ${{ steps.pr_number.outputs.number }} + # Empty report (the common case): delete any stale comment from a previous push, post nothing new. + delete: ${{ !steps.gas_report.outputs.markdown }} + message: ${{ steps.gas_report.outputs.markdown }} From 37ddfe112eb9d689a32ac329fafc81aa336e2646 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Wed, 23 Sep 2026 15:31:40 +0200 Subject: [PATCH 20/51] fix halmos --- .github/workflows/fv-halmos.yml | 2 ++ fv-requirements.txt | 1 + 2 files changed, 3 insertions(+) create mode 120000 fv-requirements.txt diff --git a/.github/workflows/fv-halmos.yml b/.github/workflows/fv-halmos.yml index 5bfa5174a..5a09d466d 100644 --- a/.github/workflows/fv-halmos.yml +++ b/.github/workflows/fv-halmos.yml @@ -16,6 +16,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v7 + with: + submodules: recursive - name: Set up environment uses: ./.github/actions/setup with: diff --git a/fv-requirements.txt b/fv-requirements.txt new file mode 120000 index 000000000..8122a6867 --- /dev/null +++ b/fv-requirements.txt @@ -0,0 +1 @@ +lib/@openzeppelin-contracts/fv-requirements.txt \ No newline at end of file From 67fbe9bc7c311e859cac801756827936322eaaca Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Wed, 23 Sep 2026 15:44:02 +0200 Subject: [PATCH 21/51] remove unused imports --- contracts/account/modules/ERC7579DelayedExecutor.sol | 1 - contracts/account/modules/ERC7579Multisig.sol | 1 - contracts/account/modules/ERC7579SelectorExecutor.sol | 1 - contracts/account/modules/ERC7579Signature.sol | 1 - contracts/crosschain/wormhole/WormholeGatewayAdapter.sol | 4 +--- contracts/mocks/account/modules/ERC7579MultisigMocks.sol | 2 -- contracts/mocks/crosschain/wormhole/WormholeRelayerMock.sol | 1 - contracts/mocks/docs/account/MyAccountERC7579.sol | 1 - contracts/mocks/docs/account/modules/MyERC7579Modules.sol | 1 - contracts/mocks/token/ERC20uRWAMock.sol | 1 - contracts/mocks/token/ERC7540SyncMock.sol | 1 - contracts/token/ERC20/extensions/ERC7540.sol | 2 -- scripts/generate/templates/EnumerableSetExtended.js | 1 - 13 files changed, 1 insertion(+), 17 deletions(-) diff --git a/contracts/account/modules/ERC7579DelayedExecutor.sol b/contracts/account/modules/ERC7579DelayedExecutor.sol index c85977fa8..7a0a35145 100644 --- a/contracts/account/modules/ERC7579DelayedExecutor.sol +++ b/contracts/account/modules/ERC7579DelayedExecutor.sol @@ -1,7 +1,6 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.27; -import {IERC7579ModuleConfig, MODULE_TYPE_EXECUTOR} from "@openzeppelin/contracts/interfaces/draft-IERC7579.sol"; import {Time} from "@openzeppelin/contracts/utils/types/Time.sol"; import {ERC7579Executor} from "./ERC7579Executor.sol"; diff --git a/contracts/account/modules/ERC7579Multisig.sol b/contracts/account/modules/ERC7579Multisig.sol index 7efc8dfdc..637c0d0eb 100644 --- a/contracts/account/modules/ERC7579Multisig.sol +++ b/contracts/account/modules/ERC7579Multisig.sol @@ -1,7 +1,6 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.27; -import {Mode} from "@openzeppelin/contracts/account/utils/draft-ERC7579Utils.sol"; import {SignatureChecker} from "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol"; import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; import {ERC7579Validator} from "./ERC7579Validator.sol"; diff --git a/contracts/account/modules/ERC7579SelectorExecutor.sol b/contracts/account/modules/ERC7579SelectorExecutor.sol index 676e477a4..d41918c77 100644 --- a/contracts/account/modules/ERC7579SelectorExecutor.sol +++ b/contracts/account/modules/ERC7579SelectorExecutor.sol @@ -2,7 +2,6 @@ pragma solidity ^0.8.27; import {ERC7579Utils} from "@openzeppelin/contracts/account/utils/draft-ERC7579Utils.sol"; -import {IERC7579Module, MODULE_TYPE_EXECUTOR} from "@openzeppelin/contracts/interfaces/draft-IERC7579.sol"; import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; import {ERC7579Executor} from "./ERC7579Executor.sol"; diff --git a/contracts/account/modules/ERC7579Signature.sol b/contracts/account/modules/ERC7579Signature.sol index 36d0b5e9b..e0f89b60c 100644 --- a/contracts/account/modules/ERC7579Signature.sol +++ b/contracts/account/modules/ERC7579Signature.sol @@ -2,7 +2,6 @@ pragma solidity ^0.8.27; -import {IERC7579Module} from "@openzeppelin/contracts/interfaces/draft-IERC7579.sol"; import {SignatureChecker} from "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol"; import {ERC7579Validator} from "./ERC7579Validator.sol"; diff --git a/contracts/crosschain/wormhole/WormholeGatewayAdapter.sol b/contracts/crosschain/wormhole/WormholeGatewayAdapter.sol index 3a9e30492..b5874e2f5 100644 --- a/contracts/crosschain/wormhole/WormholeGatewayAdapter.sol +++ b/contracts/crosschain/wormhole/WormholeGatewayAdapter.sol @@ -5,12 +5,10 @@ pragma solidity ^0.8.27; import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol"; import {IERC7786GatewaySource, IERC7786Recipient} from "@openzeppelin/contracts/interfaces/IERC7786.sol"; import {InteroperableAddress} from "@openzeppelin/contracts/utils/draft-InteroperableAddress.sol"; -import {Strings} from "@openzeppelin/contracts/utils/Strings.sol"; import {BitMaps} from "@openzeppelin/contracts/utils/structs/BitMaps.sol"; import {IWormholeReceiver} from "wormhole-solidity-sdk/interfaces/IWormholeReceiver.sol"; import {IWormholeRelayer} from "wormhole-solidity-sdk/interfaces/IWormholeRelayer.sol"; -import {VaaKey} from "wormhole-solidity-sdk/interfaces/IWormholeRelayer.sol"; -import {fromUniversalAddress, toUniversalAddress} from "wormhole-solidity-sdk/utils/UniversalAddress.sol"; +import {fromUniversalAddress} from "wormhole-solidity-sdk/utils/UniversalAddress.sol"; import {IERC7786Attributes} from "../../interfaces/IERC7786Attributes.sol"; import {ERC7786Attributes} from "../utils/ERC7786Attributes.sol"; diff --git a/contracts/mocks/account/modules/ERC7579MultisigMocks.sol b/contracts/mocks/account/modules/ERC7579MultisigMocks.sol index d3efd9097..1dc3e7c40 100644 --- a/contracts/mocks/account/modules/ERC7579MultisigMocks.sol +++ b/contracts/mocks/account/modules/ERC7579MultisigMocks.sol @@ -9,8 +9,6 @@ import {ERC7579Multisig} from "../../../account/modules/ERC7579Multisig.sol"; import {ERC7579MultisigWeighted} from "../../../account/modules/ERC7579MultisigWeighted.sol"; import {ERC7579MultisigConfirmation} from "../../../account/modules/ERC7579MultisigConfirmation.sol"; import {ERC7579MultisigStorage} from "../../../account/modules/ERC7579MultisigStorage.sol"; -import {MODULE_TYPE_EXECUTOR, IERC7579Hook} from "@openzeppelin/contracts/interfaces/draft-IERC7579.sol"; -import {Mode} from "@openzeppelin/contracts/account/utils/draft-ERC7579Utils.sol"; abstract contract ERC7579MultisigExecutorMock is EIP712, ERC7579Executor, ERC7579Multisig { bytes32 private constant EXECUTE_OPERATION = keccak256( diff --git a/contracts/mocks/crosschain/wormhole/WormholeRelayerMock.sol b/contracts/mocks/crosschain/wormhole/WormholeRelayerMock.sol index 17e4f1c5c..33502799b 100644 --- a/contracts/mocks/crosschain/wormhole/WormholeRelayerMock.sol +++ b/contracts/mocks/crosschain/wormhole/WormholeRelayerMock.sol @@ -2,7 +2,6 @@ pragma solidity ^0.8.27; -import {IWormholeRelayer} from "wormhole-solidity-sdk/interfaces/IWormholeRelayer.sol"; import {IWormholeReceiver} from "wormhole-solidity-sdk/interfaces/IWormholeReceiver.sol"; import {toUniversalAddress} from "wormhole-solidity-sdk/utils/UniversalAddress.sol"; import {Address} from "@openzeppelin/contracts/utils/Address.sol"; diff --git a/contracts/mocks/docs/account/MyAccountERC7579.sol b/contracts/mocks/docs/account/MyAccountERC7579.sol index 06dfa5d49..1fb9da6cc 100644 --- a/contracts/mocks/docs/account/MyAccountERC7579.sol +++ b/contracts/mocks/docs/account/MyAccountERC7579.sol @@ -3,7 +3,6 @@ pragma solidity ^0.8.27; import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol"; -import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol"; import {MODULE_TYPE_VALIDATOR} from "@openzeppelin/contracts/interfaces/draft-IERC7579.sol"; import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol"; diff --git a/contracts/mocks/docs/account/modules/MyERC7579Modules.sol b/contracts/mocks/docs/account/modules/MyERC7579Modules.sol index 47f44585c..9fb282820 100644 --- a/contracts/mocks/docs/account/modules/MyERC7579Modules.sol +++ b/contracts/mocks/docs/account/modules/MyERC7579Modules.sol @@ -2,7 +2,6 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.27; -import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol"; import {IERC7579Module, IERC7579Hook} from "@openzeppelin/contracts/interfaces/draft-IERC7579.sol"; import {ERC7579Executor} from "../../../../account/modules/ERC7579Executor.sol"; import {ERC7579Validator} from "../../../../account/modules/ERC7579Validator.sol"; diff --git a/contracts/mocks/token/ERC20uRWAMock.sol b/contracts/mocks/token/ERC20uRWAMock.sol index deb9cd988..d7fc0b7ba 100644 --- a/contracts/mocks/token/ERC20uRWAMock.sol +++ b/contracts/mocks/token/ERC20uRWAMock.sol @@ -1,7 +1,6 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.26; -import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import {ERC20uRWA} from "../../token/ERC20/extensions/ERC20uRWA.sol"; import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol"; diff --git a/contracts/mocks/token/ERC7540SyncMock.sol b/contracts/mocks/token/ERC7540SyncMock.sol index 67f2709de..1100e145c 100644 --- a/contracts/mocks/token/ERC7540SyncMock.sol +++ b/contracts/mocks/token/ERC7540SyncMock.sol @@ -2,7 +2,6 @@ pragma solidity ^0.8.27; -import {ERC7540} from "../../token/ERC20/extensions/ERC7540.sol"; import {ERC7540SyncDeposit} from "../../token/ERC20/extensions/ERC7540SyncDeposit.sol"; import {ERC7540SyncRedeem} from "../../token/ERC20/extensions/ERC7540SyncRedeem.sol"; diff --git a/contracts/token/ERC20/extensions/ERC7540.sol b/contracts/token/ERC20/extensions/ERC7540.sol index f23e47671..dc3c2eb9b 100644 --- a/contracts/token/ERC20/extensions/ERC7540.sol +++ b/contracts/token/ERC20/extensions/ERC7540.sol @@ -6,9 +6,7 @@ import {IERC4626} from "@openzeppelin/contracts/interfaces/IERC4626.sol"; import {IERC20, IERC20Metadata, ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; import {IERC165, ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol"; -import {LowLevelCall} from "@openzeppelin/contracts/utils/LowLevelCall.sol"; import {Math} from "@openzeppelin/contracts/utils/math/Math.sol"; -import {Memory} from "@openzeppelin/contracts/utils/Memory.sol"; import {IERC7540, IERC7540Operator, IERC7540Deposit, IERC7540Redeem} from "../../../interfaces/IERC7540.sol"; import {IERC7575, IERC7575Share} from "../../../interfaces/IERC7575.sol"; diff --git a/scripts/generate/templates/EnumerableSetExtended.js b/scripts/generate/templates/EnumerableSetExtended.js index 40dd673cd..2b7013a7a 100644 --- a/scripts/generate/templates/EnumerableSetExtended.js +++ b/scripts/generate/templates/EnumerableSetExtended.js @@ -4,7 +4,6 @@ import { SET_TYPES } from './Enumerable.opts.js'; const header = `\ pragma solidity ^0.8.24; -import {Arrays} from "@openzeppelin/contracts/utils/Arrays.sol"; import {Hashes} from "@openzeppelin/contracts/utils/cryptography/Hashes.sol"; import {Math} from "@openzeppelin/contracts/utils/math/Math.sol"; From 94455b523c4bf194c3df6b56ea100ddaf6f98d1a Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Wed, 23 Sep 2026 15:45:46 +0200 Subject: [PATCH 22/51] link missing script --- scripts/list-dependencies.js | 1 + 1 file changed, 1 insertion(+) create mode 120000 scripts/list-dependencies.js diff --git a/scripts/list-dependencies.js b/scripts/list-dependencies.js new file mode 120000 index 000000000..34612e432 --- /dev/null +++ b/scripts/list-dependencies.js @@ -0,0 +1 @@ +../lib/@openzeppelin-contracts/scripts/list-dependencies.js \ No newline at end of file From 52474919a3f65d963bf9cc4ca4ee3c0305db375b Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Wed, 23 Sep 2026 16:16:39 +0200 Subject: [PATCH 23/51] disable fv workflows (keep files as .yml.disabled) --- .github/workflows/fv-certora.yml.disabled | 148 ++++++++++++++++++ .../{fv-halmos.yml => fv-halmos.yml.disabled} | 0 2 files changed, 148 insertions(+) create mode 100644 .github/workflows/fv-certora.yml.disabled rename .github/workflows/{fv-halmos.yml => fv-halmos.yml.disabled} (100%) diff --git a/.github/workflows/fv-certora.yml.disabled b/.github/workflows/fv-certora.yml.disabled new file mode 100644 index 000000000..667fa250b --- /dev/null +++ b/.github/workflows/fv-certora.yml.disabled @@ -0,0 +1,148 @@ +name: Formal verification - Certora + +on: + # Base-repo context so a fork's PR can reach the CERTORAKEY secret. Only `verify` reads it, gated by + # the `certora` environment's manual approval -- reviewers MUST check the diff for key exfiltration. + pull_request_target: + types: + - opened + - reopened + - synchronize + - labeled + workflow_dispatch: {} + +permissions: + contents: read + +# `github.ref` is the base branch under `pull_request_target`, so key on the pull request number +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +jobs: + # No secret, no environment, read-only token: running the dependency helper here needs no more trust + # than an ordinary `pull_request` job. + identify: + runs-on: ubuntu-latest + # The helper walks an import graph from a pull request that may be untrusted, so bound it + timeout-minutes: 10 + outputs: + configs: ${{ steps.identify.outputs.configs }} + steps: + # Base branch (this workflow's own source under pull_request_target). The helper runs from HERE, + # never the PR: a PR that rewrote it to print `[]` would skip `verify` and pass `verified` green. + - uses: actions/checkout@v7 + with: + path: base + persist-credentials: false + # The PR, read as data only (never executed); checkout needs the fork risk acknowledged. + - uses: actions/checkout@v7 + with: + ref: ${{ github.event.pull_request.head.sha || github.ref }} + allow-unsafe-pr-checkout: true + fetch-depth: 0 # full history so the base...head diff can find its merge-base + path: head + persist-credentials: false + # No setup step: `list-dependencies.js` uses node builtins only, so the runner's node is enough. + - name: Identify the configs that need to be run + id: identify + env: + BASE_SHA: ${{ github.event.pull_request.base.sha }} + HEAD_SHA: ${{ github.event.pull_request.head.sha }} + FORCE_ALL: ${{ github.event_name != 'pull_request_target' || contains(github.event.pull_request.labels.*.name, 'formal-verification-force-all') }} + ALLOW_REMOVED: ${{ contains(github.event.pull_request.labels.*.name, 'formal-verification-allow-removal') }} + run: | + set -o pipefail + if [[ $FORCE_ALL = 'true' ]]; then + # An empty change list reaches every config, which is what forcing all of them asks for. + : > changed.txt + else + # A harness imports `../patched/

`, and `make -C fv apply` builds that file out of two + # tracked ones: `contracts/

`, plus `fv/diff/.patch` applied on + # top. A change to either is a change to what the prover reads, so either has to select + # the config. `--redirect` rewrites the import onto `contracts/

`, which covers the + # first; the walker has no notion of the second, so map a changed patch back onto the + # contract it applies to and let that path do the selecting. Added, edited or deleted, + # the patch is named in the diff either way. Undoing the `_` is what `make apply` does + # too, so a name that breaks this breaks the patch step as well. + git -C head diff --name-only "$BASE_SHA"..."$HEAD_SHA" | + awk '{ print } /^fv\/diff\/.+[.]patch$/ { sub(/^fv\/diff\//, ""); sub(/[.]patch$/, ""); gsub(/_/, "/"); print "contracts/" $0 }' > changed.txt + # Configs are discovered by listing `head/fv/specs`, so one the diff deletes is not there + # to be selected: delete every config and the set is empty, `verify` is skipped and + # `verified` passes green with the verification gone. Refuse unless the label says that + # was the intent -- labelling takes write access, which is what makes it a reviewed one. + REMOVED=$(git -C head diff --name-only --diff-filter=D "$BASE_SHA"..."$HEAD_SHA" -- 'fv/specs/*.conf') + if [[ -n $REMOVED && $ALLOW_REMOVED != 'true' ]]; then + # One config per line, joined: a workflow annotation is a single line. + echo "::error::This change removes ${REMOVED//$'\n'/, }, which cannot appear in the affected set. Label the pull request 'formal-verification-allow-removal' to confirm the verification is meant to go away with it." + exit 1 + fi + fi + { + printf 'configs=' + node base/scripts/list-dependencies.js --root=head --src=fv/specs --ext=.conf --redirect=fv/patched/:contracts/ < changed.txt + } >> "$GITHUB_OUTPUT" + - name: Report the affected configs + env: + CONFIGS: ${{ steps.identify.outputs.configs }} + run: | + echo "Configs affected by this diff: $CONFIGS" >> "$GITHUB_STEP_SUMMARY" + + verify: + needs: identify + if: needs.identify.outputs.configs != '[]' + runs-on: ubuntu-latest + # Cap the prover wait; override via CERTORA_TIMEOUT_MINUTES (a repo var, not env -- timeout-minutes can't read env). + timeout-minutes: ${{ vars.CERTORA_TIMEOUT_MINUTES && fromJSON(vars.CERTORA_TIMEOUT_MINUTES) || 120 }} + # The only job that reads CERTORAKEY, so the only one gated. Reviewers MUST check the diff for key + # exfiltration before approving; one approval releases the whole matrix. + environment: certora + strategy: + fail-fast: false + matrix: + config: ${{ fromJSON(needs.identify.outputs.configs) }} + name: verify (${{ matrix.config }}) + steps: + - uses: actions/checkout@v7 + with: + # Runs the contributor's code, which is what the approval above is protecting against. + ref: ${{ github.event.pull_request.head.sha || github.ref }} + allow-unsafe-pr-checkout: true + persist-credentials: false + - name: Set up environment + uses: ./.github/actions/setup + with: + # Read the cache, never write it. The scope is the base branch here, so a cache saved after + # the contributor's code has run would be restored by every other workflow. + cache: 'restore' + solc: 'on' + java: 'on' + python: 'on' + python-requirements: 'fv-requirements.txt' + - name: Verify specification + env: + # Possibly-untrusted config name: passed via env, never interpolated, so no shell parses it. + CONFIG: ${{ matrix.config }} + CERTORAKEY: ${{ secrets.CERTORAKEY }} + run: | + set -o pipefail + make -C fv apply + STATUS=0 + certoraRun "$CONFIG" --wait_for_results | tee certora.log || STATUS=$? + URL=$(grep -om1 'https://prover.certora.com/output/[a-zA-Z0-9]*/[a-zA-Z0-9]*?anonymousKey=[a-zA-Z0-9]*' certora.log || true) + echo "- $([[ $STATUS = 0 ]] && echo '✅' || echo '❌') \`$CONFIG\` ${URL:+- [report]($URL)}" >> "$GITHUB_STEP_SUMMARY" + exit "$STATUS" + + # single `required status check` for branch protection + verified: + needs: [identify, verify] + if: always() + runs-on: ubuntu-latest + steps: + - name: Check the verification results + env: + IDENTIFY: ${{ needs.identify.result }} + VERIFY: ${{ needs.verify.result }} + run: | + [[ $IDENTIFY = success ]] || { echo "::error::could not work out which configs to run"; exit 1; } + [[ $VERIFY = success || $VERIFY = skipped ]] || { echo "::error::verification $VERIFY"; exit 1; } diff --git a/.github/workflows/fv-halmos.yml b/.github/workflows/fv-halmos.yml.disabled similarity index 100% rename from .github/workflows/fv-halmos.yml rename to .github/workflows/fv-halmos.yml.disabled From f53f4c669c2264f619156bbc634ded6cdcb321d3 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Wed, 23 Sep 2026 16:29:27 +0200 Subject: [PATCH 24/51] fix forge lint unused-import - regenerate EnumerableSetExtended.sol (stale Arrays import) - silence unused-import in contracts/mocks/import.sol, whose imports exist only to force artifact compilation --- contracts/mocks/import.sol | 3 +++ contracts/utils/structs/EnumerableSetExtended.sol | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/contracts/mocks/import.sol b/contracts/mocks/import.sol index 88c9585ec..3b7943d32 100644 --- a/contracts/mocks/import.sol +++ b/contracts/mocks/import.sol @@ -2,6 +2,8 @@ pragma solidity ^0.8.20; +// This file forces the compilation of contracts that are only used (as artifacts) in tests. +// forge-lint: disable-start(unused-import) import {AccessManager} from "@openzeppelin/contracts/access/manager/AccessManager.sol"; import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol"; import {ERC721Enumerable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol"; @@ -13,3 +15,4 @@ import { } from "@openzeppelin/contracts/mocks/account/AccountMock.sol"; import {ERC1271WalletMock} from "@openzeppelin/contracts/mocks/ERC1271WalletMock.sol"; import {Create2} from "@openzeppelin/contracts/utils/Create2.sol"; +// forge-lint: disable-end(unused-import) diff --git a/contracts/utils/structs/EnumerableSetExtended.sol b/contracts/utils/structs/EnumerableSetExtended.sol index 68058f4db..66068ebda 100644 --- a/contracts/utils/structs/EnumerableSetExtended.sol +++ b/contracts/utils/structs/EnumerableSetExtended.sol @@ -3,7 +3,6 @@ pragma solidity ^0.8.24; -import {Arrays} from "@openzeppelin/contracts/utils/Arrays.sol"; import {Hashes} from "@openzeppelin/contracts/utils/cryptography/Hashes.sol"; import {Math} from "@openzeppelin/contracts/utils/math/Math.sol"; From 9732ad5cdc82e01a795dee7ab8c9328e93f3d393 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Wed, 23 Sep 2026 16:45:41 +0200 Subject: [PATCH 25/51] fix gas-compare: pass --root to list-dependencies `scripts/list-dependencies.js` is a symlink into lib/@openzeppelin-contracts, so its default root (`import.meta.dirname/..`) resolves inside the submodule and it scanned lib/@openzeppelin-contracts/contracts-exposed instead of ours. --- .github/actions/gas-compare/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/gas-compare/action.yml b/.github/actions/gas-compare/action.yml index b9d541751..5304e0237 100644 --- a/.github/actions/gas-compare/action.yml +++ b/.github/actions/gas-compare/action.yml @@ -35,7 +35,7 @@ runs: gh pr diff '${{ github.event.number }}' --repo '${{ github.repository }}' --name-only > changed.txt # Produce small report if the diff touches any contracts, otherwise fall back to full report if [ -s changed.txt ]; then - node scripts/list-dependencies.js --src=contracts,contracts-exposed --ext=.sol < changed.txt > diff.json + node scripts/list-dependencies.js --root=. --src=contracts,contracts-exposed --ext=.sol < changed.txt > diff.json filter=(--filtered diff.json) else filter=() From 452e9cc82be5fb1f65a2c3e0100d08f257cfb911 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Thu, 24 Sep 2026 11:05:22 +0200 Subject: [PATCH 26/51] docs: port the documentation pipeline to Hardhat 3 (#288) --- docs/{config.js => config.mjs} | 8 +- docs/index.md | 1037 ----------------- docs/templates/contract.hbs | 36 +- docs/templates/{helpers.js => helpers.ts} | 24 +- docs/templates/page.hbs | 6 +- .../{properties.js => properties.ts} | 46 +- hardhat.config.ts | 2 +- lib/@openzeppelin-contracts | 2 +- lib/@openzeppelin-contracts-upgradeable | 2 +- netlify.toml | 11 +- scripts/gen-nav.js | 8 +- scripts/prepare-docs.sh | 2 +- 12 files changed, 88 insertions(+), 1096 deletions(-) rename docs/{config.js => config.mjs} (80%) delete mode 100644 docs/index.md rename docs/templates/{helpers.js => helpers.ts} (55%) rename docs/templates/{properties.js => properties.ts} (54%) diff --git a/docs/config.js b/docs/config.mjs similarity index 80% rename from docs/config.js rename to docs/config.mjs index f0af66390..52dea6a34 100644 --- a/docs/config.js +++ b/docs/config.mjs @@ -1,8 +1,8 @@ -const path = require('path'); -const fs = require('fs'); +import path from 'path'; +import fs from 'fs'; -/** @type import('solidity-docgen/dist/config').UserConfig */ -module.exports = { +/** @type import('../hardhat/hardhat-solidity-docgen/internal/config.ts').UserConfig */ +export default { outputDir: 'docs/modules/api/pages', templates: 'docs/templates', exclude: ['mocks'], diff --git a/docs/index.md b/docs/index.md deleted file mode 100644 index fc0371e0c..000000000 --- a/docs/index.md +++ /dev/null @@ -1,1037 +0,0 @@ -# Solidity API - -## AccessManagerLight - -_Light version of an AccessManager contract that defines `bytes8` roles -that are stored as requirements (see {getRequirements}) for each function. - -Each requirement is a bitmask of roles that are allowed to call a function -identified by its `bytes4` selector. Users have their permissioned stored -as a bitmask of roles they belong to. - -The admin role is a special role that has access to all functions and can -manage the roles of other users._ - -### ADMIN_ROLE - -```solidity -uint8 ADMIN_ROLE -``` - -### PUBLIC_ROLE - -```solidity -uint8 PUBLIC_ROLE -``` - -### ADMIN_MASK - -```solidity -Masks.Mask ADMIN_MASK -``` - -### PUBLIC_MASK - -```solidity -Masks.Mask PUBLIC_MASK -``` - -### GroupAdded - -```solidity -event GroupAdded(address user, uint8 group) -``` - -### GroupRemoved - -```solidity -event GroupRemoved(address user, uint8 group) -``` - -### GroupAdmins - -```solidity -event GroupAdmins(uint8 group, Masks.Mask admins) -``` - -### RequirementsSet - -```solidity -event RequirementsSet(address target, bytes4 selector, Masks.Mask groups) -``` - -### MissingPermissions - -```solidity -error MissingPermissions(address user, Masks.Mask permissions, Masks.Mask requirement) -``` - -### onlyRole - -```solidity -modifier onlyRole(Masks.Mask requirement) -``` - -_Throws if the specified requirement is not met by the caller's permissions (see {getGroups})._ - -### constructor - -```solidity -constructor(address admin) public -``` - -_Initializes the contract with the `admin` as the first member of the admin group._ - -### canCall - -```solidity -function canCall(address caller, address target, bytes4 selector) public view returns (bool) -``` - -_Returns whether the `caller` has the required permissions to call the `target` with the `selector`._ - -### getGroups - -```solidity -function getGroups(address user) public view returns (Masks.Mask) -``` - -_Returns the groups that the `user` belongs to._ - -### getGroupAdmins - -```solidity -function getGroupAdmins(uint8 group) public view returns (Masks.Mask) -``` - -_Returns the admins of the `group`._ - -### getRequirements - -```solidity -function getRequirements(address target, bytes4 selector) public view returns (Masks.Mask) -``` - -_Returns the requirements for the `target` and `selector`._ - -### addGroup - -```solidity -function addGroup(address user, uint8 group) public -``` - -_Adds the `user` to the `group`. Emits {GroupAdded} event._ - -### remGroup - -```solidity -function remGroup(address user, uint8 group) public -``` - -_Removes the `user` from the `group`. Emits {GroupRemoved} event._ - -### _addGroup - -```solidity -function _addGroup(address user, uint8 group) internal -``` - -_Internal version of {addGroup} without access control._ - -### _remGroup - -```solidity -function _remGroup(address user, uint8 group) internal -``` - -_Internal version of {remGroup} without access control._ - -### setGroupAdmins - -```solidity -function setGroupAdmins(uint8 group, uint8[] admins) public -``` - -_Sets the `admins` of the `group`. Emits {GroupAdmins} event._ - -### _setGroupAdmins - -```solidity -function _setGroupAdmins(uint8 group, Masks.Mask admins) internal -``` - -_Internal version of {_setGroupAdmins} without access control._ - -### setRequirements - -```solidity -function setRequirements(address target, bytes4[] selectors, uint8[] groups) public -``` - -_Sets the `groups` requirements for the `selectors` of the `target`._ - -### _setRequirements - -```solidity -function _setRequirements(address target, bytes4 selector, Masks.Mask groups) internal -``` - -_Internal version of {_setRequirements} without access control._ - -## ERC7739SignerMock - -### constructor - -```solidity -constructor(address eoa) public -``` - -### _validateSignature - -```solidity -function _validateSignature(bytes32 hash, bytes signature) internal view virtual returns (bool) -``` - -_Signature validation algorithm. - -WARNING: Implementing a signature validation algorithm is a security-sensitive operation as it involves -cryptographic verification. It is important to review and test thoroughly before deployment. Consider -using one of the signature verification libraries ({ECDSA}, {P256} or {RSA})._ - -## MyStablecoinAllowlist - -### constructor - -```solidity -constructor(address initialAuthority) public -``` - -### allowUser - -```solidity -function allowUser(address user) public -``` - -### disallowUser - -```solidity -function disallowUser(address user) public -``` - -## ERC20CollateralMock - -### constructor - -```solidity -constructor(uint48 liveness_, string name_, string symbol_) internal -``` - -### collateral - -```solidity -function collateral() public view returns (uint256 amount, uint48 timestamp) -``` - -_Returns the collateral data of the token._ - -## ERC20CustodianMock - -### constructor - -```solidity -constructor(address custodian, string name_, string symbol_) internal -``` - -### _isCustodian - -```solidity -function _isCustodian(address user) internal view returns (bool) -``` - -_Checks if the user is a custodian._ - -#### Parameters - -| Name | Type | Description | -| ---- | ---- | ----------- | -| user | address | The address of the user to check. | - -#### Return Values - -| Name | Type | Description | -| ---- | ---- | ----------- | -| [0] | bool | True if the user is authorized, false otherwise. | - -## HybridProxy - -_A version of an ERC-1967 proxy that uses the address stored in the implementation slot as a beacon. - -The design allows to set an initial beacon that the contract may quit by upgrading to its own implementation -afterwards. - -WARNING: The fallback mechanism relies on the implementation not to define the {IBeacon-implementation} function. -Consider that if your implementation has this function, it'll be assumed as the beacon address, meaning that -the returned address will be used as this proxy's implementation._ - -### constructor - -```solidity -constructor(address implementation, bytes data) public -``` - -_Initializes the proxy with an initial implementation. If data is present, it will be used to initialize the -implementation using a delegate call._ - -### _implementation - -```solidity -function _implementation() internal view returns (address) -``` - -_Returns the current implementation address according to ERC-1967's implementation slot. - -IMPORTANT: The way this function identifies whether the implementation is a beacon, is by checking -if it implements the {IBeacon-implementation} function. Consider that an actual implementation could -define this function, mistakenly identifying it as a beacon._ - -## ERC20Allowlist - -_Extension of {ERC20} that allows to implement an allowlist -mechanism that can be managed by an authorized account with the -{_disallowUser} and {_allowUser} functions. - -The allowlist provides the guarantee to the contract owner -(e.g. a DAO or a well-configured multisig) that any account won't be -able to execute transfers or approvals to other entities to operate -on its behalf if {_allowUser} was not called with such account as an -argument. Similarly, the account will be disallowed again if -{_disallowUser} is called._ - -### _allowed - -```solidity -mapping(address => bool) _allowed -``` - -_Allowed status of addresses. True if allowed, False otherwise._ - -### UserAllowed - -```solidity -event UserAllowed(address user) -``` - -_Emitted when a `user` is allowed to transfer and approve._ - -### UserDisallowed - -```solidity -event UserDisallowed(address user) -``` - -_Emitted when a user is disallowed._ - -### ERC20Disallowed - -```solidity -error ERC20Disallowed(address user) -``` - -_The operation failed because the user is not allowed._ - -### allowed - -```solidity -function allowed(address account) public virtual returns (bool) -``` - -_Returns the allowed status of an account._ - -### _allowUser - -```solidity -function _allowUser(address user) internal virtual returns (bool) -``` - -_Allows a user to receive and transfer tokens, including minting and burning._ - -### _disallowUser - -```solidity -function _disallowUser(address user) internal virtual returns (bool) -``` - -_Disallows a user from receiving and transferring tokens, including minting and burning._ - -### _update - -```solidity -function _update(address from, address to, uint256 value) internal virtual -``` - -_See {ERC20-_update}._ - -### _approve - -```solidity -function _approve(address owner, address spender, uint256 value, bool emitEvent) internal virtual -``` - -_See {ERC20-_approve}._ - -## ERC20Blocklist - -_Extension of {ERC20} that allows to implement a blocklist -mechanism that can be managed by an authorized account with the -{_blockUser} and {_unblockUser} functions. - -The blocklist provides the guarantee to the contract owner -(e.g. a DAO or a well-configured multisig) that any account won't be -able to execute transfers or approvals to other entities to operate -on its behalf if {_blockUser} was not called with such account as an -argument. Similarly, the account will be unblocked again if -{_unblockUser} is called._ - -### _blocked - -```solidity -mapping(address => bool) _blocked -``` - -_Blocked status of addresses. True if blocked, False otherwise._ - -### UserBlocked - -```solidity -event UserBlocked(address user) -``` - -_Emitted when a user is blocked._ - -### UserUnblocked - -```solidity -event UserUnblocked(address user) -``` - -_Emitted when a user is unblocked._ - -### ERC20Blocked - -```solidity -error ERC20Blocked(address user) -``` - -_The operation failed because the user is blocked._ - -### blocked - -```solidity -function blocked(address account) public virtual returns (bool) -``` - -_Returns the blocked status of an account._ - -### _blockUser - -```solidity -function _blockUser(address user) internal virtual returns (bool) -``` - -_Blocks a user from receiving and transferring tokens, including minting and burning._ - -### _unblockUser - -```solidity -function _unblockUser(address user) internal virtual returns (bool) -``` - -_Unblocks a user from receiving and transferring tokens, including minting and burning._ - -### _update - -```solidity -function _update(address from, address to, uint256 value) internal virtual -``` - -_See {ERC20-_update}._ - -### _approve - -```solidity -function _approve(address owner, address spender, uint256 value, bool emitEvent) internal virtual -``` - -_See {ERC20-_approve}._ - -## ERC20Collateral - -_Extension of {ERC20} that limits the supply of tokens based -on a collateral amount and time-based expiration. - -The {collateral} function must be implemented to return the collateral -data. This function can call external oracles or use any local storage._ - -### ERC20ExceededSupply - -```solidity -error ERC20ExceededSupply(uint256 increasedSupply, uint256 cap) -``` - -_Total supply cap has been exceeded._ - -### ERC20ExpiredCollateral - -```solidity -error ERC20ExpiredCollateral(uint48 timestamp, uint48 expiration) -``` - -_Collateral amount has expired._ - -### constructor - -```solidity -constructor(uint48 liveness_) internal -``` - -_Sets the value of the `_liveness`. This value is immutable, it can only be -set once during construction._ - -### liveness - -```solidity -function liveness() public view virtual returns (uint48) -``` - -_Returns the minimum liveness duration of collateral._ - -### clock - -```solidity -function clock() public view virtual returns (uint48) -``` - -_Clock used for flagging checkpoints. Can be overridden to implement timestamp based checkpoints (and voting)._ - -### CLOCK_MODE - -```solidity -function CLOCK_MODE() public view virtual returns (string) -``` - -_Description of the clock_ - -### collateral - -```solidity -function collateral() public view virtual returns (uint256 amount, uint48 timestamp) -``` - -_Returns the collateral data of the token._ - -### _update - -```solidity -function _update(address from, address to, uint256 value) internal virtual -``` - -_See {ERC20-_update}._ - -## ERC20Custodian - -_Extension of {ERC20} that allows to implement a custodian -mechanism that can be managed by an authorized account with the -{freeze} and {unfreeze} functions. - -This mechanism allows a custodian (e.g. a DAO or a -well-configured multisig) to freeze and unfreeze the balance -of a user. - -The frozen balance is not available for transfers or approvals -to other entities to operate on its behalf if {freeze} was not -called with such account as an argument. Similarly, the account -will be unfrozen again if {unfreeze} is called._ - -### _frozen - -```solidity -mapping(address => uint256) _frozen -``` - -_The amount of tokens frozen by user address._ - -### TokensFrozen - -```solidity -event TokensFrozen(address user, uint256 amount) -``` - -_Emitted when tokens are frozen for a user._ - -#### Parameters - -| Name | Type | Description | -| ---- | ---- | ----------- | -| user | address | The address of the user whose tokens were frozen. | -| amount | uint256 | The amount of tokens that were frozen. | - -### TokensUnfrozen - -```solidity -event TokensUnfrozen(address user, uint256 amount) -``` - -_Emitted when tokens are unfrozen for a user._ - -#### Parameters - -| Name | Type | Description | -| ---- | ---- | ----------- | -| user | address | The address of the user whose tokens were unfrozen. | -| amount | uint256 | The amount of tokens that were unfrozen. | - -### ERC20InsufficientUnfrozenBalance - -```solidity -error ERC20InsufficientUnfrozenBalance(address user) -``` - -_The operation failed because the user has insufficient unfrozen balance._ - -### ERC20InsufficientFrozenBalance - -```solidity -error ERC20InsufficientFrozenBalance(address user) -``` - -_The operation failed because the user has insufficient frozen balance._ - -### ERC20NotCustodian - -```solidity -error ERC20NotCustodian() -``` - -_Error thrown when a non-custodian account attempts to perform a custodian-only operation._ - -### onlyCustodian - -```solidity -modifier onlyCustodian() -``` - -_Modifier to restrict access to custodian accounts only._ - -### frozen - -```solidity -function frozen(address user) public view virtual returns (uint256) -``` - -_Returns the amount of tokens frozen for a user._ - -### freeze - -```solidity -function freeze(address user, uint256 amount) external virtual -``` - -_Adjusts the amount of tokens frozen for a user._ - -#### Parameters - -| Name | Type | Description | -| ---- | ---- | ----------- | -| user | address | The address of the user whose tokens to freeze. | -| amount | uint256 | The amount of tokens frozen. Requirements: - The user must have sufficient unfrozen balance. | - -### availableBalance - -```solidity -function availableBalance(address account) public view returns (uint256 available) -``` - -_Returns the available (unfrozen) balance of an account._ - -#### Parameters - -| Name | Type | Description | -| ---- | ---- | ----------- | -| account | address | The address to query the available balance of. | - -#### Return Values - -| Name | Type | Description | -| ---- | ---- | ----------- | -| available | uint256 | The amount of tokens available for transfer. | - -### _isCustodian - -```solidity -function _isCustodian(address user) internal view virtual returns (bool) -``` - -_Checks if the user is a custodian._ - -#### Parameters - -| Name | Type | Description | -| ---- | ---- | ----------- | -| user | address | The address of the user to check. | - -#### Return Values - -| Name | Type | Description | -| ---- | ---- | ----------- | -| [0] | bool | True if the user is authorized, false otherwise. | - -### _update - -```solidity -function _update(address from, address to, uint256 value) internal virtual -``` - -_Transfers a `value` amount of tokens from `from` to `to`, or alternatively mints (or burns) if `from` -(or `to`) is the zero address. All customizations to transfers, mints, and burns should be done by overriding -this function. - -Emits a {Transfer} event._ - -## ERC4626Fees - -_ERC-4626 vault with entry/exit fees expressed in https://en.wikipedia.org/wiki/Basis_point[basis point (bp)]._ - -### previewDeposit - -```solidity -function previewDeposit(uint256 assets) public view virtual returns (uint256) -``` - -_Preview taking an entry fee on deposit. See {IERC4626-previewDeposit}._ - -### previewMint - -```solidity -function previewMint(uint256 shares) public view virtual returns (uint256) -``` - -_Preview adding an entry fee on mint. See {IERC4626-previewMint}._ - -### previewWithdraw - -```solidity -function previewWithdraw(uint256 assets) public view virtual returns (uint256) -``` - -_Preview adding an exit fee on withdraw. See {IERC4626-previewWithdraw}._ - -### previewRedeem - -```solidity -function previewRedeem(uint256 shares) public view virtual returns (uint256) -``` - -_Preview taking an exit fee on redeem. See {IERC4626-previewRedeem}._ - -### _deposit - -```solidity -function _deposit(address caller, address receiver, uint256 assets, uint256 shares) internal virtual -``` - -_Send entry fee to {_entryFeeRecipient}. See {IERC4626-_deposit}._ - -### _withdraw - -```solidity -function _withdraw(address caller, address receiver, address owner, uint256 assets, uint256 shares) internal virtual -``` - -_Send exit fee to {_exitFeeRecipient}. See {IERC4626-_deposit}._ - -### _entryFeeBasisPoints - -```solidity -function _entryFeeBasisPoints() internal view virtual returns (uint256) -``` - -### _exitFeeBasisPoints - -```solidity -function _exitFeeBasisPoints() internal view virtual returns (uint256) -``` - -### _entryFeeRecipient - -```solidity -function _entryFeeRecipient() internal view virtual returns (address) -``` - -### _exitFeeRecipient - -```solidity -function _exitFeeRecipient() internal view virtual returns (address) -``` - -## OnTokenTransferAdapter - -_This contract exposes the 667 `onTokenTransfer` hook on top of {IERC1363Receiver-onTransferReceived}. - -Inheriting from this adapter makes your `ERC1363Receiver` contract automatically compatible with tokens, such as -Chainlink's Link, that implement the 667 interface for transferAndCall._ - -### onTokenTransfer - -```solidity -function onTokenTransfer(address from, uint256 amount, bytes data) public virtual returns (bool) -``` - -## Masks - -_Library for handling bit masks_ - -### Mask - -### toMask - -```solidity -function toMask(uint8 group) internal pure returns (Masks.Mask) -``` - -_Returns a new mask with the bit at `group` index set to 1._ - -### toMask - -```solidity -function toMask(uint8[] groups) internal pure returns (Masks.Mask) -``` - -_Returns a new mask with the bits at `groups` indices set to 1._ - -### get - -```solidity -function get(Masks.Mask self, uint8 group) internal pure returns (bool) -``` - -_Get value of the mask at `group` index_ - -### isEmpty - -```solidity -function isEmpty(Masks.Mask self) internal pure returns (bool) -``` - -_Whether the mask is `bytes32(0)`_ - -### complement - -```solidity -function complement(Masks.Mask m1) internal pure returns (Masks.Mask) -``` - -_Invert the bits of a mask_ - -### union - -```solidity -function union(Masks.Mask m1, Masks.Mask m2) internal pure returns (Masks.Mask) -``` - -_Perform a bitwise OR operation on two masks_ - -### intersection - -```solidity -function intersection(Masks.Mask m1, Masks.Mask m2) internal pure returns (Masks.Mask) -``` - -_Perform a bitwise AND operation on two masks_ - -### difference - -```solidity -function difference(Masks.Mask m1, Masks.Mask m2) internal pure returns (Masks.Mask) -``` - -_Perform a bitwise difference operation on two masks (m1 - m2)_ - -### symmetric_difference - -```solidity -function symmetric_difference(Masks.Mask m1, Masks.Mask m2) internal pure returns (Masks.Mask) -``` - -_Returns the symmetric difference (∆) of two masks, also known as disjunctive union or exclusive OR (XOR)_ - -## ERC7739Signer - -_Validates signatures wrapping the message hash in a nested EIP712 type. See {ERC7739Utils}. - -Linking the signature to the EIP-712 domain separator is a security measure to prevent signature replay across different -EIP-712 domains (e.g. a single offchain owner of multiple contracts). - -This contract requires implementing the {_validateSignature} function, which passes the wrapped message hash, -which may be either an typed data or a personal sign nested type. - -NOTE: {EIP712} uses {ShortStrings} to optimize gas costs for short strings (up to 31 characters). -Consider that strings longer than that will use storage, which may limit the ability of the signer to -be used within the ERC-4337 validation phase (due to ERC-7562 storage access rules)._ - -### isValidSignature - -```solidity -function isValidSignature(bytes32 hash, bytes signature) public view virtual returns (bytes4 result) -``` - -_Attempts validating the signature in a nested EIP-712 type. - -A nested EIP-712 type might be presented in 2 different ways: - -- As a nested EIP-712 typed data -- As a _personal_ signature (an EIP-712 mimic of the `eth_personalSign` for a smart contract)_ - -### _isValidSignature - -```solidity -function _isValidSignature(bytes32 hash, bytes signature) internal view virtual returns (bool) -``` - -_Internal version of {isValidSignature} that returns a boolean._ - -### _isValidNestedPersonalSignSignature - -```solidity -function _isValidNestedPersonalSignSignature(bytes32 hash, bytes signature) internal view virtual returns (bool) -``` - -_Nested personal signature verification._ - -### _isValidNestedTypedDataSignature - -```solidity -function _isValidNestedTypedDataSignature(bytes32 hash, bytes encodedSignature) internal view virtual returns (bool) -``` - -_Nested EIP-712 typed data verification._ - -### _validateSignature - -```solidity -function _validateSignature(bytes32 hash, bytes signature) internal view virtual returns (bool) -``` - -_Signature validation algorithm. - -WARNING: Implementing a signature validation algorithm is a security-sensitive operation as it involves -cryptographic verification. It is important to review and test thoroughly before deployment. Consider -using one of the signature verification libraries ({ECDSA}, {P256} or {RSA})._ - -## ERC7739Utils - -_Utilities to process https://ercs.ethereum.org/ERCS/erc-7739[ERC-7739] typed data signatures -that are specific to an EIP-712 domain. - -This library provides methods to wrap, unwrap and operate over typed data signatures with a defensive -rehashing mechanism that includes the application's {EIP712-_domainSeparatorV4} and preserves -readability of the signed content using an EIP-712 nested approach. - -A smart contract domain can validate a signature for a typed data structure in two ways: - -- As an application validating a typed data signature. See {toNestedTypedDataHash}. -- As a smart contract validating a raw message signature. See {toNestedPersonalSignHash}. - -NOTE: A provider for a smart contract wallet would need to return this signature as the -result of a call to `personal_sign` or `eth_signTypedData`, and this may be unsupported by -API clients that expect a return value of 129 bytes, or specifically the `r,s,v` parameters -of an {ECDSA} signature, as is for example specified for {EIP712}._ - -### InvalidContentsType - -```solidity -error InvalidContentsType() -``` - -_Error when the contents type is invalid. See {tryValidateContentsType}._ - -### encodeTypedDataSig - -```solidity -function encodeTypedDataSig(bytes signature, bytes32 appSeparator, bytes32 contentsHash, string contentsDescr) internal pure returns (bytes) -``` - -_Nest a signature for a given EIP-712 type into a nested signature for the domain of the app. - -Counterpart of {decodeTypedDataSig} to extract the original signature and the nested components._ - -### decodeTypedDataSig - -```solidity -function decodeTypedDataSig(bytes encodedSignature) internal pure returns (bytes signature, bytes32 appSeparator, bytes32 contentsHash, string contentsDescr) -``` - -_Parses a nested signature into its components. - -Constructed as follows: - -`signature ‖ DOMAIN_SEPARATOR ‖ contentsHash ‖ contentsDescr ‖ uint16(contentsDescr.length)` - -- `signature` is the original signature for the nested struct hash that includes the "contents" hash -- `DOMAIN_SEPARATOR` is the EIP-712 {EIP712-_domainSeparatorV4} of the smart contract verifying the signature -- `contentsHash` is the hash of the underlying data structure or message -- `contentsDescr` is a descriptor of the "contents" part of the the EIP-712 type of the nested signature_ - -### personalSignStructHash - -```solidity -function personalSignStructHash(bytes32 contents) internal pure returns (bytes32) -``` - -_Nests an `ERC-191` digest into a `PersonalSign` EIP-712 struct, and return the corresponding struct hash. -This struct hash must be combined with a domain separator, using {MessageHashUtils-toTypedDataHash} before -being verified/recovered. - -This is used to simulates the `personal_sign` RPC method in the context of smart contracts._ - -### typedDataSignStructHash - -```solidity -function typedDataSignStructHash(string contentsTypeName, string contentsType, bytes32 contentsHash, bytes domainBytes) internal pure returns (bytes32 result) -``` - -_Nests an `EIP-712` hash (`contents`) into a `TypedDataSign` EIP-712 struct, and return the corresponding -struct hash. This struct hash must be combined with a domain separator, using {MessageHashUtils-toTypedDataHash} -before being verified/recovered._ - -### typedDataSignStructHash - -```solidity -function typedDataSignStructHash(string contentsDescr, bytes32 contentsHash, bytes domainBytes) internal pure returns (bytes32 result) -``` - -_Variant of {typedDataSignStructHash-string-string-bytes32-string-bytes} that takes a content descriptor -and decodes the `contentsTypeName` and `contentsType` out of it._ - -### typedDataSignTypehash - -```solidity -function typedDataSignTypehash(string contentsTypeName, string contentsType) internal pure returns (bytes32) -``` - -_Compute the EIP-712 typehash of the `TypedDataSign` structure for a given type (and typename)._ - -### decodeContentsDescr - -```solidity -function decodeContentsDescr(string contentsDescr) internal pure returns (string contentsTypeName, string contentsType) -``` - -_Parse the type name out of the ERC-7739 contents type description. Supports both the implicit and explicit -modes. - -Following ERC-7739 specifications, a `contentsTypeName` is considered invalid if it's empty or it contains -any of the following bytes , )\x00 - -If the `contentsType` is invalid, this returns an empty string. Otherwise, the return string has non-zero -length._ - diff --git a/docs/templates/contract.hbs b/docs/templates/contract.hbs index bcf6bfd06..e70b7a9c8 100644 --- a/docs/templates/contract.hbs +++ b/docs/templates/contract.hbs @@ -2,6 +2,10 @@ :{{name}}: pass:normal[xref:#{{anchor}}[`++{{name}}++`]] {{/each}} +{{#each functions}} +:{{fullname}}: pass:normal[xref:#{{anchor}}[`++{{name}}++`]] +{{/each}} + [.contract] [[{{anchor}}]] === `++{{name}}++` link:https://github.com/OpenZeppelin/openzeppelin-community-contracts/blob/master/{{__item_context.file.absolutePath}}[{github-icon},role=heading-link] @@ -18,29 +22,29 @@ import "@openzeppelin/community-{{__item_context.file.absolutePath}}"; .Modifiers -- {{#each modifiers}} -* `++{{name}}({{names params}})++` +* {xref-{{anchor~}} }[`++{{name}}({{names params}})++`] {{/each}} -- {{/if}} -{{#if has-functions}} +{{#if hasFunctions}} [.contract-index] .Functions -- -{{#each inherited-functions}} +{{#each inheritedFunctions}} {{#unless @first}} [.contract-subindex-inherited] .{{contract.name}} {{/unless}} {{#each functions}} -* `++{{name}}({{names params}})++` +* {xref-{{anchor~}} }[`++{{name}}({{names params}})++`] {{/each}} {{/each}} -- {{/if}} -{{#if has-events}} +{{#if hasEvents}} [.contract-index] .Events -- @@ -50,14 +54,14 @@ import "@openzeppelin/community-{{__item_context.file.absolutePath}}"; .{{name}} {{/unless}} {{#each events}} -* `++{{name}}({{names params}})++` +* {xref-{{anchor~}} }[`++{{name}}({{names params}})++`] {{/each}} {{/each}} -- {{/if}} -{{#if has-errors}} +{{#if hasErrors}} [.contract-index] .Errors -- @@ -67,14 +71,14 @@ import "@openzeppelin/community-{{__item_context.file.absolutePath}}"; .{{name}} {{/unless}} {{#each errors}} -* `++{{name}}({{names params}})++` +* {xref-{{anchor~}} }[`++{{name}}({{names params}})++`] {{/each}} {{/each}} -- {{/if}} -{{#if has-internal-variables}} +{{#if hasInternalVariables}} [.contract-index] .Internal Variables -- @@ -83,8 +87,8 @@ import "@openzeppelin/community-{{__item_context.file.absolutePath}}"; [.contract-subindex-inherited] .{{name}} {{/unless}} -{{#each internal-variables}} -* `++{{typeDescriptions.typeString}} {{#if constant}}constant{{/if}} {{name}}++` +{{#each internalVariables}} +* {xref-{{anchor~}} }[`++{{typeDescriptions.typeString}} {{#if constant}}constant{{/if}} {{name}}++`] {{/each}} {{/each}} @@ -94,7 +98,7 @@ import "@openzeppelin/community-{{__item_context.file.absolutePath}}"; {{#each modifiers}} [.contract-item] [[{{anchor}}]] -==== `[.contract-item-name]#++{{name}}++#++({{typed-params params}})++` [.item-kind]#modifier# +==== `[.contract-item-name]#++{{name}}++#++({{typedParams params}})++` [.item-kind]#modifier# {{{natspec.dev}}} @@ -103,7 +107,7 @@ import "@openzeppelin/community-{{__item_context.file.absolutePath}}"; {{#each functions}} [.contract-item] [[{{anchor}}]] -==== `[.contract-item-name]#++{{name}}++#++({{typed-params params}}){{#if returns2}} → {{typed-params returns2}}{{/if}}++` [.item-kind]#{{visibility}}# +==== `[.contract-item-name]#++{{name}}++#++({{typedParams params}}){{#if returns2}} → {{typedParams returns2}}{{/if}}++` [.item-kind]#{{visibility}}# {{{natspec.dev}}} @@ -112,7 +116,7 @@ import "@openzeppelin/community-{{__item_context.file.absolutePath}}"; {{#each events}} [.contract-item] [[{{anchor}}]] -==== `[.contract-item-name]#++{{name}}++#++({{typed-params params}})++` [.item-kind]#event# +==== `[.contract-item-name]#++{{name}}++#++({{typedParams params}})++` [.item-kind]#event# {{{natspec.dev}}} @@ -121,13 +125,13 @@ import "@openzeppelin/community-{{__item_context.file.absolutePath}}"; {{#each errors}} [.contract-item] [[{{anchor}}]] -==== `[.contract-item-name]#++{{name}}++#++({{typed-params params}})++` [.item-kind]#error# +==== `[.contract-item-name]#++{{name}}++#++({{typedParams params}})++` [.item-kind]#error# {{{natspec.dev}}} {{/each}} -{{#each internal-variables}} +{{#each internalVariables}} [.contract-item] [[{{anchor}}]] ==== `{{typeDescriptions.typeString}} [.contract-item-name]#++{{name}}++#` [.item-kind]#internal{{#if constant}} constant{{/if}}# diff --git a/docs/templates/helpers.js b/docs/templates/helpers.ts similarity index 55% rename from docs/templates/helpers.js rename to docs/templates/helpers.ts index 1b6383549..f4dc20f27 100644 --- a/docs/templates/helpers.js +++ b/docs/templates/helpers.ts @@ -1,23 +1,23 @@ -const { version } = require('../../package.json'); +import { version } from '../../package.json'; -module.exports['oz-version'] = () => version; +export const ozVersion = () => version; -module.exports['readme-path'] = opts => { +export const readmePath = opts => { return 'contracts/' + opts.data.root.id.replace(/\.adoc$/, '') + '/README.adoc'; }; -module.exports.names = params => params?.map(p => p.name).join(', '); +export const names = params => params?.map(p => p.name).join(', '); -module.exports['typed-params'] = params => { +export const typedParams = params => { return params?.map(p => `${p.type}${p.indexed ? ' indexed' : ''}${p.name ? ' ' + p.name : ''}`).join(', '); }; -const slug = (module.exports.slug = str => { +export const slug = str => { if (str === undefined) { throw new Error('Missing argument'); } return str.replace(/\W/g, '-'); -}); +}; const linksCache = new WeakMap(); @@ -34,9 +34,15 @@ function getAllLinks(items) { return res; } -module.exports['with-prelude'] = opts => { +export const withPrelude = opts => { const links = getAllLinks(opts.data.site.items); - const contents = opts.fn(); + // Index entries are rendered as `{xref-}[]`, which requires the attribute to be + // defined in the prelude below. Only items documented in this component have one: members + // inherited from another component (@openzeppelin/contracts) have no page here, and asciidoctor + // would drop the reference. Strip the xref from those and keep the plain link text. + const contents = opts + .fn() + .replace(/^(\* )\{(xref-[^}]+)\}\[(.*)\]$/gm, (entry, bullet, key, text) => (key in links ? entry : bullet + text)); const neededLinks = contents .match(/\{[-._a-z0-9]+\}/gi) .map(m => m.replace(/^\{(.+)\}$/, '$1')) diff --git a/docs/templates/page.hbs b/docs/templates/page.hbs index cab050acb..dd4206ca8 100644 --- a/docs/templates/page.hbs +++ b/docs/templates/page.hbs @@ -1,4 +1,4 @@ :github-icon: pass:[] -{{#with-prelude}} -{{readme (readme-path)}} -{{/with-prelude}} +{{#withPrelude}} +{{readme (readmePath)}} +{{/withPrelude}} diff --git a/docs/templates/properties.js b/docs/templates/properties.ts similarity index 54% rename from docs/templates/properties.js rename to docs/templates/properties.ts index 52eebac54..7cea3bb9e 100644 --- a/docs/templates/properties.js +++ b/docs/templates/properties.ts @@ -1,7 +1,7 @@ -const { isNodeType, findAll } = require('solidity-ast/utils'); -const { slug } = require('./helpers'); +import { isNodeType, findAll } from 'solidity-ast/utils.js'; +import { slug } from './helpers'; -module.exports.anchor = function anchor({ item, contract }) { +export const anchor = function anchor({ item, contract }) { let res = ''; if (contract) { res += contract.name + '-'; @@ -17,9 +17,25 @@ module.exports.anchor = function anchor({ item, contract }) { return res; }; -module.exports.inheritance = function ({ item, build }) { +export const fullname = function fullname({ item }) { + let res = ''; + res += item.name; + if ('parameters' in item) { + const signature = item.parameters.parameters.map(v => v.typeName.typeDescriptions.typeString).join(','); + res += slug('(' + signature + ')'); + } + if (isNodeType('VariableDeclaration', item)) { + res += '-' + slug(item.typeName.typeDescriptions.typeString); + } + if (res.charAt(res.length - 1) === '-') { + return res.slice(0, -1); + } + return res; +}; + +export const inheritance = function ({ item, build }) { if (!isNodeType('ContractDefinition', item)) { - throw new Error('used inherited-items on non-contract'); + throw new Error('inheritance modifier used on non-contract'); } return item.linearizedBaseContracts @@ -27,42 +43,42 @@ module.exports.inheritance = function ({ item, build }) { .filter((c, i) => c.name !== 'Context' || i === 0); }; -module.exports['has-functions'] = function ({ item }) { +export const hasFunctions = function ({ item }) { return item.inheritance.some(c => c.functions.length > 0); }; -module.exports['has-events'] = function ({ item }) { +export const hasEvents = function ({ item }) { return item.inheritance.some(c => c.events.length > 0); }; -module.exports['has-errors'] = function ({ item }) { +export const hasErrors = function ({ item }) { return item.inheritance.some(c => c.errors.length > 0); }; -module.exports['internal-variables'] = function ({ item }) { +export const internalVariables = function ({ item }) { return item.variables.filter(({ visibility }) => visibility === 'internal'); }; -module.exports['has-internal-variables'] = function ({ item }) { - return module.exports['internal-variables']({ item }).length > 0; +export const hasInternalVariables = function ({ item }) { + return internalVariables({ item }).length > 0; }; -module.exports.functions = function ({ item }) { +export const functions = function ({ item }) { return [ ...[...findAll('FunctionDefinition', item)].filter(f => f.visibility !== 'private'), ...[...findAll('VariableDeclaration', item)].filter(f => f.visibility === 'public'), ]; }; -module.exports.returns2 = function ({ item }) { +export const returns2 = function ({ item }) { if (isNodeType('VariableDeclaration', item)) { - return [{ type: item.typeDescriptions.typeString }]; + return [{ type: item.typeName.typeDescriptions.typeString }]; } else { return item.returns; } }; -module.exports['inherited-functions'] = function ({ item }) { +export const inheritedFunctions = function ({ item }) { const { inheritance } = item; const baseFunctions = new Set(inheritance.flatMap(c => c.functions.flatMap(f => f.baseFunctions ?? []))); return inheritance.map((contract, i) => ({ diff --git a/hardhat.config.ts b/hardhat.config.ts index 65d705503..536bc2bd7 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -112,5 +112,5 @@ export default defineConfig({ include: ['contracts/**/*.sol'], exclude: ['**/*WithInit.sol'], }, - // docgen: await import('./docs/config.mjs').then(m => m.default), + docgen: await import('./docs/config.mjs').then(m => m.default), }); diff --git a/lib/@openzeppelin-contracts b/lib/@openzeppelin-contracts index 8d03dee9b..4858ab13a 160000 --- a/lib/@openzeppelin-contracts +++ b/lib/@openzeppelin-contracts @@ -1 +1 @@ -Subproject commit 8d03dee9b880c2aa7403c224847fcd9d0073bd33 +Subproject commit 4858ab13a5ad897f59753028f6315f9d487c4322 diff --git a/lib/@openzeppelin-contracts-upgradeable b/lib/@openzeppelin-contracts-upgradeable index c15fd56a7..66f1abde7 160000 --- a/lib/@openzeppelin-contracts-upgradeable +++ b/lib/@openzeppelin-contracts-upgradeable @@ -1 +1 @@ -Subproject commit c15fd56a7042fa99411c5eeffe0baeddb88695b0 +Subproject commit 66f1abde79804adc54850bec28f242ff959ae6e7 diff --git a/netlify.toml b/netlify.toml index 0447f41ad..3a2a7525e 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,3 +1,12 @@ [build] -command = "npm run docs" +# Netlify only initializes top-level submodules, but the compilation reaches a nested one: +# lib/email-tx-builder/.../Verifier.sol imports @openzeppelin/contracts-upgradeable, whose own +# remappings.txt resolves @openzeppelin/contracts to its nested lib/openzeppelin-contracts. +# Mirror the `submodules: recursive` checkout that .github/workflows/checks.yml uses. +command = "git submodule update --init --recursive && npm run docs" publish = "build/site" + +# Hardhat 3 requires Node >= 22.13. Keep in sync with NODE_DEFAULT_VERSION in +# .github/actions/setup/action.yml. +[build.environment] +NODE_VERSION = "24" diff --git a/scripts/gen-nav.js b/scripts/gen-nav.js index df872b1ce..721b58405 100644 --- a/scripts/gen-nav.js +++ b/scripts/gen-nav.js @@ -41,13 +41,7 @@ const menuItems = files.reduce( return acc; }, { - items: { - token: { - name: 'tokens', - dir: '', - items: {}, - }, - }, + items: {}, }, ); diff --git a/scripts/prepare-docs.sh b/scripts/prepare-docs.sh index 912054a64..5cbfb48a0 100755 --- a/scripts/prepare-docs.sh +++ b/scripts/prepare-docs.sh @@ -20,7 +20,7 @@ examples_target_dir="docs/modules/api/examples" for f in "$examples_source_dir"/**/*.sol; do name="${f/#"$examples_source_dir"/}" mkdir -p "$examples_target_dir/$(dirname "$name")" - sed -Ee '/^import/s|"(\.\./)+|"@openzeppelin/contracts/|' "$f" > "$examples_target_dir/$name" + sed -Ee '/^import/s|"(\.\./)+|"@openzeppelin/community-contracts/|' "$f" > "$examples_target_dir/$name" done node scripts/gen-nav.js "$OUTDIR" > "$OUTDIR/../nav.adoc" From a33d9faddde12e9348ba7c9e26d52fd94da51cb9 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Thu, 12 Nov 2026 16:04:17 +0100 Subject: [PATCH 27/51] Update OpenZeppelin Contracts submodules and make ERC7540 deposit/mint payable Bump lib/@openzeppelin-contracts to efaa6f78a and lib/@openzeppelin-contracts-upgradeable to its matching transpilation (64dd3a63). IERC4626 now declares deposit and mint as payable. ERC7540 follows ERC4626 and rejects any native value with ERC4626UnexpectedNativeValue. --- contracts/token/ERC20/extensions/ERC7540.sol | 13 +++++++++++-- lib/@openzeppelin-contracts | 2 +- lib/@openzeppelin-contracts-upgradeable | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/contracts/token/ERC20/extensions/ERC7540.sol b/contracts/token/ERC20/extensions/ERC7540.sol index 4b1766558..ebda9be24 100644 --- a/contracts/token/ERC20/extensions/ERC7540.sol +++ b/contracts/token/ERC20/extensions/ERC7540.sol @@ -90,6 +90,9 @@ abstract contract ERC7540 is ERC20, IERC4626, ERC165, IERC7540, IERC7575Share { /// @dev Attempted to redeem more shares than the max amount for `owner`. error ERC4626ExceededMaxRedeem(address owner, uint256 shares, uint256 max); + /// @dev Attempted to {deposit} or {mint} with a native value (`msg.value`), which this vault does not accept. + error ERC4626UnexpectedNativeValue(uint256 value); + /// @dev The `operator` is not the caller or an approved operator of the `controller`. error ERC7540InvalidOperator(address controller, address operator); @@ -467,8 +470,11 @@ abstract contract ERC7540 is ERC20, IERC4626, ERC165, IERC7540, IERC7575Share { /** * @dev See {IERC4626-deposit}. Calls the three-argument overload with `msg.sender` as `controller`. + * + * NOTE: This function is `payable` to match {IERC4626}, but reverts if any native value is sent. */ - function deposit(uint256 assets, address receiver) public virtual override returns (uint256) { + function deposit(uint256 assets, address receiver) public payable virtual override returns (uint256) { + require(msg.value == 0, ERC4626UnexpectedNativeValue(msg.value)); return deposit(assets, receiver, _msgSender()); } @@ -504,8 +510,11 @@ abstract contract ERC7540 is ERC20, IERC4626, ERC165, IERC7540, IERC7575Share { /** * @dev See {IERC4626-mint}. Calls the three-argument overload with `msg.sender` as `controller`. + * + * NOTE: This function is `payable` to match {IERC4626}, but reverts if any native value is sent. */ - function mint(uint256 shares, address receiver) public virtual override returns (uint256 assets) { + function mint(uint256 shares, address receiver) public payable virtual override returns (uint256 assets) { + require(msg.value == 0, ERC4626UnexpectedNativeValue(msg.value)); return mint(shares, receiver, _msgSender()); } diff --git a/lib/@openzeppelin-contracts b/lib/@openzeppelin-contracts index 4858ab13a..efaa6f78a 160000 --- a/lib/@openzeppelin-contracts +++ b/lib/@openzeppelin-contracts @@ -1 +1 @@ -Subproject commit 4858ab13a5ad897f59753028f6315f9d487c4322 +Subproject commit efaa6f78ab1dde05416246e801c0baaf4f900d49 diff --git a/lib/@openzeppelin-contracts-upgradeable b/lib/@openzeppelin-contracts-upgradeable index 66f1abde7..64dd3a633 160000 --- a/lib/@openzeppelin-contracts-upgradeable +++ b/lib/@openzeppelin-contracts-upgradeable @@ -1 +1 @@ -Subproject commit 66f1abde79804adc54850bec28f242ff959ae6e7 +Subproject commit 64dd3a6334bb83122c9e029929331b18e9f2d172 From 8600cc2c7e676d9b9e19eaf2a08547ca7ceef0e4 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Thu, 12 Nov 2026 16:34:24 +0100 Subject: [PATCH 28/51] Transpile upgradeable variant with the hardhat-transpiler plugin Replace scripts/upgradeable/transpile.js with the `transpile` task of the hardhat-transpiler plugin from OpenZeppelin Contracts, using its new `upgradeablePackages` option (OpenZeppelin/openzeppelin-contracts#6872). The submodule tracks the transpiler-dependencies branch until that PR is merged. transpile.sh now mirrors the OpenZeppelin Contracts script, and the patch adds the original code as a second source folder (replacing PeerImports.sol). Add a remapping so that Hardhat 3 resolves @openzeppelin/contracts to the same copy from within lib/@openzeppelin-contracts-upgradeable. --- .gitmodules | 2 +- hardhat.config.ts | 5 + lib/@openzeppelin-contracts | 2 +- remappings.txt | 1 + scripts/upgradeable/README.md | 10 +- scripts/upgradeable/transpile.config.json | 6 +- scripts/upgradeable/transpile.js | 172 ---------------------- scripts/upgradeable/transpile.sh | 5 +- scripts/upgradeable/upgradeable.patch | 34 +++-- 9 files changed, 41 insertions(+), 196 deletions(-) delete mode 100644 scripts/upgradeable/transpile.js diff --git a/.gitmodules b/.gitmodules index 9300a3809..f3061af3b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "lib/@openzeppelin-contracts"] path = lib/@openzeppelin-contracts url = https://github.com/OpenZeppelin/openzeppelin-contracts.git - branch = master + branch = transpiler-dependencies [submodule "lib/@openzeppelin-contracts-upgradeable"] path = lib/@openzeppelin-contracts-upgradeable url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable.git diff --git a/hardhat.config.ts b/hardhat.config.ts index 536bc2bd7..367c2c9c3 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -51,6 +51,11 @@ export default defineConfig({ }, solidity: { version: argv.compiler, + // Remappings are defined in `remappings.txt`. Hardhat 3 also applies the `remappings.txt` of the + // `lib/@openzeppelin-contracts-upgradeable` submodule to its files, which points `@openzeppelin/contracts` to a nested + // copy. The last entry of `remappings.txt` uses a more specific context so that the submodule uses the same copy as + // the rest of the project. (Comments are not allowed in `remappings.txt` as Foundry rejects them.) + // // Dependencies that the tests deploy directly. Hardhat 3 only emits artifacts for compilation roots, so importing // them from a solidity file (the old `contracts/mocks/import.sol` trick) is not enough anymore. npmFilesToBuild: [ diff --git a/lib/@openzeppelin-contracts b/lib/@openzeppelin-contracts index efaa6f78a..628ff21e7 160000 --- a/lib/@openzeppelin-contracts +++ b/lib/@openzeppelin-contracts @@ -1 +1 @@ -Subproject commit efaa6f78ab1dde05416246e801c0baaf4f900d49 +Subproject commit 628ff21e761805634f8d7546f580c590b4d4bf69 diff --git a/remappings.txt b/remappings.txt index be729580f..ed847262e 100644 --- a/remappings.txt +++ b/remappings.txt @@ -6,3 +6,4 @@ @zk-email/contracts/=lib/zk-email-verify/packages/contracts/ wormhole-solidity-sdk/=lib/wormhole-solidity-sdk/src/ forge-std=lib/forge-std/src +lib/@openzeppelin-contracts-upgradeable/contracts/:@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/contracts/ diff --git a/scripts/upgradeable/README.md b/scripts/upgradeable/README.md index 5703141dd..809d88c3b 100644 --- a/scripts/upgradeable/README.md +++ b/scripts/upgradeable/README.md @@ -4,16 +4,14 @@ When the `master` branch or `release-v*` branches are updated, the code is trans ## `transpile.sh` -Applies patches and invokes the transpiler with the settings in `transpile.config.json` (for example, excluding certain files). +Applies patches and invokes the transpiler (the `transpile` task of the `hardhat-transpiler` plugin from OpenZeppelin Contracts) with the settings in `transpile.config.json` (for example, excluding certain files). -## `transpile.js` - -Unlike OpenZeppelin Contracts, this library builds on contracts it doesn't own. This script runs the transpiler on the compiled sources, keeps the output for `contracts/` only, and rewrites its imports: +Unlike OpenZeppelin Contracts, this library builds on contracts it doesn't own. The `upgradeablePackages` setting makes the transpiler keep the dependency sources so that their symbols can be resolved, discard their transpiled output, and rewrite the imports of the transpiled files: - Stateful contracts from `@openzeppelin/contracts` are imported from `@openzeppelin/contracts-upgradeable`. -- Stateless declarations (interfaces, libraries, etc.) are imported from their original package, including `@openzeppelin/community-contracts` for the ones in this repository. +- Stateless declarations (interfaces, libraries, etc.) are imported from their original package, including `@openzeppelin/community-contracts` for the ones in this repository (`peerProject` is prepended to their path). -A stateful contract from any other package has no upgradeable variant, so the files that use it must be excluded in `transpile.config.json`. Files that are excluded or not transpiled are imported in `contracts/mocks/PeerImports.sol` so they remain available to the tests. +A stateful contract from any other package has no upgradeable variant, so the files that use it must be excluded in `transpile.config.json`. Files that are excluded or not transpiled remain available to the tests through the original code in `lib/openzeppelin-community-contracts`, which the patch adds as a source folder. ## `transpile-onto.sh` diff --git a/scripts/upgradeable/transpile.config.json b/scripts/upgradeable/transpile.config.json index b335d729b..250f53c43 100644 --- a/scripts/upgradeable/transpile.config.json +++ b/scripts/upgradeable/transpile.config.json @@ -10,5 +10,9 @@ ], "publicInitializers": ["!contracts/mocks/**/*"], "namespaced": true, - "namespaceExclude": ["contracts/mocks/**/*"] + "namespaceExclude": ["contracts/mocks/**/*"], + "peerProject": "@openzeppelin/community-", + "upgradeablePackages": { + "@openzeppelin/contracts/": "@openzeppelin/contracts-upgradeable/" + } } diff --git a/scripts/upgradeable/transpile.js b/scripts/upgradeable/transpile.js deleted file mode 100644 index 75b62ada4..000000000 --- a/scripts/upgradeable/transpile.js +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env node - -// Transpiles `contracts/` using the build info produced by `hardhat compile`. -// -// Unlike OpenZeppelin Contracts, this library depends on contracts it does not own (`@openzeppelin/contracts` and -// third party packages). These sources must remain part of the transpilation so that symbols can be resolved, but -// their transpiled output is discarded. Imports in the transpiled files are then rewritten so that: -// - Stateful contracts from `@openzeppelin/contracts` are imported from `@openzeppelin/contracts-upgradeable`. -// - Stateless declarations (interfaces, libraries, free functions, etc.) are imported from their original package. - -const fs = require('fs'); -const path = require('path'); -const { transpile } = require('@openzeppelin/upgrade-safe-transpiler'); -const { findAlreadyInitializable } = require('@openzeppelin/upgrade-safe-transpiler/dist/find-already-initializable'); - -const SOURCES = 'contracts'; -const PEER_PLACEHOLDER = '__peer__'; -const PACKAGES = { - [SOURCES + '/']: '@openzeppelin/community-contracts/', -}; -const UPGRADEABLE_PACKAGES = { - '@openzeppelin/contracts/': '@openzeppelin/contracts-upgradeable/', -}; - -const settingsPath = process.argv[2] ?? path.join(__dirname, 'transpile.config.json'); -const { initializablePath, ...settings } = JSON.parse(fs.readFileSync(settingsPath, 'utf8')); - -const root = process.cwd(); -const buildInfoDir = path.join(root, 'artifacts', 'build-info'); -const buildInfos = fs.readdirSync(buildInfoDir); -if (buildInfos.length !== 1) { - throw new Error(`Expected ${buildInfoDir} to contain only one file`); -} -const { input, output, solcVersion } = JSON.parse(fs.readFileSync(path.join(buildInfoDir, buildInfos[0]), 'utf8')); - -const isLocal = file => file.startsWith(SOURCES + '/'); - -// Contracts that already inherit from `Initializable` are left untouched. The transpiler would exclude them from the -// transformation, but dependencies must stay included for their symbols to be resolved. Instead, `initializablePath` is -// handled here and only local files are excluded. The transpiler then defaults to importing `Initializable` from -// `contracts/Initializable.sol` (as a peer), which is redirected to `initializablePath`. -const alreadyInitializable = findAlreadyInitializable(output, initializablePath); -const DEFAULT_INITIALIZABLE = path.join(PEER_PLACEHOLDER, SOURCES, 'Initializable.sol'); - -// Maps an import path produced by the transpiler to its final location. -function resolveImport(file, importPath) { - if (importPath === DEFAULT_INITIALIZABLE) { - return initializablePath; - } - if (importPath.startsWith(PEER_PLACEHOLDER + '/')) { - const original = importPath.slice(PEER_PLACEHOLDER.length + 1); - const prefix = Object.keys(PACKAGES).find(p => original.startsWith(p)); - return prefix ? PACKAGES[prefix] + original.slice(prefix.length) : original; - } - if (importPath.startsWith('.')) { - return importPath; - } - const prefix = Object.keys(UPGRADEABLE_PACKAGES).find(p => importPath.startsWith(p)); - if (prefix === undefined) { - throw new Error(`${file} imports a stateful contract from ${importPath}, which has no upgradeable variant`); - } - return UPGRADEABLE_PACKAGES[prefix] + importPath.slice(prefix.length); -} - -function rewriteImports(file, source) { - return source.replace(/^(import\s[^;]*?["'])([^"']+)(["'];)/gm, (_, pre, importPath, post) => - [pre, resolveImport(file, importPath), post].join(''), - ); -} - -// The generated `WithInit` file contains a block for every transformed contract, including those from dependencies. -// Only the blocks corresponding to local contracts are kept. Their imports are restricted to the contract and the -// user-defined types of its constructor arguments, to avoid clashes between symbols the imported files bring into scope. -const ELEMENTARY_TYPES = /^(address|bool|string|bytes\d*|u?int\d*|u?fixed[\dx]*)$/; - -function filterWithInit(file, source) { - const [header, ...blocks] = source.split(/^(?=import ")/m); - const kept = blocks - .map(block => { - const [, importPath, name, params] = block.match( - /^import "([^"]+)";\s+contract \w+ is (\w+) {\s+constructor\(([^)]*)\)/, - ); - const types = params - .split(',') - .map(param => param.trim().match(/^\w+/)?.[0]) - .filter(type => type && !ELEMENTARY_TYPES.test(type)); - const symbols = [...new Set([name, ...types])]; - return { importPath, block: block.replace(/^import "/, `import {${symbols.join(', ')}} from "`) }; - }) - .filter(({ importPath }) => isLocal(path.join(path.dirname(file), importPath))) - .map(({ block }) => block); - return [header, ...kept].join(''); -} - -// Transpiling with a peer project requires every import to list its symbols. Dependencies are only transformed so their -// symbols can be resolved and their output is discarded, so their unaliased imports are expanded to every exported symbol. -for (const [source, { ast }] of Object.entries(output.sources)) { - if (isLocal(source)) continue; - for (const node of ast.nodes) { - if (node.nodeType === 'ImportDirective' && node.symbolAliases.length === 0 && node.unitAlias === '') { - const { exportedSymbols } = output.sources[node.absolutePath].ast; - node.symbolAliases = Object.keys(exportedSymbols).map(name => ({ foreign: { name }, local: null })); - } - } -} - -async function main() { - const files = await transpile( - input, - output, - { root, sources: path.join(root, SOURCES) }, - { - ...settings, - exclude: [...(settings.exclude ?? []), ...alreadyInitializable.filter(isLocal)], - solcVersion, - peerProject: PEER_PLACEHOLDER + '/', - }, - ); - - const withInitPath = path.join(SOURCES, 'mocks', 'WithInit.sol'); - const results = files - .filter(t => isLocal(t.path)) - .map(t => ({ - path: t.path, - source: t.path === withInitPath ? filterWithInit(t.path, t.source) : rewriteImports(t.path, t.source), - })); - - for (const { path: file, source } of results) { - fs.mkdirSync(path.dirname(path.join(root, file)), { recursive: true }); - fs.writeFileSync(path.join(root, file), source); - } - - if (settings.deleteOriginals) { - const keep = new Set([...results.map(t => t.path), ...alreadyInitializable]); - const deleted = Object.keys(output.sources).filter(source => isLocal(source) && !keep.has(source)); - for (const source of deleted) { - fs.rmSync(path.join(root, source), { force: true }); - } - - // Files without an upgradeable variant are imported from the peer project, so they are compiled (and exposed) for - // the tests. Files that only contain imports (e.g. `mocks/import.sol`) have their imported symbols forwarded. Names - // declared in more than one file are aliased to avoid clashes. - const declarations = deleted.map(source => { - const { nodes } = output.sources[source].ast; - const contracts = nodes.filter(n => n.nodeType === 'ContractDefinition').map(n => n.name); - const imported = nodes - .filter(n => n.nodeType === 'ImportDirective') - .flatMap(n => n.symbolAliases.map(a => a.local ?? a.foreign.name)); - return { source, names: contracts.length > 0 ? contracts : imported }; - }); - const count = {}; - declarations.flatMap(({ names }) => names).forEach(name => (count[name] = (count[name] ?? 0) + 1)); - const peerImports = [ - '// SPDX-License-Identifier: UNLICENSED', - 'pragma solidity ^0.8.20;', - '', - ...declarations - .filter(({ names }) => names.length > 0) - .map(({ source, names }, i) => { - const symbols = names.map(name => (count[name] > 1 ? `${name} as ${name}_${i}` : name)); - return `import {${symbols.join(', ')}} from "${resolveImport(source, path.join(PEER_PLACEHOLDER, source))}";`; - }), - '', - ]; - fs.writeFileSync(path.join(root, SOURCES, 'mocks', 'PeerImports.sol'), peerImports.join('\n')); - } -} - -main().catch(error => { - console.error(error); - process.exitCode = 1; -}); diff --git a/scripts/upgradeable/transpile.sh b/scripts/upgradeable/transpile.sh index 284cc38de..d26ca074d 100755 --- a/scripts/upgradeable/transpile.sh +++ b/scripts/upgradeable/transpile.sh @@ -7,10 +7,9 @@ DIRNAME="$(dirname -- "${BASH_SOURCE[0]}")" # apply patches to the codebase bash "$DIRNAME/patch-apply.sh" -# compile and run the transpiler +# run the transpiler npm run clean -npx hardhat compile -node "$DIRNAME/transpile.js" "$DIRNAME/transpile.config.json" +npx hardhat transpile --settings "$DIRNAME/transpile.config.json" # delete compilation artifacts of vanilla code npm run clean diff --git a/scripts/upgradeable/upgradeable.patch b/scripts/upgradeable/upgradeable.patch index 96b6554d1..ed3d4bae6 100644 --- a/scripts/upgradeable/upgradeable.patch +++ b/scripts/upgradeable/upgradeable.patch @@ -1,5 +1,5 @@ diff --git a/README.md b/README.md -index dbce31e..074338a 100644 +index dbce31e2..074338a3 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,11 @@ @@ -14,20 +14,30 @@ index dbce31e..074338a 100644 ## Overview This repository contains contracts and libraries in the following categories: -diff --git a/hardhat.config.js b/hardhat.config.js -index 754d915..1766649 100644 ---- a/hardhat.config.js -+++ b/hardhat.config.js -@@ -55,6 +55,7 @@ module.exports = { +diff --git a/hardhat.config.ts b/hardhat.config.ts +index 367c2c9c..8b86a042 100644 +--- a/hardhat.config.ts ++++ b/hardhat.config.ts +@@ -47,7 +47,7 @@ export default defineConfig({ + // remappings.txt entry, so it is a project file that no compilation root imports by name: `npmFilesToBuild` cannot + // reach it (HHE901), and being imported is not enough for Hardhat 3 to emit an artifact. Building its directory as + // a source directory is what makes those artifacts appear. +- sources: [argv.src, 'lib/email-tx-builder/packages/contracts/src/utils'], ++ sources: [argv.src, 'lib/openzeppelin-community-contracts/contracts', 'lib/email-tx-builder/packages/contracts/src/utils'], + }, + solidity: { + version: argv.compiler, +@@ -114,7 +114,7 @@ export default defineConfig({ exposed: { imports: true, initializers: true, -+ exclude: ['**/*WithInit.sol'], +- include: ['contracts/**/*.sol'], ++ include: ['{,lib/openzeppelin-community-contracts/}contracts/**/*.sol'], + exclude: ['**/*WithInit.sol'], }, - gasReporter: { - enabled: argv.gas, + docgen: await import('./docs/config.mjs').then(m => m.default), diff --git a/package.json b/package.json -index 489f780..923ee3f 100644 +index 3d5173a5..0e85483f 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ @@ -38,11 +48,11 @@ index 489f780..923ee3f 100644 "description": "Solidity library of smart contracts from the OpenZeppelin Community", "author": "OpenZeppelin Community ", diff --git a/remappings.txt b/remappings.txt -index 0ffaddd..d03bc78 100644 +index ed847262..ac65d26f 100644 --- a/remappings.txt +++ b/remappings.txt @@ -1,6 +1,7 @@ - @openzeppelin/contracts/=lib/@openzeppelin-contracts/contracts/ + @openzeppelin/contracts/=node_modules/@openzeppelin/contracts/contracts/ @openzeppelin/contracts-upgradeable/=lib/@openzeppelin-contracts-upgradeable/contracts/ -@openzeppelin/community-contracts/=contracts/ +@openzeppelin/community-contracts-upgradeable/=contracts/ From 778353bceaf15ccc7201b76314d75befecc31656 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Thu, 12 Nov 2026 16:42:10 +0100 Subject: [PATCH 29/51] Minimize pragmas and mark files copied from OpenZeppelin Contracts Add scripts/minimize-pragma.js and the `pragma` npm script, copied from OpenZeppelin Contracts, and run it. Most contracts now require ^0.8.31, following the new floor of their OpenZeppelin Contracts dependencies; some interfaces and contracts are lowered. The generator templates are updated to match. Add a header to the files in scripts/ and .github/workflows/ that are exact copies of the ones in lib/@openzeppelin-contracts. --- .github/workflows/actionlint.yml | 2 + .github/workflows/gas-comment.yml | 2 + contracts/account/RoleAccount.sol | 2 +- contracts/account/RoleAccountFactory.sol | 2 +- .../modules/ERC7579DelayedExecutor.sol | 2 +- contracts/account/modules/ERC7579Executor.sol | 2 +- contracts/account/modules/ERC7579Multisig.sol | 2 +- .../modules/ERC7579MultisigConfirmation.sol | 2 +- .../modules/ERC7579MultisigStorage.sol | 2 +- .../modules/ERC7579MultisigWeighted.sol | 2 +- .../modules/ERC7579SelectorExecutor.sol | 2 +- .../account/modules/ERC7579Signature.sol | 2 +- .../account/modules/ERC7579Validator.sol | 2 +- contracts/crosschain/ERC7786OpenBridge.sol | 2 +- .../axelar/AxelarGatewayAdapter.sol | 2 +- .../crosschain/utils/ERC7786Attributes.sol | 2 +- .../wormhole/WormholeGatewayAdapter.sol | 2 +- .../TimelockControllerEnumerable.sol | 2 +- contracts/interfaces/IERC7540.sol | 2 +- contracts/interfaces/IERC7575.sol | 2 +- contracts/interfaces/IERC7786Attributes.sol | 2 +- contracts/interfaces/IERC7943.sol | 2 +- contracts/interfaces/IERC7969.sol | 2 +- .../token/ERC20/extensions/ERC20Freezable.sol | 2 +- .../token/ERC20/extensions/ERC20uRWA.sol | 2 +- .../token/ERC20/extensions/ERC4626Fees.sol | 2 +- contracts/token/ERC20/extensions/ERC7540.sol | 2 +- .../ERC20/extensions/ERC7540AdminDeposit.sol | 2 +- .../ERC20/extensions/ERC7540AdminRedeem.sol | 2 +- .../ERC20/extensions/ERC7540DelayDeposit.sol | 2 +- .../ERC20/extensions/ERC7540DelayRedeem.sol | 2 +- .../ERC20/extensions/ERC7540EpochDeposit.sol | 2 +- .../ERC20/extensions/ERC7540EpochRedeem.sol | 2 +- .../ERC20/extensions/ERC7540SyncDeposit.sol | 2 +- .../ERC20/extensions/ERC7540SyncRedeem.sol | 2 +- contracts/utils/cryptography/DKIMRegistry.sol | 2 +- contracts/utils/cryptography/ZKEmailUtils.sol | 2 +- .../signers/SignerAccessManaged.sol | 2 +- .../cryptography/signers/SignerZKEmail.sol | 2 +- .../verifiers/ERC7913ZKEmailVerifier.sol | 2 +- .../utils/structs/EnumerableMapExtended.sol | 2 +- .../utils/structs/EnumerableSetExtended.sol | 2 +- package.json | 1 + scripts/checks/compare-gas-reports.js | 2 + scripts/checks/generation.sh | 2 + scripts/checks/pragma-validity.js | 2 + .../templates/EnumerableMapExtended.js | 2 +- .../templates/EnumerableSetExtended.js | 2 +- scripts/get-contracts-metadata.js | 2 + scripts/git-user-config.sh | 2 + scripts/minimize-pragma.js | 150 ++++++++++++++++++ scripts/solc-versions.js | 2 + scripts/update-docs-branch.js | 2 + scripts/upgradeable/patch-apply.sh | 2 + scripts/upgradeable/patch-save.sh | 2 + 55 files changed, 215 insertions(+), 42 deletions(-) create mode 100755 scripts/minimize-pragma.js diff --git a/.github/workflows/actionlint.yml b/.github/workflows/actionlint.yml index 031ff47d2..dceae7964 100644 --- a/.github/workflows/actionlint.yml +++ b/.github/workflows/actionlint.yml @@ -1,3 +1,5 @@ +# This file is an exact copy of lib/@openzeppelin-contracts/.github/workflows/actionlint.yml. + name: lint workflows on: diff --git a/.github/workflows/gas-comment.yml b/.github/workflows/gas-comment.yml index f58623595..042ddedbe 100644 --- a/.github/workflows/gas-comment.yml +++ b/.github/workflows/gas-comment.yml @@ -1,3 +1,5 @@ +# This file is an exact copy of lib/@openzeppelin-contracts/.github/workflows/gas-comment.yml. + name: gas-comment # Posts the gas comparison produced by the `checks` workflow as a sticky PR comment. diff --git a/contracts/account/RoleAccount.sol b/contracts/account/RoleAccount.sol index f6aa6d025..9de09ba0b 100644 --- a/contracts/account/RoleAccount.sol +++ b/contracts/account/RoleAccount.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {IAccessManager} from "@openzeppelin/contracts/access/manager/IAccessManager.sol"; import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol"; diff --git a/contracts/account/RoleAccountFactory.sol b/contracts/account/RoleAccountFactory.sol index 2f002bc9b..ebfb8b275 100644 --- a/contracts/account/RoleAccountFactory.sol +++ b/contracts/account/RoleAccountFactory.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol"; import {RoleAccount} from "./RoleAccount.sol"; diff --git a/contracts/account/modules/ERC7579DelayedExecutor.sol b/contracts/account/modules/ERC7579DelayedExecutor.sol index 7a0a35145..f02c64908 100644 --- a/contracts/account/modules/ERC7579DelayedExecutor.sol +++ b/contracts/account/modules/ERC7579DelayedExecutor.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {Time} from "@openzeppelin/contracts/utils/types/Time.sol"; import {ERC7579Executor} from "./ERC7579Executor.sol"; diff --git a/contracts/account/modules/ERC7579Executor.sol b/contracts/account/modules/ERC7579Executor.sol index b1201d078..4c8f72bf2 100644 --- a/contracts/account/modules/ERC7579Executor.sol +++ b/contracts/account/modules/ERC7579Executor.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.20; import { IERC7579Module, diff --git a/contracts/account/modules/ERC7579Multisig.sol b/contracts/account/modules/ERC7579Multisig.sol index 637c0d0eb..91cceadd7 100644 --- a/contracts/account/modules/ERC7579Multisig.sol +++ b/contracts/account/modules/ERC7579Multisig.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {SignatureChecker} from "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol"; import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; diff --git a/contracts/account/modules/ERC7579MultisigConfirmation.sol b/contracts/account/modules/ERC7579MultisigConfirmation.sol index 3991b6a4d..f047f80a4 100644 --- a/contracts/account/modules/ERC7579MultisigConfirmation.sol +++ b/contracts/account/modules/ERC7579MultisigConfirmation.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol"; import {SignatureChecker} from "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol"; diff --git a/contracts/account/modules/ERC7579MultisigStorage.sol b/contracts/account/modules/ERC7579MultisigStorage.sol index e8c07e748..fbcf6d1d1 100644 --- a/contracts/account/modules/ERC7579MultisigStorage.sol +++ b/contracts/account/modules/ERC7579MultisigStorage.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {SignatureChecker} from "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol"; import {ERC7579Multisig} from "./ERC7579Multisig.sol"; diff --git a/contracts/account/modules/ERC7579MultisigWeighted.sol b/contracts/account/modules/ERC7579MultisigWeighted.sol index 679b3ab73..c7c294ac9 100644 --- a/contracts/account/modules/ERC7579MultisigWeighted.sol +++ b/contracts/account/modules/ERC7579MultisigWeighted.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol"; import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; diff --git a/contracts/account/modules/ERC7579SelectorExecutor.sol b/contracts/account/modules/ERC7579SelectorExecutor.sol index d41918c77..1b7d7f8b7 100644 --- a/contracts/account/modules/ERC7579SelectorExecutor.sol +++ b/contracts/account/modules/ERC7579SelectorExecutor.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {ERC7579Utils} from "@openzeppelin/contracts/account/utils/draft-ERC7579Utils.sol"; import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; diff --git a/contracts/account/modules/ERC7579Signature.sol b/contracts/account/modules/ERC7579Signature.sol index e0f89b60c..1e701979e 100644 --- a/contracts/account/modules/ERC7579Signature.sol +++ b/contracts/account/modules/ERC7579Signature.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {SignatureChecker} from "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol"; import {ERC7579Validator} from "./ERC7579Validator.sol"; diff --git a/contracts/account/modules/ERC7579Validator.sol b/contracts/account/modules/ERC7579Validator.sol index c9fe0e9b7..fee3537c1 100644 --- a/contracts/account/modules/ERC7579Validator.sol +++ b/contracts/account/modules/ERC7579Validator.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {ERC4337Utils} from "@openzeppelin/contracts/account/utils/ERC4337Utils.sol"; import { diff --git a/contracts/crosschain/ERC7786OpenBridge.sol b/contracts/crosschain/ERC7786OpenBridge.sol index 4c5a5bcc5..8f9cac892 100644 --- a/contracts/crosschain/ERC7786OpenBridge.sol +++ b/contracts/crosschain/ERC7786OpenBridge.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol"; import {IERC7786GatewaySource, IERC7786Recipient} from "@openzeppelin/contracts/interfaces/IERC7786.sol"; diff --git a/contracts/crosschain/axelar/AxelarGatewayAdapter.sol b/contracts/crosschain/axelar/AxelarGatewayAdapter.sol index 04c99cb42..5a411173c 100644 --- a/contracts/crosschain/axelar/AxelarGatewayAdapter.sol +++ b/contracts/crosschain/axelar/AxelarGatewayAdapter.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {AxelarExecutable} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/executable/AxelarExecutable.sol"; import {IAxelarGateway} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IAxelarGateway.sol"; diff --git a/contracts/crosschain/utils/ERC7786Attributes.sol b/contracts/crosschain/utils/ERC7786Attributes.sol index c50ddd9ff..8c2ffea20 100644 --- a/contracts/crosschain/utils/ERC7786Attributes.sol +++ b/contracts/crosschain/utils/ERC7786Attributes.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.20; import {IERC7786Attributes} from "../../interfaces/IERC7786Attributes.sol"; diff --git a/contracts/crosschain/wormhole/WormholeGatewayAdapter.sol b/contracts/crosschain/wormhole/WormholeGatewayAdapter.sol index 31313a536..e9db700dd 100644 --- a/contracts/crosschain/wormhole/WormholeGatewayAdapter.sol +++ b/contracts/crosschain/wormhole/WormholeGatewayAdapter.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol"; import {IERC7786GatewaySource, IERC7786Recipient} from "@openzeppelin/contracts/interfaces/IERC7786.sol"; diff --git a/contracts/governance/TimelockControllerEnumerable.sol b/contracts/governance/TimelockControllerEnumerable.sol index 1877ed9d4..213811802 100644 --- a/contracts/governance/TimelockControllerEnumerable.sol +++ b/contracts/governance/TimelockControllerEnumerable.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.24; +pragma solidity ^0.8.31; import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol"; import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; diff --git a/contracts/interfaces/IERC7540.sol b/contracts/interfaces/IERC7540.sol index d4ea87f43..8441193f6 100644 --- a/contracts/interfaces/IERC7540.sol +++ b/contracts/interfaces/IERC7540.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity >=0.8.4; +pragma solidity >=0.6.2; import {IERC7575} from "./IERC7575.sol"; diff --git a/contracts/interfaces/IERC7575.sol b/contracts/interfaces/IERC7575.sol index 43b678153..df94039ad 100644 --- a/contracts/interfaces/IERC7575.sol +++ b/contracts/interfaces/IERC7575.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity >=0.8.4; +pragma solidity >=0.6.2; import {IERC165} from "@openzeppelin/contracts/interfaces/IERC165.sol"; import {IERC4626} from "@openzeppelin/contracts/interfaces/IERC4626.sol"; diff --git a/contracts/interfaces/IERC7786Attributes.sol b/contracts/interfaces/IERC7786Attributes.sol index 2bb829cef..053e6e0a0 100644 --- a/contracts/interfaces/IERC7786Attributes.sol +++ b/contracts/interfaces/IERC7786Attributes.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.4; +pragma solidity >=0.4.11; /** * @dev Standard attributes for ERC-7786. These attributes may be standardized in different ERCs. diff --git a/contracts/interfaces/IERC7943.sol b/contracts/interfaces/IERC7943.sol index 034208800..7db4aae80 100644 --- a/contracts/interfaces/IERC7943.sol +++ b/contracts/interfaces/IERC7943.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.26; +pragma solidity >=0.8.4; import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol"; diff --git a/contracts/interfaces/IERC7969.sol b/contracts/interfaces/IERC7969.sol index 23544d86c..c948bd045 100644 --- a/contracts/interfaces/IERC7969.sol +++ b/contracts/interfaces/IERC7969.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.20; +pragma solidity >=0.4.16; /** * @title ERC-7969 DKIM Registry Interface. diff --git a/contracts/token/ERC20/extensions/ERC20Freezable.sol b/contracts/token/ERC20/extensions/ERC20Freezable.sol index 319cf7cfd..e46490c5a 100644 --- a/contracts/token/ERC20/extensions/ERC20Freezable.sol +++ b/contracts/token/ERC20/extensions/ERC20Freezable.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.26; +pragma solidity ^0.8.31; import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import {Math} from "@openzeppelin/contracts/utils/math/Math.sol"; diff --git a/contracts/token/ERC20/extensions/ERC20uRWA.sol b/contracts/token/ERC20/extensions/ERC20uRWA.sol index ed00df7e9..7d746a858 100644 --- a/contracts/token/ERC20/extensions/ERC20uRWA.sol +++ b/contracts/token/ERC20/extensions/ERC20uRWA.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.26; +pragma solidity ^0.8.31; import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import {ERC165, IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol"; diff --git a/contracts/token/ERC20/extensions/ERC4626Fees.sol b/contracts/token/ERC20/extensions/ERC4626Fees.sol index 57a37d87a..38e2b74d8 100644 --- a/contracts/token/ERC20/extensions/ERC4626Fees.sol +++ b/contracts/token/ERC20/extensions/ERC4626Fees.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.24; +pragma solidity ^0.8.31; import {ERC4626} from "@openzeppelin/contracts/token/ERC20/extensions/ERC4626.sol"; import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; diff --git a/contracts/token/ERC20/extensions/ERC7540.sol b/contracts/token/ERC20/extensions/ERC7540.sol index ebda9be24..5e971fbd7 100644 --- a/contracts/token/ERC20/extensions/ERC7540.sol +++ b/contracts/token/ERC20/extensions/ERC7540.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {IERC4626} from "@openzeppelin/contracts/interfaces/IERC4626.sol"; import {IERC20, IERC20Metadata, ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; diff --git a/contracts/token/ERC20/extensions/ERC7540AdminDeposit.sol b/contracts/token/ERC20/extensions/ERC7540AdminDeposit.sol index c58240dcf..db69e6d9d 100644 --- a/contracts/token/ERC20/extensions/ERC7540AdminDeposit.sol +++ b/contracts/token/ERC20/extensions/ERC7540AdminDeposit.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {Math} from "@openzeppelin/contracts/utils/math/Math.sol"; import {ERC7540} from "./ERC7540.sol"; diff --git a/contracts/token/ERC20/extensions/ERC7540AdminRedeem.sol b/contracts/token/ERC20/extensions/ERC7540AdminRedeem.sol index 4c60e28eb..0146812ce 100644 --- a/contracts/token/ERC20/extensions/ERC7540AdminRedeem.sol +++ b/contracts/token/ERC20/extensions/ERC7540AdminRedeem.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {Math} from "@openzeppelin/contracts/utils/math/Math.sol"; import {ERC7540} from "./ERC7540.sol"; diff --git a/contracts/token/ERC20/extensions/ERC7540DelayDeposit.sol b/contracts/token/ERC20/extensions/ERC7540DelayDeposit.sol index c88b7697d..df5c30591 100644 --- a/contracts/token/ERC20/extensions/ERC7540DelayDeposit.sol +++ b/contracts/token/ERC20/extensions/ERC7540DelayDeposit.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {IERC6372} from "@openzeppelin/contracts/interfaces/IERC6372.sol"; import {ERC6372Utils} from "@openzeppelin/contracts/utils/ERC6372Utils.sol"; diff --git a/contracts/token/ERC20/extensions/ERC7540DelayRedeem.sol b/contracts/token/ERC20/extensions/ERC7540DelayRedeem.sol index 710304a7b..362804504 100644 --- a/contracts/token/ERC20/extensions/ERC7540DelayRedeem.sol +++ b/contracts/token/ERC20/extensions/ERC7540DelayRedeem.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {IERC6372} from "@openzeppelin/contracts/interfaces/IERC6372.sol"; import {ERC6372Utils} from "@openzeppelin/contracts/utils/ERC6372Utils.sol"; diff --git a/contracts/token/ERC20/extensions/ERC7540EpochDeposit.sol b/contracts/token/ERC20/extensions/ERC7540EpochDeposit.sol index 8b65caddb..f0fab57da 100644 --- a/contracts/token/ERC20/extensions/ERC7540EpochDeposit.sol +++ b/contracts/token/ERC20/extensions/ERC7540EpochDeposit.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {Math} from "@openzeppelin/contracts/utils/math/Math.sol"; import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol"; diff --git a/contracts/token/ERC20/extensions/ERC7540EpochRedeem.sol b/contracts/token/ERC20/extensions/ERC7540EpochRedeem.sol index 66d677802..67d4e3867 100644 --- a/contracts/token/ERC20/extensions/ERC7540EpochRedeem.sol +++ b/contracts/token/ERC20/extensions/ERC7540EpochRedeem.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {Math} from "@openzeppelin/contracts/utils/math/Math.sol"; import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol"; diff --git a/contracts/token/ERC20/extensions/ERC7540SyncDeposit.sol b/contracts/token/ERC20/extensions/ERC7540SyncDeposit.sol index ef2d63749..dadd18646 100644 --- a/contracts/token/ERC20/extensions/ERC7540SyncDeposit.sol +++ b/contracts/token/ERC20/extensions/ERC7540SyncDeposit.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {ERC7540} from "./ERC7540.sol"; diff --git a/contracts/token/ERC20/extensions/ERC7540SyncRedeem.sol b/contracts/token/ERC20/extensions/ERC7540SyncRedeem.sol index da858f38a..be5e6949d 100644 --- a/contracts/token/ERC20/extensions/ERC7540SyncRedeem.sol +++ b/contracts/token/ERC20/extensions/ERC7540SyncRedeem.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {ERC7540} from "./ERC7540.sol"; diff --git a/contracts/utils/cryptography/DKIMRegistry.sol b/contracts/utils/cryptography/DKIMRegistry.sol index 15204364a..8342e0961 100644 --- a/contracts/utils/cryptography/DKIMRegistry.sol +++ b/contracts/utils/cryptography/DKIMRegistry.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.26; +pragma solidity ^0.8.20; import {IDKIMRegistry} from "../../interfaces/IERC7969.sol"; diff --git a/contracts/utils/cryptography/ZKEmailUtils.sol b/contracts/utils/cryptography/ZKEmailUtils.sol index dddc18f75..2fd1f4435 100644 --- a/contracts/utils/cryptography/ZKEmailUtils.sol +++ b/contracts/utils/cryptography/ZKEmailUtils.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.24; +pragma solidity ^0.8.31; import {Bytes} from "@openzeppelin/contracts/utils/Bytes.sol"; import {Strings} from "@openzeppelin/contracts/utils/Strings.sol"; diff --git a/contracts/utils/cryptography/signers/SignerAccessManaged.sol b/contracts/utils/cryptography/signers/SignerAccessManaged.sol index 8f711b99a..dad80337d 100644 --- a/contracts/utils/cryptography/signers/SignerAccessManaged.sol +++ b/contracts/utils/cryptography/signers/SignerAccessManaged.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {IAccessManager} from "@openzeppelin/contracts/access/manager/IAccessManager.sol"; import {SignatureChecker} from "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol"; diff --git a/contracts/utils/cryptography/signers/SignerZKEmail.sol b/contracts/utils/cryptography/signers/SignerZKEmail.sol index 088446648..d5019f311 100644 --- a/contracts/utils/cryptography/signers/SignerZKEmail.sol +++ b/contracts/utils/cryptography/signers/SignerZKEmail.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.24; +pragma solidity ^0.8.31; import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol"; import {IDKIMRegistry} from "@zk-email/contracts/DKIMRegistry.sol"; diff --git a/contracts/utils/cryptography/verifiers/ERC7913ZKEmailVerifier.sol b/contracts/utils/cryptography/verifiers/ERC7913ZKEmailVerifier.sol index ccf0495ea..02953796c 100644 --- a/contracts/utils/cryptography/verifiers/ERC7913ZKEmailVerifier.sol +++ b/contracts/utils/cryptography/verifiers/ERC7913ZKEmailVerifier.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.24; +pragma solidity ^0.8.31; import {IERC7913SignatureVerifier} from "@openzeppelin/contracts/interfaces/IERC7913.sol"; import {IDKIMRegistry} from "@zk-email/contracts/DKIMRegistry.sol"; diff --git a/contracts/utils/structs/EnumerableMapExtended.sol b/contracts/utils/structs/EnumerableMapExtended.sol index 89c3e71ad..255db77ed 100644 --- a/contracts/utils/structs/EnumerableMapExtended.sol +++ b/contracts/utils/structs/EnumerableMapExtended.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT // This file was procedurally generated from scripts/generate/templates/EnumerableMapExtended.js. -pragma solidity ^0.8.24; +pragma solidity ^0.8.31; import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; import {EnumerableSetExtended} from "./EnumerableSetExtended.sol"; diff --git a/contracts/utils/structs/EnumerableSetExtended.sol b/contracts/utils/structs/EnumerableSetExtended.sol index 66068ebda..c113a1f40 100644 --- a/contracts/utils/structs/EnumerableSetExtended.sol +++ b/contracts/utils/structs/EnumerableSetExtended.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT // This file was procedurally generated from scripts/generate/templates/EnumerableSetExtended.js. -pragma solidity ^0.8.24; +pragma solidity ^0.8.31; import {Hashes} from "@openzeppelin/contracts/utils/cryptography/Hashes.sol"; import {Math} from "@openzeppelin/contracts/utils/math/Math.sol"; diff --git a/package.json b/package.json index 3d5173a57..1c5123677 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "test": "hardhat test", "test:generation": "scripts/checks/generation.sh", "test:inheritance": "scripts/checks/inheritance-ordering.js artifacts/build-info/*.output.json", + "pragma": "hardhat build --noExpose && scripts/minimize-pragma.js artifacts/build-info/*", "test:pragma": "scripts/checks/pragma-validity.js artifacts/build-info/*", "coverage": "hardhat test --coverage", "gas-report": "hardhat test --gas-stats" diff --git a/scripts/checks/compare-gas-reports.js b/scripts/checks/compare-gas-reports.js index 13cf19b29..b8e7f27b4 100755 --- a/scripts/checks/compare-gas-reports.js +++ b/scripts/checks/compare-gas-reports.js @@ -1,5 +1,7 @@ #!/usr/bin/env node +// This file is an exact copy of lib/@openzeppelin-contracts/scripts/checks/compare-gas-reports.js. + import fs from 'fs'; import chalk from 'chalk'; diff --git a/scripts/checks/generation.sh b/scripts/checks/generation.sh index 00d609f94..0f5f8da9b 100755 --- a/scripts/checks/generation.sh +++ b/scripts/checks/generation.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +# This file is an exact copy of lib/@openzeppelin-contracts/scripts/checks/generation.sh. + set -euo pipefail npm run generate diff --git a/scripts/checks/pragma-validity.js b/scripts/checks/pragma-validity.js index 73e66cfd5..f5034a431 100755 --- a/scripts/checks/pragma-validity.js +++ b/scripts/checks/pragma-validity.js @@ -1,5 +1,7 @@ #!/usr/bin/env node +// This file is an exact copy of lib/@openzeppelin-contracts/scripts/checks/pragma-validity.js. + import semver from 'semver'; import pLimit from 'p-limit'; import yargs from 'yargs'; diff --git a/scripts/generate/templates/EnumerableMapExtended.js b/scripts/generate/templates/EnumerableMapExtended.js index 6d4312107..4db8d4dc9 100644 --- a/scripts/generate/templates/EnumerableMapExtended.js +++ b/scripts/generate/templates/EnumerableMapExtended.js @@ -2,7 +2,7 @@ import format from '../format-lines.js'; import { SET_TYPES, MAP_TYPES } from './Enumerable.opts.js'; const header = `\ -pragma solidity ^0.8.24; +pragma solidity ^0.8.31; import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; import {EnumerableSetExtended} from "./EnumerableSetExtended.sol"; diff --git a/scripts/generate/templates/EnumerableSetExtended.js b/scripts/generate/templates/EnumerableSetExtended.js index 2b7013a7a..dc6b762d9 100644 --- a/scripts/generate/templates/EnumerableSetExtended.js +++ b/scripts/generate/templates/EnumerableSetExtended.js @@ -2,7 +2,7 @@ import format from '../format-lines.js'; import { SET_TYPES } from './Enumerable.opts.js'; const header = `\ -pragma solidity ^0.8.24; +pragma solidity ^0.8.31; import {Hashes} from "@openzeppelin/contracts/utils/cryptography/Hashes.sol"; import {Math} from "@openzeppelin/contracts/utils/math/Math.sol"; diff --git a/scripts/get-contracts-metadata.js b/scripts/get-contracts-metadata.js index 6099ee271..2031334c6 100644 --- a/scripts/get-contracts-metadata.js +++ b/scripts/get-contracts-metadata.js @@ -1,3 +1,5 @@ +// This file is an exact copy of lib/@openzeppelin-contracts/scripts/get-contracts-metadata.js. + import fs from 'fs'; import path from 'path'; import { glob } from 'glob'; diff --git a/scripts/git-user-config.sh b/scripts/git-user-config.sh index e7b81c3eb..b180e3dd9 100644 --- a/scripts/git-user-config.sh +++ b/scripts/git-user-config.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +# This file is an exact copy of lib/@openzeppelin-contracts/scripts/git-user-config.sh. + set -euo pipefail -x git config user.name 'github-actions' diff --git a/scripts/minimize-pragma.js b/scripts/minimize-pragma.js new file mode 100755 index 000000000..b936de544 --- /dev/null +++ b/scripts/minimize-pragma.js @@ -0,0 +1,150 @@ +#!/usr/bin/env node + +// This file is an exact copy of lib/@openzeppelin-contracts/scripts/minimize-pragma.js. + +import fs from 'fs'; +import graphlib from 'graphlib'; +import semver from 'semver'; +import pLimit from 'p-limit'; +import { hideBin } from 'yargs/helpers'; +import yargs from 'yargs/yargs'; + +import { getContractsMetadata } from './get-contracts-metadata.js'; +import { versions as allSolcVersions, compile } from './solc-versions.js'; + +const { + argv: { pattern, skipPatterns, minVersionForContracts, minVersionForInterfaces, concurrency, _: artifacts }, +} = yargs(hideBin(process.argv)) + .env('') + .options({ + pattern: { alias: 'p', type: 'string', default: 'contracts/**/*.sol' }, + skipPatterns: { alias: 's', type: 'string', default: 'contracts/mocks/**/*.sol' }, + minVersionForContracts: { type: 'string', default: '0.8.20' }, + minVersionForInterfaces: { type: 'string', default: '0.0.0' }, + concurrency: { alias: 'c', type: 'number', default: 8 }, + }); + +// limit concurrency +const limit = pLimit(concurrency); + +/******************************************************************************************************************** + * HELPERS * + ********************************************************************************************************************/ + +const setPragma = (file, pragma) => + fs.writeFileSync( + file, + fs + .readFileSync(file, 'utf8') + .replace(/pragma solidity [><=^]*[0-9]+\.[0-9]+\.[0-9]+;/, `pragma solidity ${pragma};`), + 'utf8', + ); + +/** + * Updates the pragma in the given file to the newPragma version. If the file was procedurally + * generated, the same update is applied to its `.eta` template, so the change survives the next + * `npm run generate` and keeps the generated file in sync with its source. + * @param {*} file Path to the file to update (relative to the repo root). + * @param {*} pragma New pragma version to set. (ex: '>=0.8.4') + */ +const updatePragma = (file, pragma) => { + setPragma(file, pragma); + const template = fs.readFileSync(file, 'utf8').match(/procedurally generated from (\S+\.eta)/)?.[1]; + if (template && fs.existsSync(template)) setPragma(template, pragma); +}; + +/** + * Get the applicable pragmas for a given file by compiling it with all solc versions. + * @param {*} file Absolute path to the file to compile. + * @param {*} candidates List of solc version to test. (ex: ['0.8.4','0.8.5']) + * @returns {Promise} List of applicable pragmas. + */ +const getApplicablePragmas = (file, candidates = allSolcVersions) => + Promise.all( + candidates.map(version => + limit(() => + compile(file, version).then( + () => version, + () => null, + ), + ), + ), + ).then(versions => versions.filter(Boolean)); + +/** + * Get the minimum applicable pragmas for a given file. + * @param {*} file Absolute path to the file to compile. + * @param {*} candidates List of solc version to test. (ex: ['0.8.4','0.8.5']) + * @returns {Promise} Smallest applicable pragma out of the list. + */ +const getMinimalApplicablePragma = (file, candidates = allSolcVersions) => + getApplicablePragmas(file, candidates).then(valid => { + if (valid.length == 0) { + throw new Error(`No valid pragma found for ${file}`); + } else { + return valid.sort(semver.compare).at(0); + } + }); + +/** + * Get the minimum applicable pragmas for a given file, and update the file to use it. + * @param {*} file Absolute path to the file to compile. + * @param {*} candidates List of solc version to test. (ex: ['0.8.4','0.8.5']) + * @param {*} prefix Prefix to use when building the pragma (ex: '^') + * @returns {Promise} Version that was used and set in the file + */ +const setMinimalApplicablePragma = (file, candidates = allSolcVersions, prefix = '>=') => + getMinimalApplicablePragma(file, candidates) + .then(version => `${prefix}${version}`) + .then(pragma => { + updatePragma(file, pragma); + return pragma; + }); + +/******************************************************************************************************************** + * MAIN * + ********************************************************************************************************************/ + +// Build metadata from artifact files (hardhat compilation) +const metadata = getContractsMetadata(pattern, skipPatterns, artifacts); + +// Build dependency graph +const graph = new graphlib.Graph({ directed: true }); +Object.keys(metadata).forEach(file => { + graph.setNode(file); + metadata[file].sources.forEach(dep => graph.setEdge(dep, file)); +}); + +// Weaken all pragma to allow exploration +Object.keys(metadata).forEach(file => setPragma(file, '>=0.0.0')); + +// Do a topological traversal of the dependency graph, minimizing pragma for each file we encounter +(async () => { + const queue = graph.sources(); + const pragmas = {}; + while (queue.length) { + const file = queue.shift(); + if (!Object.hasOwn(pragmas, file)) { + if (Object.hasOwn(metadata, file)) { + const minVersion = metadata[file].interface ? minVersionForInterfaces : minVersionForContracts; + const parentsPragmas = graph + .predecessors(file) + .map(file => pragmas[file]) + .filter(Boolean); + const candidates = allSolcVersions.filter( + v => semver.gte(v, minVersion) && parentsPragmas.every(p => semver.satisfies(v, p)), + ); + const pragmaPrefix = metadata[file].interface ? '>=' : '^'; + + process.stdout.write( + `[${Object.keys(pragmas).length + 1}/${Object.keys(metadata).length}] Searching minimal version for ${file} ... `, + ); + const pragma = await setMinimalApplicablePragma(file, candidates, pragmaPrefix); + console.log(pragma); + + pragmas[file] = pragma; + } + queue.push(...graph.successors(file)); + } + } +})(); diff --git a/scripts/solc-versions.js b/scripts/solc-versions.js index abffda515..b6dae6c4d 100644 --- a/scripts/solc-versions.js +++ b/scripts/solc-versions.js @@ -1,3 +1,5 @@ +// This file is an exact copy of lib/@openzeppelin-contracts/scripts/solc-versions.js. + import { execFile } from 'child_process'; import semver from 'semver'; import { range } from './helpers.js'; diff --git a/scripts/update-docs-branch.js b/scripts/update-docs-branch.js index 67f25fb3e..59ef931b0 100644 --- a/scripts/update-docs-branch.js +++ b/scripts/update-docs-branch.js @@ -1,3 +1,5 @@ +// This file is an exact copy of lib/@openzeppelin-contracts/scripts/update-docs-branch.js. + import proc from 'child_process'; import fs from 'fs'; import path from 'path'; diff --git a/scripts/upgradeable/patch-apply.sh b/scripts/upgradeable/patch-apply.sh index d9e17589b..6697aba0e 100755 --- a/scripts/upgradeable/patch-apply.sh +++ b/scripts/upgradeable/patch-apply.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +# This file is an exact copy of lib/@openzeppelin-contracts/scripts/upgradeable/patch-apply.sh. + set -euo pipefail DIRNAME="$(dirname -- "${BASH_SOURCE[0]}")" diff --git a/scripts/upgradeable/patch-save.sh b/scripts/upgradeable/patch-save.sh index 111e6f157..4a2644eaa 100755 --- a/scripts/upgradeable/patch-save.sh +++ b/scripts/upgradeable/patch-save.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +# This file is an exact copy of lib/@openzeppelin-contracts/scripts/upgradeable/patch-save.sh. + set -euo pipefail DIRNAME="$(dirname -- "${BASH_SOURCE[0]}")" From 7ebbf0e43c66a17829ed21a1ac135f058916183a Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Thu, 12 Nov 2026 16:42:23 +0100 Subject: [PATCH 30/51] Remove disabled formal verification workflows --- .github/workflows/fv-certora.yml.disabled | 148 ---------------------- .github/workflows/fv-halmos.yml.disabled | 30 ----- 2 files changed, 178 deletions(-) delete mode 100644 .github/workflows/fv-certora.yml.disabled delete mode 100644 .github/workflows/fv-halmos.yml.disabled diff --git a/.github/workflows/fv-certora.yml.disabled b/.github/workflows/fv-certora.yml.disabled deleted file mode 100644 index 667fa250b..000000000 --- a/.github/workflows/fv-certora.yml.disabled +++ /dev/null @@ -1,148 +0,0 @@ -name: Formal verification - Certora - -on: - # Base-repo context so a fork's PR can reach the CERTORAKEY secret. Only `verify` reads it, gated by - # the `certora` environment's manual approval -- reviewers MUST check the diff for key exfiltration. - pull_request_target: - types: - - opened - - reopened - - synchronize - - labeled - workflow_dispatch: {} - -permissions: - contents: read - -# `github.ref` is the base branch under `pull_request_target`, so key on the pull request number -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -jobs: - # No secret, no environment, read-only token: running the dependency helper here needs no more trust - # than an ordinary `pull_request` job. - identify: - runs-on: ubuntu-latest - # The helper walks an import graph from a pull request that may be untrusted, so bound it - timeout-minutes: 10 - outputs: - configs: ${{ steps.identify.outputs.configs }} - steps: - # Base branch (this workflow's own source under pull_request_target). The helper runs from HERE, - # never the PR: a PR that rewrote it to print `[]` would skip `verify` and pass `verified` green. - - uses: actions/checkout@v7 - with: - path: base - persist-credentials: false - # The PR, read as data only (never executed); checkout needs the fork risk acknowledged. - - uses: actions/checkout@v7 - with: - ref: ${{ github.event.pull_request.head.sha || github.ref }} - allow-unsafe-pr-checkout: true - fetch-depth: 0 # full history so the base...head diff can find its merge-base - path: head - persist-credentials: false - # No setup step: `list-dependencies.js` uses node builtins only, so the runner's node is enough. - - name: Identify the configs that need to be run - id: identify - env: - BASE_SHA: ${{ github.event.pull_request.base.sha }} - HEAD_SHA: ${{ github.event.pull_request.head.sha }} - FORCE_ALL: ${{ github.event_name != 'pull_request_target' || contains(github.event.pull_request.labels.*.name, 'formal-verification-force-all') }} - ALLOW_REMOVED: ${{ contains(github.event.pull_request.labels.*.name, 'formal-verification-allow-removal') }} - run: | - set -o pipefail - if [[ $FORCE_ALL = 'true' ]]; then - # An empty change list reaches every config, which is what forcing all of them asks for. - : > changed.txt - else - # A harness imports `../patched/

`, and `make -C fv apply` builds that file out of two - # tracked ones: `contracts/

`, plus `fv/diff/.patch` applied on - # top. A change to either is a change to what the prover reads, so either has to select - # the config. `--redirect` rewrites the import onto `contracts/

`, which covers the - # first; the walker has no notion of the second, so map a changed patch back onto the - # contract it applies to and let that path do the selecting. Added, edited or deleted, - # the patch is named in the diff either way. Undoing the `_` is what `make apply` does - # too, so a name that breaks this breaks the patch step as well. - git -C head diff --name-only "$BASE_SHA"..."$HEAD_SHA" | - awk '{ print } /^fv\/diff\/.+[.]patch$/ { sub(/^fv\/diff\//, ""); sub(/[.]patch$/, ""); gsub(/_/, "/"); print "contracts/" $0 }' > changed.txt - # Configs are discovered by listing `head/fv/specs`, so one the diff deletes is not there - # to be selected: delete every config and the set is empty, `verify` is skipped and - # `verified` passes green with the verification gone. Refuse unless the label says that - # was the intent -- labelling takes write access, which is what makes it a reviewed one. - REMOVED=$(git -C head diff --name-only --diff-filter=D "$BASE_SHA"..."$HEAD_SHA" -- 'fv/specs/*.conf') - if [[ -n $REMOVED && $ALLOW_REMOVED != 'true' ]]; then - # One config per line, joined: a workflow annotation is a single line. - echo "::error::This change removes ${REMOVED//$'\n'/, }, which cannot appear in the affected set. Label the pull request 'formal-verification-allow-removal' to confirm the verification is meant to go away with it." - exit 1 - fi - fi - { - printf 'configs=' - node base/scripts/list-dependencies.js --root=head --src=fv/specs --ext=.conf --redirect=fv/patched/:contracts/ < changed.txt - } >> "$GITHUB_OUTPUT" - - name: Report the affected configs - env: - CONFIGS: ${{ steps.identify.outputs.configs }} - run: | - echo "Configs affected by this diff: $CONFIGS" >> "$GITHUB_STEP_SUMMARY" - - verify: - needs: identify - if: needs.identify.outputs.configs != '[]' - runs-on: ubuntu-latest - # Cap the prover wait; override via CERTORA_TIMEOUT_MINUTES (a repo var, not env -- timeout-minutes can't read env). - timeout-minutes: ${{ vars.CERTORA_TIMEOUT_MINUTES && fromJSON(vars.CERTORA_TIMEOUT_MINUTES) || 120 }} - # The only job that reads CERTORAKEY, so the only one gated. Reviewers MUST check the diff for key - # exfiltration before approving; one approval releases the whole matrix. - environment: certora - strategy: - fail-fast: false - matrix: - config: ${{ fromJSON(needs.identify.outputs.configs) }} - name: verify (${{ matrix.config }}) - steps: - - uses: actions/checkout@v7 - with: - # Runs the contributor's code, which is what the approval above is protecting against. - ref: ${{ github.event.pull_request.head.sha || github.ref }} - allow-unsafe-pr-checkout: true - persist-credentials: false - - name: Set up environment - uses: ./.github/actions/setup - with: - # Read the cache, never write it. The scope is the base branch here, so a cache saved after - # the contributor's code has run would be restored by every other workflow. - cache: 'restore' - solc: 'on' - java: 'on' - python: 'on' - python-requirements: 'fv-requirements.txt' - - name: Verify specification - env: - # Possibly-untrusted config name: passed via env, never interpolated, so no shell parses it. - CONFIG: ${{ matrix.config }} - CERTORAKEY: ${{ secrets.CERTORAKEY }} - run: | - set -o pipefail - make -C fv apply - STATUS=0 - certoraRun "$CONFIG" --wait_for_results | tee certora.log || STATUS=$? - URL=$(grep -om1 'https://prover.certora.com/output/[a-zA-Z0-9]*/[a-zA-Z0-9]*?anonymousKey=[a-zA-Z0-9]*' certora.log || true) - echo "- $([[ $STATUS = 0 ]] && echo '✅' || echo '❌') \`$CONFIG\` ${URL:+- [report]($URL)}" >> "$GITHUB_STEP_SUMMARY" - exit "$STATUS" - - # single `required status check` for branch protection - verified: - needs: [identify, verify] - if: always() - runs-on: ubuntu-latest - steps: - - name: Check the verification results - env: - IDENTIFY: ${{ needs.identify.result }} - VERIFY: ${{ needs.verify.result }} - run: | - [[ $IDENTIFY = success ]] || { echo "::error::could not work out which configs to run"; exit 1; } - [[ $VERIFY = success || $VERIFY = skipped ]] || { echo "::error::verification $VERIFY"; exit 1; } diff --git a/.github/workflows/fv-halmos.yml.disabled b/.github/workflows/fv-halmos.yml.disabled deleted file mode 100644 index 5a09d466d..000000000 --- a/.github/workflows/fv-halmos.yml.disabled +++ /dev/null @@ -1,30 +0,0 @@ -name: Formal verification - Halmos - -on: - pull_request: - types: - - opened - - reopened - - synchronize - - labeled - workflow_dispatch: {} - -concurrency: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - -jobs: - halmos: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v7 - with: - submodules: recursive - - name: Set up environment - uses: ./.github/actions/setup - with: - foundry: 'on' - python: 'on' - python-requirements: 'fv-requirements.txt' - - name: Run Halmos - run: halmos --match-test '^symbolic|^testSymbolic' -vv - env: - HALMOS_ALLOW_DOWNLOAD: 1 From e93170aeb20a92424a7521a0addbc47d62b28dfe Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Thu, 12 Nov 2026 16:47:03 +0100 Subject: [PATCH 31/51] Mark gas-compare action as a copy of the OpenZeppelin Contracts one Update lib/@openzeppelin-contracts to the transpiler-dependencies branch, where the gas-compare action now passes --root=. to list-dependencies, making both copies identical. --- .github/actions/gas-compare/action.yml | 2 ++ lib/@openzeppelin-contracts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/actions/gas-compare/action.yml b/.github/actions/gas-compare/action.yml index 5304e0237..43b0d630b 100644 --- a/.github/actions/gas-compare/action.yml +++ b/.github/actions/gas-compare/action.yml @@ -1,3 +1,5 @@ +# This file is an exact copy of lib/@openzeppelin-contracts/.github/actions/gas-compare/action.yml. + name: Compare gas costs description: Compare gas costs between branches inputs: diff --git a/lib/@openzeppelin-contracts b/lib/@openzeppelin-contracts index 628ff21e7..5dc54278a 160000 --- a/lib/@openzeppelin-contracts +++ b/lib/@openzeppelin-contracts @@ -1 +1 @@ -Subproject commit 628ff21e761805634f8d7546f580c590b4d4bf69 +Subproject commit 5dc54278a06c56093ee3126fb99edba1626f74b3 From 91d98499af531981e69e0c7d5509c5793a1d91dc Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Thu, 12 Nov 2026 16:48:42 +0100 Subject: [PATCH 32/51] Use the OpenZeppelin Contracts setup action Drop the java and solc inputs, which were only used by the formal verification workflows, making the action identical to the one in lib/@openzeppelin-contracts. --- .github/actions/setup/action.yml | 33 ++------------------------------ 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 9d86065d7..cd31af28a 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -1,3 +1,5 @@ +# This file is an exact copy of lib/@openzeppelin-contracts/.github/actions/setup/action.yml. + name: Setup description: Common environment setup inputs: @@ -9,10 +11,6 @@ inputs: description: Whether to set up Foundry required: false default: 'off' # 'off' | 'on' | - java: - description: Whether to set up Java - required: false - default: 'off' # 'off' | 'on' | python: description: Whether to set up Python required: false @@ -28,10 +26,6 @@ inputs: # the cache scope is keyed on the branch, so a write from such a job lands where every other # workflow reads from. default: 'on' # 'off' | 'restore' | 'on' - solc: - description: Whether to set up solc - required: false - default: 'off' # 'off' | 'on' | runs: using: composite @@ -47,22 +41,14 @@ runs: [[ "${{ inputs.foundry }}" = "on" ]] \ && echo "foundry=$FOUNDRY_DEFAULT_VERSION" \ || echo "foundry=${{ inputs.foundry }}" - [[ "${{ inputs.java }}" = "on" ]] \ - && echo "java=$JAVA_DEFAULT_VERSION" \ - || echo "java=${{ inputs.java }}" [[ "${{ inputs.python }}" = "on" ]] \ && echo "python=$PYTHON_DEFAULT_VERSION" \ || echo "python=${{ inputs.python }}" - [[ "${{ inputs.solc }}" = "on" ]] \ - && echo "solc=$SOLC_DEFAULT_VERSION" \ - || echo "solc=${{ inputs.solc }}" ) > $GITHUB_OUTPUT env: NODE_DEFAULT_VERSION: "24.x" FOUNDRY_DEFAULT_VERSION: "stable" - JAVA_DEFAULT_VERSION: "21" PYTHON_DEFAULT_VERSION: "3.13" - SOLC_DEFAULT_VERSION: "0.8.35" # Node & npm setup - name: Install Node (${{ steps.versions.outputs.node }}) if: inputs.node != 'off' @@ -93,13 +79,6 @@ runs: uses: foundry-rs/foundry-toolchain@v1 with: version: ${{ steps.versions.outputs.foundry }} - # Java setup - - name: Install java (${{ steps.versions.outputs.java }}) - if: ${{ inputs.java != 'off' }} - uses: actions/setup-java@v5 - with: - distribution: temurin - java-version: ${{ steps.versions.outputs.java }} # Python setup - name: Install python (${{ steps.versions.outputs.python }}) if: inputs.python != 'off' @@ -113,11 +92,3 @@ runs: if: inputs.python != 'off' shell: bash run: pip install -r ${{ inputs.python-requirements }} - # Solc setup - - name: Install solc (${{ steps.versions.outputs.solc }}) - if: inputs.solc != 'off' - shell: bash - run: | - wget -q https://github.com/argotorg/solidity/releases/download/v${{ steps.versions.outputs.solc }}/solc-static-linux - chmod +x solc-static-linux - sudo mv solc-static-linux /usr/local/bin/solc From 83ba96691aa27b4c6215cd72dada4fdcd2d44c9e Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Thu, 12 Nov 2026 16:50:06 +0100 Subject: [PATCH 33/51] Update lib/@openzeppelin-contracts to fix setup action quotes --- .github/actions/setup/action.yml | 8 ++++---- lib/@openzeppelin-contracts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index cd31af28a..b2d95b02c 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -30,7 +30,7 @@ inputs: runs: using: composite steps: - - name: "Determine versions to install" + - name: 'Determine versions to install' id: versions shell: bash run: | @@ -46,9 +46,9 @@ runs: || echo "python=${{ inputs.python }}" ) > $GITHUB_OUTPUT env: - NODE_DEFAULT_VERSION: "24.x" - FOUNDRY_DEFAULT_VERSION: "stable" - PYTHON_DEFAULT_VERSION: "3.13" + NODE_DEFAULT_VERSION: '24.x' + FOUNDRY_DEFAULT_VERSION: 'stable' + PYTHON_DEFAULT_VERSION: '3.13' # Node & npm setup - name: Install Node (${{ steps.versions.outputs.node }}) if: inputs.node != 'off' diff --git a/lib/@openzeppelin-contracts b/lib/@openzeppelin-contracts index 5dc54278a..d5fb6a20c 160000 --- a/lib/@openzeppelin-contracts +++ b/lib/@openzeppelin-contracts @@ -1 +1 @@ -Subproject commit 5dc54278a06c56093ee3126fb99edba1626f74b3 +Subproject commit d5fb6a20c473de3c747b5f16b71c19cac52149b9 From b90ba492946dfc273068dffba246f96642604dee Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Thu, 12 Nov 2026 16:52:25 +0100 Subject: [PATCH 34/51] Align checks workflow with OpenZeppelin Contracts Run on next-v* and release-v* branches, run slither with the slither Foundry profile, and bump crytic/slither-action to v0.4.2. --- .github/workflows/checks.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 2b8a40118..7314af025 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -4,6 +4,8 @@ on: push: branches: - master + - next-v* + - release-v* pull_request: {} workflow_dispatch: {} @@ -103,13 +105,15 @@ jobs: slither: runs-on: ubuntu-latest + env: + FOUNDRY_PROFILE: slither steps: - uses: actions/checkout@v7 with: submodules: recursive - name: Set up environment uses: ./.github/actions/setup - - uses: crytic/slither-action@v0.4.1 + - uses: crytic/slither-action@v0.4.2 codespell: runs-on: ubuntu-latest From 5548062d10ace2a291b255f0175b68de6f075439 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Thu, 12 Nov 2026 16:54:57 +0100 Subject: [PATCH 35/51] Restore the submodules checkout in the docs workflow Building the docs compiles the contracts, which needs the dependencies in lib/. Also update lib/@openzeppelin-contracts, which removes a trailing space from its docs workflow. --- .github/workflows/docs.yml | 2 ++ lib/@openzeppelin-contracts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 721133abd..adf2306ad 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -12,6 +12,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v7 + with: + submodules: recursive - name: Set up environment uses: ./.github/actions/setup - run: bash scripts/git-user-config.sh diff --git a/lib/@openzeppelin-contracts b/lib/@openzeppelin-contracts index d5fb6a20c..2e049f344 160000 --- a/lib/@openzeppelin-contracts +++ b/lib/@openzeppelin-contracts @@ -1 +1 @@ -Subproject commit d5fb6a20c473de3c747b5f16b71c19cac52149b9 +Subproject commit 2e049f3448825a1dc5bbae30f9c04b5c2e96d9d9 From 35ad4e622d5c12e17a2ab854bdd37eeb008ed643 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Thu, 12 Nov 2026 17:02:41 +0100 Subject: [PATCH 36/51] Fix the pragma of mocks Raise the pragma of mocks whose declared minimum version cannot compile them, following the new floors of their dependencies (^0.8.31). The ERC-7786 recipient mocks implement an interface function without `override`, which requires ^0.8.8. --- contracts/mocks/account/AccountZKEmailMock.sol | 2 +- contracts/mocks/account/modules/ERC7579ExecutorMocks.sol | 2 +- contracts/mocks/account/modules/ERC7579MultisigMocks.sol | 2 +- contracts/mocks/crosschain/ERC7786GatewayMock.sol | 2 +- contracts/mocks/crosschain/ERC7786RecipientInvalidMock.sol | 2 +- contracts/mocks/crosschain/ERC7786RecipientRevertMock.sol | 2 +- contracts/mocks/crosschain/axelar/AxelarGatewayMock.sol | 2 +- contracts/mocks/docs/account/MyAccountERC7579.sol | 2 +- contracts/mocks/docs/account/MyAccountERC7913.sol | 2 +- contracts/mocks/docs/account/MyAccountMultiSigner.sol | 2 +- contracts/mocks/docs/account/MyAccountMultiSignerWeighted.sol | 2 +- .../docs/account/modules/MyERC7579DelayedSocialRecovery.sol | 2 +- contracts/mocks/docs/account/modules/MyERC7579Modules.sol | 2 +- .../mocks/docs/account/modules/MyERC7579SocialRecovery.sol | 2 +- contracts/mocks/docs/crosschain/MyERC7786GatewaySource.sol | 2 +- contracts/mocks/docs/utils/cryptography/ERC7739SignerECDSA.sol | 2 +- contracts/mocks/docs/utils/cryptography/MyContractDomain.sol | 2 +- contracts/mocks/import.sol | 2 +- contracts/mocks/token/ERC20uRWAMock.sol | 2 +- contracts/mocks/token/ERC7540AdminMock.sol | 2 +- contracts/mocks/token/ERC7540DelayMock.sol | 2 +- contracts/mocks/token/ERC7540EpochMock.sol | 2 +- contracts/mocks/token/ERC7540SyncDepositMock.sol | 2 +- contracts/mocks/token/ERC7540SyncMock.sol | 2 +- contracts/mocks/token/ERC7540SyncRedeemMock.sol | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/contracts/mocks/account/AccountZKEmailMock.sol b/contracts/mocks/account/AccountZKEmailMock.sol index 67e917fb0..b6764f0ee 100644 --- a/contracts/mocks/account/AccountZKEmailMock.sol +++ b/contracts/mocks/account/AccountZKEmailMock.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.24; +pragma solidity ^0.8.31; import {Account} from "@openzeppelin/contracts/account/Account.sol"; import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol"; diff --git a/contracts/mocks/account/modules/ERC7579ExecutorMocks.sol b/contracts/mocks/account/modules/ERC7579ExecutorMocks.sol index 85f7dd138..efe0f5d6a 100644 --- a/contracts/mocks/account/modules/ERC7579ExecutorMocks.sol +++ b/contracts/mocks/account/modules/ERC7579ExecutorMocks.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {ERC7579Executor} from "../../../account/modules/ERC7579Executor.sol"; import {ERC7579DelayedExecutor} from "../../../account/modules/ERC7579DelayedExecutor.sol"; diff --git a/contracts/mocks/account/modules/ERC7579MultisigMocks.sol b/contracts/mocks/account/modules/ERC7579MultisigMocks.sol index 1dc3e7c40..994ff6083 100644 --- a/contracts/mocks/account/modules/ERC7579MultisigMocks.sol +++ b/contracts/mocks/account/modules/ERC7579MultisigMocks.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol"; import {ERC7579Executor} from "../../../account/modules/ERC7579Executor.sol"; diff --git a/contracts/mocks/crosschain/ERC7786GatewayMock.sol b/contracts/mocks/crosschain/ERC7786GatewayMock.sol index c5a3f2709..423a4341c 100644 --- a/contracts/mocks/crosschain/ERC7786GatewayMock.sol +++ b/contracts/mocks/crosschain/ERC7786GatewayMock.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.24; +pragma solidity ^0.8.31; import {IERC7786GatewaySource, IERC7786Recipient} from "@openzeppelin/contracts/interfaces/IERC7786.sol"; import {BitMaps} from "@openzeppelin/contracts/utils/structs/BitMaps.sol"; diff --git a/contracts/mocks/crosschain/ERC7786RecipientInvalidMock.sol b/contracts/mocks/crosschain/ERC7786RecipientInvalidMock.sol index d7f559456..cb1237995 100644 --- a/contracts/mocks/crosschain/ERC7786RecipientInvalidMock.sol +++ b/contracts/mocks/crosschain/ERC7786RecipientInvalidMock.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity ^0.8.8; import {IERC7786Recipient} from "@openzeppelin/contracts/interfaces/IERC7786.sol"; diff --git a/contracts/mocks/crosschain/ERC7786RecipientRevertMock.sol b/contracts/mocks/crosschain/ERC7786RecipientRevertMock.sol index b070a7a3a..f5d7e4092 100644 --- a/contracts/mocks/crosschain/ERC7786RecipientRevertMock.sol +++ b/contracts/mocks/crosschain/ERC7786RecipientRevertMock.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity ^0.8.8; import {IERC7786Recipient} from "@openzeppelin/contracts/interfaces/IERC7786.sol"; diff --git a/contracts/mocks/crosschain/axelar/AxelarGatewayMock.sol b/contracts/mocks/crosschain/axelar/AxelarGatewayMock.sol index 9aeec2fc9..76394e8f6 100644 --- a/contracts/mocks/crosschain/axelar/AxelarGatewayMock.sol +++ b/contracts/mocks/crosschain/axelar/AxelarGatewayMock.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {IAxelarGateway} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IAxelarGateway.sol"; import {IBaseAmplifierGateway} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IBaseAmplifierGateway.sol"; diff --git a/contracts/mocks/docs/account/MyAccountERC7579.sol b/contracts/mocks/docs/account/MyAccountERC7579.sol index 1fb9da6cc..4d54f2323 100644 --- a/contracts/mocks/docs/account/MyAccountERC7579.sol +++ b/contracts/mocks/docs/account/MyAccountERC7579.sol @@ -1,6 +1,6 @@ // contracts/MyAccountERC7579.sol // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol"; import {MODULE_TYPE_VALIDATOR} from "@openzeppelin/contracts/interfaces/draft-IERC7579.sol"; diff --git a/contracts/mocks/docs/account/MyAccountERC7913.sol b/contracts/mocks/docs/account/MyAccountERC7913.sol index 6dff41fc3..036eaddf2 100644 --- a/contracts/mocks/docs/account/MyAccountERC7913.sol +++ b/contracts/mocks/docs/account/MyAccountERC7913.sol @@ -1,7 +1,7 @@ // contracts/MyAccountERC7913.sol // SPDX-License-Identifier: MIT -pragma solidity ^0.8.24; +pragma solidity ^0.8.31; import {Account} from "@openzeppelin/contracts/account/Account.sol"; import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol"; diff --git a/contracts/mocks/docs/account/MyAccountMultiSigner.sol b/contracts/mocks/docs/account/MyAccountMultiSigner.sol index 056cca621..c474a8cd5 100644 --- a/contracts/mocks/docs/account/MyAccountMultiSigner.sol +++ b/contracts/mocks/docs/account/MyAccountMultiSigner.sol @@ -1,7 +1,7 @@ // contracts/MyAccountERC7913.sol // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {Account} from "@openzeppelin/contracts/account/Account.sol"; import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol"; diff --git a/contracts/mocks/docs/account/MyAccountMultiSignerWeighted.sol b/contracts/mocks/docs/account/MyAccountMultiSignerWeighted.sol index fd5e76604..1a7db29e4 100644 --- a/contracts/mocks/docs/account/MyAccountMultiSignerWeighted.sol +++ b/contracts/mocks/docs/account/MyAccountMultiSignerWeighted.sol @@ -1,7 +1,7 @@ // contracts/MyAccountERC7913.sol // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {Account} from "@openzeppelin/contracts/account/Account.sol"; import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol"; diff --git a/contracts/mocks/docs/account/modules/MyERC7579DelayedSocialRecovery.sol b/contracts/mocks/docs/account/modules/MyERC7579DelayedSocialRecovery.sol index 08b6ffe1a..308d956eb 100644 --- a/contracts/mocks/docs/account/modules/MyERC7579DelayedSocialRecovery.sol +++ b/contracts/mocks/docs/account/modules/MyERC7579DelayedSocialRecovery.sol @@ -1,6 +1,6 @@ // contracts/MyERC7579DelayedSocialRecovery.sol // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol"; import {ERC7579Executor} from "../../../../account/modules/ERC7579Executor.sol"; diff --git a/contracts/mocks/docs/account/modules/MyERC7579Modules.sol b/contracts/mocks/docs/account/modules/MyERC7579Modules.sol index 9fb282820..7afba5a8f 100644 --- a/contracts/mocks/docs/account/modules/MyERC7579Modules.sol +++ b/contracts/mocks/docs/account/modules/MyERC7579Modules.sol @@ -1,6 +1,6 @@ // contracts/MyERC7579Modules.sol // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {IERC7579Module, IERC7579Hook} from "@openzeppelin/contracts/interfaces/draft-IERC7579.sol"; import {ERC7579Executor} from "../../../../account/modules/ERC7579Executor.sol"; diff --git a/contracts/mocks/docs/account/modules/MyERC7579SocialRecovery.sol b/contracts/mocks/docs/account/modules/MyERC7579SocialRecovery.sol index 7f63aece5..212112a01 100644 --- a/contracts/mocks/docs/account/modules/MyERC7579SocialRecovery.sol +++ b/contracts/mocks/docs/account/modules/MyERC7579SocialRecovery.sol @@ -1,6 +1,6 @@ // contracts/MyERC7579SocialRecovery.sol // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol"; import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol"; diff --git a/contracts/mocks/docs/crosschain/MyERC7786GatewaySource.sol b/contracts/mocks/docs/crosschain/MyERC7786GatewaySource.sol index 21aaef606..447719e51 100644 --- a/contracts/mocks/docs/crosschain/MyERC7786GatewaySource.sol +++ b/contracts/mocks/docs/crosschain/MyERC7786GatewaySource.sol @@ -1,6 +1,6 @@ // contracts/MyERC7786GatewaySource.sol // SPDX-License-Identifier: MIT -pragma solidity ^0.8.24; +pragma solidity ^0.8.31; import {IERC7786GatewaySource} from "@openzeppelin/contracts/interfaces/IERC7786.sol"; import {InteroperableAddress} from "@openzeppelin/contracts/utils/draft-InteroperableAddress.sol"; diff --git a/contracts/mocks/docs/utils/cryptography/ERC7739SignerECDSA.sol b/contracts/mocks/docs/utils/cryptography/ERC7739SignerECDSA.sol index ee11ce9e6..88c3f24bd 100644 --- a/contracts/mocks/docs/utils/cryptography/ERC7739SignerECDSA.sol +++ b/contracts/mocks/docs/utils/cryptography/ERC7739SignerECDSA.sol @@ -1,6 +1,6 @@ // contracts/ERC7739ECDSA.sol // SPDX-License-Identifier: MIT -pragma solidity ^0.8.20; +pragma solidity ^0.8.31; import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol"; import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol"; diff --git a/contracts/mocks/docs/utils/cryptography/MyContractDomain.sol b/contracts/mocks/docs/utils/cryptography/MyContractDomain.sol index e3eeb5eeb..c2b03b61f 100644 --- a/contracts/mocks/docs/utils/cryptography/MyContractDomain.sol +++ b/contracts/mocks/docs/utils/cryptography/MyContractDomain.sol @@ -1,6 +1,6 @@ // contracts/MyContractDomain.sol // SPDX-License-Identifier: MIT -pragma solidity ^0.8.20; +pragma solidity ^0.8.31; import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol"; import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol"; diff --git a/contracts/mocks/import.sol b/contracts/mocks/import.sol index 8802b23dc..2e0bb0158 100644 --- a/contracts/mocks/import.sol +++ b/contracts/mocks/import.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.20; +pragma solidity ^0.8.31; // This file forces the compilation of contracts that are only used (as artifacts) in tests. // forge-lint: disable-start(unused-import) diff --git a/contracts/mocks/token/ERC20uRWAMock.sol b/contracts/mocks/token/ERC20uRWAMock.sol index d7fc0b7ba..c3474c19a 100644 --- a/contracts/mocks/token/ERC20uRWAMock.sol +++ b/contracts/mocks/token/ERC20uRWAMock.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.26; +pragma solidity ^0.8.31; import {ERC20uRWA} from "../../token/ERC20/extensions/ERC20uRWA.sol"; import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol"; diff --git a/contracts/mocks/token/ERC7540AdminMock.sol b/contracts/mocks/token/ERC7540AdminMock.sol index 94b8d2ae9..d2b3525ac 100644 --- a/contracts/mocks/token/ERC7540AdminMock.sol +++ b/contracts/mocks/token/ERC7540AdminMock.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {ERC7540} from "../../token/ERC20/extensions/ERC7540.sol"; import {ERC7540AdminDeposit} from "../../token/ERC20/extensions/ERC7540AdminDeposit.sol"; diff --git a/contracts/mocks/token/ERC7540DelayMock.sol b/contracts/mocks/token/ERC7540DelayMock.sol index 60f8bcadb..dd51ea9c7 100644 --- a/contracts/mocks/token/ERC7540DelayMock.sol +++ b/contracts/mocks/token/ERC7540DelayMock.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {ERC7540} from "../../token/ERC20/extensions/ERC7540.sol"; import {ERC7540DelayDeposit} from "../../token/ERC20/extensions/ERC7540DelayDeposit.sol"; diff --git a/contracts/mocks/token/ERC7540EpochMock.sol b/contracts/mocks/token/ERC7540EpochMock.sol index 28d4ff8fd..c5d309c8c 100644 --- a/contracts/mocks/token/ERC7540EpochMock.sol +++ b/contracts/mocks/token/ERC7540EpochMock.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {ERC7540} from "../../token/ERC20/extensions/ERC7540.sol"; import {ERC7540EpochDeposit} from "../../token/ERC20/extensions/ERC7540EpochDeposit.sol"; diff --git a/contracts/mocks/token/ERC7540SyncDepositMock.sol b/contracts/mocks/token/ERC7540SyncDepositMock.sol index e30195841..a484e227c 100644 --- a/contracts/mocks/token/ERC7540SyncDepositMock.sol +++ b/contracts/mocks/token/ERC7540SyncDepositMock.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {ERC7540} from "../../token/ERC20/extensions/ERC7540.sol"; import {ERC7540SyncDeposit} from "../../token/ERC20/extensions/ERC7540SyncDeposit.sol"; diff --git a/contracts/mocks/token/ERC7540SyncMock.sol b/contracts/mocks/token/ERC7540SyncMock.sol index 1100e145c..93bc159a1 100644 --- a/contracts/mocks/token/ERC7540SyncMock.sol +++ b/contracts/mocks/token/ERC7540SyncMock.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {ERC7540SyncDeposit} from "../../token/ERC20/extensions/ERC7540SyncDeposit.sol"; import {ERC7540SyncRedeem} from "../../token/ERC20/extensions/ERC7540SyncRedeem.sol"; diff --git a/contracts/mocks/token/ERC7540SyncRedeemMock.sol b/contracts/mocks/token/ERC7540SyncRedeemMock.sol index 1dea210c2..5a51b18c9 100644 --- a/contracts/mocks/token/ERC7540SyncRedeemMock.sol +++ b/contracts/mocks/token/ERC7540SyncRedeemMock.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.27; +pragma solidity ^0.8.31; import {ERC7540} from "../../token/ERC20/extensions/ERC7540.sol"; import {ERC7540SyncRedeem} from "../../token/ERC20/extensions/ERC7540SyncRedeem.sol"; From e4cb36590390957c8496a6e6e5941750437bde36 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Thu, 12 Nov 2026 17:03:33 +0100 Subject: [PATCH 37/51] Mark docs files copied from OpenZeppelin Contracts --- docs/README.md | 2 ++ docs/config.mjs | 2 ++ docs/templates/page.hbs | 1 + docs/templates/properties.ts | 2 ++ 4 files changed, 7 insertions(+) diff --git a/docs/README.md b/docs/README.md index ca39e51db..5be283056 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,3 +1,5 @@ + + Documentation is hosted at https://docs.openzeppelin.com/contracts. All of the content for the site is in this repository. The guides are in the diff --git a/docs/config.mjs b/docs/config.mjs index 52dea6a34..72502417e 100644 --- a/docs/config.mjs +++ b/docs/config.mjs @@ -1,3 +1,5 @@ +// This file is an exact copy of lib/@openzeppelin-contracts/docs/config.mjs. + import path from 'path'; import fs from 'fs'; diff --git a/docs/templates/page.hbs b/docs/templates/page.hbs index dd4206ca8..699e94d43 100644 --- a/docs/templates/page.hbs +++ b/docs/templates/page.hbs @@ -1,3 +1,4 @@ +{{!-- This file is an exact copy of lib/@openzeppelin-contracts/docs/templates/page.hbs. --}} :github-icon: pass:[] {{#withPrelude}} {{readme (readmePath)}} diff --git a/docs/templates/properties.ts b/docs/templates/properties.ts index 7cea3bb9e..32c78bf51 100644 --- a/docs/templates/properties.ts +++ b/docs/templates/properties.ts @@ -1,3 +1,5 @@ +// This file is an exact copy of lib/@openzeppelin-contracts/docs/templates/properties.ts. + import { isNodeType, findAll } from 'solidity-ast/utils.js'; import { slug } from './helpers'; From adc215c315e45478fed41f6249d10a1998f68380 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Thu, 12 Nov 2026 17:06:11 +0100 Subject: [PATCH 38/51] Mark docs helpers as a copy of the OpenZeppelin Contracts one Update lib/@openzeppelin-contracts, where the withPrelude helper now drops the xrefs to items documented in another component, making both copies identical. --- docs/templates/helpers.ts | 2 ++ lib/@openzeppelin-contracts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/templates/helpers.ts b/docs/templates/helpers.ts index f4dc20f27..d0de6d126 100644 --- a/docs/templates/helpers.ts +++ b/docs/templates/helpers.ts @@ -1,3 +1,5 @@ +// This file is an exact copy of lib/@openzeppelin-contracts/docs/templates/helpers.ts. + import { version } from '../../package.json'; export const ozVersion = () => version; diff --git a/lib/@openzeppelin-contracts b/lib/@openzeppelin-contracts index 2e049f344..5a105d1c3 160000 --- a/lib/@openzeppelin-contracts +++ b/lib/@openzeppelin-contracts @@ -1 +1 @@ -Subproject commit 2e049f3448825a1dc5bbae30f9c04b5c2e96d9d9 +Subproject commit 5a105d1c38e6ab2e513513d80c041f59f1ba7f69 From 290299c4e6467fd5e27b0d9e20b3cefe34b63bba Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Thu, 12 Nov 2026 17:22:35 +0100 Subject: [PATCH 39/51] Update package.json Signed-off-by: Hadrien Croubois --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1c5123677..641ec406e 100644 --- a/package.json +++ b/package.json @@ -24,10 +24,10 @@ "solhint": "solhint --config solhint.config.cjs --noPoster --noPrompt --disc", "clean": "hardhat clean && rimraf build contracts/build", "generate": "scripts/generate/run.js", + "pragma": "hardhat build --noExpose && scripts/minimize-pragma.js artifacts/build-info/*", "test": "hardhat test", "test:generation": "scripts/checks/generation.sh", "test:inheritance": "scripts/checks/inheritance-ordering.js artifacts/build-info/*.output.json", - "pragma": "hardhat build --noExpose && scripts/minimize-pragma.js artifacts/build-info/*", "test:pragma": "scripts/checks/pragma-validity.js artifacts/build-info/*", "coverage": "hardhat test --coverage", "gas-report": "hardhat test --gas-stats" From bbe5717eb36f644beecbe284c040fdaee936123c Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Thu, 12 Nov 2026 17:32:25 +0100 Subject: [PATCH 40/51] Fix CI: regenerate package-lock.json and lint the ERC-7540 Foundry tests The lock file was out of sync with the dependencies of the updated lib/@openzeppelin-contracts, which made `npm ci` fail. It is regenerated from scratch, as updating it in place left Hardhat packages nested under the submodule where hardhat.config.ts cannot resolve them. The Foundry tests merged from master use `test_`/`invariant_` function names and an invariant handler with many ghost variables: disable the matching solhint rules, as other Foundry tests do, and apply prettier. --- package-lock.json | 3397 +++++++---------- test/token/ERC20/extensions/ERC7540.t.sol | 12 +- .../extensions/ERC7540EpochDeposit.t.sol | 2 + .../ERC20/extensions/ERC7540EpochRedeem.t.sol | 2 + 4 files changed, 1299 insertions(+), 2114 deletions(-) diff --git a/package-lock.json b/package-lock.json index e2a1d324c..0d6b2dce5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,16 +20,16 @@ "dev": true, "license": "MIT", "devDependencies": { - "@changesets/changelog-github": "^0.7.0", - "@changesets/cli": "^2.26.0", - "@changesets/pre": "^2.0.0", - "@changesets/read": "^0.6.0", + "@changesets/changelog-github": "^1.0.0", + "@changesets/cli": "^3.0.0", + "@changesets/pre": "^3.0.0", + "@changesets/read": "^1.0.0", "@eslint/compat": "^1.2.1", "@ethereumjs/mpt": "^10.1.0", "@noble/curves": "^2.0.1", "@nomicfoundation/hardhat-ethers": "^4.0.14", "@nomicfoundation/hardhat-ethers-chai-matchers": "^3.0.11", - "@nomicfoundation/hardhat-mocha": "^3.0.21", + "@nomicfoundation/hardhat-mocha": "^4.0.0", "@nomicfoundation/hardhat-network-helpers": "^3.0.11", "@openzeppelin/docs-utils": "^0.1.6", "@openzeppelin/merkle-tree": "^1.0.7", @@ -43,7 +43,7 @@ "eslint-plugin-mocha": "^11.3.0", "eta": "^4.6.0", "ethers": "^6.16.0", - "glob": "^13.0.0", + "glob": "^14.0.0", "globals": "^17.0.0", "graphlib": "^2.1.8", "handlebars": "^4.7.9", @@ -65,6 +65,55 @@ "solidity-ast": "^0.4.61", "undici": "^8.2.0", "yargs": "^18.0.0" + }, + "engines": { + "node": "^22.12 || ^24 || >=26" + } + }, + "lib/@openzeppelin-contracts/node_modules/@noble/curves": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-2.4.0.tgz", + "integrity": "sha512-P4/62zrgfH33CneE3Dn4WhJVA22YUU0eR51wKIan4NVRvwsA0YnPTwWGpNbpuacSujmSFLvyzpyuR30+fbq2Ew==", + "dev": true, + "license": "MIT", + "dependencies": { + "@noble/hashes": "2.4.0" + }, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "lib/@openzeppelin-contracts/node_modules/@noble/hashes": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-2.4.0.tgz", + "integrity": "sha512-X5XaVWZIBCT7HHZGm5I7ZQXDwLG+bGXuSrMQAW+7Zvl87h1kmc1ZB1VSRJcpUfoUrGQp4Fkoxm5kZ+Ms+aW+eA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "lib/@openzeppelin-contracts/node_modules/minimatch": { + "version": "11.0.8", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-11.0.8.tgz", + "integrity": "sha512-nFQuYSTVrGvysVBps5Ih+0BdnYFN/Cj3C816r6+p7yK+FHrVLGE4O4N9AFwykrlNlvM2HYt+Rad1Uiro6h88Ig==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/nonrecursive-glob-match": "^1.1.0", + "brace-expansion": "^5.0.12" + }, + "engines": { + "node": "20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "lib/@openzeppelin-contracts/scripts/solhint-custom": { @@ -72,7 +121,7 @@ "version": "0.0.0", "dev": true, "dependencies": { - "minimatch": "^10.2.2" + "minimatch": "^11.0.0" } }, "node_modules/@adraffy/ens-normalize": { @@ -107,16 +156,6 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/runtime": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.7.tgz", - "integrity": "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@bytecodealliance/preview2-shim": { "version": "0.17.0", "resolved": "https://registry.npmjs.org/@bytecodealliance/preview2-shim/-/preview2-shim-0.17.0.tgz", @@ -125,300 +164,304 @@ "license": "(Apache-2.0 WITH LLVM-exception)" }, "node_modules/@changesets/apply-release-plan": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@changesets/apply-release-plan/-/apply-release-plan-7.1.1.tgz", - "integrity": "sha512-9qPCm/rLx/xoOFXIHGB229+4GOL76S4MC+7tyOuTsR6+1jYlfFDQORdvwR5hDA6y4FL2BPt3qpbcQIS+dW85LA==", + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/@changesets/apply-release-plan/-/apply-release-plan-8.1.1.tgz", + "integrity": "sha512-nk2Hbq3M9NeHMdaIRBDvawKrQJzXB9sGyBUE5yWnIKtvdcNCPj75zBekJYr0gTT2ecJH3eFeTrc8eisPImcv0Q==", "dev": true, "license": "MIT", "dependencies": { - "@changesets/config": "^3.1.4", - "@changesets/get-version-range-type": "^0.4.0", - "@changesets/git": "^3.0.4", - "@changesets/should-skip-package": "^0.1.2", - "@changesets/types": "^6.1.0", - "@manypkg/get-packages": "^1.1.3", - "detect-indent": "^6.0.0", - "fs-extra": "^7.0.1", - "lodash.startcase": "^4.4.0", - "outdent": "^0.5.0", - "prettier": "^2.7.1", - "resolve-from": "^5.0.0", - "semver": "^7.5.3" - } - }, - "node_modules/@changesets/apply-release-plan/node_modules/prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", - "dev": true, - "license": "MIT", - "bin": { - "prettier": "bin-prettier.js" + "@changesets/config": "^4.0.1", + "@changesets/format": "^0.1.2", + "@changesets/git": "^4.0.1", + "@changesets/should-skip-package": "^1.0.0", + "@changesets/types": "^7.0.0", + "import-meta-resolve": "^4.2.0", + "jsonc-parser": "^3.3.1", + "semver": "^7.8.1" }, "engines": { - "node": ">=10.13.0" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" + "node": "^22.11 || ^24 || >=26" } }, "node_modules/@changesets/assemble-release-plan": { - "version": "6.0.10", - "resolved": "https://registry.npmjs.org/@changesets/assemble-release-plan/-/assemble-release-plan-6.0.10.tgz", - "integrity": "sha512-rSDcqdJ9KbVyjpBIuCidhvZNIiVt1XaIYp73ycVQRIA5n/j6wQaEk0ChRLMUQ1vkxZe51PTQ9OIhbg6HQMW45A==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@changesets/assemble-release-plan/-/assemble-release-plan-7.0.0.tgz", + "integrity": "sha512-oEW8BxdA604kGGtDSCiHr5w9Tv4UWe9I2k61IBNZzCOE1kbYaJj4v+lFQNgcEZFkUc2pV/+hASErGDvpJOZCTg==", "dev": true, "license": "MIT", "dependencies": { - "@changesets/errors": "^0.2.0", - "@changesets/get-dependents-graph": "^2.1.4", - "@changesets/should-skip-package": "^0.1.2", - "@changesets/types": "^6.1.0", - "@manypkg/get-packages": "^1.1.3", - "semver": "^7.5.3" + "@changesets/errors": "^1.0.0", + "@changesets/get-dependents-graph": "^3.0.0", + "@changesets/should-skip-package": "^1.0.0", + "@changesets/types": "^7.0.0", + "semver": "^7.8.1" + }, + "engines": { + "node": "^22.11 || ^24 || >=26" } }, "node_modules/@changesets/changelog-git": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@changesets/changelog-git/-/changelog-git-0.2.1.tgz", - "integrity": "sha512-x/xEleCFLH28c3bQeQIyeZf8lFXyDFVn1SgcBiR2Tw/r4IAWlk1fzxCEZ6NxQAjF2Nwtczoen3OA2qR+UawQ8Q==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@changesets/changelog-git/-/changelog-git-1.0.0.tgz", + "integrity": "sha512-3Dst2Ime2Op5nd4XmWJLPIgp11ZFqJqSkVug9izK6TDcIV4YlhPS4ECbEVR+eGI0bk0r1ItogD4j2Oli87bJrA==", "dev": true, "license": "MIT", "dependencies": { - "@changesets/types": "^6.1.0" + "@changesets/types": "^7.0.0" + }, + "engines": { + "node": "^22.11 || ^24 || >=26" } }, "node_modules/@changesets/changelog-github": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/@changesets/changelog-github/-/changelog-github-0.7.0.tgz", - "integrity": "sha512-rBsbRvc4TVn+FvFnOVM3LxlFJfTXXCp8gfVJ+0BubxWNSVnLuAzowi5j+IEraLLP52w8AAs9QfKbPS3MMiXQJA==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@changesets/changelog-github/-/changelog-github-1.0.1.tgz", + "integrity": "sha512-QUcrV7878yHlWPXXPA6gqSxNKwtVHCd1K22L7ZAoJw2yGy8K4QvjwOStD75+1Q9KD9ZSUgGS94HuYdd7HOVtpA==", "dev": true, "license": "MIT", "dependencies": { - "@changesets/get-github-info": "^0.8.0", - "@changesets/types": "^6.1.0", - "dotenv": "^8.1.0" + "@changesets/get-github-info": "^1.0.1", + "@changesets/types": "^7.0.0" + }, + "engines": { + "node": "^22.11 || ^24 || >=26" } }, "node_modules/@changesets/cli": { - "version": "2.31.1", - "resolved": "https://registry.npmjs.org/@changesets/cli/-/cli-2.31.1.tgz", - "integrity": "sha512-uO05WTcRBwuVOJVSW8Cmpqw6q0WDL53ajGCMyszutvOe5toOnunbpM4jZzf+qxBOz7i0AzopZ8diBuewjmF40w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@changesets/apply-release-plan": "^7.1.1", - "@changesets/assemble-release-plan": "^6.0.10", - "@changesets/changelog-git": "^0.2.1", - "@changesets/config": "^3.1.4", - "@changesets/errors": "^0.2.0", - "@changesets/get-dependents-graph": "^2.1.4", - "@changesets/get-release-plan": "^4.0.16", - "@changesets/git": "^3.0.4", - "@changesets/logger": "^0.1.1", - "@changesets/pre": "^2.0.2", - "@changesets/read": "^0.6.7", - "@changesets/should-skip-package": "^0.1.2", - "@changesets/types": "^6.1.0", - "@changesets/write": "^0.4.0", - "@inquirer/external-editor": "^1.0.2", - "@manypkg/get-packages": "^1.1.3", - "ansi-colors": "^4.1.3", - "enquirer": "^2.4.1", - "fs-extra": "^7.0.1", - "mri": "^1.2.0", - "package-manager-detector": "^0.2.0", - "picocolors": "^1.1.0", - "resolve-from": "^5.0.0", - "semver": "^7.5.3", - "spawndamnit": "^3.0.1", - "term-size": "^2.1.0" + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@changesets/cli/-/cli-3.0.3.tgz", + "integrity": "sha512-L1i67bMfkK6iC/kDejuNO4pFgTRcWIObsD6Qof2woP1I4M8tj17DGlcpRaTzTv1DYSP5EMwWdEtR8X0Pj5Jg3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@changesets/apply-release-plan": "^8.1.1", + "@changesets/assemble-release-plan": "^7.0.0", + "@changesets/changelog-git": "^1.0.0", + "@changesets/config": "^4.0.1", + "@changesets/errors": "^1.0.0", + "@changesets/get-dependents-graph": "^3.0.0", + "@changesets/git": "^4.0.1", + "@changesets/pre": "^3.0.0", + "@changesets/read": "^1.0.1", + "@changesets/should-skip-package": "^1.0.0", + "@changesets/types": "^7.0.0", + "@changesets/write": "^1.0.1", + "@clack/prompts": "^1.7.0", + "@manypkg/get-packages": "^3.1.0", + "@pnpm/deps.graph-sequencer": "^1100.0.1", + "cac": "^7.0.0", + "import-meta-resolve": "^4.2.0", + "launch-editor": "^2.14.1", + "package-manager-detector": "^1.6.0", + "semver": "^7.8.1", + "tinyexec": "^1.3.1" }, "bin": { "changeset": "bin.js" + }, + "engines": { + "node": "^22.11 || ^24 || >=26", + "npm": ">=10.9.0", + "pnpm": ">=10.0.0", + "yarn": ">=4.5.2" } }, "node_modules/@changesets/config": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/@changesets/config/-/config-3.1.4.tgz", - "integrity": "sha512-pf0bvD/v6WI2cRlZ6hzpjtZdSlXDXMAJ+Iz7xfFzV4ZxJ8OGGAON+1qYc99ZPrijnt4xp3VGG7eNvAOGS24V1Q==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@changesets/config/-/config-4.0.1.tgz", + "integrity": "sha512-PxpxSQLQSLDjceAgRq+4FWlU+HflDIw03mmPVipxoQx9xrXFUjmqTy3SE+n/2t+DqPdpPiLWVr5NRiLZvjyLwg==", "dev": true, "license": "MIT", "dependencies": { - "@changesets/errors": "^0.2.0", - "@changesets/get-dependents-graph": "^2.1.4", - "@changesets/logger": "^0.1.1", - "@changesets/should-skip-package": "^0.1.2", - "@changesets/types": "^6.1.0", - "@manypkg/get-packages": "^1.1.3", - "fs-extra": "^7.0.1", - "micromatch": "^4.0.8" + "@changesets/get-dependents-graph": "^3.0.0", + "@changesets/should-skip-package": "^1.0.0", + "@changesets/types": "^7.0.0", + "@manypkg/get-packages": "^3.1.0", + "picomatch": "^4.0.7" + }, + "engines": { + "node": "^22.11 || ^24 || >=26" } }, "node_modules/@changesets/errors": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@changesets/errors/-/errors-0.2.0.tgz", - "integrity": "sha512-6BLOQUscTpZeGljvyQXlWOItQyU71kCdGz7Pi8H8zdw6BI0g3m43iL4xKUVPWtG+qrrL9DTjpdn8eYuCQSRpow==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@changesets/errors/-/errors-1.0.0.tgz", + "integrity": "sha512-ElN/mEzn6zmETgjwf5MclCMa9ef59sAR0lfO8VSYIsiRvbC2FbLB/92EoYw10Sl0kGixxHFiJZUSv7dA+YpR8g==", "dev": true, "license": "MIT", - "dependencies": { - "extendable-error": "^0.1.5" + "engines": { + "node": "^22.11 || ^24 || >=26" } }, - "node_modules/@changesets/get-dependents-graph": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@changesets/get-dependents-graph/-/get-dependents-graph-2.1.4.tgz", - "integrity": "sha512-ZsS00x6WvmHq3sQv8oCMwL0f/z3wbXCVuSVTJwCnnmbC/iBdNJGFx1EcbMG4PC6sXRyH69liM4A2WKXzn/kRPg==", + "node_modules/@changesets/format": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@changesets/format/-/format-0.1.3.tgz", + "integrity": "sha512-zTZrJbfY81+/MsXsey6i3jQjpApz4PqRQ+nouHGDJhCa5sKCExwR9mZFQ/67lMsqZDNy2G2v3wTbzOmZ56EtaQ==", "dev": true, "license": "MIT", "dependencies": { - "@changesets/types": "^6.1.0", - "@manypkg/get-packages": "^1.1.3", - "picocolors": "^1.1.0", - "semver": "^7.5.3" + "package-manager-detector": "^1.8.0", + "tinyexec": "^1.3.1" + }, + "engines": { + "node": "^22.11 || ^24 || >=26" } }, - "node_modules/@changesets/get-github-info": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@changesets/get-github-info/-/get-github-info-0.8.0.tgz", - "integrity": "sha512-cRnC+xdF0JIik7coko3iUP9qbnfi1iJQ3sAa6dE+Tx3+ET8bjFEm63PA4WEohgjYcmsOikPHWzPsMWWiZmntOQ==", + "node_modules/@changesets/get-dependents-graph": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@changesets/get-dependents-graph/-/get-dependents-graph-3.0.0.tgz", + "integrity": "sha512-ji/t5wFA1zREKXRUePE6Qi+Qu2UgxCeSSGQrphezwvQZrp49B7sJ+8+wvM0tA7zPeSxYKCojDy3WWgrl+s+awg==", "dev": true, "license": "MIT", "dependencies": { - "dataloader": "^1.4.0", - "node-fetch": "^2.5.0" + "@changesets/types": "^7.0.0", + "semver": "^7.8.1" + }, + "engines": { + "node": "^22.11 || ^24 || >=26" } }, - "node_modules/@changesets/get-release-plan": { - "version": "4.0.16", - "resolved": "https://registry.npmjs.org/@changesets/get-release-plan/-/get-release-plan-4.0.16.tgz", - "integrity": "sha512-2K5Om6CrMPm45rtvckfzWo7e9jOVCKLCnXia5eUPaURH7/LWzri7pK1TycdzAuAtehLkW7VPbWLCSExTHmiI6g==", + "node_modules/@changesets/get-github-info": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@changesets/get-github-info/-/get-github-info-1.0.1.tgz", + "integrity": "sha512-ifLQCky/ZtDgZ4xCiUMjnLZSJ8xk52iIzMJbBBPlZWjr2CiTNTaTDddIVWKicrUAdWuLWL7PUw2fNa1yPwLpIg==", "dev": true, "license": "MIT", "dependencies": { - "@changesets/assemble-release-plan": "^6.0.10", - "@changesets/config": "^3.1.4", - "@changesets/pre": "^2.0.2", - "@changesets/read": "^0.6.7", - "@changesets/types": "^6.1.0", - "@manypkg/get-packages": "^1.1.3" + "dataloader": "^2.2.3" + }, + "engines": { + "node": "^22.11 || ^24 || >=26" } }, - "node_modules/@changesets/get-version-range-type": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@changesets/get-version-range-type/-/get-version-range-type-0.4.0.tgz", - "integrity": "sha512-hwawtob9DryoGTpixy1D3ZXbGgJu1Rhr+ySH2PvTLHvkZuQ7sRT4oQwMh0hbqZH1weAooedEjRsbrWcGLCeyVQ==", - "dev": true, - "license": "MIT" - }, "node_modules/@changesets/git": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@changesets/git/-/git-3.0.4.tgz", - "integrity": "sha512-BXANzRFkX+XcC1q/d27NKvlJ1yf7PSAgi8JG6dt8EfbHFHi4neau7mufcSca5zRhwOL8j9s6EqsxmT+s+/E6Sw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@changesets/errors": "^0.2.0", - "@manypkg/get-packages": "^1.1.3", - "is-subdir": "^1.1.1", - "micromatch": "^4.0.8", - "spawndamnit": "^3.0.1" - } - }, - "node_modules/@changesets/logger": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@changesets/logger/-/logger-0.1.1.tgz", - "integrity": "sha512-OQtR36ZlnuTxKqoW4Sv6x5YIhOmClRd5pWsjZsddYxpWs517R0HkyiefQPIytCVh4ZcC5x9XaG8KTdd5iRQUfg==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@changesets/git/-/git-4.0.1.tgz", + "integrity": "sha512-6vWpIAC4LkpmlqaIu37ViT5enyd9+uBwAiGqCGhASvkSHBgx4PrtTGXWTMFYpDmZbjgyonyVgMciPrW4MqtJsA==", "dev": true, "license": "MIT", "dependencies": { - "picocolors": "^1.1.0" + "@changesets/errors": "^1.0.0", + "@changesets/types": "^7.0.0", + "@manypkg/get-packages": "^3.1.0", + "picomatch": "^4.0.4", + "tinyexec": "^1.3.0" + }, + "engines": { + "node": "^22.11 || ^24 || >=26" } }, "node_modules/@changesets/parse": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/@changesets/parse/-/parse-0.4.3.tgz", - "integrity": "sha512-ZDmNc53+dXdWEv7fqIUSgRQOLYoUom5Z40gmLgmATmYR9NbL6FJJHwakcCpzaeCy+1D0m0n7mT4jj2B/MQPl7A==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@changesets/parse/-/parse-1.0.0.tgz", + "integrity": "sha512-P0iaMb9p9CRYZiTgAllEIF9AUMQHIy1G72tKlcIqJp61icZSsKQNiOPdxAMZG8m/DvZwt/oz5xEbTpike//dWg==", "dev": true, "license": "MIT", "dependencies": { - "@changesets/types": "^6.1.0", - "js-yaml": "^4.1.1" + "@changesets/types": "^7.0.0", + "yaml": "^2.9.0" + }, + "engines": { + "node": "^22.11 || ^24 || >=26" } }, "node_modules/@changesets/pre": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@changesets/pre/-/pre-2.0.2.tgz", - "integrity": "sha512-HaL/gEyFVvkf9KFg6484wR9s0qjAXlZ8qWPDkTyKF6+zqjBe/I2mygg3MbpZ++hdi0ToqNUF8cjj7fBy0dg8Ug==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@changesets/pre/-/pre-3.0.0.tgz", + "integrity": "sha512-Zm/6YliV/a2oeWTqHJf6KxLrQwgcK1i/BRDl2m0EKZvbnxV5fG9QRhwJJGshjsZTUTS6dkfURQ2K6aAvgNw/3Q==", "dev": true, "license": "MIT", "dependencies": { - "@changesets/errors": "^0.2.0", - "@changesets/types": "^6.1.0", - "@manypkg/get-packages": "^1.1.3", - "fs-extra": "^7.0.1" + "@changesets/errors": "^1.0.0", + "@changesets/types": "^7.0.0", + "@manypkg/get-packages": "^3.1.0" + }, + "engines": { + "node": "^22.11 || ^24 || >=26" } }, "node_modules/@changesets/read": { - "version": "0.6.7", - "resolved": "https://registry.npmjs.org/@changesets/read/-/read-0.6.7.tgz", - "integrity": "sha512-D1G4AUYGrBEk8vj8MGwf75k9GpN6XL3wg8i42P2jZZwFLXnlr2Pn7r9yuQNbaMCarP7ZQWNJbV6XLeysAIMhTA==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@changesets/read/-/read-1.0.1.tgz", + "integrity": "sha512-nzvSC6RcTiWf/dsuwZFXpLzGGsRHYCL68U3uHV7srsulU93aVWY7u2GEJiDZ+4GIIElfaW5EqtKC0UHroY+LTQ==", "dev": true, "license": "MIT", "dependencies": { - "@changesets/git": "^3.0.4", - "@changesets/logger": "^0.1.1", - "@changesets/parse": "^0.4.3", - "@changesets/types": "^6.1.0", - "fs-extra": "^7.0.1", - "p-filter": "^2.1.0", - "picocolors": "^1.1.0" + "@changesets/git": "^4.0.1", + "@changesets/parse": "^1.0.0", + "@changesets/types": "^7.0.0" + }, + "engines": { + "node": "^22.11 || ^24 || >=26" } }, "node_modules/@changesets/should-skip-package": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@changesets/should-skip-package/-/should-skip-package-0.1.2.tgz", - "integrity": "sha512-qAK/WrqWLNCP22UDdBTMPH5f41elVDlsNyat180A33dWxuUDyNpg6fPi/FyTZwRriVjg0L8gnjJn2F9XAoF0qw==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@changesets/should-skip-package/-/should-skip-package-1.0.0.tgz", + "integrity": "sha512-pwqoJmbONn1XgXmZXPEExgAaT+HdZLjALFTDgIm+PnS5KeO2nLtzA2/Q+4aMFY14kFMuXKG30MObhvDzWgzDgg==", "dev": true, "license": "MIT", "dependencies": { - "@changesets/types": "^6.1.0", - "@manypkg/get-packages": "^1.1.3" + "@changesets/types": "^7.0.0" + }, + "engines": { + "node": "^22.11 || ^24 || >=26" } }, "node_modules/@changesets/types": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/@changesets/types/-/types-6.1.0.tgz", - "integrity": "sha512-rKQcJ+o1nKNgeoYRHKOS07tAMNd3YSN0uHaJOZYjBAgxfV7TUE7JE+z4BzZdQwb5hKaYbayKN5KrYV7ODb2rAA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@changesets/types/-/types-7.0.0.tgz", + "integrity": "sha512-c5GoiQyt3pxiXjrWSNoP8/GRf4kG+VnKzovx1OQM8dYYALlSwgedmkPmJ+ZqGxqwg9D3Bkj85Uo4KLd5BN3A0w==", "dev": true, - "license": "MIT" + "license": "MIT", + "engines": { + "node": "^22.11 || ^24 || >=26" + } }, "node_modules/@changesets/write": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@changesets/write/-/write-0.4.0.tgz", - "integrity": "sha512-CdTLvIOPiCNuH71pyDu3rA+Q0n65cmAbXnwWH84rKGiFumFzkmHNT8KHTMEchcxN+Kl8I54xGUhJ7l3E7X396Q==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@changesets/write/-/write-1.0.1.tgz", + "integrity": "sha512-q/ThtP9gcnEP6xlv7LrY26C2mHqdGBti/MmOVngt/M/oIGYkssmQGxPK9WzBNt2juVcH/vml2WQ+ra8LXYOTaA==", "dev": true, "license": "MIT", "dependencies": { - "@changesets/types": "^6.1.0", - "fs-extra": "^7.0.1", - "human-id": "^4.1.1", - "prettier": "^2.7.1" + "@changesets/format": "^0.1.1", + "@changesets/types": "^7.0.0", + "human-id": "^4.2.0" + }, + "engines": { + "node": "^22.11 || ^24 || >=26" } }, - "node_modules/@changesets/write/node_modules/prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "node_modules/@clack/core": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@clack/core/-/core-1.6.0.tgz", + "integrity": "sha512-4GZynIB2IIe431odxesswvWTCP6orvqd6e2b07b3VFWBQRqUqIHc/EPIZwFoKS692QBp+ooPuXKaJV8g4kXuYA==", "dev": true, "license": "MIT", - "bin": { - "prettier": "bin-prettier.js" + "dependencies": { + "fast-string-width": "^3.0.2", + "fast-wrap-ansi": "^0.2.0", + "sisteransi": "^2.0.0" }, "engines": { - "node": ">=10.13.0" + "node": ">= 20.12.0" + } + }, + "node_modules/@clack/prompts": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@clack/prompts/-/prompts-1.9.0.tgz", + "integrity": "sha512-tEj8X2No2A1c9NDnZECxiiJ8TP3vmFlN9tLlLeSaMqVW4tUmVG2R4qpv/eP4zymWxnymYLkLcIYVV0VcWj3RCQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@clack/core": "1.6.0", + "fast-string-width": "^3.0.2", + "fast-wrap-ansi": "^0.2.0", + "sisteransi": "^2.0.0" }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" + "engines": { + "node": ">= 20.12.0" } }, "node_modules/@esbuild/aix-ppc64": { @@ -896,9 +939,9 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.12.2", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz", - "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==", + "version": "4.12.3", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.3.tgz", + "integrity": "sha512-R76UKbvsqI68DJJVTVyqFKqU98CN4+B+acxNfEA2IFarSzP0SjtKf/3+fFiXzTyv5Fj3PxLkGHe2wnVWWMxobQ==", "dev": true, "license": "MIT", "engines": { @@ -949,9 +992,9 @@ "license": "MIT" }, "node_modules/@eslint/config-array/node_modules/brace-expansion": { - "version": "1.1.18", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.18.tgz", - "integrity": "sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==", + "version": "1.1.22", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.22.tgz", + "integrity": "sha512-CKLDTuSsN0+r1ThM0WkzzBI7dnPI6xEGfa/JnVYIK9JNBA1N1NyPwXVHor//NKD/y3sDxp764sZdLhFK7pH8XQ==", "dev": true, "license": "MIT", "dependencies": { @@ -999,9 +1042,9 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.6.tgz", - "integrity": "sha512-l2Ul9PrHsPCKcEY/ac7VgFj9D80C7S68sOKc618SyHDPK36s1XcFebXY0iTzUVn4Yq+YbwvSnDmCz9yxjX+QrA==", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.7.tgz", + "integrity": "sha512-F42g89Qd5oAWtp0k0nnSrjziAKza7w8SVT4mStc18LZMaRb4J1HQAHLCalEtDCxrTuksx7NU9qsmeLwpOfPqWw==", "dev": true, "license": "MIT", "dependencies": { @@ -1011,7 +1054,7 @@ "globals": "^14.0.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", - "js-yaml": "^4.3.0", + "js-yaml": "^4.3.2", "minimatch": "^3.1.5", "strip-json-comments": "^3.1.1" }, @@ -1039,6 +1082,13 @@ "url": "https://github.com/sponsors/epoberezkin" } }, + "node_modules/@eslint/eslintrc/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, "node_modules/@eslint/eslintrc/node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -1047,9 +1097,9 @@ "license": "MIT" }, "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { - "version": "1.1.18", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.18.tgz", - "integrity": "sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==", + "version": "1.1.22", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.22.tgz", + "integrity": "sha512-CKLDTuSsN0+r1ThM0WkzzBI7dnPI6xEGfa/JnVYIK9JNBA1N1NyPwXVHor//NKD/y3sDxp764sZdLhFK7pH8XQ==", "dev": true, "license": "MIT", "dependencies": { @@ -1070,6 +1120,29 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@eslint/eslintrc/node_modules/js-yaml": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.2.tgz", + "integrity": "sha512-SFNOvSJ+Dgf/9An904Yx+CgSlIPCkIpao4qo51lpee25TIRejdH3rhR4EZMGoNx3/TP3O+wzWuiTFl4sqbltzA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/puzrin" + }, + { + "type": "github", + "url": "https://github.com/sponsors/nodeca" + } + ], + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -1166,6 +1239,84 @@ "node": ">=14" } }, + "node_modules/@ethereumjs/common/node_modules/@noble/curves": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz", + "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@noble/hashes": "1.4.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@ethereumjs/common/node_modules/@noble/hashes": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz", + "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@ethereumjs/common/node_modules/@scure/base": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.9.tgz", + "integrity": "sha512-8YKhl8GHiNI/pU2VMaofa2Tor7PJRAjwQLBBuilkJ9L5+13yVbC7JO/wS7piioAvPSwR3JKM1IJ/u4xQzbcXKg==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@ethereumjs/common/node_modules/@scure/bip32": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz", + "integrity": "sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@noble/curves": "~1.4.0", + "@noble/hashes": "~1.4.0", + "@scure/base": "~1.1.6" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@ethereumjs/common/node_modules/@scure/bip39": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz", + "integrity": "sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@noble/hashes": "~1.4.0", + "@scure/base": "~1.1.6" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@ethereumjs/common/node_modules/ethereum-cryptography": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.2.1.tgz", + "integrity": "sha512-r/W8lkHSiTLxUxW8Rf3u4HGB0xQweG2RyETjywylKZSzLWoWAijRz8WCuOtJ6wah+avllXBqZuk29HCCvhEIRg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@noble/curves": "1.4.2", + "@noble/hashes": "1.4.0", + "@scure/bip32": "1.4.0", + "@scure/bip39": "1.3.0" + } + }, "node_modules/@ethereumjs/mpt": { "version": "10.1.3", "resolved": "https://registry.npmjs.org/@ethereumjs/mpt/-/mpt-10.1.3.tgz", @@ -1183,6 +1334,19 @@ "node": ">=20" } }, + "node_modules/@ethereumjs/mpt/node_modules/@noble/hashes": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-2.4.0.tgz", + "integrity": "sha512-X5XaVWZIBCT7HHZGm5I7ZQXDwLG+bGXuSrMQAW+7Zvl87h1kmc1ZB1VSRJcpUfoUrGQp4Fkoxm5kZ+Ms+aW+eA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/@ethereumjs/rlp": { "version": "10.1.3", "resolved": "https://registry.npmjs.org/@ethereumjs/rlp/-/rlp-10.1.3.tgz", @@ -1240,12 +1404,90 @@ "node": ">=14" } }, - "node_modules/@ethereumjs/util": { - "version": "10.1.3", - "resolved": "https://registry.npmjs.org/@ethereumjs/util/-/util-10.1.3.tgz", - "integrity": "sha512-PhezOVe4DFaC+QLIsnK/tiOaXjpjS2F9AH4Ez0EfWevFw9NWNSg95l7I0dWuHF0B7v9odm2Ijqwo0EnARXtUmA==", + "node_modules/@ethereumjs/tx/node_modules/@noble/curves": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz", + "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==", "dev": true, - "license": "MPL-2.0", + "license": "MIT", + "dependencies": { + "@noble/hashes": "1.4.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@ethereumjs/tx/node_modules/@noble/hashes": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz", + "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@ethereumjs/tx/node_modules/@scure/base": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.9.tgz", + "integrity": "sha512-8YKhl8GHiNI/pU2VMaofa2Tor7PJRAjwQLBBuilkJ9L5+13yVbC7JO/wS7piioAvPSwR3JKM1IJ/u4xQzbcXKg==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@ethereumjs/tx/node_modules/@scure/bip32": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz", + "integrity": "sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@noble/curves": "~1.4.0", + "@noble/hashes": "~1.4.0", + "@scure/base": "~1.1.6" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@ethereumjs/tx/node_modules/@scure/bip39": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz", + "integrity": "sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@noble/hashes": "~1.4.0", + "@scure/base": "~1.1.6" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@ethereumjs/tx/node_modules/ethereum-cryptography": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.2.1.tgz", + "integrity": "sha512-r/W8lkHSiTLxUxW8Rf3u4HGB0xQweG2RyETjywylKZSzLWoWAijRz8WCuOtJ6wah+avllXBqZuk29HCCvhEIRg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@noble/curves": "1.4.2", + "@noble/hashes": "1.4.0", + "@scure/bip32": "1.4.0", + "@scure/bip39": "1.3.0" + } + }, + "node_modules/@ethereumjs/util": { + "version": "10.1.3", + "resolved": "https://registry.npmjs.org/@ethereumjs/util/-/util-10.1.3.tgz", + "integrity": "sha512-PhezOVe4DFaC+QLIsnK/tiOaXjpjS2F9AH4Ez0EfWevFw9NWNSg95l7I0dWuHF0B7v9odm2Ijqwo0EnARXtUmA==", + "dev": true, + "license": "MPL-2.0", "dependencies": { "@ethereumjs/rlp": "^10.1.3", "@noble/curves": "^2.0.1", @@ -1255,6 +1497,35 @@ "node": ">=20" } }, + "node_modules/@ethereumjs/util/node_modules/@noble/curves": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-2.4.0.tgz", + "integrity": "sha512-P4/62zrgfH33CneE3Dn4WhJVA22YUU0eR51wKIan4NVRvwsA0YnPTwWGpNbpuacSujmSFLvyzpyuR30+fbq2Ew==", + "dev": true, + "license": "MIT", + "dependencies": { + "@noble/hashes": "2.4.0" + }, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@ethereumjs/util/node_modules/@noble/hashes": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-2.4.0.tgz", + "integrity": "sha512-X5XaVWZIBCT7HHZGm5I7ZQXDwLG+bGXuSrMQAW+7Zvl87h1kmc1ZB1VSRJcpUfoUrGQp4Fkoxm5kZ+Ms+aW+eA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/@frangio/servbot": { "version": "0.3.0-1", "resolved": "https://registry.npmjs.org/@frangio/servbot/-/servbot-0.3.0-1.tgz", @@ -1342,208 +1613,53 @@ "url": "https://github.com/sponsors/nzakas" } }, - "node_modules/@inquirer/external-editor": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@inquirer/external-editor/-/external-editor-1.0.3.tgz", - "integrity": "sha512-RWbSrDiYmO4LbejWY7ttpxczuwQyZLBUyygsA9Nsv95hpzUWwnNTVQmAq3xuh7vNwCp07UTmE5i11XAEExx4RA==", - "dev": true, - "license": "MIT", - "dependencies": { - "chardet": "^2.1.1", - "iconv-lite": "^0.7.0" - }, - "engines": { - "node": ">=18" - }, - "peerDependencies": { - "@types/node": ">=18" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - } - } - }, - "node_modules/@isaacs/cliui": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", - "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", - "dev": true, - "license": "ISC", - "peer": true, - "dependencies": { - "string-width": "^5.1.2", - "string-width-cjs": "npm:string-width@^4.2.0", - "strip-ansi": "^7.0.1", - "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", - "wrap-ansi": "^8.1.0", - "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.3.0.tgz", - "integrity": "sha512-WpDfL7NO6j7tH88IDBNVdUJxDh9nmCteAVW9dsep846XdwF4naCBK+/tGLX3KJgcpgMRXCFlTM2hKGoK9FsdrQ==", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-styles": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", - "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true, - "license": "MIT", - "peer": true - }, - "node_modules/@isaacs/cliui/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", - "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "ansi-regex": "^6.2.2" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/@manypkg/find-root": { + "node_modules/@isaacs/nonrecursive-glob-match": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@manypkg/find-root/-/find-root-1.1.0.tgz", - "integrity": "sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==", + "resolved": "https://registry.npmjs.org/@isaacs/nonrecursive-glob-match/-/nonrecursive-glob-match-1.1.0.tgz", + "integrity": "sha512-GPm/Dbvk5RLmhRnxXIa7nTpK0xtl4E0wj0MslsuNiJ1FIROU+2+9lgUC/dgF7Ey4QCWhfEsgxilMRMCdHPfDfw==", "dev": true, - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.5.5", - "@types/node": "^12.7.1", - "find-up": "^4.1.0", - "fs-extra": "^8.1.0" - } - }, - "node_modules/@manypkg/find-root/node_modules/@types/node": { - "version": "12.20.55", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz", - "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==", - "dev": true, - "license": "MIT" + "license": "BlueOak-1.0.0" }, - "node_modules/@manypkg/find-root/node_modules/fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "node_modules/@manypkg/find-root": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@manypkg/find-root/-/find-root-3.1.0.tgz", + "integrity": "sha512-BcSqCyKhBVZ5YkSzOiheMCV41kqAFptW6xGqYSTjkVTl9XQpr+pqHhwgGCOHQtjDCv7Is6EFyA14Sm5GVbVABA==", "dev": true, "license": "MIT", "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" + "@manypkg/tools": "^2.1.0" }, "engines": { - "node": ">=6 <7 || >=8" + "node": ">=20.0.0" } }, "node_modules/@manypkg/get-packages": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@manypkg/get-packages/-/get-packages-1.1.3.tgz", - "integrity": "sha512-fo+QhuU3qE/2TQMQmbVMqaQ6EWbMhi4ABWP+O4AM1NqPBuy0OrApV5LO6BrrgnhtAHS2NH6RrVk9OL181tTi8A==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@manypkg/get-packages/-/get-packages-3.1.0.tgz", + "integrity": "sha512-0TbBVyvPrP7xGYBI/cP8UP+yl/z+HtbTttAD7FMAJgn/kXOTwh5/60TsqP9ZYY710forNfyV0N8P/IE/ujGZJg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/runtime": "^7.5.5", - "@changesets/types": "^4.0.1", - "@manypkg/find-root": "^1.1.0", - "fs-extra": "^8.1.0", - "globby": "^11.0.0", - "read-yaml-file": "^1.1.0" + "@manypkg/find-root": "^3.1.0", + "@manypkg/tools": "^2.1.0" + }, + "engines": { + "node": ">=20.0.0" } }, - "node_modules/@manypkg/get-packages/node_modules/@changesets/types": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@changesets/types/-/types-4.1.0.tgz", - "integrity": "sha512-LDQvVDv5Kb50ny2s25Fhm3d9QSZimsoUGBsUioj6MC3qbMUCuC8GPIvk/M6IvXx3lYhAs0lwWUQLb+VIEUCECw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@manypkg/get-packages/node_modules/fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "node_modules/@manypkg/tools": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@manypkg/tools/-/tools-2.1.2.tgz", + "integrity": "sha512-6QEf6yqFbETdwGITKq57aYoPfX/3K8XFNwsAlx0C1M7o8cb79sv1M3w+tWuWvIcSbNqrLF7OD7YpZMVVz335hQ==", "dev": true, "license": "MIT", "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" + "jju": "^1.4.0", + "tinyglobby": "^0.2.13", + "yaml": "^2.9.0" }, "engines": { - "node": ">=6 <7 || >=8" + "node": ">=20.0.0" } }, "node_modules/@metamask/abi-utils": { @@ -1591,19 +1707,6 @@ "node": ">=16.0.0" } }, - "node_modules/@metamask/utils/node_modules/@noble/hashes": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz", - "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.21.3 || >=16" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, "node_modules/@noble/ciphers": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/@noble/ciphers/-/ciphers-1.3.0.tgz", @@ -1618,95 +1721,57 @@ } }, "node_modules/@noble/curves": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-2.3.0.tgz", - "integrity": "sha512-v7cY+4oWYPQszRj6ZFGzTVL7uP2TaLo1xMhWHzYC5wj0ZhOXQ5x+sBre8rF3hi8cAoi0bh1qXoovoOkdFtvqEg==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.9.0.tgz", + "integrity": "sha512-7YDlXiNMdO1YZeH6t/kvopHHbIZzlxrCV9WLqCY6QhcXOoXiNCMDqJIglZ9Yjx5+w7Dz30TITFrlTjnRg7sKEg==", "dev": true, "license": "MIT", "dependencies": { - "@noble/hashes": "2.3.0" + "@noble/hashes": "1.8.0" }, "engines": { - "node": ">= 20.19.0" + "node": "^14.21.3 || >=16" }, "funding": { "url": "https://paulmillr.com/funding/" } }, "node_modules/@noble/hashes": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-2.3.0.tgz", - "integrity": "sha512-oN+QwyX7VSHotibwubG3kpzbwKrfnyR6OOO+3Nk/53ADL7FmgHHz4TgrbaYKvvOw09u6QTx0oiH1cNCIOuN0CQ==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz", + "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==", "dev": true, "license": "MIT", "engines": { - "node": ">= 20.19.0" + "node": "^14.21.3 || >=16" }, "funding": { "url": "https://paulmillr.com/funding/" } }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" - } - }, "node_modules/@nomicfoundation/edr": { - "version": "0.17.0", - "resolved": "https://registry.npmjs.org/@nomicfoundation/edr/-/edr-0.17.0.tgz", - "integrity": "sha512-gnPDZEgIzkp5fwGMI8AVoRconp1BK8SGWiBTtQXq9G0+CAvS7hlz7Y9HiHptyv84cqKVacRSDqsS+7oN08su1Q==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr/-/edr-0.25.0.tgz", + "integrity": "sha512-aO9XbrBwhKoP7O8fXVDJZR+4DJRGC1as2nsQ1V4MxnwxiZD5XfhrPSX3DE918O/1oLZ5HQ+n9e0d8D5P/JiHig==", "dev": true, "license": "MIT", "engines": { "node": ">= 22" }, "optionalDependencies": { - "@nomicfoundation/edr-darwin-arm64": "0.17.0", - "@nomicfoundation/edr-darwin-x64": "0.17.0", - "@nomicfoundation/edr-linux-arm64-gnu": "0.17.0", - "@nomicfoundation/edr-linux-arm64-musl": "0.17.0", - "@nomicfoundation/edr-linux-x64-gnu": "0.17.0", - "@nomicfoundation/edr-linux-x64-musl": "0.17.0", - "@nomicfoundation/edr-win32-x64-msvc": "0.17.0" + "@nomicfoundation/edr-darwin-arm64": "0.25.0", + "@nomicfoundation/edr-darwin-x64": "0.25.0", + "@nomicfoundation/edr-linux-arm64-gnu": "0.25.0", + "@nomicfoundation/edr-linux-arm64-musl": "0.25.0", + "@nomicfoundation/edr-linux-x64-gnu": "0.25.0", + "@nomicfoundation/edr-linux-x64-musl": "0.25.0", + "@nomicfoundation/edr-win32-x64-msvc": "0.25.0" } }, "node_modules/@nomicfoundation/edr-darwin-arm64": { - "version": "0.17.0", - "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-darwin-arm64/-/edr-darwin-arm64-0.17.0.tgz", - "integrity": "sha512-rw+lAEQ9/XB5kvTRlu9fs+bZ1byF3OIMOpNfkg6cSUDCZZeXXhgpbzCWVHnmY6VVcka0L/qUDbhsNPD6GmBFIw==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-darwin-arm64/-/edr-darwin-arm64-0.25.0.tgz", + "integrity": "sha512-k5jOQ4430lNIRPeDMmgDMeoCp0iqY8bjO5ZYBg93sH2FEDvyS08e6stBvmm9j91+VkAj24DIdjwq3b0AEKfutw==", "cpu": [ "arm64" ], @@ -1721,9 +1786,9 @@ } }, "node_modules/@nomicfoundation/edr-darwin-x64": { - "version": "0.17.0", - "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-darwin-x64/-/edr-darwin-x64-0.17.0.tgz", - "integrity": "sha512-QLE4fnl0B8GK40H0QE4I4jXZ9rqG0P+QawZjlVjJAjl3mLcSCJNaNHVX1S5Z5Ee4Acrr6dfgAH8nRsTu6N8Zfw==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-darwin-x64/-/edr-darwin-x64-0.25.0.tgz", + "integrity": "sha512-V26jWmq2qsm6Aywh0MbSEBCkB5o1EAym9KFNi3dsbAi7sNFiyFYf5tQZ7HWpttVRNOGTXnyX6GhIpb90jbLPrQ==", "cpu": [ "x64" ], @@ -1738,9 +1803,9 @@ } }, "node_modules/@nomicfoundation/edr-linux-arm64-gnu": { - "version": "0.17.0", - "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-arm64-gnu/-/edr-linux-arm64-gnu-0.17.0.tgz", - "integrity": "sha512-NzdxADNC7L1BfgfmrqUhzUddz4Cg3Uf1pkXbVlJ38Tvn3h09m/D7+VAlxXjkvrJ5M7OoaHmr114vSlQ9zNSFJw==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-arm64-gnu/-/edr-linux-arm64-gnu-0.25.0.tgz", + "integrity": "sha512-1QRVSdq4YNS+r7f6MmWS8J/K0A9JlrzIjeV/BVEM5gTe7KyxJ0NwX4ErUAMbizl2JCmDwuD1SAak8X6YjZDMJA==", "cpu": [ "arm64" ], @@ -1758,9 +1823,9 @@ } }, "node_modules/@nomicfoundation/edr-linux-arm64-musl": { - "version": "0.17.0", - "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-arm64-musl/-/edr-linux-arm64-musl-0.17.0.tgz", - "integrity": "sha512-1o3LTouqc831tR+cr2dfckVRlEat8Om/dqYC58NFAaED/OVj52ndX4p+qvKg2qQ0AvW6wszjRZ4TY01F3VHZ/A==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-arm64-musl/-/edr-linux-arm64-musl-0.25.0.tgz", + "integrity": "sha512-uNim6ggISggh9nRAtwhVgDQ4cmkypM1kpqP757DL9q8DremHMGdK8BgPMx8J2VNMfjYwC7Ohuyszztau6obkLg==", "cpu": [ "arm64" ], @@ -1778,9 +1843,9 @@ } }, "node_modules/@nomicfoundation/edr-linux-x64-gnu": { - "version": "0.17.0", - "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-x64-gnu/-/edr-linux-x64-gnu-0.17.0.tgz", - "integrity": "sha512-pDyvBR9tXBGL6u0Qc60Hi7szpjHq9xqa9aHgT81/qbcisTRkwpqEcHv6zFJ6ZIkCZa0+WYcziQ67Nho17btYvA==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-x64-gnu/-/edr-linux-x64-gnu-0.25.0.tgz", + "integrity": "sha512-V0/Zjsd7WlRpwxtbtI1YFRaV0lF/+EtOHf5H01riCAZixK16N67PGY4QPwrZ/FQrk15bCzu/fFtgR5WpmFAuPg==", "cpu": [ "x64" ], @@ -1798,9 +1863,9 @@ } }, "node_modules/@nomicfoundation/edr-linux-x64-musl": { - "version": "0.17.0", - "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-x64-musl/-/edr-linux-x64-musl-0.17.0.tgz", - "integrity": "sha512-AnPUwuhKUkbgDM7TDfU3q3R4uXP4P+0IG8+8hdph/sgo34LA0cFILWQhKKnR4eSdlgLiepG9bjpF84yXuydyuA==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-x64-musl/-/edr-linux-x64-musl-0.25.0.tgz", + "integrity": "sha512-oZHb4vFOeloPwXS9pJpf3z5/QSIaTMzxObbQ6OZXqg+oK1BNxk86wmgsaMlq/4kfcWVYcYQ6m57HCUWlzU1MZw==", "cpu": [ "x64" ], @@ -1818,9 +1883,9 @@ } }, "node_modules/@nomicfoundation/edr-win32-x64-msvc": { - "version": "0.17.0", - "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-win32-x64-msvc/-/edr-win32-x64-msvc-0.17.0.tgz", - "integrity": "sha512-buvHzzK/UzeXcgY7UD0izceM2GRxC5akKgBaCfPdcpQybOmSdJHUm9kSCEWmy/YTf4HVLLgA9EyrHCLqY2Tsrw==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-win32-x64-msvc/-/edr-win32-x64-msvc-0.25.0.tgz", + "integrity": "sha512-uB0GT6iWOJu7qHEo4vNbr0yRedzuRCmOF+YkxXrQHaY2oKGcHpqZ0UnS1ak1NMZ2iyQWc2y5y8WYySNcwPq04g==", "cpu": [ "x64" ], @@ -1835,41 +1900,41 @@ } }, "node_modules/@nomicfoundation/hardhat-errors": { - "version": "3.0.20", - "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-errors/-/hardhat-errors-3.0.20.tgz", - "integrity": "sha512-6wmiB5zkqQ+3d+3Ta/vl0MvlIXdrAwUF+OMX2bi7RbCgBfGbbjBbzQhXmJUuhx6XDMPeswdRjjOChpK07tDNmw==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-errors/-/hardhat-errors-3.1.5.tgz", + "integrity": "sha512-P7ipqHQqIyCIlfCv/104x6yRmjgXi+mXu2bqx+2wnkWnUtfaQKdGs9p/IFP64Zaty7IrlwR4ZJfRm5iQXJBJiA==", "dev": true, "license": "MIT", "dependencies": { - "@nomicfoundation/hardhat-utils": "^4.1.5" + "@nomicfoundation/hardhat-utils": "^5.1.0" } }, "node_modules/@nomicfoundation/hardhat-ethers": { - "version": "4.0.15", - "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-ethers/-/hardhat-ethers-4.0.15.tgz", - "integrity": "sha512-qLBvq2RcKuffObX08LVZr9LixDSnsJwwxeRKYCfr5p1VTkMT0XP5JU2Y8AOIady39O5v7ZuzIEY+xH+DdqrBKA==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-ethers/-/hardhat-ethers-4.2.2.tgz", + "integrity": "sha512-gag6y9TBEzmHsSlNbsTD/brlJVrodiBHxNctZj1peKUURTOaW/QP3wGyrpGWJMQrWDKc3b+d7Vdb/3aFuJuK2w==", "dev": true, "license": "MIT", "dependencies": { - "@nomicfoundation/hardhat-errors": "^3.0.17", - "@nomicfoundation/hardhat-utils": "^4.1.5", + "@nomicfoundation/hardhat-errors": "^3.1.0", + "@nomicfoundation/hardhat-utils": "^5.0.0", "@nomicfoundation/hardhat-zod-utils": "^3.0.5", - "ethereum-cryptography": "^2.2.1", + "ethereum-cryptography": "^3.0.0", "ethers": "^6.14.0", "zod": "^3.23.8" }, "peerDependencies": { - "hardhat": "^3.8.0" + "hardhat": "^3.18.0" } }, "node_modules/@nomicfoundation/hardhat-ethers-chai-matchers": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-ethers-chai-matchers/-/hardhat-ethers-chai-matchers-3.0.11.tgz", - "integrity": "sha512-pAOTjBQRNKqCh8cLJD6dsOeGWrU8fe9Wrz4UqO03qhJbwmj0md2bq2LEPaMZAgDtxVS0ZteiVGx64DgBfyb7XA==", + "version": "3.0.13", + "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-ethers-chai-matchers/-/hardhat-ethers-chai-matchers-3.0.13.tgz", + "integrity": "sha512-1YS8M0dByQX6rKbEZj7m1N+zbPaIRw1FiurYPzJDBkTDFTUN+iywkG9S9GctxBQMJrhZLWkAcnJ4bkN45fHRJA==", "dev": true, "license": "MIT", "dependencies": { - "@nomicfoundation/hardhat-utils": "^4.1.4", + "@nomicfoundation/hardhat-utils": "^5.0.0", "@types/chai-as-promised": "^8.0.1", "chai-as-promised": "^8.0.0", "deep-eql": "^5.0.1" @@ -1882,61 +1947,62 @@ } }, "node_modules/@nomicfoundation/hardhat-mocha": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-mocha/-/hardhat-mocha-3.1.0.tgz", - "integrity": "sha512-bZgm1NWoVvwPdc2SQwjyj/HuFePG5LjS+zuLqqwwW8w5hq5+NIFZtgcOoTFNhShDFXeItLxOYiC2K2Pk/q2scw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-mocha/-/hardhat-mocha-4.0.1.tgz", + "integrity": "sha512-KOskqrcIj83D/eHouegWFYpU5wlcLnwibJgvKn+Eq6anyPdY4G5oDhYbdGtn3Ic8rIdq3sj1shSD75rx9zi3kw==", "dev": true, "license": "MIT", "dependencies": { - "@nomicfoundation/hardhat-errors": "^3.0.15", - "@nomicfoundation/hardhat-utils": "^4.1.2", + "@nomicfoundation/hardhat-errors": "^3.1.0", + "@nomicfoundation/hardhat-utils": "^5.0.0", "@nomicfoundation/hardhat-zod-utils": "^3.0.5", "tsx": "^4.23.1", "zod": "^3.23.8" }, "peerDependencies": { "hardhat": "^3.12.0", - "mocha": "^11.0.0" + "mocha": "^12.0.0" } }, "node_modules/@nomicfoundation/hardhat-network-helpers": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-network-helpers/-/hardhat-network-helpers-3.0.11.tgz", - "integrity": "sha512-3/xuORejAOGbfqBmIen+OCHu9ExK9O8pjE11ILU9NcN37zy3GDbyNCKV9keK1gSjWWVb0okAlAR/yvewfEE4TA==", + "version": "3.0.12", + "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-network-helpers/-/hardhat-network-helpers-3.0.12.tgz", + "integrity": "sha512-rT9Zz9ssFIJV/omKY7h0u5XqWMHzlSSwL4Fjk9r+Yj48kYgV6WpMsDcpo4f0dmI0vSDkdme3WgZOb7cO0BxteA==", "dev": true, "license": "MIT", "dependencies": { "@nomicfoundation/hardhat-errors": "^3.0.16", - "@nomicfoundation/hardhat-utils": "^4.1.4" + "@nomicfoundation/hardhat-utils": "^5.0.0" }, "peerDependencies": { "hardhat": "^3.8.0" } }, "node_modules/@nomicfoundation/hardhat-utils": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-utils/-/hardhat-utils-4.1.8.tgz", - "integrity": "sha512-6dyf/irAQ01kUjd8ol83/KAqZCCwnrlF8sSb2aHDAxR5hG1yxi6xf29HqG3UwCtEPyojN/n+lydZ8NEMRQ2/dg==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-utils/-/hardhat-utils-5.1.2.tgz", + "integrity": "sha512-KA1s8zKGjf0YLQ5fK070NdzsJ4XGYYYcUW6zaugmSfjgmYxISXjbCWNHWryGz0EgJzU65UH6n3G2tNgKE+lGJQ==", "dev": true, "license": "MIT", "dependencies": { - "@streamparser/json-node": "^0.0.22", + "@streamparser/json-node": "^0.0.26", "env-paths": "^4.0.0", - "ethereum-cryptography": "^2.2.1", + "ethereum-cryptography": "^3.0.0", "fast-equals": "^6.0.0", "json-stream-stringify": "^3.1.7", + "micro-eth-signer": "^0.19.0", "rfdc": "^1.3.1", - "undici": "^6.28.0" + "undici": "^7.29.0" } }, "node_modules/@nomicfoundation/hardhat-utils/node_modules/undici": { - "version": "6.28.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-6.28.0.tgz", - "integrity": "sha512-LIY910g9TI13YS95lrMFrs8Rm/u/irgHeTWoKCoteeJ04CUJ92eEfj0rVn+7VKMPBpUPiUoBKfhNyLI23EE/KA==", + "version": "7.30.2", + "resolved": "https://registry.npmjs.org/undici/-/undici-7.30.2.tgz", + "integrity": "sha512-mLyPQnHwUxaM/rideoK/+KL8DaAJLRl4aBCfmX444aCSLnIaomqPLtNRe2jdCYcsk5wZzXrDIQC8ZeYNRAYyIA==", "dev": true, "license": "MIT", "engines": { - "node": ">=18.17" + "node": ">=20.18.1" } }, "node_modules/@nomicfoundation/hardhat-vendored": { @@ -1947,14 +2013,14 @@ "license": "MIT" }, "node_modules/@nomicfoundation/hardhat-zod-utils": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-zod-utils/-/hardhat-zod-utils-3.0.6.tgz", - "integrity": "sha512-DraBttTle+tRi24wkEfTYUrsX/Cdp74ySXcc4MUzMQPBQNUTFx5YyTH7qFhXQdz3V171iqLAQpOAhNcEqwmq9Q==", + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-zod-utils/-/hardhat-zod-utils-3.0.9.tgz", + "integrity": "sha512-KSlTWx6mvOGr06aVs3RKoNE+UVdkEsLqMNpak5Ag+6ZqklBs+SOPJeLjjyuXcneBkf7Rwpa8qQdTSKDJx3Dt+Q==", "dev": true, "license": "MIT", "dependencies": { "@nomicfoundation/hardhat-errors": "^3.0.13", - "@nomicfoundation/hardhat-utils": "^4.1.2" + "@nomicfoundation/hardhat-utils": "^5.1.1" }, "peerDependencies": { "zod": "^3.23.8" @@ -2091,226 +2157,50 @@ "oz-docs": "oz-docs.js" } }, - "node_modules/@openzeppelin/docs-utils/node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "license": "MIT", - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, "node_modules/@openzeppelin/docs-utils/node_modules/env-paths": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", - "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/@openzeppelin/docs-utils/node_modules/js-yaml": { - "version": "3.15.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.15.1.tgz", - "integrity": "sha512-S99WuO3HlhO3XN41EtYUNl9zzXjoJx7QvmipxsJVxtCBT0YHEFy+iOJhjSvrmV12nYhWpZaM8lPHkJm0yUMbag==", - "dev": true, - "license": "MIT", - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/@openzeppelin/merkle-tree": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@openzeppelin/merkle-tree/-/merkle-tree-1.0.8.tgz", - "integrity": "sha512-E2c9/Y3vjZXwVvPZKqCKUn7upnvam1P1ZhowJyZVQSkzZm5WhumtaRr+wkUXrZVfkIc7Gfrl7xzabElqDL09ow==", - "dev": true, - "license": "MIT", - "dependencies": { - "@metamask/abi-utils": "^2.0.4", - "ethereum-cryptography": "^3.0.0" - } - }, - "node_modules/@openzeppelin/merkle-tree/node_modules/@noble/curves": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.9.0.tgz", - "integrity": "sha512-7YDlXiNMdO1YZeH6t/kvopHHbIZzlxrCV9WLqCY6QhcXOoXiNCMDqJIglZ9Yjx5+w7Dz30TITFrlTjnRg7sKEg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@noble/hashes": "1.8.0" - }, - "engines": { - "node": "^14.21.3 || >=16" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/@openzeppelin/merkle-tree/node_modules/@noble/hashes": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz", - "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.21.3 || >=16" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/@openzeppelin/merkle-tree/node_modules/@scure/bip32": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.7.0.tgz", - "integrity": "sha512-E4FFX/N3f4B80AKWp5dP6ow+flD1LQZo/w8UnLGYZO674jS6YnYeepycOOksv+vLPSpgN35wgKgy+ybfTb2SMw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@noble/curves": "~1.9.0", - "@noble/hashes": "~1.8.0", - "@scure/base": "~1.2.5" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/@openzeppelin/merkle-tree/node_modules/@scure/bip39": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.6.0.tgz", - "integrity": "sha512-+lF0BbLiJNwVlev4eKelw1WWLaiKXw7sSl8T6FvBlWkdX+94aGJ4o8XjUdlyhTCjd8c+B3KT3JfS8P0bLRNU6A==", - "dev": true, - "license": "MIT", - "dependencies": { - "@noble/hashes": "~1.8.0", - "@scure/base": "~1.2.5" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/@openzeppelin/merkle-tree/node_modules/ethereum-cryptography": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-3.2.0.tgz", - "integrity": "sha512-Urr5YVsalH+Jo0sYkTkv1MyI9bLYZwW8BENZCeE1QYaTHETEYx0Nv/SVsWkSqpYrzweg6d8KMY1wTjH/1m/BIg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@noble/ciphers": "1.3.0", - "@noble/curves": "1.9.0", - "@noble/hashes": "1.8.0", - "@scure/bip32": "1.7.0", - "@scure/bip39": "1.6.0" - }, - "engines": { - "node": "^14.21.3 || >=16", - "npm": ">=9" - } - }, - "node_modules/@openzeppelin/upgrade-safe-transpiler": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/@openzeppelin/upgrade-safe-transpiler/-/upgrade-safe-transpiler-0.4.2.tgz", - "integrity": "sha512-Rct4coEubwKpUIcFv41DUHQiOMMTH1EZ23oYBESFqN79TZ7qiUMdfgQKsokwozkqqPD7WR4dvZpzdFl46wrZzg==", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "^8.0.0", - "compare-versions": "^6.0.0", - "ethereum-cryptography": "^3.0.0", - "lodash": "^4.17.20", - "minimatch": "^10.0.3", - "minimist": "^1.2.5", - "solidity-ast": "^0.4.51" - }, - "bin": { - "upgrade-safe-transpiler": "dist/cli.js" - } - }, - "node_modules/@openzeppelin/upgrade-safe-transpiler/node_modules/@noble/curves": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.9.0.tgz", - "integrity": "sha512-7YDlXiNMdO1YZeH6t/kvopHHbIZzlxrCV9WLqCY6QhcXOoXiNCMDqJIglZ9Yjx5+w7Dz30TITFrlTjnRg7sKEg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@noble/hashes": "1.8.0" - }, - "engines": { - "node": "^14.21.3 || >=16" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/@openzeppelin/upgrade-safe-transpiler/node_modules/@noble/hashes": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz", - "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.21.3 || >=16" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/@openzeppelin/upgrade-safe-transpiler/node_modules/@scure/bip32": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.7.0.tgz", - "integrity": "sha512-E4FFX/N3f4B80AKWp5dP6ow+flD1LQZo/w8UnLGYZO674jS6YnYeepycOOksv+vLPSpgN35wgKgy+ybfTb2SMw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@noble/curves": "~1.9.0", - "@noble/hashes": "~1.8.0", - "@scure/base": "~1.2.5" - }, - "funding": { - "url": "https://paulmillr.com/funding/" + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" } }, - "node_modules/@openzeppelin/upgrade-safe-transpiler/node_modules/@scure/bip39": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.6.0.tgz", - "integrity": "sha512-+lF0BbLiJNwVlev4eKelw1WWLaiKXw7sSl8T6FvBlWkdX+94aGJ4o8XjUdlyhTCjd8c+B3KT3JfS8P0bLRNU6A==", + "node_modules/@openzeppelin/merkle-tree": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@openzeppelin/merkle-tree/-/merkle-tree-1.0.8.tgz", + "integrity": "sha512-E2c9/Y3vjZXwVvPZKqCKUn7upnvam1P1ZhowJyZVQSkzZm5WhumtaRr+wkUXrZVfkIc7Gfrl7xzabElqDL09ow==", "dev": true, "license": "MIT", "dependencies": { - "@noble/hashes": "~1.8.0", - "@scure/base": "~1.2.5" - }, - "funding": { - "url": "https://paulmillr.com/funding/" + "@metamask/abi-utils": "^2.0.4", + "ethereum-cryptography": "^3.0.0" } }, - "node_modules/@openzeppelin/upgrade-safe-transpiler/node_modules/ethereum-cryptography": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-3.2.0.tgz", - "integrity": "sha512-Urr5YVsalH+Jo0sYkTkv1MyI9bLYZwW8BENZCeE1QYaTHETEYx0Nv/SVsWkSqpYrzweg6d8KMY1wTjH/1m/BIg==", + "node_modules/@openzeppelin/upgrade-safe-transpiler": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@openzeppelin/upgrade-safe-transpiler/-/upgrade-safe-transpiler-0.4.2.tgz", + "integrity": "sha512-Rct4coEubwKpUIcFv41DUHQiOMMTH1EZ23oYBESFqN79TZ7qiUMdfgQKsokwozkqqPD7WR4dvZpzdFl46wrZzg==", "dev": true, "license": "MIT", "dependencies": { - "@noble/ciphers": "1.3.0", - "@noble/curves": "1.9.0", - "@noble/hashes": "1.8.0", - "@scure/bip32": "1.7.0", - "@scure/bip39": "1.6.0" + "ajv": "^8.0.0", + "compare-versions": "^6.0.0", + "ethereum-cryptography": "^3.0.0", + "lodash": "^4.17.20", + "minimatch": "^10.0.3", + "minimist": "^1.2.5", + "solidity-ast": "^0.4.51" }, - "engines": { - "node": "^14.21.3 || >=16", - "npm": ">=9" + "bin": { + "upgrade-safe-transpiler": "dist/cli.js" } }, "node_modules/@openzeppelin/upgrades-core": { - "version": "1.46.0", - "resolved": "https://registry.npmjs.org/@openzeppelin/upgrades-core/-/upgrades-core-1.46.0.tgz", - "integrity": "sha512-UFSeO/4r8eeXj0C/HAwV+J4b72sE1HX0aALQFs5S2RBOsfXvKweyjQf35vrK32LQiyHdP6IPShAsEBVvpSEgGQ==", + "version": "1.48.0", + "resolved": "https://registry.npmjs.org/@openzeppelin/upgrades-core/-/upgrades-core-1.48.0.tgz", + "integrity": "sha512-mlrCU9MtXy3wgpQZj1MaAAu59slktjtFRQeiu91rpWRKg+e8KDJlzpE4zuIxXbdP0sE5voNeCiKch5IsPn/PWA==", "dev": true, "license": "MIT", "dependencies": { @@ -2320,6 +2210,7 @@ "chalk": "^4.1.0", "compare-versions": "^6.0.0", "debug": "^4.1.1", + "env-paths": "^2.2.1", "ethereumjs-util": "^7.0.3", "minimatch": "^10.2.5", "minimist": "^1.2.7", @@ -2347,16 +2238,14 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "node_modules/@openzeppelin/upgrades-core/node_modules/env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", "dev": true, "license": "MIT", - "optional": true, - "peer": true, "engines": { - "node": ">=14" + "node": ">=6" } }, "node_modules/@pnpm/config.env-replace": { @@ -2369,6 +2258,19 @@ "node": ">=12.22.0" } }, + "node_modules/@pnpm/deps.graph-sequencer": { + "version": "1100.0.1", + "resolved": "https://registry.npmjs.org/@pnpm/deps.graph-sequencer/-/deps.graph-sequencer-1100.0.1.tgz", + "integrity": "sha512-pOr5+q1fLYKwFN3LAJuGZEnfXDcQ73zqgDHMtGy+K+uIoUqyY+6MeDCWFwfu+4EFuq76I5EPFofoNAI+Bmmq4A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=22.13" + }, + "funding": { + "url": "https://opencollective.com/pnpm" + } + }, "node_modules/@pnpm/network.ca-file": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/@pnpm/network.ca-file/-/network.ca-file-1.0.2.tgz", @@ -2415,97 +2317,38 @@ } }, "node_modules/@scure/bip32": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz", - "integrity": "sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@noble/curves": "~1.4.0", - "@noble/hashes": "~1.4.0", - "@scure/base": "~1.1.6" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/@scure/bip32/node_modules/@noble/curves": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz", - "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.7.0.tgz", + "integrity": "sha512-E4FFX/N3f4B80AKWp5dP6ow+flD1LQZo/w8UnLGYZO674jS6YnYeepycOOksv+vLPSpgN35wgKgy+ybfTb2SMw==", "dev": true, "license": "MIT", "dependencies": { - "@noble/hashes": "1.4.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/@scure/bip32/node_modules/@noble/hashes": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz", - "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 16" + "@noble/curves": "~1.9.0", + "@noble/hashes": "~1.8.0", + "@scure/base": "~1.2.5" }, "funding": { "url": "https://paulmillr.com/funding/" } }, - "node_modules/@scure/bip32/node_modules/@scure/base": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.9.tgz", - "integrity": "sha512-8YKhl8GHiNI/pU2VMaofa2Tor7PJRAjwQLBBuilkJ9L5+13yVbC7JO/wS7piioAvPSwR3JKM1IJ/u4xQzbcXKg==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, "node_modules/@scure/bip39": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz", - "integrity": "sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.6.0.tgz", + "integrity": "sha512-+lF0BbLiJNwVlev4eKelw1WWLaiKXw7sSl8T6FvBlWkdX+94aGJ4o8XjUdlyhTCjd8c+B3KT3JfS8P0bLRNU6A==", "dev": true, "license": "MIT", "dependencies": { - "@noble/hashes": "~1.4.0", - "@scure/base": "~1.1.6" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/@scure/bip39/node_modules/@noble/hashes": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz", - "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 16" + "@noble/hashes": "~1.8.0", + "@scure/base": "~1.2.5" }, "funding": { "url": "https://paulmillr.com/funding/" } }, - "node_modules/@scure/bip39/node_modules/@scure/base": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.9.tgz", - "integrity": "sha512-8YKhl8GHiNI/pU2VMaofa2Tor7PJRAjwQLBBuilkJ9L5+13yVbC7JO/wS7piioAvPSwR3JKM1IJ/u4xQzbcXKg==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, "node_modules/@sentry/core": { - "version": "9.47.1", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-9.47.1.tgz", - "integrity": "sha512-KX62+qIt4xgy8eHKHiikfhz2p5fOciXd0Cl+dNzhgPFq8klq4MGMNaf148GB3M/vBqP4nw/eFvRMAayFCgdRQw==", + "version": "9.47.2", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-9.47.2.tgz", + "integrity": "sha512-WYEP2ZHkTQMP7Gg5frzrQy1475TnK5Qv8wgvHiTlNerYaEBCNpAeWjUltTgfCQ8Hbv1iq4inca7Kqmmyv9gLnQ==", "dev": true, "license": "MIT", "engines": { @@ -2533,20 +2376,20 @@ "license": "MIT" }, "node_modules/@streamparser/json": { - "version": "0.0.22", - "resolved": "https://registry.npmjs.org/@streamparser/json/-/json-0.0.22.tgz", - "integrity": "sha512-b6gTSBjJ8G8SuO3Gbbj+zXbVx8NSs1EbpbMKpzGLWMdkR+98McH9bEjSz3+0mPJf68c5nxa3CrJHp5EQNXM6zQ==", + "version": "0.0.26", + "resolved": "https://registry.npmjs.org/@streamparser/json/-/json-0.0.26.tgz", + "integrity": "sha512-46597LNFI+MFdUnzX2QJWwmdTRdq0XVD+vVNJTtGVzIrnCuhG9pFo1OAzbNBqci8UJgk/X5KJZ6LcV+y7PTuDQ==", "dev": true, "license": "MIT" }, "node_modules/@streamparser/json-node": { - "version": "0.0.22", - "resolved": "https://registry.npmjs.org/@streamparser/json-node/-/json-node-0.0.22.tgz", - "integrity": "sha512-sJT2ptNRwqB1lIsQrQlCoWk5rF4tif9wDh+7yluAGijJamAhrHGYpFB/Zg3hJeceoZypi74ftXk8DHzwYpbZSg==", + "version": "0.0.26", + "resolved": "https://registry.npmjs.org/@streamparser/json-node/-/json-node-0.0.26.tgz", + "integrity": "sha512-9OxH3oyILbxiHxNfhvfVpyWgaiLDxreWLk6t6xdSZxJlzKciXReMN6w446+lu+cgdpJxJlwNoyfBLPtTrCUJgA==", "dev": true, "license": "MIT", "dependencies": { - "@streamparser/json": "^0.0.22" + "@streamparser/json": "^0.0.26" } }, "node_modules/@szmarczak/http-timer": { @@ -2611,9 +2454,9 @@ "license": "MIT" }, "node_modules/@types/estree": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz", - "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.10.tgz", + "integrity": "sha512-lTyOMnOcmRBzdCv6/4zUZCrEhV0xrqQiUZBZtVcbmLHBXKLnN8q89v/wKRF/Q0HbwVsqbIG3o5HDoFl9sduM+g==", "dev": true, "license": "MIT" }, @@ -2639,9 +2482,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "25.9.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-25.9.5.tgz", - "integrity": "sha512-OScDchr2fwuUmWdf4kZ9h7PcJiYDVInhJizG/biAq3cAvqwYktuy/TYGGdZNMtNTFUP7rnb0NU4TUdm82kt4Rg==", + "version": "25.9.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-25.9.9.tgz", + "integrity": "sha512-b4e2xxj/yMeT2hNlD6x7zNFiQK2Dlmkb9CQ6v3/1G2RezKN4YS2lcEv8lzGm1mhs4f2lM4yNAMI/zUDBZBBt7w==", "dev": true, "license": "MIT", "dependencies": { @@ -2686,9 +2529,9 @@ "license": "MIT" }, "node_modules/acorn": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.18.0.tgz", - "integrity": "sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.19.0.tgz", + "integrity": "sha512-oJlA3XiRm7Cyk6qFD2Jn8ak9B7jSy0qy00ADO3+8dpT0LSjFihQYv4C02LFCSYJV3Q37xYwwRy5m+IpIiUzqWw==", "dev": true, "license": "MIT", "bin": { @@ -2709,9 +2552,9 @@ } }, "node_modules/adm-zip": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.6.0.tgz", - "integrity": "sha512-XleryMhbuksdKtofnWZ9Sk+4CUTbms4Mb/EU32SZwToAyZ5RgVos/ki8n+yr0LWHOGKuakbXTuuYNHLQjhddgg==", + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.6.1.tgz", + "integrity": "sha512-Xwrja8nx9e5o2N1my4DsKCeKpdrnACyr1wtbPxBDgGzKzKyE9kRtBFA8mWldI+RVlD7CBZNWY/wQ2+ydwOR6kQ==", "dev": true, "license": "MIT", "engines": { @@ -2792,21 +2635,27 @@ "node": ">= 8" } }, - "node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "node_modules/anymatch/node_modules/picomatch": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", "dev": true, - "license": "Python-2.0" + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "license": "MIT", - "engines": { - "node": ">=8" + "dependencies": { + "sprintf-js": "~1.0.2" } }, "node_modules/assertion-error": { @@ -2873,9 +2722,9 @@ } }, "node_modules/better-ajv-errors": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/better-ajv-errors/-/better-ajv-errors-2.0.3.tgz", - "integrity": "sha512-t1vxUP+vYKsaYi/BbKo2K98nEAZmfi4sjwvmRT8aOPDzPJeAtLurfoIDazVkLILxO4K+Sw4YrLYnBQ46l6pePg==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/better-ajv-errors/-/better-ajv-errors-2.0.4.tgz", + "integrity": "sha512-ezhaIONGpRAPg9FeAovIXHdFXxdkVBqn7+KWOmIrWEAJmcKGj6xBTyM2KfC+hnKE4vNpq061Qf4zq0ocWOuC4Q==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -2909,19 +2758,6 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/better-path-resolve": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/better-path-resolve/-/better-path-resolve-1.0.0.tgz", - "integrity": "sha512-pbnl5XzGBdrFU/wT4jqmJVPn2B6UHPBOhzMQkY/SPUPB6QtUXtmBHBIwCbXJol93mOpGMnQyP/+BB19q04xj7g==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-windows": "^1.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/bignumber.js": { "version": "9.3.1", "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.3.1.tgz", @@ -2960,9 +2796,9 @@ "license": "MIT" }, "node_modules/brace-expansion": { - "version": "5.0.9", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.9.tgz", - "integrity": "sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==", + "version": "5.0.13", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.13.tgz", + "integrity": "sha512-Vh3dmFbc4wZeox7M9I/0L9GfFd83Su4+yCck/OF9Gi/P/dAHn0RT7X4K9R7gMNMhDck3DvhR6QXsnQdjjgwNvQ==", "dev": true, "license": "MIT", "dependencies": { @@ -3044,6 +2880,16 @@ "dev": true, "license": "MIT" }, + "node_modules/cac": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/cac/-/cac-7.1.0.tgz", + "integrity": "sha512-LMDU/U2yA4IPIY8KT0NsNPWEYZvAMkbgyspxJ6btJaYV+WMDOHAZCmB0lsTObiHaRS1V/ztKAl7+TSkTqXyeoA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=20.19.0" + } + }, "node_modules/cacheable-lookup": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz", @@ -3133,20 +2979,6 @@ "node": ">=6" } }, - "node_modules/camelcase": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", - "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/cbor": { "version": "10.0.12", "resolved": "https://registry.npmjs.org/cbor/-/cbor-10.0.12.tgz", @@ -3204,13 +3036,6 @@ "node": ">=8" } }, - "node_modules/chardet": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-2.2.0.tgz", - "integrity": "sha512-rddelWYNPRrXq6PtNEN2S3f6t9ILzvqaN5pVgi4kqt9jHQaXIial9PznB5iSPVlQSLNaaH22ItWz3EJtQ10+OA==", - "dev": true, - "license": "MIT" - }, "node_modules/check-error": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.3.tgz", @@ -3277,9 +3102,9 @@ } }, "node_modules/cliui/node_modules/ansi-regex": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.3.0.tgz", - "integrity": "sha512-WpDfL7NO6j7tH88IDBNVdUJxDh9nmCteAVW9dsep846XdwF4naCBK+/tGLX3KJgcpgMRXCFlTM2hKGoK9FsdrQ==", + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.6.0.tgz", + "integrity": "sha512-XZ5apbzreCbXSKwPjJstu8R0zOi247w3XYwWxtwBXgpZrCyc1Ka7p9/xY0A9/diMewmHbEKz+FIraWaEWjlN5g==", "dev": true, "license": "MIT", "engines": { @@ -3419,6 +3244,36 @@ } } }, + "node_modules/cosmiconfig/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/cosmiconfig/node_modules/js-yaml": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.2.tgz", + "integrity": "sha512-SFNOvSJ+Dgf/9An904Yx+CgSlIPCkIpao4qo51lpee25TIRejdH3rhR4EZMGoNx3/TP3O+wzWuiTFl4sqbltzA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/puzrin" + }, + { + "type": "github", + "url": "https://github.com/sponsors/nodeca" + } + ], + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, "node_modules/crc-32": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz", @@ -3477,11 +3332,11 @@ } }, "node_modules/dataloader": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/dataloader/-/dataloader-1.4.0.tgz", - "integrity": "sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/dataloader/-/dataloader-2.2.3.tgz", + "integrity": "sha512-y2krtASINtPFS1rSDjacrFgn1dcUuoREVabwlOGOe4SdxenREqwjwjElAdwvbGM7kgZz9a3KVicWR7vcz8rnzA==", "dev": true, - "license": "BSD-3-Clause" + "license": "MIT" }, "node_modules/debug": { "version": "4.4.3", @@ -3501,20 +3356,6 @@ } } }, - "node_modules/decamelize": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", - "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/decompress-response": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", @@ -3599,48 +3440,15 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/detect-indent": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz", - "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/diff": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz", - "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-9.0.0.tgz", + "integrity": "sha512-svtcdpS8CgJyqAjEQIXdb3OjhFVVYjzGAPO8WGCmRbrml64SPw/jJD4GoE98aR7r25A0XcgrK3F02yw9R/vhQw==", "dev": true, "license": "BSD-3-Clause", "peer": true, "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "license": "MIT", - "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/dotenv": { - "version": "8.6.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz", - "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==", - "dev": true, - "license": "BSD-2-Clause", - "engines": { - "node": ">=10" + "node": ">=0.3.1" } }, "node_modules/dunder-proto": { @@ -3658,14 +3466,6 @@ "node": ">= 0.4" } }, - "node_modules/eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true, - "license": "MIT", - "peer": true - }, "node_modules/elliptic": { "version": "6.6.1", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.1.tgz", @@ -3993,9 +3793,9 @@ "license": "MIT" }, "node_modules/eslint/node_modules/brace-expansion": { - "version": "1.1.18", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.18.tgz", - "integrity": "sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==", + "version": "1.1.22", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.22.tgz", + "integrity": "sha512-CKLDTuSsN0+r1ThM0WkzzBI7dnPI6xEGfa/JnVYIK9JNBA1N1NyPwXVHor//NKD/y3sDxp764sZdLhFK7pH8XQ==", "dev": true, "license": "MIT", "dependencies": { @@ -4223,42 +4023,21 @@ } }, "node_modules/ethereum-cryptography": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.2.1.tgz", - "integrity": "sha512-r/W8lkHSiTLxUxW8Rf3u4HGB0xQweG2RyETjywylKZSzLWoWAijRz8WCuOtJ6wah+avllXBqZuk29HCCvhEIRg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@noble/curves": "1.4.2", - "@noble/hashes": "1.4.0", - "@scure/bip32": "1.4.0", - "@scure/bip39": "1.3.0" - } - }, - "node_modules/ethereum-cryptography/node_modules/@noble/curves": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz", - "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-3.2.0.tgz", + "integrity": "sha512-Urr5YVsalH+Jo0sYkTkv1MyI9bLYZwW8BENZCeE1QYaTHETEYx0Nv/SVsWkSqpYrzweg6d8KMY1wTjH/1m/BIg==", "dev": true, "license": "MIT", "dependencies": { - "@noble/hashes": "1.4.0" + "@noble/ciphers": "1.3.0", + "@noble/curves": "1.9.0", + "@noble/hashes": "1.8.0", + "@scure/bip32": "1.7.0", + "@scure/bip39": "1.6.0" }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/ethereum-cryptography/node_modules/@noble/hashes": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz", - "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==", - "dev": true, - "license": "MIT", "engines": { - "node": ">= 16" - }, - "funding": { - "url": "https://paulmillr.com/funding/" + "node": "^14.21.3 || >=16", + "npm": ">=9" } }, "node_modules/ethereumjs-util": { @@ -4385,13 +4164,6 @@ "safe-buffer": "^5.1.1" } }, - "node_modules/extendable-error": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/extendable-error/-/extendable-error-0.1.7.tgz", - "integrity": "sha512-UOiS2in6/Q0FK0R0q6UY9vYpQ21mr/Qn1KOnte7vsACuNJf514WvCCUHSRCPcgjPT2bAhNIJdlE6bVap1GKmeg==", - "dev": true, - "license": "MIT" - }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -4407,32 +4179,15 @@ "license": "Apache-2.0" }, "node_modules/fast-equals": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-6.0.2.tgz", - "integrity": "sha512-sAjhj9ZhOxYCGiNMnZLaucOqf5ZeFnHNoKoAZiD9thhJ0N8RP85qJK759/97C/3L7NzzmGVB5uiX9AUpySZmUQ==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-6.2.2.tgz", + "integrity": "sha512-n+XqoarWCgcar0O3om3DeNYx6xTuLWGTUF1bRZ9iuO00tsPepzP1L4V7rqtxxZ4PEya34UCESReimFvxmEVwIA==", "dev": true, "license": "MIT", "engines": { "node": ">=6.0.0" } }, - "node_modules/fast-glob": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", - "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.8" - }, - "engines": { - "node": ">=8.6.0" - } - }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", @@ -4447,10 +4202,27 @@ "dev": true, "license": "MIT" }, + "node_modules/fast-string-truncated-width": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fast-string-truncated-width/-/fast-string-truncated-width-3.0.3.tgz", + "integrity": "sha512-0jjjIEL6+0jag3l2XWWizO64/aZVtpiGE3t0Zgqxv0DPuxiMjvB3M24fCyhZUO4KomJQPj3LTSUnDP3GpdwC0g==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-string-width": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/fast-string-width/-/fast-string-width-3.0.2.tgz", + "integrity": "sha512-gX8LrtNEI5hq8DVUfRQMbr5lpaS4nMIWV+7XEbXk2b8kiQIizgnlr12B4dA3ZEx3308ze0O4Q1R+cHts8kyUJg==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-string-truncated-width": "^3.0.2" + } + }, "node_modules/fast-uri": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.6.tgz", - "integrity": "sha512-7Ical1vFEMr0onbVzEDIreM22I4khW+fzyQPwvAFWBp1iwdshSZRsL4jjRvPG9JP1uiqMHRto+YU6R2/CzDz5Q==", + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.9.tgz", + "integrity": "sha512-hS/0Wt3Ya043oKXs0sIxrMpKQITXhMLIrVAKKXi4gozGC9v7YRWVnXIZzjNPTO02M9BdxLCWqK1yRXgNziVyJQ==", "dev": true, "funding": [ { @@ -4464,14 +4236,32 @@ ], "license": "BSD-3-Clause" }, - "node_modules/fastq": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz", - "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==", + "node_modules/fast-wrap-ansi": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/fast-wrap-ansi/-/fast-wrap-ansi-0.2.2.tgz", + "integrity": "sha512-7F2Fl+TjRSenLqlU3UjSH0iyqopqoZIu7eZVpEirP2g1GtWa2G/ecEmBdgz31+Mxr+ELclgg6sokpSFIQiZ02Q==", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "reusify": "^1.0.4" + "fast-string-width": "^3.0.2" + } + }, + "node_modules/fdir": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", + "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "picomatch": "^3 || ^4" + }, + "peerDependenciesMeta": { + "picomatch": { + "optional": true + } } }, "node_modules/file-entry-cache": { @@ -4514,15 +4304,18 @@ "node": ">=8" } }, - "node_modules/flat": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", - "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "node_modules/find-up-simple": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/find-up-simple/-/find-up-simple-1.0.1.tgz", + "integrity": "sha512-afd4O7zpqHeRyg4PfDQsXmlDe2PfdHtJt6Akt8jOWaApLOZk5JXs6VMR29lz03pRe9mpykrRCYIYxaJYcfpncQ==", "dev": true, - "license": "BSD-3-Clause", + "license": "MIT", "peer": true, - "bin": { - "flat": "cli.js" + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/flat-cache": { @@ -4562,38 +4355,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/foreground-child": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", - "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", - "dev": true, - "license": "ISC", - "peer": true, - "dependencies": { - "cross-spawn": "^7.0.6", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/foreground-child/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "license": "ISC", - "peer": true, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/form-data-encoder": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz", @@ -4604,21 +4365,6 @@ "node": ">= 14.17" } }, - "node_modules/fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - }, - "engines": { - "node": ">=6 <7 || >=8" - } - }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", @@ -4655,9 +4401,9 @@ } }, "node_modules/get-east-asian-width": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.6.0.tgz", - "integrity": "sha512-QRbvDIbx6YklUe6RxeTeleMR0yv3cYH6PsPZHcnVn7xv7zO1BHN8r0XETu8n6Ye3Q+ahtSarc3WgtNWmehIBfA==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.7.0.tgz", + "integrity": "sha512-XjH1AECxf0giL2V1aU8vKyRR2ppRUb5c0EvT7zuJTokQ74bNo52zOtghqdWIqrhUD79fo3x0WfKZdOqxF6LG1Q==", "dev": true, "license": "MIT", "engines": { @@ -4720,15 +4466,15 @@ } }, "node_modules/glob": { - "version": "13.0.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.6.tgz", - "integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==", + "version": "14.0.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-14.0.6.tgz", + "integrity": "sha512-OwXjVP2svY5EyLY75Vek96C8qK43gqrt4xsZ+qSILdnaEiJPXkd62mcfUSNx/TQErQRdu5uM5kF67sfONragKw==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { - "minimatch": "^10.2.2", + "minimatch": "^11.0.5", "minipass": "^7.1.3", - "path-scurry": "^2.0.2" + "path-scurry": "^3.0.0" }, "engines": { "node": "18 || 20 || >=22" @@ -4750,35 +4496,31 @@ "node": ">= 6" } }, - "node_modules/globals": { - "version": "17.11.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-17.11.0.tgz", - "integrity": "sha512-Z2I8hM+PbJDXQDq3Icgpzv+mPdwr68iZUU9d5WW4FuXfDUQfkZaZuvjMv42/5crNyw154+9+VWXbYrUgDXbxNw==", + "node_modules/glob/node_modules/minimatch": { + "version": "11.0.8", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-11.0.8.tgz", + "integrity": "sha512-nFQuYSTVrGvysVBps5Ih+0BdnYFN/Cj3C816r6+p7yK+FHrVLGE4O4N9AFwykrlNlvM2HYt+Rad1Uiro6h88Ig==", "dev": true, - "license": "MIT", + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/nonrecursive-glob-match": "^1.1.0", + "brace-expansion": "^5.0.12" + }, "engines": { - "node": ">=18" + "node": "20 || >=22" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "node_modules/globals": { + "version": "17.14.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-17.14.0.tgz", + "integrity": "sha512-UtdkTVyAJePQv0J2M9Xe4L0ruNSDV314XiIJsADI2Zf40bcdAonE/D/OhAU8AT99oij9mhLByb+NvA3QWZYgCg==", "dev": true, "license": "MIT", - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, "engines": { - "node": ">=10" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -4824,11 +4566,11 @@ } }, "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "version": "4.2.12", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.12.tgz", + "integrity": "sha512-iuyGF2E4oafQfPsRrG2wtY2ILupMhvtdrhzrxB+0VcjsPpSPttpfYdjnGFGsTi5MaJFjI1jOKHPQ6UTbTj9TAw==", "dev": true, - "license": "ISC" + "license": "BlueOak-1.0.0" }, "node_modules/graphlib": { "version": "2.1.8", @@ -4841,13 +4583,13 @@ } }, "node_modules/handlebars": { - "version": "4.7.9", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.9.tgz", - "integrity": "sha512-4E71E0rpOaQuJR2A3xDZ+GM1HyWYv1clR58tC8emQNeQe3RH7MAzSbat+V0wG78LQBo6m6bzSG/L4pBuCsgnUQ==", + "version": "4.7.10", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.10.tgz", + "integrity": "sha512-P5VJMVM7qgBn6vjXMw8WG9uVI+ncf2pi72j4de4yz5ZULLj2RGqLYaKOYGsgyrViQ0tePOVlN1tDCCXXtFqXKg==", "dev": true, "license": "MIT", "dependencies": { - "minimist": "^1.2.5", + "minimist": "^1.2.8", "neo-async": "^2.6.2", "source-map": "^0.6.1", "wordwrap": "^1.0.0" @@ -4863,15 +4605,15 @@ } }, "node_modules/hardhat": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/hardhat/-/hardhat-3.14.0.tgz", - "integrity": "sha512-6VlEaARXKtz2RUWhOlbTUMN2uM03oHxjsGJNfTpVDOokYMDL7/aFy3m/QfcXyaxYghUZLhW/0oJO4f6Xh34cHg==", + "version": "3.21.2", + "resolved": "https://registry.npmjs.org/hardhat/-/hardhat-3.21.2.tgz", + "integrity": "sha512-+vkDnIhuEWBH+FzOAQh+2C1rnnkEaM7JOsm3faj8IyHH2CvgmkiuM1bcqsAMw7uNzdNCpgF5NZhDhvM3kbyXrA==", "dev": true, "license": "MIT", "dependencies": { - "@nomicfoundation/edr": "0.17.0", - "@nomicfoundation/hardhat-errors": "^3.0.17", - "@nomicfoundation/hardhat-utils": "^4.1.6", + "@nomicfoundation/edr": "0.25.0", + "@nomicfoundation/hardhat-errors": "^3.1.3", + "@nomicfoundation/hardhat-utils": "^5.1.0", "@nomicfoundation/hardhat-vendored": "^3.0.4", "@nomicfoundation/hardhat-zod-utils": "^3.0.5", "@nomicfoundation/solidity-analyzer": "^0.1.1", @@ -4879,8 +4621,8 @@ "adm-zip": "^0.6.0", "chokidar": "^5.0.0", "enquirer": "^2.3.0", - "ethereum-cryptography": "^2.2.1", - "micro-eth-signer": "^0.14.0", + "ethereum-cryptography": "^3.0.0", + "micro-eth-signer": "^0.19.0", "p-map": "^7.0.6", "resolve.exports": "^2.0.3", "semver": "^7.8.5", @@ -4948,9 +4690,9 @@ } }, "node_modules/hardhat/node_modules/ws": { - "version": "8.21.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.3.tgz", - "integrity": "sha512-201TZ/kPWxoPr/OKWjquZR1SWKXcvxdH+e1xrx89b3YbmzLMFCLfnaG1HFIgWzJOEWZ7MvpK++odZufgYR50Rw==", + "version": "8.22.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.22.2.tgz", + "integrity": "sha512-/rEZ2ejown2N5gxVTHUu9bVVC7ttu0/Tgzf5hbTOixR3Fs7mbbXgn2DbdbcKgJOmpQMtrIUWivtYuVMnp/W/yA==", "dev": true, "license": "MIT", "engines": { @@ -5061,17 +4803,6 @@ "node": ">= 0.4" } }, - "node_modules/he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "dev": true, - "license": "MIT", - "peer": true, - "bin": { - "he": "bin/he" - } - }, "node_modules/hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", @@ -5085,16 +4816,16 @@ } }, "node_modules/http-cache-semantics": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz", - "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.3.0.tgz", + "integrity": "sha512-M5t5LlJpS1UHMjvwRQVdFHvPISGeLAxNcrWuJkeGh0KxsqCHZ1O3NXZU/8x7cD0BDcGW8kapxMKTvwlqrNkHkA==", "dev": true, "license": "BSD-2-Clause" }, "node_modules/http2-wrapper": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz", - "integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==", + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.4.tgz", + "integrity": "sha512-y5jx4isTOKEC5Hu1lswc+IxytGlqDmwF1qJtk9qIS8l1KVxuHO5g522UfmErt1H2pMcH/xq+KiFQUB8aVWIABA==", "dev": true, "license": "MIT", "dependencies": { @@ -5106,9 +4837,9 @@ } }, "node_modules/human-id": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/human-id/-/human-id-4.2.1.tgz", - "integrity": "sha512-zPGsiS+dWoTZtZ4AtpA9Y+BdSFSNWvnouNlWNoUFyAM6xHOHmdCvqO3k8AIbdamCOv4gUFUVNPf6rJFfc4UiJw==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/human-id/-/human-id-4.2.2.tgz", + "integrity": "sha512-Z+8unD6em/MJwyrkWQ2M3wygRGI1+MztbutiNwk1DCuEPXOZRWGjtcMPZYP1exY9iNZMhd7ZOSMQSo9WYtiQRw==", "dev": true, "license": "MIT", "bin": { @@ -5131,23 +4862,6 @@ "url": "https://github.com/sponsors/typicode" } }, - "node_modules/iconv-lite": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.3.tgz", - "integrity": "sha512-IKXpvIzjnC9XTAUbVBcMfGS0EPaIXtW6v+zr+RRp+hqULEpo0owZax6wyRwPOJbWbzjYspQwusTsfVr0ifh4uQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" - } - }, "node_modules/ignore": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", @@ -5175,14 +4889,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/import-fresh/node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "node_modules/import-meta-resolve": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.2.0.tgz", + "integrity": "sha512-Iqv2fzaTQN28s/FwZAoFq0ZSs/7hMAHJVX+w8PZl3cY19Pxk6jFFalxQoIfW2826i/fDLXv8IiEZRIT0lDuWcg==", "dev": true, "license": "MIT", - "engines": { - "node": ">=4" + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" } }, "node_modules/imurmurhash": { @@ -5208,93 +4923,17 @@ "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", "dev": true, "license": "ISC" - }, - "node_modules/interoperable-addresses": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/interoperable-addresses/-/interoperable-addresses-0.1.3.tgz", - "integrity": "sha512-0URwTYBZzjg+BsjEssrvxQPB2XHYVIXLcMjUR0Bd4IoINQHgmR5nbHAOSsCAAR32FsrN1VLZNaqPl8ijQzIMVQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@scure/base": "^1.2.6", - "ethereum-cryptography": "^3.0.0", - "typed-regex": "^0.0.8" - } - }, - "node_modules/interoperable-addresses/node_modules/@noble/curves": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.9.0.tgz", - "integrity": "sha512-7YDlXiNMdO1YZeH6t/kvopHHbIZzlxrCV9WLqCY6QhcXOoXiNCMDqJIglZ9Yjx5+w7Dz30TITFrlTjnRg7sKEg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@noble/hashes": "1.8.0" - }, - "engines": { - "node": "^14.21.3 || >=16" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/interoperable-addresses/node_modules/@noble/hashes": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz", - "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.21.3 || >=16" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/interoperable-addresses/node_modules/@scure/bip32": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.7.0.tgz", - "integrity": "sha512-E4FFX/N3f4B80AKWp5dP6ow+flD1LQZo/w8UnLGYZO674jS6YnYeepycOOksv+vLPSpgN35wgKgy+ybfTb2SMw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@noble/curves": "~1.9.0", - "@noble/hashes": "~1.8.0", - "@scure/base": "~1.2.5" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/interoperable-addresses/node_modules/@scure/bip39": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.6.0.tgz", - "integrity": "sha512-+lF0BbLiJNwVlev4eKelw1WWLaiKXw7sSl8T6FvBlWkdX+94aGJ4o8XjUdlyhTCjd8c+B3KT3JfS8P0bLRNU6A==", - "dev": true, - "license": "MIT", - "dependencies": { - "@noble/hashes": "~1.8.0", - "@scure/base": "~1.2.5" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/interoperable-addresses/node_modules/ethereum-cryptography": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-3.2.0.tgz", - "integrity": "sha512-Urr5YVsalH+Jo0sYkTkv1MyI9bLYZwW8BENZCeE1QYaTHETEYx0Nv/SVsWkSqpYrzweg6d8KMY1wTjH/1m/BIg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@noble/ciphers": "1.3.0", - "@noble/curves": "1.9.0", - "@noble/hashes": "1.8.0", - "@scure/bip32": "1.7.0", - "@scure/bip39": "1.6.0" - }, - "engines": { - "node": "^14.21.3 || >=16", - "npm": ">=9" + }, + "node_modules/interoperable-addresses": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/interoperable-addresses/-/interoperable-addresses-0.1.3.tgz", + "integrity": "sha512-0URwTYBZzjg+BsjEssrvxQPB2XHYVIXLcMjUR0Bd4IoINQHgmR5nbHAOSsCAAR32FsrN1VLZNaqPl8ijQzIMVQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@scure/base": "^1.2.6", + "ethereum-cryptography": "^3.0.0", + "typed-regex": "^0.0.8" } }, "node_modules/is-arrayish": { @@ -5374,25 +5013,17 @@ } }, "node_modules/is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-plain-obj": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", - "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-4.0.0.tgz", + "integrity": "sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==", "dev": true, "license": "MIT", "peer": true, "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/is-port-reachable": { @@ -5418,19 +5049,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/is-subdir": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/is-subdir/-/is-subdir-1.2.0.tgz", - "integrity": "sha512-2AT6j+gXe/1ueqbW6fLZJiIw3F8iXGJtt0yDrZaBhAZEG1raiTxKWU+IPqMCzQAXOUCKdA4UDMgacKH25XG2Cw==", - "dev": true, - "license": "MIT", - "dependencies": { - "better-path-resolve": "1.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/is-typed-array": { "version": "1.1.15", "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz", @@ -5461,16 +5079,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/is-windows": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", @@ -5485,22 +5093,12 @@ "dev": true, "license": "ISC" }, - "node_modules/jackspeak": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", - "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "node_modules/jju": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz", + "integrity": "sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==", "dev": true, - "license": "BlueOak-1.0.0", - "peer": true, - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" - } + "license": "MIT" }, "node_modules/js-tokens": { "version": "4.0.0", @@ -5510,23 +5108,14 @@ "license": "MIT" }, "node_modules/js-yaml": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.1.tgz", - "integrity": "sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ==", + "version": "3.15.2", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.15.2.tgz", + "integrity": "sha512-6EuL879VkRA+1Cz578mKMiKvjPNEuk6+r1JaFzoSWejZmtf7xWbIyw1e3KkxlkzTIt9Taw6JBhEppG7utc1P+w==", "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/puzrin" - }, - { - "type": "github", - "url": "https://github.com/sponsors/nodeca" - } - ], "license": "MIT", "dependencies": { - "argparse": "^2.0.1" + "argparse": "^1.0.7", + "esprima": "^4.0.0" }, "bin": { "js-yaml": "bin/js-yaml.js" @@ -5570,15 +5159,12 @@ "node": ">=7.10.1" } }, - "node_modules/jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", + "node_modules/jsonc-parser": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", + "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==", "dev": true, - "license": "MIT", - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } + "license": "MIT" }, "node_modules/jsonpointer": { "version": "5.0.1", @@ -5647,6 +5233,17 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/launch-editor": { + "version": "2.14.2", + "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.14.2.tgz", + "integrity": "sha512-NHJEb30MGBCkmZXLZwz25t37QR4aY03ZzPYUJXOJaOa92uWwExI9SBQUuIznBYc1xkD7cJNGX7oc3Nl3sq2kQQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "picocolors": "^1.1.1", + "shell-quote": "^1.10.0" + } + }, "node_modules/leven": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", @@ -5679,15 +5276,15 @@ "license": "MIT" }, "node_modules/lint-staged": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-17.3.0.tgz", - "integrity": "sha512-woZS3vNe3UKqBaLPvbLOtKRY4tLANpWQhom12MGWqC8Mh1lCOO+WgSwmX2amjJAqTY9BkXYW87fCUH5H9Ph6xw==", + "version": "17.6.0", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-17.6.0.tgz", + "integrity": "sha512-nOhBfYkZEwkFtNzD5pK9s9LkcWoxJ+whLzEnhqi9nl7zTB5n7tg8+9iYgMGx2Wm3VlLu8cbNj0RACzY+nWi5iQ==", "dev": true, "license": "MIT", "dependencies": { - "picomatch": "^4.0.5", + "picomatch": "^4.0.7", "string-argv": "^0.3.2", - "tinyexec": "^1.2.4" + "tinyexec": "^1.3.1" }, "bin": { "lint-staged": "bin/lint-staged.js" @@ -5699,20 +5296,7 @@ "url": "https://opencollective.com/lint-staged" }, "optionalDependencies": { - "yaml": "^2.9.0" - } - }, - "node_modules/lint-staged/node_modules/picomatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz", - "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" + "yaml": "^2.9.1" } }, "node_modules/locate-path": { @@ -5749,49 +5333,6 @@ "dev": true, "license": "MIT" }, - "node_modules/lodash.truncate": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", - "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==", - "dev": true, - "license": "MIT" - }, - "node_modules/log-symbols": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", - "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "chalk": "^4.1.0", - "is-unicode-supported": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/log-symbols/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/loupe": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.2.1.tgz", @@ -5844,52 +5385,59 @@ "safe-buffer": "^5.1.2" } }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "node_modules/micro-eth-signer": { + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/micro-eth-signer/-/micro-eth-signer-0.19.0.tgz", + "integrity": "sha512-vgij8q88ZMcTvWDnOy76htaneQqagvU7FYjvtxUCeQJT2iTjYCHMzw46ArybKJNZICQ8W8qUFhI9CXWCePd9uQ==", "dev": true, "license": "MIT", + "dependencies": { + "@noble/ciphers": "2.2.0", + "@noble/curves": "2.2.0", + "@noble/hashes": "2.2.0", + "micro-packed": "0.9.0" + }, "engines": { - "node": ">= 8" + "node": ">= 20.19.0" } }, - "node_modules/micro-eth-signer": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/micro-eth-signer/-/micro-eth-signer-0.14.0.tgz", - "integrity": "sha512-5PLLzHiVYPWClEvZIXXFu5yutzpadb73rnQCpUqIHu3No3coFuWQNfE5tkBQJ7djuLYl6aRLaS0MgWJYGoqiBw==", + "node_modules/micro-eth-signer/node_modules/@noble/ciphers": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@noble/ciphers/-/ciphers-2.2.0.tgz", + "integrity": "sha512-Z6pjIZ/8IJcCGzb2S/0Px5J81yij85xASuk1teLNeg75bfT07MV3a/O2Mtn1I2se43k3lkVEcFaR10N4cgQcZA==", "dev": true, "license": "MIT", - "dependencies": { - "@noble/curves": "~1.8.1", - "@noble/hashes": "~1.7.1", - "micro-packed": "~0.7.2" + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" } }, "node_modules/micro-eth-signer/node_modules/@noble/curves": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.8.2.tgz", - "integrity": "sha512-vnI7V6lFNe0tLAuJMu+2sX+FcL14TaCWy1qiczg1VwRmPrpQCdq5ESXQMqUc2tluRNf6irBXrWbl1mGN8uaU/g==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-2.2.0.tgz", + "integrity": "sha512-T/BoHgFXirb0ENSPBquzX0rcjXeM6Lo892a2jlYJkqk83LqZx0l1Of7DzlKJ6jkpvMrkHSnAcgb5JegL8SeIkQ==", "dev": true, "license": "MIT", "dependencies": { - "@noble/hashes": "1.7.2" + "@noble/hashes": "2.2.0" }, "engines": { - "node": "^14.21.3 || >=16" + "node": ">= 20.19.0" }, "funding": { "url": "https://paulmillr.com/funding/" } }, "node_modules/micro-eth-signer/node_modules/@noble/hashes": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.7.2.tgz", - "integrity": "sha512-biZ0NUSxyjLLqo6KxEJ1b+C2NAx0wtDoFvCaXHGgUkeHzf3Xc1xKumFKREuT7f7DARNZ/slvYUwFG6B0f2b6hQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-2.2.0.tgz", + "integrity": "sha512-IYqDGiTXab6FniAgnSdZwgWbomxpy9FtYvLKs7wCUs2a8RkITG+DFGO1DM9cr+E3/RgADRpFjrKVaJ1z6sjtEg==", "dev": true, "license": "MIT", "engines": { - "node": "^14.21.3 || >=16" + "node": ">= 20.19.0" }, "funding": { "url": "https://paulmillr.com/funding/" @@ -5903,18 +5451,31 @@ "license": "MIT" }, "node_modules/micro-packed": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/micro-packed/-/micro-packed-0.7.3.tgz", - "integrity": "sha512-2Milxs+WNC00TRlem41oRswvw31146GiSaoCT7s3Xi2gMUglW5QBeqlQaZeHr5tJx9nm3i57LNXPqxOOaWtTYg==", + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/micro-packed/-/micro-packed-0.9.0.tgz", + "integrity": "sha512-gFdaWTxEXOwtSOcpxulO4AuXVtp3HWIRmB8eq8+3m1Zku0ubgva0UGpi03YhcvsTJasHngG9gTIUK5kHNKdesg==", "dev": true, "license": "MIT", "dependencies": { - "@scure/base": "~1.2.5" + "@scure/base": "~2.2.0" + }, + "engines": { + "node": ">= 20.19.0" }, "funding": { "url": "https://paulmillr.com/funding/" } }, + "node_modules/micro-packed/node_modules/@scure/base": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@scure/base/-/base-2.2.0.tgz", + "integrity": "sha512-b8XEupJibegiXV+tDUseI8oLQc8ei3d/4Jkb2RpbHh3MfE054ov3uIz2dhFkB3FI8iwYkEh0gGCApkrYggkPNg==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/micromatch": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", @@ -5929,6 +5490,19 @@ "node": ">=8.6" } }, + "node_modules/micromatch/node_modules/picomatch": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/mimic-response": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz", @@ -5993,323 +5567,177 @@ } }, "node_modules/mocha": { - "version": "11.8.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.8.0.tgz", - "integrity": "sha512-VyCeUdGN3A9lmCTTgG4yuvY9ixxaDk+xt2R/7/+1AP6EqNG+G9OKkzBwhVtVYoNX8YsxNSgAl8mOv3IAeOpFbw==", + "version": "12.0.3", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-12.0.3.tgz", + "integrity": "sha512-beammieDdiWdkjANWeWPpkxUROYGi5FN88fPOkLiticz7HTg3Y+Pho3EYE6SUdcuWnZ3h2WD8EXCA55JF4o6wg==", "dev": true, "license": "MIT", "peer": true, "dependencies": { "browser-stdout": "^1.3.1", - "chokidar": "^4.0.1", + "chokidar": "^5.0.0", "debug": "^4.3.5", - "diff": "^7.0.0", - "escape-string-regexp": "^4.0.0", - "find-up": "^5.0.0", - "glob": "^10.4.5", - "he": "^1.2.0", - "is-path-inside": "^3.0.3", - "js-yaml": "^4.1.0", - "log-symbols": "^4.1.0", - "minimatch": "^9.0.5", - "ms": "^2.1.3", - "picocolors": "^1.1.1", - "serialize-javascript": "^6.0.2", - "strip-json-comments": "^3.1.1", - "supports-color": "^8.1.1", - "workerpool": "^9.2.0", - "yargs": "^17.7.2", - "yargs-parser": "^21.1.1", - "yargs-unparser": "^2.0.0" - }, - "bin": { - "_mocha": "bin/_mocha", - "mocha": "bin/mocha.js" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, - "node_modules/mocha/node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true, - "license": "MIT", - "peer": true - }, - "node_modules/mocha/node_modules/brace-expansion": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.4.tgz", - "integrity": "sha512-hGfVzPxthbf3+2yjg/RBs60cB0FhqBS/zvdV/4wn4/BmN0bNMMHPc4V/BbFieqf1TKAGGAHnY4eSjajCl0f2Xg==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/mocha/node_modules/chokidar": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", - "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "readdirp": "^4.0.1" - }, - "engines": { - "node": ">= 14.16.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/mocha/node_modules/cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dev": true, - "license": "ISC", - "peer": true, - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/mocha/node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/mocha/node_modules/glob": { - "version": "10.5.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz", - "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==", - "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", - "dev": true, - "license": "ISC", - "peer": true, - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^1.11.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/mocha/node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "p-locate": "^5.0.0" + "diff": "^9.0.0", + "find-up-simple": "^1.0.1", + "glob": "^13.0.0", + "is-path-inside": "^4.0.0", + "is-unicode-supported": "^0.1.0", + "js-yaml": "^5.0.0", + "minimatch": "^10.2.2", + "ms": "^2.1.3", + "picocolors": "^1.1.1", + "serialize-javascript": "^7.1.1", + "strip-json-comments": "^5.0.3", + "supports-color": "^8.1.1", + "workerpool": "^10.0.0" }, - "engines": { - "node": ">=10" + "bin": { + "mocha": "bin/mocha.js" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "engines": { + "node": "^20.19.0 || >=22.12.0" } }, - "node_modules/mocha/node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "node_modules/mocha/node_modules/argparse": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-3.0.4.tgz", + "integrity": "sha512-fwWK3Zq22l4XJJjx5mcBHGikIk+hJqO+32dPm0Jur7+rtG5x1scOjSfdT9ZKeWHPpsya/l0HHK4tDImBkTrtvA==", "dev": true, - "license": "ISC", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/puzrin" + }, + { + "type": "github", + "url": "https://github.com/sponsors/nodeca" + } + ], + "license": "PSF-2.0", "peer": true }, - "node_modules/mocha/node_modules/minimatch": { - "version": "9.0.9", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz", - "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==", + "node_modules/mocha/node_modules/chokidar": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", + "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", "dev": true, - "license": "ISC", + "license": "MIT", "peer": true, "dependencies": { - "brace-expansion": "^2.0.2" + "readdirp": "^5.0.0" }, "engines": { - "node": ">=16 || 14 >=14.17" + "node": ">= 20.19.0" }, "funding": { - "url": "https://github.com/sponsors/isaacs" + "url": "https://paulmillr.com/funding/" } }, - "node_modules/mocha/node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "node_modules/mocha/node_modules/glob": { + "version": "13.0.7", + "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.7.tgz", + "integrity": "sha512-wfsFgXQ8A3SEI9XGf7Nl3Y9l7ffSrGh7SUCT7vU/2CzYPep9kjxAn1S40F9OPKxAMGCVl7HtNlJhrCJUeUq83g==", "dev": true, - "license": "MIT", + "license": "BlueOak-1.0.0", "peer": true, "dependencies": { - "yocto-queue": "^0.1.0" + "minimatch": "^10.2.2", + "minipass": "^7.1.3", + "path-scurry": "^2.0.2" }, "engines": { - "node": ">=10" + "node": "18 || 20 || >=22" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/mocha/node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "node_modules/mocha/node_modules/js-yaml": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-5.5.0.tgz", + "integrity": "sha512-paNr4LFIFPjeeSmwNYdrb8FafLLG/Cr2Af3GjbsHJ5CxIjH4r0c2emlmRdAtpPAieP1gRVzk6buBbVP5gBMGAg==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/puzrin" + }, + { + "type": "github", + "url": "https://github.com/sponsors/nodeca" + } + ], "license": "MIT", "peer": true, "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" + "argparse": "^3.0.3" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "bin": { + "js-yaml": "bin/js-yaml.mjs" } }, "node_modules/mocha/node_modules/path-scurry": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz", + "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==", "dev": true, "license": "BlueOak-1.0.0", "peer": true, "dependencies": { - "lru-cache": "^10.2.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + "lru-cache": "^11.0.0", + "minipass": "^7.1.2" }, "engines": { - "node": ">=16 || 14 >=14.18" + "node": "18 || 20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, "node_modules/mocha/node_modules/readdirp": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", - "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.1.1.tgz", + "integrity": "sha512-Kko+Y5XQ6fM+Ce3dq3m9YGxnacYZYl9cA1wZjaF3Vbry2L3i1qVg8+CAgNPsXRArPMUMCaOR7oa9Nqntc43JKA==", "dev": true, "license": "MIT", "peer": true, "engines": { - "node": ">= 14.18.0" + "node": ">= 20.19.0" }, "funding": { "type": "individual", "url": "https://paulmillr.com/funding/" } }, - "node_modules/mocha/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, - "node_modules/mocha/node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "node_modules/mocha/node_modules/strip-json-comments": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.3.tgz", + "integrity": "sha512-1tB5mhVo7U+ETBKNf92xT4hrQa3pm0MZ0PQvuDnWgAAGHDsfp4lPSpiS6psrSiet87wyGPh9ft6wmhOMQ0hDiw==", "dev": true, "license": "MIT", "peer": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, "engines": { - "node": ">=10" + "node": ">=14.16" }, "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/mocha/node_modules/yargs": { - "version": "17.7.3", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.3.tgz", - "integrity": "sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g==", + "node_modules/mocha/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" + "has-flag": "^4.0.0" }, - "engines": { - "node": ">=12" - } - }, - "node_modules/mocha/node_modules/yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true, - "license": "MIT", - "peer": true, "engines": { "node": ">=10" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/mri": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz", - "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" + "url": "https://github.com/chalk/supports-color?sponsor=1" } }, "node_modules/ms": { @@ -6340,27 +5768,6 @@ "dev": true, "license": "MIT" }, - "node_modules/node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "dev": true, - "license": "MIT", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, "node_modules/node-gyp-build": { "version": "4.8.4", "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz", @@ -6437,13 +5844,6 @@ "node": ">= 0.8.0" } }, - "node_modules/outdent": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/outdent/-/outdent-0.5.0.tgz", - "integrity": "sha512-/jHxFIzoMXdqPzTaCpFzAAWhpkSjZPF4Vsn6jAfNpmbH/ymsmd7Qc6VE9BGn0L6YMj6uwpQLxCECpus4ukKS9Q==", - "dev": true, - "license": "MIT" - }, "node_modules/p-cancelable": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz", @@ -6454,33 +5854,10 @@ "node": ">=12.20" } }, - "node_modules/p-filter": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-filter/-/p-filter-2.1.0.tgz", - "integrity": "sha512-ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-map": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/p-filter/node_modules/p-map": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz", - "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/p-limit": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-7.3.1.tgz", - "integrity": "sha512-0trZaiG7Y7kN/Egy9a8j47t9osC0Tch4PaIWd9yGF6bvmlk7muExRvGNYb8sXBwEKMoNKsbNN9P8EefuQekE4Q==", + "version": "7.3.3", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-7.3.3.tgz", + "integrity": "sha512-SKgVvDU5TNIxQ4r30U75BNLC6a+6GOEjngrk/ysM5+Zu3oJuk1SC5ApzIzY/7PjCEjoVPMWJ0zho/4QUiEB7TQ==", "dev": true, "license": "MIT", "dependencies": { @@ -6523,9 +5900,9 @@ } }, "node_modules/p-map": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.6.tgz", - "integrity": "sha512-I4Prw6ivkd6p8PiYR1tXASOAOBzIJwu0TB7fqaX0c/8c3QAehNYmX57EijyGGGBt3c/BIowGwV03RVBtXvHEVg==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.1.1.tgz", + "integrity": "sha512-6Lh3jQPLthYujSrlw6ccWXBGZTkoTCz27Hd92g79LH/kjAbgoEu0t442cCCNbegPSJsA0lwDX8z0bcKtkpA32g==", "dev": true, "license": "MIT", "engines": { @@ -6572,14 +5949,11 @@ "license": "BlueOak-1.0.0" }, "node_modules/package-manager-detector": { - "version": "0.2.11", - "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-0.2.11.tgz", - "integrity": "sha512-BEnLolu+yuz22S56CU1SUKq3XC3PkwD5wv4ikR4MfGvnRVcmzXR9DwSlW2fEamyTPyXHomBJRzgapeuBvRNzJQ==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.9.0.tgz", + "integrity": "sha512-zAMfbta9nPA8AKkA4WdmNAT8R8s6Dk0/xwPsqNnRidMFcLo1YkLuPDTgs2f64XdzS8vbLNnoJ+uUIkgbz7oRHA==", "dev": true, - "license": "MIT", - "dependencies": { - "quansync": "^0.2.7" - } + "license": "MIT" }, "node_modules/parent-module": { "version": "1.0.1", @@ -6634,9 +6008,9 @@ } }, "node_modules/path-scurry": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz", - "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-3.0.0.tgz", + "integrity": "sha512-1pTbQqH1wIwMi/eleQ5leFTTCkzFsPcgXNjwOA8YGGW/W4/kHT3dssE7Z6NH+zuqNLOzOB0uaD61yl7cAcVhgg==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -6671,9 +6045,9 @@ } }, "node_modules/pbkdf2": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.6.tgz", - "integrity": "sha512-BT6eelPB1EyGHo8pC0o9Bl6k6SYVhKO1jEbd3lcTrtr7XHdjP8BW1YpfCV3G9Kwkxgattk+S5q2/RvuttCsS1g==", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.7.tgz", + "integrity": "sha512-nS4mvFgVwUrecPTRdpdseM2fwpdfnX0/HibA8DgBRQtihUAzHQYJFU2l+OlEtiXtpqkrMvCPDwyXMUnASDt6Qw==", "dev": true, "license": "MIT", "dependencies": { @@ -6696,28 +6070,18 @@ "license": "ISC" }, "node_modules/picomatch": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", - "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz", + "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==", "dev": true, "license": "MIT", "engines": { - "node": ">=8.6" + "node": ">=12" }, "funding": { "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/pluralize": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz", @@ -6759,9 +6123,9 @@ } }, "node_modules/prettier": { - "version": "3.9.6", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.6.tgz", - "integrity": "sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g==", + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.10.1.tgz", + "integrity": "sha512-70vp3ZUYoPlFbF9uiTdXHUUCGEIp7d4+6p+8DYbkm2jP7x/3i/paXVF6dopSI3zd/CEitrZN1rc4i85xWmmXlg==", "dev": true, "license": "MIT", "bin": { @@ -6845,44 +6209,6 @@ "node": ">=6" } }, - "node_modules/quansync": { - "version": "0.2.11", - "resolved": "https://registry.npmjs.org/quansync/-/quansync-0.2.11.tgz", - "integrity": "sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/antfu" - }, - { - "type": "individual", - "url": "https://github.com/sponsors/sxzz" - } - ], - "license": "MIT" - }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, "node_modules/quick-lru": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", @@ -6932,46 +6258,6 @@ "node": ">=0.10.0" } }, - "node_modules/read-yaml-file": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-yaml-file/-/read-yaml-file-1.1.0.tgz", - "integrity": "sha512-VIMnQi/Z4HT2Fxuwg5KrY174U1VdUIASQVWXXyqtNRtxSr9IYkn1rsI6Tb6HsrHCmB7gVpNwX6JxPTHcH6IoTA==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.1.5", - "js-yaml": "^3.6.1", - "pify": "^4.0.1", - "strip-bom": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/read-yaml-file/node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "license": "MIT", - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, - "node_modules/read-yaml-file/node_modules/js-yaml": { - "version": "3.15.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.15.1.tgz", - "integrity": "sha512-S99WuO3HlhO3XN41EtYUNl9zzXjoJx7QvmipxsJVxtCBT0YHEFy+iOJhjSvrmV12nYhWpZaM8lPHkJm0yUMbag==", - "dev": true, - "license": "MIT", - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, "node_modules/readable-stream": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", @@ -7005,7 +6291,20 @@ "picomatch": "^2.2.1" }, "engines": { - "node": ">=8.10.0" + "node": ">=8.10.0" + } + }, + "node_modules/readdirp/node_modules/picomatch": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" } }, "node_modules/registry-auth-token": { @@ -7037,17 +6336,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/require-from-string": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", @@ -7066,19 +6354,19 @@ "license": "MIT" }, "node_modules/resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true, "license": "MIT", "engines": { - "node": ">=8" + "node": ">=4" } }, "node_modules/resolve.exports": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz", - "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.4.tgz", + "integrity": "sha512-zepuGL0ulf+nt+XaFrlKeaiTJeyPFPLLY62+ncq1/VTHBdt3HsfXOH60priZ6tnXQozdGcDeIF5JVTanvIcYWQ==", "dev": true, "license": "MIT", "engines": { @@ -7111,17 +6399,6 @@ "node": ">= 4" } }, - "node_modules/reusify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", - "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", - "dev": true, - "license": "MIT", - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, "node_modules/rfdc": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz", @@ -7130,13 +6407,13 @@ "license": "MIT" }, "node_modules/rimraf": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.1.3.tgz", - "integrity": "sha512-LKg+Cr2ZF61fkcaK1UdkH2yEBBKnYjTyWzTJT6KNPcSPaiT7HSdhtMXQuN5wkTX0Xu72KQ1l8S42rlmexS2hSA==", + "version": "6.1.4", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.1.4.tgz", + "integrity": "sha512-Fk3reQDVPZUMbEm7Zwxz03BWQMW3V5buSk9aU8OckTrO8A1nQtbqvYsAantGNermwsIsXcuOBqcoJ3HuMELctw==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { - "glob": "^13.0.3", + "glob": "^14.0.3", "package-json-from-dist": "^1.0.1" }, "bin": { @@ -7176,30 +6453,6 @@ "rlp": "bin/rlp" } }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -7221,13 +6474,6 @@ ], "license": "MIT" }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true, - "license": "MIT" - }, "node_modules/scrypt-js": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-3.0.1.tgz", @@ -7259,9 +6505,9 @@ "license": "MIT" }, "node_modules/semver": { - "version": "7.8.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", - "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.6.tgz", + "integrity": "sha512-9lpSSU4Mly3mrtruwLs1eLK6+gzbzqeBFwRNjIjE+9LuDpWdYctrQlQ3ej1Ilgi7gknpsTRnPoLP8DpCHqHIJw==", "dev": true, "license": "ISC", "bin": { @@ -7272,14 +6518,14 @@ } }, "node_modules/serialize-javascript": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", - "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-7.1.4.tgz", + "integrity": "sha512-FqlEuoTq/zRmA4Lg6aOqyH3lCHbUtCB0bmHCeFniX2GBdDqMJM3FwdvEhlE5Pim1dlt2FfBdVPmUNNiGhhKqpw==", "dev": true, "license": "BSD-3-Clause", "peer": true, - "dependencies": { - "randombytes": "^2.1.0" + "engines": { + "node": ">=20.0.0" } }, "node_modules/set-function-length": { @@ -7358,6 +6604,19 @@ "node": ">=8" } }, + "node_modules/shell-quote": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.12.0.tgz", + "integrity": "sha512-PcByqNyT/38F2kDNi006HAMRJaULuBzq/FOsw3qdZvX/GA9W/jamDaRskgHjubHiftXK5sIFxLNkvrXUwcof6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", @@ -7365,14 +6624,14 @@ "dev": true, "license": "ISC" }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "node_modules/sisteransi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-2.0.0.tgz", + "integrity": "sha512-2WCqLdt12eN6ehLI50S2/ZxoowXU3DD1KVPRyVP0WEsFahrGZZmCdq1K59qjJljMRIDTwx1D9YaRK+hDneBUMg==", "dev": true, "license": "MIT", "engines": { - "node": ">=8" + "node": ">=20" } }, "node_modules/slice-ansi": { @@ -7394,9 +6653,9 @@ } }, "node_modules/solhint": { - "version": "6.2.4", - "resolved": "https://registry.npmjs.org/solhint/-/solhint-6.2.4.tgz", - "integrity": "sha512-2hCfsDGcCit/4Ue0Bf3HxalxEaHM/rfoSf3rMVAQQ5NWWcVPS0F+RSqQzMEPc8Ta7r5L3DeaKyzmbjD5B2fUdg==", + "version": "6.2.5", + "resolved": "https://registry.npmjs.org/solhint/-/solhint-6.2.5.tgz", + "integrity": "sha512-WCkEQIJHMaCLv7d9SuTsGjcsprv2DLP2dxg95oUtAe7qYh4Ho3NfECCNSSTZ6OPnjv1HMV8z2Bcg7nH1UBAZiA==", "dev": true, "license": "MIT", "dependencies": { @@ -7432,6 +6691,13 @@ "resolved": "lib/@openzeppelin-contracts/scripts/solhint-custom", "link": true }, + "node_modules/solhint/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, "node_modules/solhint/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", @@ -7449,6 +6715,64 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, + "node_modules/solhint/node_modules/glob": { + "version": "13.0.7", + "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.7.tgz", + "integrity": "sha512-wfsFgXQ8A3SEI9XGf7Nl3Y9l7ffSrGh7SUCT7vU/2CzYPep9kjxAn1S40F9OPKxAMGCVl7HtNlJhrCJUeUq83g==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "minimatch": "^10.2.2", + "minipass": "^7.1.3", + "path-scurry": "^2.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/solhint/node_modules/js-yaml": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.2.tgz", + "integrity": "sha512-SFNOvSJ+Dgf/9An904Yx+CgSlIPCkIpao4qo51lpee25TIRejdH3rhR4EZMGoNx3/TP3O+wzWuiTFl4sqbltzA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/puzrin" + }, + { + "type": "github", + "url": "https://github.com/sponsors/nodeca" + } + ], + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/solhint/node_modules/path-scurry": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz", + "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "lru-cache": "^11.0.0", + "minipass": "^7.1.2" + }, + "engines": { + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/solidity-ast": { "version": "0.4.62", "resolved": "https://registry.npmjs.org/solidity-ast/-/solidity-ast-0.4.62.tgz", @@ -7670,30 +6994,6 @@ "node": ">=0.10.0" } }, - "node_modules/spawndamnit": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spawndamnit/-/spawndamnit-3.0.1.tgz", - "integrity": "sha512-MmnduQUuHCoFckZoWnXsTg7JaiLBJrKFj9UI2MbRPGaJeVpsLcVBu6P/IGZovziM/YBsellCmsprgNA+w0CzVg==", - "dev": true, - "license": "SEE LICENSE IN LICENSE", - "dependencies": { - "cross-spawn": "^7.0.5", - "signal-exit": "^4.0.1" - } - }, - "node_modules/spawndamnit/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", @@ -7743,23 +7043,6 @@ "node": ">=8" } }, - "node_modules/string-width-cjs": { - "name": "string-width", - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -7773,31 +7056,6 @@ "node": ">=8" } }, - "node_modules/strip-ansi-cjs": { - "name": "strip-ansi", - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, "node_modules/strip-json-comments": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", @@ -7825,14 +7083,13 @@ } }, "node_modules/table": { - "version": "6.9.0", - "resolved": "https://registry.npmjs.org/table/-/table-6.9.0.tgz", - "integrity": "sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==", + "version": "6.10.1", + "resolved": "https://registry.npmjs.org/table/-/table-6.10.1.tgz", + "integrity": "sha512-f05boz6UD5S70AJiUxqKOnDuE45mBIVagX490oQmcW38+Lq/H1s7CjIpFgJjR/kpV87L4lw/AN+14D2PktQJsQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { "ajv": "^8.0.1", - "lodash.truncate": "^4.4.2", "slice-ansi": "^4.0.0", "string-width": "^4.2.3", "strip-ansi": "^6.0.1" @@ -7841,19 +7098,6 @@ "node": ">=10.0.0" } }, - "node_modules/term-size": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz", - "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", @@ -7862,15 +7106,32 @@ "license": "MIT" }, "node_modules/tinyexec": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.3.0.tgz", - "integrity": "sha512-QKAl9m8gWWGHV8jZcPeym6j+XULi6tOf1mT83WYJ4Lk2ytW/uwAWkrP0uFsdoYMdueVJ0qs26wZ+23xeB4ibNQ==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.3.1.tgz", + "integrity": "sha512-GCvB3aoys96IuDFBMcTB46JOR6mdMtAToqwiW8JlWhsoh1mhHi/xn9ss/Dg7N555GiJyEt2qzoG/NHCwM6h1EA==", "dev": true, "license": "MIT", "engines": { "node": ">=18" } }, + "node_modules/tinyglobby": { + "version": "0.2.17", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz", + "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fdir": "^6.5.0", + "picomatch": "^4.0.4" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/SuperchupuDev" + } + }, "node_modules/to-buffer": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.2.2.tgz", @@ -7906,13 +7167,6 @@ "node": ">=8.0" } }, - "node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", - "dev": true, - "license": "MIT" - }, "node_modules/tslib": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", @@ -7921,9 +7175,9 @@ "license": "0BSD" }, "node_modules/tsx": { - "version": "4.23.12", - "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.23.12.tgz", - "integrity": "sha512-FDf4L4sYzKtzWYhU/Xm0AQFdTjdIxNo9ElTf2mxXM6k8YMHXzYUe4yODVaXP4V9uMFbVg8c0qyBccK2OOxb45Q==", + "version": "4.23.15", + "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.23.15.tgz", + "integrity": "sha512-Yiex1Ovn8z2xPpOWckIiysV1SSyRMY9BkLF++q0yKiDxCqRhosKfMg3janKkiLBwZ5c/YryloKwGZcrEmtwxKw==", "dev": true, "license": "MIT", "dependencies": { @@ -7989,9 +7243,9 @@ } }, "node_modules/undici": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-8.10.0.tgz", - "integrity": "sha512-HvltHd7avK13QIw/oLe4qoOLyoVSoafqJ2jYOrtMRBkbYT31eiBQ8O0ehRKZiEZCMEyLFQNIADpgCWC5fALvYQ==", + "version": "8.12.4", + "resolved": "https://registry.npmjs.org/undici/-/undici-8.12.4.tgz", + "integrity": "sha512-8Mx+uNKKER2bA4AdtedkqRbwUCIJFr2nJckXRe5yrDqzePqwLP7VNcctN8/XdmDSbF7mS+jJKIszlL+vbam1VA==", "dev": true, "license": "MIT", "engines": { @@ -8005,16 +7259,6 @@ "dev": true, "license": "MIT" }, - "node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4.0.0" - } - }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -8047,24 +7291,6 @@ "uuid": "dist/bin/uuid" } }, - "node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", - "dev": true, - "license": "BSD-2-Clause" - }, - "node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dev": true, - "license": "MIT", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -8082,9 +7308,9 @@ } }, "node_modules/which-typed-array": { - "version": "1.1.22", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.22.tgz", - "integrity": "sha512-fvO4ExWMFsqyhG3AiPAObMuY1lxaqgYcxbc49CNdWDDECOJNgQyvsOWVwbZc+qf3rzRtxojBK+CMEv0Ld5CYpw==", + "version": "1.1.24", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.24.tgz", + "integrity": "sha512-wk4Mf4pR5mRP7eYuuTBCIQ9d0ud2Fv2jRLQpfgnRjbOxAFHmjKFValgTpitVKzJJS8ajnYQV2Du1SZ8j6b/EUQ==", "dev": true, "license": "MIT", "dependencies": { @@ -8121,9 +7347,9 @@ "license": "MIT" }, "node_modules/workerpool": { - "version": "9.3.4", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-9.3.4.tgz", - "integrity": "sha512-TmPRQYYSAnnDiEB0P/Ytip7bFGvqnSU6I2BcuSw7Hx+JSg/DsUi5ebYfc8GYaSdpuvOcEs6dXxPurOYpe9QFwg==", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-10.0.3.tgz", + "integrity": "sha512-6z2Iis68Wqth93/G/wJP9u+R3O+d2XTlgWChGCwuT1qLbBsOYueGRZuJ++v3mtDP5KjYdy+WzvWC+VWETSVXJA==", "dev": true, "license": "Apache-2.0", "peer": true @@ -8146,30 +7372,10 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/wrap-ansi-cjs": { - "name": "wrap-ansi", - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.3.0.tgz", - "integrity": "sha512-WpDfL7NO6j7tH88IDBNVdUJxDh9nmCteAVW9dsep846XdwF4naCBK+/tGLX3KJgcpgMRXCFlTM2hKGoK9FsdrQ==", + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.6.0.tgz", + "integrity": "sha512-XZ5apbzreCbXSKwPjJstu8R0zOi247w3XYwWxtwBXgpZrCyc1Ka7p9/xY0A9/diMewmHbEKz+FIraWaEWjlN5g==", "dev": true, "license": "MIT", "engines": { @@ -8266,12 +7472,11 @@ } }, "node_modules/yaml": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.9.0.tgz", - "integrity": "sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==", + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.9.1.tgz", + "integrity": "sha512-3NxN8+78OdzbT7C/WjGsyfPAtJaN3FNDsWxv7Y7mcDsT/oOmgW8BpyQQFFBnvZE3j9Y2Sdz1ULFLezL7Eb2yFw==", "dev": true, "license": "ISC", - "optional": true, "bin": { "yaml": "bin.mjs" }, @@ -8283,9 +7488,9 @@ } }, "node_modules/yargs": { - "version": "18.1.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.1.0.tgz", - "integrity": "sha512-2rAgRKu54VsHkqI0/tYkmluGXHD4KW7yZoycuqDQ15QOTnc2VVfy0nN/1eMhnQLO00A+dwtK20xuCnc1YGeUyg==", + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.2.0.tgz", + "integrity": "sha512-9OpKOLeaoNFecEp7P6iYbzze/5CqWoH7N3SMs/6y1XF4nMvFMspEGZzJ6uFi9MmQwXhyzqYoSEKO3tvA3Z/o2w==", "dev": true, "license": "MIT", "dependencies": { @@ -8301,37 +7506,19 @@ } }, "node_modules/yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "version": "22.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-22.0.0.tgz", + "integrity": "sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==", "dev": true, "license": "ISC", - "peer": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/yargs-unparser": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", - "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "camelcase": "^6.0.0", - "decamelize": "^4.0.0", - "flat": "^5.0.2", - "is-plain-obj": "^2.1.0" - }, "engines": { - "node": ">=10" + "node": "^20.19.0 || ^22.12.0 || >=23" } }, "node_modules/yargs/node_modules/ansi-regex": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.3.0.tgz", - "integrity": "sha512-WpDfL7NO6j7tH88IDBNVdUJxDh9nmCteAVW9dsep846XdwF4naCBK+/tGLX3KJgcpgMRXCFlTM2hKGoK9FsdrQ==", + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.6.0.tgz", + "integrity": "sha512-XZ5apbzreCbXSKwPjJstu8R0zOi247w3XYwWxtwBXgpZrCyc1Ka7p9/xY0A9/diMewmHbEKz+FIraWaEWjlN5g==", "dev": true, "license": "MIT", "engines": { @@ -8342,9 +7529,9 @@ } }, "node_modules/yargs/node_modules/string-width": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.2.2.tgz", - "integrity": "sha512-GaPUh5gfdrYzqeVNZvUfT23vYYxXzKYidUcnMtJg/3rxRV63EFZy3k6xfKlmfeJD0176lnUV/Usr3XcwSvFzpg==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.3.0.tgz", + "integrity": "sha512-ZbmZM0JCihQN91dWnxoipT2KOEyHqEyfRXUyjuRhW8b/xnqPDoq4gWEVApTVa9db2wN8mmoikgFBbjh71+cGeQ==", "dev": true, "license": "MIT", "dependencies": { @@ -8374,16 +7561,6 @@ "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, - "node_modules/yargs/node_modules/yargs-parser": { - "version": "22.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-22.0.0.tgz", - "integrity": "sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^20.19.0 || ^22.12.0 || >=23" - } - }, "node_modules/yocto-queue": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.2.2.tgz", diff --git a/test/token/ERC20/extensions/ERC7540.t.sol b/test/token/ERC20/extensions/ERC7540.t.sol index da39ff031..bde7694c0 100644 --- a/test/token/ERC20/extensions/ERC7540.t.sol +++ b/test/token/ERC20/extensions/ERC7540.t.sol @@ -1,6 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.27; +// solhint-disable func-name-mixedcase + import {Test} from "forge-std/Test.sol"; import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; @@ -91,6 +93,7 @@ interface IERC7540InvariantVault { function totalClaimableRedeemAssets() external view returns (uint256); } +// solhint-disable-next-line max-states-count contract ERC7540InvariantHandler is Test { IERC7540InvariantVault public immutable vault; ERC7540InvariantAsset public immutable asset; @@ -379,10 +382,11 @@ contract ERC7540InvariantHandler is Test { if (!found) return; uint256 shares = vault.totalRedeemShares(epochId); // keep the vault solvent: never promise more than the free balance (see {ERC7540-_isSolvent}) - uint256 free = asset.balanceOf(address(vault)) + - vault.totalClaimableDepositAssets() - - vault.totalPendingDepositAssets() - - vault.totalClaimableRedeemAssets(); + uint256 free = + asset.balanceOf(address(vault)) + + vault.totalClaimableDepositAssets() - + vault.totalPendingDepositAssets() - + vault.totalClaimableRedeemAssets(); uint256 assets = (shares * bound(rateBps, 1, 30_000)) / 10_000; if (assets > free) assets = free; try vault.fulfillRedeemEpoch(epochId, assets) { diff --git a/test/token/ERC20/extensions/ERC7540EpochDeposit.t.sol b/test/token/ERC20/extensions/ERC7540EpochDeposit.t.sol index cb879e5ba..c74486794 100644 --- a/test/token/ERC20/extensions/ERC7540EpochDeposit.t.sol +++ b/test/token/ERC20/extensions/ERC7540EpochDeposit.t.sol @@ -2,6 +2,8 @@ pragma solidity ^0.8.27; +// solhint-disable func-name-mixedcase + import {Test} from "forge-std/Test.sol"; import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import {ERC20Mock} from "@openzeppelin/contracts/mocks/token/ERC20Mock.sol"; diff --git a/test/token/ERC20/extensions/ERC7540EpochRedeem.t.sol b/test/token/ERC20/extensions/ERC7540EpochRedeem.t.sol index 907150b81..c14f396b7 100644 --- a/test/token/ERC20/extensions/ERC7540EpochRedeem.t.sol +++ b/test/token/ERC20/extensions/ERC7540EpochRedeem.t.sol @@ -2,6 +2,8 @@ pragma solidity ^0.8.27; +// solhint-disable func-name-mixedcase + import {Test} from "forge-std/Test.sol"; import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import {ERC20Mock} from "@openzeppelin/contracts/mocks/token/ERC20Mock.sol"; From a96400b782e0a7dc31d474de835f9cce864d82b2 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Thu, 12 Nov 2026 17:32:29 +0100 Subject: [PATCH 41/51] Use the OpenZeppelin Contracts codecov config and pre-commit hook Ignore contracts-exposed in coverage, and run test:generation before committing, making both files identical to the ones in lib/@openzeppelin-contracts. --- .codecov.yml | 6 +++++- .husky/pre-commit | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.codecov.yml b/.codecov.yml index 786ab2469..ae4ce21c7 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -1,3 +1,5 @@ +# This file is an exact copy of lib/@openzeppelin-contracts/.codecov.yml. + comment: off github_checks: annotations: false @@ -12,4 +14,6 @@ coverage: threshold: 1% ignore: - "test" - - "contracts/mocks" \ No newline at end of file + - "contracts/mocks" + - "contracts/vendor" + - "contracts-exposed" diff --git a/.husky/pre-commit b/.husky/pre-commit index 2312dc587..6f7383985 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1 +1,4 @@ +# This file is an exact copy of lib/@openzeppelin-contracts/.husky/pre-commit. + +npm run test:generation npx lint-staged From 25c4c39cf4e7c6a32102e7e4f52afc1a22d9837a Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Thu, 12 Nov 2026 17:41:24 +0100 Subject: [PATCH 42/51] ERC4626Fees: silence slither locked-ether false positive IERC4626 now declares deposit and mint as payable (OpenZeppelin/openzeppelin-contracts#6624). ERC4626 rejects any native value unless _enablePayableDeposit is overridden, which ERC4626Fees does not do, so no ether can be locked. --- contracts/token/ERC20/extensions/ERC4626Fees.sol | 1 + 1 file changed, 1 insertion(+) diff --git a/contracts/token/ERC20/extensions/ERC4626Fees.sol b/contracts/token/ERC20/extensions/ERC4626Fees.sol index 38e2b74d8..352ee8f77 100644 --- a/contracts/token/ERC20/extensions/ERC4626Fees.sol +++ b/contracts/token/ERC20/extensions/ERC4626Fees.sol @@ -8,6 +8,7 @@ import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol import {Math} from "@openzeppelin/contracts/utils/math/Math.sol"; /// @dev ERC-4626 vault with entry/exit fees expressed in https://en.wikipedia.org/wiki/Basis_point[basis point (bp)]. +// slither-disable-next-line locked-ether abstract contract ERC4626Fees is ERC4626 { using Math for uint256; From ac56bdd46c3b9895e7c895c89c506700ee1f93b6 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Thu, 12 Nov 2026 17:48:31 +0100 Subject: [PATCH 43/51] Allow manually triggering the upgradeable transpilation Add a workflow_dispatch trigger, and skip the job on -upgradeable branches since the branch filter only applies to push events. --- .github/workflows/upgradeable.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/upgradeable.yml b/.github/workflows/upgradeable.yml index 81fd9dba0..8897b3388 100644 --- a/.github/workflows/upgradeable.yml +++ b/.github/workflows/upgradeable.yml @@ -6,12 +6,15 @@ on: - master - release-v* - '!**-upgradeable' + workflow_dispatch: {} concurrency: group: upgradeable-${{ github.ref }} jobs: transpile: + # Skip on transpiled branches, which are already upgradeable + if: ${{ !endsWith(github.ref_name, '-upgradeable') }} permissions: contents: write runs-on: ubuntu-latest From db5335902dfb852290980d4172645ff35830ac34 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Fri, 13 Nov 2026 16:57:37 +0100 Subject: [PATCH 44/51] Update the OpenZeppelin Contracts submodule Picks up the hardhat-transpiler rework: the two transpilation paths are merged into one, and the dependency mode -- the part this repository relies on -- now lives in its own module, which keeps the delta against upstream master down to a handful of hooks. --- lib/@openzeppelin-contracts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/@openzeppelin-contracts b/lib/@openzeppelin-contracts index 5a105d1c3..ad3fa49c1 160000 --- a/lib/@openzeppelin-contracts +++ b/lib/@openzeppelin-contracts @@ -1 +1 @@ -Subproject commit 5a105d1c38e6ab2e513513d80c041f59f1ba7f69 +Subproject commit ad3fa49c101fb010969344c94a5e4c896ad4a8d0 From 6c114282031a916fe5db0f09f58cef9a0eded06a Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Fri, 13 Nov 2026 17:19:54 +0100 Subject: [PATCH 45/51] Update the OpenZeppelin Contracts submodule Picks up the hardhat-transpiler post-processing chaining. --- lib/@openzeppelin-contracts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/@openzeppelin-contracts b/lib/@openzeppelin-contracts index ad3fa49c1..0f95c6969 160000 --- a/lib/@openzeppelin-contracts +++ b/lib/@openzeppelin-contracts @@ -1 +1 @@ -Subproject commit ad3fa49c101fb010969344c94a5e4c896ad4a8d0 +Subproject commit 0f95c6969a18bf8a283a7019de3265b7852eb4bc From 45a5f94f5ee72fb0e98af411598d524a9e3f7bb8 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Fri, 13 Nov 2026 18:01:46 +0100 Subject: [PATCH 46/51] Track OpenZeppelin Contracts master now that #6872 is merged Move lib/@openzeppelin-contracts to the merge commit of OpenZeppelin/openzeppelin-contracts#6872 (7df9390d5) and lib/@openzeppelin-contracts-upgradeable to the matching "Transpile 7df9390d5" commit (eb9d0cb1). --- .gitmodules | 2 +- lib/@openzeppelin-contracts | 2 +- lib/@openzeppelin-contracts-upgradeable | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index f3061af3b..9300a3809 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "lib/@openzeppelin-contracts"] path = lib/@openzeppelin-contracts url = https://github.com/OpenZeppelin/openzeppelin-contracts.git - branch = transpiler-dependencies + branch = master [submodule "lib/@openzeppelin-contracts-upgradeable"] path = lib/@openzeppelin-contracts-upgradeable url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable.git diff --git a/lib/@openzeppelin-contracts b/lib/@openzeppelin-contracts index 0f95c6969..7df9390d5 160000 --- a/lib/@openzeppelin-contracts +++ b/lib/@openzeppelin-contracts @@ -1 +1 @@ -Subproject commit 0f95c6969a18bf8a283a7019de3265b7852eb4bc +Subproject commit 7df9390d5989ea2cb7a70ad93f96245d8a82574e diff --git a/lib/@openzeppelin-contracts-upgradeable b/lib/@openzeppelin-contracts-upgradeable index 64dd3a633..eb9d0cb1c 160000 --- a/lib/@openzeppelin-contracts-upgradeable +++ b/lib/@openzeppelin-contracts-upgradeable @@ -1 +1 @@ -Subproject commit 64dd3a6334bb83122c9e029929331b18e9f2d172 +Subproject commit eb9d0cb1c2f4b58036702be74b90bef10e121b7a From 0b30583056835723f9d6f58c282711dbc72a512f Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Fri, 13 Nov 2026 18:46:23 +0100 Subject: [PATCH 47/51] Symlink scripts that are exact copies of the OpenZeppelin Contracts ones Only scripts that behave the same when resolved through a symlink. get-contracts-metadata.js (and minimize-pragma.js / pragma-validity.js, which import it), update-docs-branch.js and docs/templates/helpers.ts resolve paths from import.meta.dirname or import ../package.json, which Node resolves from the symlink target, so they stay as copies. --- scripts/checks/compare-gas-reports.js | 253 +------------------------- scripts/checks/generation.sh | 9 +- scripts/git-user-config.sh | 9 +- scripts/solc-versions.js | 17 +- scripts/upgradeable/patch-apply.sh | 22 +-- scripts/upgradeable/patch-save.sh | 21 +-- 6 files changed, 6 insertions(+), 325 deletions(-) mode change 100755 => 120000 scripts/checks/compare-gas-reports.js mode change 100755 => 120000 scripts/checks/generation.sh mode change 100644 => 120000 scripts/git-user-config.sh mode change 100644 => 120000 scripts/solc-versions.js mode change 100755 => 120000 scripts/upgradeable/patch-apply.sh mode change 100755 => 120000 scripts/upgradeable/patch-save.sh diff --git a/scripts/checks/compare-gas-reports.js b/scripts/checks/compare-gas-reports.js deleted file mode 100755 index b8e7f27b4..000000000 --- a/scripts/checks/compare-gas-reports.js +++ /dev/null @@ -1,252 +0,0 @@ -#!/usr/bin/env node - -// This file is an exact copy of lib/@openzeppelin-contracts/scripts/checks/compare-gas-reports.js. - -import fs from 'fs'; -import chalk from 'chalk'; - -import { hideBin } from 'yargs/helpers'; -import yargs from 'yargs/yargs'; - -const { argv } = yargs(hideBin(process.argv)) - .env('') - .options({ - style: { - type: 'string', - choices: ['shell', 'markdown'], - default: 'shell', - }, - hideEqual: { - type: 'boolean', - default: true, - }, - strictTesting: { - type: 'boolean', - default: false, - }, - // JSON array of source files the change reaches (from `scripts/list-dependencies.js`); absent = report all. - filtered: { - type: 'string', - }, - }); - -// Deduce base tx cost from the percentage denominator -const BASE_TX_COST = 21000; - -// Utilities -const variation = (current, previous, offset = 0) => ({ - value: current - offset, - delta: current - previous, - prcnt: (100 * (current - previous)) / (previous - offset), -}); - -const variations = (current, previous, offset = 0) => - current.min == current.max && previous.min == previous.max - ? { - avg: variation(current.avg, previous.avg, offset), - } - : { - min: variation(current.min, previous.min, offset), - max: variation(current.max, previous.max, offset), - avg: variation(current.avg, previous.avg, offset), - median: variation(current.median, previous.median, offset), - }; - -// Report class -class Report { - // Read report file - static load(filepath) { - return JSON.parse(fs.readFileSync(filepath, 'utf8')); - } - - // Compare two reports - static compare(update, ref, opts = { hideEqual: true, strictTesting: false }) { - const refContracts = ref.contracts ?? {}; - const updateContracts = update.contracts ?? {}; - // Drop contracts the change cannot reach: their min/max/avg/median only move with test-suite - // churn, not a real change. `sourceName` is the path `filtered` is expressed in. - return Object.entries(updateContracts) - .filter(([key]) => key in refContracts) - .filter(([, contract]) => !opts.filtered || opts.filtered.has(contract.sourceName)) - .flatMap(([key, contract]) => { - const refContract = refContracts[key]; - const refFunctions = refContracts[key]?.functions ?? {}; - return [ - ...(contract.deployment && refContract.deployment - ? [ - { - contract: contract.contractName, - method: '[constructor]', - ...variations(contract.deployment, refContract.deployment, BASE_TX_COST), - }, - ] - : []), - ...Object.entries(contract.functions ?? {}) - .filter(([method]) => method in refFunctions) - .filter(([method, data]) => !opts.strictTesting || data.count === refFunctions[method].count) - .map(([method, currentData]) => ({ - contract: contract.contractName, - method, - ...variations(currentData, refFunctions[method], BASE_TX_COST), - })), - ]; - }) - .sort((a, b) => `${a.contract}:${a.method}`.localeCompare(`${b.contract}:${b.method}`)) - .filter(row => !opts.hideEqual || row.min?.delta || row.max?.delta || row.avg?.delta || row.median?.delta); - } -} - -// Display -function center(text, length) { - return text.padStart((text.length + length) / 2).padEnd(length); -} - -function plusSign(num) { - return num > 0 ? '+' : ''; -} - -function formatCellShell(cell) { - const format = chalk[cell?.delta > 0 ? 'red' : cell?.delta < 0 ? 'green' : 'reset']; - return [ - format((!isFinite(cell?.value) ? '-' : cell.value.toString()).padStart(8)), - format((!isFinite(cell?.delta) ? '-' : plusSign(cell.delta) + cell.delta.toString()).padStart(8)), - format((!isFinite(cell?.prcnt) ? '-' : plusSign(cell.prcnt) + cell.prcnt.toFixed(2) + '%').padStart(8)), - ]; -} - -function formatCmpShell(rows) { - const contractLength = Math.max(8, ...rows.map(({ contract }) => contract.length)); - const methodLength = Math.max(7, ...rows.map(({ method }) => method.length)); - - const COLS = [ - { txt: '', length: 0 }, - { txt: 'Contract', length: contractLength }, - { txt: 'Method', length: methodLength }, - { txt: 'Min', length: 30 }, - { txt: 'Max', length: 30 }, - { txt: 'Median', length: 30 }, - { txt: 'Avg', length: 30 }, - { txt: '', length: 0 }, - ]; - const HEADER = COLS.map(entry => chalk.bold(center(entry.txt, entry.length || 0))) - .join(' | ') - .trim(); - const SEPARATOR = COLS.map(({ length }) => (length > 0 ? '-'.repeat(length + 2) : '')) - .join('|') - .trim(); - - return [ - '', - HEADER, - ...rows.map(entry => - [ - '', - chalk.grey(entry.contract.padEnd(contractLength)), - entry.method.padEnd(methodLength), - ...formatCellShell(entry.min), - ...formatCellShell(entry.max), - ...formatCellShell(entry.median), - ...formatCellShell(entry.avg), - '', - ] - .join(' | ') - .trim(), - ), - '', - ] - .join(`\n${SEPARATOR}\n`) - .trim(); -} - -function alignPattern(align) { - switch (align) { - case 'left': - case undefined: - return ':-'; - case 'right': - return '-:'; - case 'center': - return ':-:'; - } -} - -function trend(value) { - return value > 0 ? ':x:' : value < 0 ? ':heavy_check_mark:' : ':heavy_minus_sign:'; -} - -function formatCellMarkdown(cell) { - return [ - !isFinite(cell?.value) ? '-' : cell.value.toString(), - !isFinite(cell?.delta) ? '-' : plusSign(cell.delta) + cell.delta.toString(), - !isFinite(cell?.prcnt) ? '-' : plusSign(cell.prcnt) + cell.prcnt.toFixed(2) + '% ' + trend(cell.delta), - ]; -} - -function formatCmpMarkdown(rows) { - const COLS = [ - { txt: '' }, - { txt: 'Contract', align: 'left' }, - { txt: 'Method', align: 'left' }, - { txt: 'Min', align: 'right' }, - { txt: '(+/-)', align: 'right' }, - { txt: '%', align: 'right' }, - { txt: 'Max', align: 'right' }, - { txt: '(+/-)', align: 'right' }, - { txt: '%', align: 'right' }, - { txt: 'Median', align: 'right' }, - { txt: '(+/-)', align: 'right' }, - { txt: '%', align: 'right' }, - { txt: 'Avg', align: 'right' }, - { txt: '(+/-)', align: 'right' }, - { txt: '%', align: 'right' }, - { txt: '' }, - ]; - const HEADER = COLS.map(entry => entry.txt) - .join(' | ') - .trim(); - const SEPARATOR = COLS.map(entry => (entry.txt ? alignPattern(entry.align) : '')) - .join('|') - .trim(); - - return [ - '# Changes to gas costs', - '', - HEADER, - SEPARATOR, - rows - .map(entry => - [ - '', - entry.contract, - entry.method, - ...formatCellMarkdown(entry.min), - ...formatCellMarkdown(entry.max), - ...formatCellMarkdown(entry.median), - ...formatCellMarkdown(entry.avg), - '', - ] - .join(' | ') - .trim(), - ) - .join('\n'), - '', - ] - .join('\n') - .trim(); -} - -// MAIN -const filtered = argv.filtered && new Set(Report.load(argv.filtered)); -const report = Report.compare(Report.load(argv._[0]), Report.load(argv._[1]), { ...argv, filtered }); - -switch (argv.style) { - case 'markdown': - // Empty output (no reachable contract changed cost) rather than a bare header: gas-comment.yml - // deletes the comment when the body is empty. - if (report.length > 0) console.log(formatCmpMarkdown(report)); - break; - case 'shell': - default: - console.log(formatCmpShell(report)); - break; -} diff --git a/scripts/checks/compare-gas-reports.js b/scripts/checks/compare-gas-reports.js new file mode 120000 index 000000000..b11fc48e7 --- /dev/null +++ b/scripts/checks/compare-gas-reports.js @@ -0,0 +1 @@ +../../lib/@openzeppelin-contracts/scripts/checks/compare-gas-reports.js \ No newline at end of file diff --git a/scripts/checks/generation.sh b/scripts/checks/generation.sh deleted file mode 100755 index 0f5f8da9b..000000000 --- a/scripts/checks/generation.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# This file is an exact copy of lib/@openzeppelin-contracts/scripts/checks/generation.sh. - -set -euo pipefail - -npm run generate -git diff -R --exit-code diff --git a/scripts/checks/generation.sh b/scripts/checks/generation.sh new file mode 120000 index 000000000..185d64727 --- /dev/null +++ b/scripts/checks/generation.sh @@ -0,0 +1 @@ +../../lib/@openzeppelin-contracts/scripts/checks/generation.sh \ No newline at end of file diff --git a/scripts/git-user-config.sh b/scripts/git-user-config.sh deleted file mode 100644 index b180e3dd9..000000000 --- a/scripts/git-user-config.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# This file is an exact copy of lib/@openzeppelin-contracts/scripts/git-user-config.sh. - -set -euo pipefail -x - -git config user.name 'github-actions' -git config user.email '41898282+github-actions[bot]@users.noreply.github.com' diff --git a/scripts/git-user-config.sh b/scripts/git-user-config.sh new file mode 120000 index 000000000..5c281800c --- /dev/null +++ b/scripts/git-user-config.sh @@ -0,0 +1 @@ +../lib/@openzeppelin-contracts/scripts/git-user-config.sh \ No newline at end of file diff --git a/scripts/solc-versions.js b/scripts/solc-versions.js deleted file mode 100644 index b6dae6c4d..000000000 --- a/scripts/solc-versions.js +++ /dev/null @@ -1,16 +0,0 @@ -// This file is an exact copy of lib/@openzeppelin-contracts/scripts/solc-versions.js. - -import { execFile } from 'child_process'; -import semver from 'semver'; -import { range } from './helpers.js'; - -export const versions = ['0.4.26', '0.5.16', '0.6.12', '0.7.6', '0.8.33'] - .map(semver.parse) - .flatMap(({ major, minor, patch }) => range(patch + 1).map(p => `${major}.${minor}.${p}`)); - -export const compile = (source, version) => - new Promise((resolve, reject) => - execFile('forge', ['build', source, '--use', version, '--out', `out/solc-${version}`], error => - error ? reject(error) : resolve(), - ), - ); diff --git a/scripts/solc-versions.js b/scripts/solc-versions.js new file mode 120000 index 000000000..2c2e38715 --- /dev/null +++ b/scripts/solc-versions.js @@ -0,0 +1 @@ +../lib/@openzeppelin-contracts/scripts/solc-versions.js \ No newline at end of file diff --git a/scripts/upgradeable/patch-apply.sh b/scripts/upgradeable/patch-apply.sh deleted file mode 100755 index 6697aba0e..000000000 --- a/scripts/upgradeable/patch-apply.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -# This file is an exact copy of lib/@openzeppelin-contracts/scripts/upgradeable/patch-apply.sh. - -set -euo pipefail - -DIRNAME="$(dirname -- "${BASH_SOURCE[0]}")" -PATCH="$DIRNAME/upgradeable.patch" - -error() { - echo Error: "$*" >&2 - exit 1 -} - -if ! git diff-files --quiet ":!$PATCH" || ! git diff-index --quiet HEAD ":!$PATCH"; then - error "Repository must have no staged or unstaged changes" -fi - -if ! git apply -3 "$PATCH"; then - error "Fix conflicts and run $DIRNAME/patch-save.sh" -fi diff --git a/scripts/upgradeable/patch-apply.sh b/scripts/upgradeable/patch-apply.sh new file mode 120000 index 000000000..dfb04a082 --- /dev/null +++ b/scripts/upgradeable/patch-apply.sh @@ -0,0 +1 @@ +../../lib/@openzeppelin-contracts/scripts/upgradeable/patch-apply.sh \ No newline at end of file diff --git a/scripts/upgradeable/patch-save.sh b/scripts/upgradeable/patch-save.sh deleted file mode 100755 index 4a2644eaa..000000000 --- a/scripts/upgradeable/patch-save.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -# This file is an exact copy of lib/@openzeppelin-contracts/scripts/upgradeable/patch-save.sh. - -set -euo pipefail - -DIRNAME="$(dirname -- "${BASH_SOURCE[0]}")" -PATCH="$DIRNAME/upgradeable.patch" - -error() { - echo Error: "$*" >&2 - exit 1 -} - -if ! git diff-files --quiet ":!$PATCH"; then - error "Unstaged changes. Stage to include in patch or temporarily stash." -fi - -git diff-index --cached --patch --output="$PATCH" HEAD -git restore --staged --worktree ":!$PATCH" diff --git a/scripts/upgradeable/patch-save.sh b/scripts/upgradeable/patch-save.sh new file mode 120000 index 000000000..9bfbb5c31 --- /dev/null +++ b/scripts/upgradeable/patch-save.sh @@ -0,0 +1 @@ +../../lib/@openzeppelin-contracts/scripts/upgradeable/patch-save.sh \ No newline at end of file From 3bc09b6683cf5f83bd1a9274330efdae97bc380a Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Fri, 13 Nov 2026 19:05:43 +0100 Subject: [PATCH 48/51] Publish the docs from master again The upstream copy of update-docs-branch.js only runs on release-v* branches, but this repository has none: docs.yml runs on master and publishes docs-v0.x from there. Restore the master-branch logic (and --no-verify on the docs commit) from the previous version, converted to ESM. --- scripts/update-docs-branch.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/scripts/update-docs-branch.js b/scripts/update-docs-branch.js index 59ef931b0..8825e6704 100644 --- a/scripts/update-docs-branch.js +++ b/scripts/update-docs-branch.js @@ -1,5 +1,3 @@ -// This file is an exact copy of lib/@openzeppelin-contracts/scripts/update-docs-branch.js. - import proc from 'child_process'; import fs from 'fs'; import path from 'path'; @@ -16,13 +14,16 @@ const tryRead = cmd => { } }; -const releaseBranchRegex = /^release-v(?(?\d+)\.(?\d+)(?:\.(?\d+))?)$/; +// The community contracts currently don't have a defined release process. +// The master branch is used for development, and the docs are updated from there. +// Use /^release-v(?(?\d+)\.(?\d+)(?:\.(?\d+))?)$/ for a release branch +const masterBranch = /^master$/; const currentBranch = read('git rev-parse --abbrev-ref HEAD'); -const match = currentBranch.match(releaseBranchRegex); +const match = currentBranch.match(masterBranch); if (!match) { - console.error('Not currently on a release branch'); + console.error('Not currently on master branch'); process.exit(1); } @@ -34,7 +35,9 @@ if (pkgVersion.includes('-') && !pkgVersion.includes('.0.0-')) { } const current = match.groups; -const docsBranch = `docs-v${current.major}.x`; +const major = current?.major ?? pkgVersion.split('.')[0]; +const minor = current?.minor ?? pkgVersion.split('.')[1]; +const docsBranch = `docs-v${major}.x`; // Fetch remotes and find the docs branch if it exists run('git fetch --all --no-tags'); @@ -54,7 +57,7 @@ if (!matchingDocsBranches) { } const publishedVersion = JSON.parse(read(`git show ${publishedRef}:package.json`)).version; const publishedMinor = publishedVersion.match(/\d+\.(?\d+)\.\d+/).groups.minor; - if (current.minor < publishedMinor) { + if (minor < publishedMinor) { console.error('Refusing to update docs: newer version is published'); process.exit(0); } @@ -66,5 +69,5 @@ if (!matchingDocsBranches) { run('npm run prepare-docs'); run('git add -f docs'); // --force needed because generated docs files are gitignored -run('git commit -m "Update docs"'); +run('git commit --no-verify -m "Update docs"'); run(`git checkout ${currentBranch}`); From d6596abab52e9e7411c4c38a6ccfb1d851320b1f Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Fri, 13 Nov 2026 21:23:54 +0100 Subject: [PATCH 49/51] Resolve @openzeppelin/contracts through the submodule for Foundry remappings.txt pointed @openzeppelin/contracts to node_modules, which Hardhat needs but which projects that install this repository with forge install do not have, so their builds failed. Point remappings.txt to the submodule again, as on master, and add the node_modules remappings for Hardhat only, through a plugin (hardhat/hardhat-remappings.ts) that uses the readNpmPackageRemappings hook. The remappings themselves are listed in hardhat.config.ts. upgradeable.patch adds the same remapping for the original code in lib/openzeppelin-community-contracts, whose remappings.txt would otherwise point to its own nested submodule. --- hardhat.config.ts | 21 +++++++++++++++++---- hardhat/hardhat-remappings.ts | 27 +++++++++++++++++++++++++++ remappings.txt | 4 ++-- scripts/upgradeable/upgradeable.patch | 20 ++++++++++++++------ 4 files changed, 60 insertions(+), 12 deletions(-) create mode 100644 hardhat/hardhat-remappings.ts diff --git a/hardhat.config.ts b/hardhat.config.ts index 367c2c9c3..04f89f0c2 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -12,6 +12,7 @@ import hardhatExposed from '@openzeppelin/contracts/hardhat/hardhat-exposed/plug import hardhatTranspiler from '@openzeppelin/contracts/hardhat/hardhat-transpiler/plugin.ts'; import hardhatOzContractsHelpers from '@openzeppelin/contracts/hardhat/hardhat-oz-contracts-helpers/plugin.ts'; import '@openzeppelin/contracts/hardhat/async-test-sanity.ts'; +import hardhatRemappingsPlugin from './hardhat/hardhat-remappings.ts'; // Parameters import yargs from 'yargs/yargs'; @@ -26,6 +27,16 @@ const argv = await yargs() }) .parse(); +// `remappings.txt` points `@openzeppelin/contracts` to the submodule, which is what Foundry (and projects that install +// this repository with `forge install`) need. Hardhat must instead resolve it through `node_modules`, as an npm +// package, for `npmFilesToBuild` to accept its files and for every dependency to share a single copy (the +// `zk-email-verify` submodule resolves `@openzeppelin/contracts` through npm). These remappings take precedence over +// the ones of `remappings.txt` for Hardhat only. +const hardhatRemappings = [ + '@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/contracts/', + 'lib/@openzeppelin-contracts-upgradeable/contracts/:@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/contracts/', +]; + // Configuration export default defineConfig({ plugins: [ @@ -41,6 +52,7 @@ export default defineConfig({ hardhatExposed, hardhatTranspiler, hardhatOzContractsHelpers, + hardhatRemappingsPlugin(hardhatRemappings), ], paths: { // `ECDSAOwnedDKIMRegistry` is needed (as-is, not exposed) by the tests. It lives in a submodule reached through a @@ -51,10 +63,11 @@ export default defineConfig({ }, solidity: { version: argv.compiler, - // Remappings are defined in `remappings.txt`. Hardhat 3 also applies the `remappings.txt` of the - // `lib/@openzeppelin-contracts-upgradeable` submodule to its files, which points `@openzeppelin/contracts` to a nested - // copy. The last entry of `remappings.txt` uses a more specific context so that the submodule uses the same copy as - // the rest of the project. (Comments are not allowed in `remappings.txt` as Foundry rejects them.) + // Remappings are defined in `remappings.txt`, and overridden for Hardhat by `hardhatRemappings` (see above). + // Hardhat 3 also applies the `remappings.txt` of the `lib/@openzeppelin-contracts-upgradeable` submodule to its + // files, which points `@openzeppelin/contracts` to a nested copy. The last entry of `remappings.txt` (and of + // `hardhatRemappings`) uses a more specific context so that the submodule uses the same copy as the rest of the + // project. (Comments are not allowed in `remappings.txt` as Foundry rejects them.) // // Dependencies that the tests deploy directly. Hardhat 3 only emits artifacts for compilation roots, so importing // them from a solidity file (the old `contracts/mocks/import.sol` trick) is not enough anymore. diff --git a/hardhat/hardhat-remappings.ts b/hardhat/hardhat-remappings.ts new file mode 100644 index 000000000..542bf902a --- /dev/null +++ b/hardhat/hardhat-remappings.ts @@ -0,0 +1,27 @@ +import path from 'node:path'; + +import type { HardhatPlugin } from 'hardhat/types/plugins'; + +/** + * Remappings that apply to Hardhat only, on top of the ones of `remappings.txt` (which Foundry also reads). They are + * given precedence: Hardhat keeps the first remapping of a given context and prefix. + * + * Only the project itself is affected, not its npm dependencies. Remappings are resolved relative to the project root. + */ +export default function hardhatRemappings(remappings: string[]): HardhatPlugin { + return { + id: 'hardhat-remappings', + hookHandlers: { + solidity: async () => ({ + default: async () => ({ + readNpmPackageRemappings: async (context, packageName, packageVersion, packagePath, next) => { + const sources = await next(context, packageName, packageVersion, packagePath); + return packagePath === context.config.paths.root + ? [{ remappings, source: path.join(packagePath, 'remappings.txt') }, ...sources] + : sources; + }, + }), + }), + }, + }; +} diff --git a/remappings.txt b/remappings.txt index ed847262e..6e72639e1 100644 --- a/remappings.txt +++ b/remappings.txt @@ -1,4 +1,4 @@ -@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/contracts/ +@openzeppelin/contracts/=lib/@openzeppelin-contracts/contracts/ @openzeppelin/contracts-upgradeable/=lib/@openzeppelin-contracts-upgradeable/contracts/ @openzeppelin/community-contracts/=contracts/ @axelar-network/axelar-gmp-sdk-solidity/=lib/axelar-gmp-sdk-solidity/ @@ -6,4 +6,4 @@ @zk-email/contracts/=lib/zk-email-verify/packages/contracts/ wormhole-solidity-sdk/=lib/wormhole-solidity-sdk/src/ forge-std=lib/forge-std/src -lib/@openzeppelin-contracts-upgradeable/contracts/:@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/contracts/ +lib/@openzeppelin-contracts-upgradeable/contracts/:@openzeppelin/contracts/=lib/@openzeppelin-contracts/contracts/ diff --git a/scripts/upgradeable/upgradeable.patch b/scripts/upgradeable/upgradeable.patch index ed3d4bae6..e9268d2f9 100644 --- a/scripts/upgradeable/upgradeable.patch +++ b/scripts/upgradeable/upgradeable.patch @@ -15,10 +15,18 @@ index dbce31e2..074338a3 100644 This repository contains contracts and libraries in the following categories: diff --git a/hardhat.config.ts b/hardhat.config.ts -index 367c2c9c..8b86a042 100644 +index 04f89f0c..bb081161 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts -@@ -47,7 +47,7 @@ export default defineConfig({ +@@ -35,6 +35,7 @@ const argv = await yargs() + const hardhatRemappings = [ + '@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/contracts/', + 'lib/@openzeppelin-contracts-upgradeable/contracts/:@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/contracts/', ++ 'lib/openzeppelin-community-contracts/:@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/contracts/', + ]; + + // Configuration +@@ -59,7 +60,7 @@ export default defineConfig({ // remappings.txt entry, so it is a project file that no compilation root imports by name: `npmFilesToBuild` cannot // reach it (HHE901), and being imported is not enough for Hardhat 3 to emit an artifact. Building its directory as // a source directory is what makes those artifacts appear. @@ -27,7 +35,7 @@ index 367c2c9c..8b86a042 100644 }, solidity: { version: argv.compiler, -@@ -114,7 +114,7 @@ export default defineConfig({ +@@ -127,7 +128,7 @@ export default defineConfig({ exposed: { imports: true, initializers: true, @@ -37,7 +45,7 @@ index 367c2c9c..8b86a042 100644 }, docgen: await import('./docs/config.mjs').then(m => m.default), diff --git a/package.json b/package.json -index 3d5173a5..0e85483f 100644 +index 641ec406..e02d949e 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ @@ -48,11 +56,11 @@ index 3d5173a5..0e85483f 100644 "description": "Solidity library of smart contracts from the OpenZeppelin Community", "author": "OpenZeppelin Community ", diff --git a/remappings.txt b/remappings.txt -index ed847262..ac65d26f 100644 +index 6e72639e..d9088320 100644 --- a/remappings.txt +++ b/remappings.txt @@ -1,6 +1,7 @@ - @openzeppelin/contracts/=node_modules/@openzeppelin/contracts/contracts/ + @openzeppelin/contracts/=lib/@openzeppelin-contracts/contracts/ @openzeppelin/contracts-upgradeable/=lib/@openzeppelin-contracts-upgradeable/contracts/ -@openzeppelin/community-contracts/=contracts/ +@openzeppelin/community-contracts-upgradeable/=contracts/ From 6f0c7651e8907e9e129a5a1fe35a6cfaed903d0e Mon Sep 17 00:00:00 2001 From: James Toussaint <33313130+james-toussaint@users.noreply.github.com> Date: Tue, 17 Nov 2026 12:14:40 +0100 Subject: [PATCH 50/51] Destructure connection in AxelarHelper and WormholeHelper --- test/crosschain/axelar/AxelarHelper.js | 19 ++++++++++++------- test/crosschain/wormhole/WormholeHelper.js | 13 +++++-------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/test/crosschain/axelar/AxelarHelper.js b/test/crosschain/axelar/AxelarHelper.js index 6cbb17cdc..7b0663880 100644 --- a/test/crosschain/axelar/AxelarHelper.js +++ b/test/crosschain/axelar/AxelarHelper.js @@ -1,13 +1,18 @@ export async function deploy(connection, owner) { - const axelar = await connection.ethers.deployContract('AxelarGatewayMock'); - const gatewayA = await connection.ethers.deployContract('AxelarGatewayAdapter', [axelar, owner]); - const gatewayB = await connection.ethers.deployContract('AxelarGatewayAdapter', [axelar, owner]); + const { + ethers, + helpers: { chain }, + } = connection; + + const axelar = await ethers.deployContract('AxelarGatewayMock'); + const gatewayA = await ethers.deployContract('AxelarGatewayAdapter', [axelar, owner]); + const gatewayB = await ethers.deployContract('AxelarGatewayAdapter', [axelar, owner]); await Promise.all([ - gatewayA.connect(owner).registerChainEquivalence(connection.helpers.chain.erc7930, 'local'), - gatewayB.connect(owner).registerChainEquivalence(connection.helpers.chain.erc7930, 'local'), - gatewayA.connect(owner).registerRemoteGateway(connection.helpers.chain.toErc7930(gatewayB)), - gatewayB.connect(owner).registerRemoteGateway(connection.helpers.chain.toErc7930(gatewayA)), + gatewayA.connect(owner).registerChainEquivalence(chain.erc7930, 'local'), + gatewayB.connect(owner).registerChainEquivalence(chain.erc7930, 'local'), + gatewayA.connect(owner).registerRemoteGateway(chain.toErc7930(gatewayB)), + gatewayB.connect(owner).registerRemoteGateway(chain.toErc7930(gatewayA)), ]); return { axelar, gatewayA, gatewayB }; diff --git a/test/crosschain/wormhole/WormholeHelper.js b/test/crosschain/wormhole/WormholeHelper.js index 21cc4a567..109e383c2 100644 --- a/test/crosschain/wormhole/WormholeHelper.js +++ b/test/crosschain/wormhole/WormholeHelper.js @@ -4,18 +4,15 @@ export const toUniversalAddress = addr => ethers.zeroPadValue(addr.target ?? add export const fromUniversalAddress = addr => ethers.getAddress(ethers.hexlify(ethers.getBytes(addr).slice(-20))); export async function deploy(connection, owner, wormholeChainId = 23600) { + const { chain } = connection.helpers; const wormhole = await connection.ethers.deployContract('WormholeRelayerMock', [wormholeChainId]); const gatewayA = await connection.ethers.deployContract('WormholeGatewayAdapter', [wormhole, owner]); const gatewayB = await connection.ethers.deployContract('WormholeGatewayAdapter', [wormhole, owner]); - await gatewayA - .connect(owner) - .registerChainEquivalence(ethers.Typed.bytes(connection.helpers.chain.erc7930), wormholeChainId); - await gatewayB - .connect(owner) - .registerChainEquivalence(ethers.Typed.bytes(connection.helpers.chain.erc7930), wormholeChainId); - await gatewayA.connect(owner).registerRemoteGateway(ethers.Typed.bytes(connection.helpers.chain.toErc7930(gatewayB))); - await gatewayB.connect(owner).registerRemoteGateway(ethers.Typed.bytes(connection.helpers.chain.toErc7930(gatewayA))); + await gatewayA.connect(owner).registerChainEquivalence(ethers.Typed.bytes(chain.erc7930), wormholeChainId); + await gatewayB.connect(owner).registerChainEquivalence(ethers.Typed.bytes(chain.erc7930), wormholeChainId); + await gatewayA.connect(owner).registerRemoteGateway(ethers.Typed.bytes(chain.toErc7930(gatewayB))); + await gatewayB.connect(owner).registerRemoteGateway(ethers.Typed.bytes(chain.toErc7930(gatewayA))); return { wormholeChainId, wormhole, gatewayA, gatewayB }; } From 0537d307c3224144e5dba956a7398cbdec3c1e3b Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Tue, 17 Nov 2026 15:42:06 +0100 Subject: [PATCH 51/51] Remove unused imports from the mocks import file --- contracts/mocks/import.sol | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/contracts/mocks/import.sol b/contracts/mocks/import.sol index 2e0bb0158..eacd205ac 100644 --- a/contracts/mocks/import.sol +++ b/contracts/mocks/import.sol @@ -6,14 +6,8 @@ pragma solidity ^0.8.31; // forge-lint: disable-start(unused-import) import {AccessManager} from "@openzeppelin/contracts/access/manager/AccessManager.sol"; import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol"; -import {ERC721Enumerable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol"; import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol"; -import { - AccountECDSAMock, - AccountERC7579Mock, - AccountERC7913Mock -} from "@openzeppelin/contracts/mocks/account/AccountMock.sol"; -import {ERC1271WalletMock} from "@openzeppelin/contracts/mocks/ERC1271WalletMock.sol"; +import {AccountERC7913Mock} from "@openzeppelin/contracts/mocks/account/AccountMock.sol"; import {ERC20Reentrant} from "@openzeppelin/contracts/mocks/token/ERC20Reentrant.sol"; import {Create2} from "@openzeppelin/contracts/utils/Create2.sol"; // forge-lint: disable-end(unused-import)