From 7223d79ded7b8c5a3fc71d1494152b02dcbfdd7e Mon Sep 17 00:00:00 2001 From: Yudi Levi Date: Mon, 4 Mar 2024 09:11:28 +0000 Subject: [PATCH 01/11] removed pause functionality and related code --- contracts/carbon/CarbonController.sol | 48 +- data/named-accounts.ts | 3 +- .../mainnet/0013-CarbonController-upgrade.ts | 22 + deploy/scripts/mainnet/0100-revoke-roles.ts | 7 - .../mainnet/0013-carbon-controller-upgrade.ts | 30 ++ deploy/tests/mainnet/0100-revoke-roles.ts | 2 - pnpm-lock.yaml | 503 +++++++++--------- test/forge/CarbonController.t.sol | 59 -- test/forge/Pairs.t.sol | 14 - test/forge/Strategies.t.sol | 62 --- test/forge/TestFixture.t.sol | 2 - test/forge/Trading.t.sol | 14 - test/forge/Voucher.t.sol | 10 - utils/Roles.ts | 1 - 14 files changed, 302 insertions(+), 475 deletions(-) create mode 100644 deploy/scripts/mainnet/0013-CarbonController-upgrade.ts create mode 100644 deploy/tests/mainnet/0013-carbon-controller-upgrade.ts diff --git a/contracts/carbon/CarbonController.sol b/contracts/carbon/CarbonController.sol index fd9680ce..ff87371d 100644 --- a/contracts/carbon/CarbonController.sol +++ b/contracts/carbon/CarbonController.sol @@ -26,9 +26,6 @@ contract CarbonController is OnlyProxyDelegate, Utils { - // the emergency manager role is required to pause/unpause - bytes32 private constant ROLE_EMERGENCY_STOPPER = keccak256("ROLE_EMERGENCY_STOPPER"); - // the fees manager role is required to withdraw fees bytes32 private constant ROLE_FEES_MANAGER = keccak256("ROLE_FEES_MANAGER"); @@ -82,7 +79,6 @@ contract CarbonController is */ function __CarbonController_init_unchained() internal onlyInitializing { // set up administrative roles - _setRoleAdmin(ROLE_EMERGENCY_STOPPER, ROLE_ADMIN); _setRoleAdmin(ROLE_FEES_MANAGER, ROLE_ADMIN); } @@ -92,14 +88,7 @@ contract CarbonController is * @inheritdoc Upgradeable */ function version() public pure virtual override(IVersioned, Upgradeable) returns (uint16) { - return 5; - } - - /** - * @dev returns the emergency stopper role - */ - function roleEmergencyStopper() external pure returns (bytes32) { - return ROLE_EMERGENCY_STOPPER; + return 6; } /** @@ -164,7 +153,7 @@ contract CarbonController is function createPair( Token token0, Token token1 - ) external nonReentrant whenNotPaused onlyProxyDelegate returns (Pair memory) { + ) external nonReentrant onlyProxyDelegate returns (Pair memory) { _validateInputTokens(token0, token1); return _createPair(token0, token1); } @@ -193,7 +182,7 @@ contract CarbonController is Token token0, Token token1, Order[2] calldata orders - ) external payable nonReentrant whenNotPaused onlyProxyDelegate returns (uint256) { + ) external payable nonReentrant onlyProxyDelegate returns (uint256) { _validateInputTokens(token0, token1); // don't allow unnecessary eth @@ -223,7 +212,7 @@ contract CarbonController is uint256 strategyId, Order[2] calldata currentOrders, Order[2] calldata newOrders - ) external payable nonReentrant whenNotPaused onlyProxyDelegate { + ) external payable nonReentrant onlyProxyDelegate { Pair memory strategyPair = _pairById(_pairIdByStrategyId(strategyId)); // only the owner of the strategy is allowed to delete it @@ -248,7 +237,7 @@ contract CarbonController is /** * @inheritdoc ICarbonController */ - function deleteStrategy(uint256 strategyId) external nonReentrant whenNotPaused onlyProxyDelegate { + function deleteStrategy(uint256 strategyId) external nonReentrant onlyProxyDelegate { // find strategy, reverts if none Pair memory strategyPair = _pairById(_pairIdByStrategyId(strategyId)); @@ -303,7 +292,7 @@ contract CarbonController is TradeAction[] calldata tradeActions, uint256 deadline, uint128 minReturn - ) external payable nonReentrant whenNotPaused onlyProxyDelegate returns (uint128) { + ) external payable nonReentrant onlyProxyDelegate returns (uint128) { _validateTradeParams(sourceToken, targetToken, deadline, msg.value, minReturn); Pair memory _pair = _pair(sourceToken, targetToken); TradeParams memory params = TradeParams({ @@ -329,7 +318,7 @@ contract CarbonController is TradeAction[] calldata tradeActions, uint256 deadline, uint128 maxInput - ) external payable nonReentrant whenNotPaused onlyProxyDelegate returns (uint128) { + ) external payable nonReentrant onlyProxyDelegate returns (uint128) { _validateTradeParams(sourceToken, targetToken, deadline, msg.value, maxInput); if (sourceToken.isNative()) { @@ -400,7 +389,6 @@ contract CarbonController is address recipient ) external - whenNotPaused onlyRoleMember(ROLE_FEES_MANAGER) validAddress(recipient) validAddress(Token.unwrap(token)) @@ -411,28 +399,6 @@ contract CarbonController is return _withdrawFees(msg.sender, amount, token, recipient); } - /** - * @dev pauses the CarbonController - * - * requirements: - * - * - the caller must have the ROLE_EMERGENCY_STOPPER privilege - */ - function pause() external onlyRoleMember(ROLE_EMERGENCY_STOPPER) { - _pause(); - } - - /** - * @dev resumes the CarbonController - * - * requirements: - * - * - the caller must have the ROLE_EMERGENCY_STOPPER privilege - */ - function unpause() external onlyRoleMember(ROLE_EMERGENCY_STOPPER) { - _unpause(); - } - /** * @dev validates both tokens are valid addresses and unique */ diff --git a/data/named-accounts.ts b/data/named-accounts.ts index 1b033337..32ebdaab 100644 --- a/data/named-accounts.ts +++ b/data/named-accounts.ts @@ -149,7 +149,7 @@ const TokenNamedAccounts = { }; const BancorNamedAccounts = { - bancorNetworkV3: { + bancorNetworkV3: { ...getAddress(mainnet, '0xeEF417e1D5CC832e619ae18D2F140De2999dD4fB') } }; @@ -172,7 +172,6 @@ export const NamedAccounts = { foundationMultisig: { ...getAddress(mainnet, '0xeBeD45Ca22fcF70AdCcAb7618C51A3Dbb06C8d83') }, foundationMultisig2: { ...getAddress(mainnet, '0x0c333d48Af19c2b42577f3C8f4779F0347F8C819') }, daoMultisig: { ...getAddress(mainnet, '0x7e3692a6d8c34a762079fa9057aed87be7e67cb8') }, - daoPauserMultisig: { ...getAddress(mainnet, '0xc140c1CD2e587fC04DAa780d49b616F768476660') }, ...TokenNamedAccounts, ...TestNamedAccounts, diff --git a/deploy/scripts/mainnet/0013-CarbonController-upgrade.ts b/deploy/scripts/mainnet/0013-CarbonController-upgrade.ts new file mode 100644 index 00000000..b199bea6 --- /dev/null +++ b/deploy/scripts/mainnet/0013-CarbonController-upgrade.ts @@ -0,0 +1,22 @@ +import { DeployedContracts, InstanceName, setDeploymentMetadata, upgradeProxy } from '../../../utils/Deploy'; +import { DeployFunction } from 'hardhat-deploy/types'; +import { HardhatRuntimeEnvironment } from 'hardhat/types'; + +/** + * @dev trade by source extended input upgrade + */ +const func: DeployFunction = async ({ getNamedAccounts }: HardhatRuntimeEnvironment) => { + const { deployer } = await getNamedAccounts(); + const voucher = await DeployedContracts.Voucher.deployed(); + + const carbonController = await DeployedContracts.CarbonController.deployed(); + await upgradeProxy({ + name: InstanceName.CarbonController, + from: deployer, + args: [voucher.address, carbonController.address] + }); + + return true; +}; + +export default setDeploymentMetadata(__filename, func); diff --git a/deploy/scripts/mainnet/0100-revoke-roles.ts b/deploy/scripts/mainnet/0100-revoke-roles.ts index 81bbea98..635a9aa1 100644 --- a/deploy/scripts/mainnet/0100-revoke-roles.ts +++ b/deploy/scripts/mainnet/0100-revoke-roles.ts @@ -48,13 +48,6 @@ const func: DeployFunction = async ({ getNamedAccounts }: HardhatRuntimeEnvironm from: deployer }); - // renounce CarbonController's ROLE_EMERGENCY_STOPPER role from the deployer - await renounceRole({ - name: InstanceName.CarbonController, - id: Roles.CarbonController.ROLE_EMERGENCY_STOPPER, - from: deployer - }); - // renounce CarbonController's ROLE_FEES_MANAGER role from the deployer await renounceRole({ name: InstanceName.CarbonController, diff --git a/deploy/tests/mainnet/0013-carbon-controller-upgrade.ts b/deploy/tests/mainnet/0013-carbon-controller-upgrade.ts new file mode 100644 index 00000000..d49c3e86 --- /dev/null +++ b/deploy/tests/mainnet/0013-carbon-controller-upgrade.ts @@ -0,0 +1,30 @@ +import { CarbonController, ProxyAdmin } from '../../../components/Contracts'; +import { DeployedContracts, describeDeployment } from '../../../utils/Deploy'; +import { expect } from 'chai'; +import { ethers } from 'hardhat'; + +describeDeployment(__filename, () => { + let proxyAdmin: ProxyAdmin; + let carbonController: CarbonController; + + beforeEach(async () => { + proxyAdmin = await DeployedContracts.ProxyAdmin.deployed(); + carbonController = await DeployedContracts.CarbonController.deployed(); + }); + + it('should deploy and configure the carbon controller contract', async () => { + expect(await proxyAdmin.getProxyAdmin(carbonController.address)).to.equal(proxyAdmin.address); + expect(await carbonController.version()).to.equal(6); + }); + + it('carbon controller implementation should be initialized', async () => { + const implementationAddress = await proxyAdmin.getProxyImplementation(carbonController.address); + const carbonControllerImpl: CarbonController = await ethers.getContractAt( + 'CarbonController', + implementationAddress + ); + // hardcoding gas limit to avoid gas estimation attempts (which get rejected instead of reverted) + const tx = await carbonControllerImpl.initialize({ gasLimit: 6000000 }); + await expect(tx.wait()).to.be.reverted; + }); +}); diff --git a/deploy/tests/mainnet/0100-revoke-roles.ts b/deploy/tests/mainnet/0100-revoke-roles.ts index 06befd50..41368933 100644 --- a/deploy/tests/mainnet/0100-revoke-roles.ts +++ b/deploy/tests/mainnet/0100-revoke-roles.ts @@ -31,8 +31,6 @@ describeDeployment( expect(await voucher.hasRole(Roles.Upgradeable.ROLE_ADMIN, deployer)).to.be.false; expect(await carbonVortex.hasRole(Roles.Upgradeable.ROLE_ADMIN, deployer)).to.be.false; - // expect deployer not to have the emergency stopper role - expect(await carbon.hasRole(Roles.CarbonController.ROLE_EMERGENCY_STOPPER, deployer)).to.be.false; // expect deployer not to have the fee manager role expect(await carbon.hasRole(Roles.CarbonController.ROLE_FEES_MANAGER, deployer)).to.be.false; }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2bca53f4..5503529f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -47,16 +47,16 @@ devDependencies: version: 4.9.2 '@sentry/hub': specifier: ^7.56.0 - version: 7.102.0 + version: 7.105.0 '@sentry/node': specifier: ^7.56.0 - version: 7.102.0 + version: 7.105.0 '@sentry/types': specifier: ^7.56.0 - version: 7.102.0 + version: 7.105.0 '@sentry/utils': specifier: ^7.56.0 - version: 7.102.0 + version: 7.105.0 '@tenderly/hardhat-tenderly': specifier: 1.1.6 version: 1.1.6(hardhat@2.15.0) @@ -74,7 +74,7 @@ devDependencies: version: 0.5.5 '@types/chai': specifier: ^4.3.4 - version: 4.3.11 + version: 4.3.12 '@types/humanize-duration': specifier: ^3.27.1 version: 3.27.4 @@ -86,13 +86,13 @@ devDependencies: version: 10.0.6 '@types/node': specifier: ^20.3.1 - version: 20.11.19 + version: 20.11.24 '@typescript-eslint/eslint-plugin': specifier: ^5.60.0 - version: 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.56.0)(typescript@5.3.3) + version: 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.57.0)(typescript@5.3.3) '@typescript-eslint/parser': specifier: ^5.60.0 - version: 5.62.0(eslint@8.56.0)(typescript@5.3.3) + version: 5.62.0(eslint@8.57.0)(typescript@5.3.3) adm-zip: specifier: ^0.5.10 version: 0.5.10 @@ -116,25 +116,25 @@ devDependencies: version: 16.4.5 eslint: specifier: ^8.43.0 - version: 8.56.0 + version: 8.57.0 eslint-config-prettier: specifier: ^8.6.0 - version: 8.10.0(eslint@8.56.0) + version: 8.10.0(eslint@8.57.0) eslint-config-standard: specifier: ^17.0.0 - version: 17.1.0(eslint-plugin-import@2.29.1)(eslint-plugin-n@16.6.2)(eslint-plugin-promise@6.1.1)(eslint@8.56.0) + version: 17.1.0(eslint-plugin-import@2.29.1)(eslint-plugin-n@16.6.2)(eslint-plugin-promise@6.1.1)(eslint@8.57.0) eslint-plugin-import: specifier: ^2.27.5 - version: 2.29.1(@typescript-eslint/parser@5.62.0)(eslint@8.56.0) + version: 2.29.1(@typescript-eslint/parser@5.62.0)(eslint@8.57.0) eslint-plugin-mocha: specifier: ^10.1.0 - version: 10.3.0(eslint@8.56.0) + version: 10.3.0(eslint@8.57.0) eslint-plugin-n: specifier: ^16.0.0 - version: 16.6.2(eslint@8.56.0) + version: 16.6.2(eslint@8.57.0) eslint-plugin-promise: specifier: ^6.1.1 - version: 6.1.1(eslint@8.56.0) + version: 6.1.1(eslint@8.57.0) ethereum-waffle: specifier: ^3.4.4 version: 3.4.4(typescript@5.3.3) @@ -197,10 +197,10 @@ devDependencies: version: 3.6.2(typescript@5.3.3) solidity-coverage: specifier: ^0.8.2 - version: 0.8.8(hardhat@2.15.0) + version: 0.8.10(hardhat@2.15.0) ts-node: specifier: ^10.9.1 - version: 10.9.2(@types/node@20.11.19)(typescript@5.3.3) + version: 10.9.2(@types/node@20.11.24)(typescript@5.3.3) typechain: specifier: ^8.1.1 version: 8.3.2(typescript@5.3.3) @@ -218,7 +218,7 @@ packages: /@anders-t/ethers-ledger@1.0.4: resolution: {integrity: sha512-EVuIE5qe1rSbO4A/uHSHENtqA+OTA73aWNzWxiqo/kpUlXIpb6pWps31Pf4Zeh3XL5uW7iXWmkKjDYfJgQXAbw==} dependencies: - '@ledgerhq/hw-app-eth': 6.35.5 + '@ledgerhq/hw-app-eth': 6.35.6 '@ledgerhq/hw-transport-node-hid': 6.28.4 ethers: 5.7.2 transitivePeerDependencies: @@ -248,9 +248,9 @@ packages: resolution: {integrity: sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.9 - '@jridgewell/gen-mapping': 0.3.3 - '@jridgewell/trace-mapping': 0.3.22 + '@babel/types': 7.24.0 + '@jridgewell/gen-mapping': 0.3.5 + '@jridgewell/trace-mapping': 0.3.25 jsesc: 2.5.2 dev: true @@ -263,22 +263,22 @@ packages: resolution: {integrity: sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/template': 7.23.9 - '@babel/types': 7.23.9 + '@babel/template': 7.24.0 + '@babel/types': 7.24.0 dev: true /@babel/helper-hoist-variables@7.22.5: resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.9 + '@babel/types': 7.24.0 dev: true /@babel/helper-split-export-declaration@7.22.6: resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.9 + '@babel/types': 7.24.0 dev: true /@babel/helper-string-parser@7.23.4: @@ -300,21 +300,21 @@ packages: js-tokens: 4.0.0 dev: true - /@babel/parser@7.23.9: - resolution: {integrity: sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==} + /@babel/parser@7.24.0: + resolution: {integrity: sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==} engines: {node: '>=6.0.0'} hasBin: true dependencies: '@babel/types': 7.17.0 dev: true - /@babel/template@7.23.9: - resolution: {integrity: sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==} + /@babel/template@7.24.0: + resolution: {integrity: sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==} engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.23.5 - '@babel/parser': 7.23.9 - '@babel/types': 7.23.9 + '@babel/parser': 7.24.0 + '@babel/types': 7.24.0 dev: true /@babel/traverse@7.23.2: @@ -327,8 +327,8 @@ packages: '@babel/helper-function-name': 7.23.0 '@babel/helper-hoist-variables': 7.22.5 '@babel/helper-split-export-declaration': 7.22.6 - '@babel/parser': 7.23.9 - '@babel/types': 7.23.9 + '@babel/parser': 7.24.0 + '@babel/types': 7.24.0 debug: 4.3.4(supports-color@8.1.1) globals: 11.12.0 transitivePeerDependencies: @@ -343,8 +343,8 @@ packages: to-fast-properties: 2.0.0 dev: true - /@babel/types@7.23.9: - resolution: {integrity: sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==} + /@babel/types@7.24.0: + resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==} engines: {node: '>=6.9.0'} dependencies: '@babel/helper-string-parser': 7.23.4 @@ -407,13 +407,13 @@ packages: deprecated: Please use @ensdomains/ens-contracts dev: true - /@eslint-community/eslint-utils@4.4.0(eslint@8.56.0): + /@eslint-community/eslint-utils@4.4.0(eslint@8.57.0): resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 dependencies: - eslint: 8.56.0 + eslint: 8.57.0 eslint-visitor-keys: 3.4.3 dev: true @@ -439,8 +439,8 @@ packages: - supports-color dev: true - /@eslint/js@8.56.0: - resolution: {integrity: sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==} + /@eslint/js@8.57.0: + resolution: {integrity: sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true @@ -835,8 +835,8 @@ packages: '@ethersproject/properties': 5.7.0 '@ethersproject/strings': 5.7.0 - /@fastify/busboy@2.1.0: - resolution: {integrity: sha512-+KpH+QxZU7O4675t3mnkQKcZZg56u+K/Ct2K+N2AZYNVK8kyeo/bI18tI8aPm3tvNNRyTWfj6s5tnGNlcbQRsA==} + /@fastify/busboy@2.1.1: + resolution: {integrity: sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==} engines: {node: '>=14'} /@humanwhocodes/config-array@0.11.14: @@ -871,29 +871,29 @@ packages: wrap-ansi-cjs: /wrap-ansi@7.0.0 dev: true - /@jridgewell/gen-mapping@0.3.3: - resolution: {integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==} + /@jridgewell/gen-mapping@0.3.5: + resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==} engines: {node: '>=6.0.0'} dependencies: - '@jridgewell/set-array': 1.1.2 + '@jridgewell/set-array': 1.2.1 '@jridgewell/sourcemap-codec': 1.4.15 - '@jridgewell/trace-mapping': 0.3.22 + '@jridgewell/trace-mapping': 0.3.25 dev: true /@jridgewell/resolve-uri@3.1.2: resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==} engines: {node: '>=6.0.0'} - /@jridgewell/set-array@1.1.2: - resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==} + /@jridgewell/set-array@1.2.1: + resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==} engines: {node: '>=6.0.0'} dev: true /@jridgewell/sourcemap-codec@1.4.15: resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} - /@jridgewell/trace-mapping@0.3.22: - resolution: {integrity: sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw==} + /@jridgewell/trace-mapping@0.3.25: + resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} dependencies: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.4.15 @@ -905,8 +905,8 @@ packages: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.4.15 - /@ledgerhq/cryptoassets@11.4.0: - resolution: {integrity: sha512-1M0iNyZlmf4MbLGk6vl5CK3gyHAT0yeUzkMbQn+Eo3JL0Y8ng7bl39GGRVasD7X7d/ue2nrG1bX6peGhLcDL/Q==} + /@ledgerhq/cryptoassets@11.4.1: + resolution: {integrity: sha512-vgOHC0RxuBjoE2ZNiQScpU8hyXnYqkslw0MIuypHGnjLF48XA6rNdABS1JlMuzIFtQB2/NebUbEJ0FUPbQFHeg==} dependencies: axios: 1.6.7 bs58check: 2.1.2 @@ -942,11 +942,11 @@ packages: resolution: {integrity: sha512-jFpohaSW+p1Obp3NDT9QSByEtT3gtBZIjVNu8m25gnrH5zdtfPVlPwH6UiuS50s+2dHQyehV8hF+IfreKDWAZA==} dev: true - /@ledgerhq/evm-tools@1.0.15: - resolution: {integrity: sha512-tKz3jcMMC7Z/oKYZaH51BSxPYPWwDT5GC+2UiB5IbtdXTObea1lRTBo8mrzMQDsJrDCUCzTP1uJdHgF01h1x0g==} + /@ledgerhq/evm-tools@1.0.16: + resolution: {integrity: sha512-51Cx5CaUpJQaV9JLjEAck/5dct6FRn7dyAomKzZ0mwXjdzq4fRdbv2+9VGlLRWzapLdRtKWxX64nA8zzQnbhoA==} dependencies: - '@ledgerhq/cryptoassets': 11.4.0 - '@ledgerhq/live-env': 1.0.0 + '@ledgerhq/cryptoassets': 11.4.1 + '@ledgerhq/live-env': 1.0.1 axios: 1.6.7 crypto-js: 4.2.0 ethers: 5.7.2 @@ -956,15 +956,15 @@ packages: - utf-8-validate dev: true - /@ledgerhq/hw-app-eth@6.35.5: - resolution: {integrity: sha512-GLNUUz8+R6CSBFc6YftMk3aqm539w1CMGj+wWn9RwStM7tbWIuwoU/TzjF0nd5pocDeTQcddeYOGhtBMGXyAzQ==} + /@ledgerhq/hw-app-eth@6.35.6: + resolution: {integrity: sha512-ecMY9KTr8ziJ4In0Ve9S+vFCqx1aztFGUMr678krdcBcEx0adohcfG4EKBoeRKOJSVGwp/qkvQMP8Fez4mCL5A==} dependencies: '@ethersproject/abi': 5.7.0 '@ethersproject/rlp': 5.7.0 - '@ledgerhq/cryptoassets': 11.4.0 + '@ledgerhq/cryptoassets': 11.4.1 '@ledgerhq/domain-service': 1.1.18 '@ledgerhq/errors': 6.16.2 - '@ledgerhq/evm-tools': 1.0.15 + '@ledgerhq/evm-tools': 1.0.16 '@ledgerhq/hw-transport': 6.30.4 '@ledgerhq/hw-transport-mocker': 6.28.4 '@ledgerhq/logs': 6.12.0 @@ -1017,8 +1017,8 @@ packages: events: 3.3.0 dev: true - /@ledgerhq/live-env@1.0.0: - resolution: {integrity: sha512-gQKmnH3k49nlvM3cmPa0CLgW3W19AK0iDNSsyddnBVIXGM5RDSZheg2rQPbp2a+MHSC3SPoy9TFcT2DN67roTg==} + /@ledgerhq/live-env@1.0.1: + resolution: {integrity: sha512-pfc8n89MoF7TzE/2KO5Y9Ts5oR9/Pjzls/IWwKlL9keaO5+GmubuNcy3FFgeY2m3gbqXeVZK3hk3Fn8yaGZh6Q==} dependencies: rxjs: 7.8.1 utility-types: 3.11.0 @@ -1486,13 +1486,13 @@ packages: '@scure/base': 1.1.5 dev: true - /@sentry-internal/tracing@7.102.0: - resolution: {integrity: sha512-BlE33HWL1IzkGa0W+pwTiyu01MUIfYf+WnO9UC8qkDW3jxVvg2zhoSjXSxikT+KPCOgoZpQHspaTzwjnI1LCvw==} + /@sentry-internal/tracing@7.105.0: + resolution: {integrity: sha512-b+AFYB7Bc9vmyxl2jbmuT4esX5G0oPfpz35A0sxFzmJIhvMg1YMDNio2c81BtKN+VSPORCnKMLhfk3kyKKvWMQ==} engines: {node: '>=8'} dependencies: - '@sentry/core': 7.102.0 - '@sentry/types': 7.102.0 - '@sentry/utils': 7.102.0 + '@sentry/core': 7.105.0 + '@sentry/types': 7.105.0 + '@sentry/utils': 7.105.0 dev: true /@sentry/core@5.30.0: @@ -1505,12 +1505,12 @@ packages: '@sentry/utils': 5.30.0 tslib: 1.14.1 - /@sentry/core@7.102.0: - resolution: {integrity: sha512-GO9eLOSBK1waW4AD0wDXAreaNqXFQ1MPQZrkKcN+GJYEFhJK1+u+MSV7vO5Fs/rIfaTZIZ2jtEkxSSAOucE8EQ==} + /@sentry/core@7.105.0: + resolution: {integrity: sha512-5xsaTG6jZincTeJUmZomlv20mVRZUEF1U/g89lmrSOybyk2+opEnB1JeBn4ODwnvmSik8r2QLr6/RiYlaxRJCg==} engines: {node: '>=8'} dependencies: - '@sentry/types': 7.102.0 - '@sentry/utils': 7.102.0 + '@sentry/types': 7.105.0 + '@sentry/utils': 7.105.0 dev: true /@sentry/hub@5.30.0: @@ -1521,13 +1521,13 @@ packages: '@sentry/utils': 5.30.0 tslib: 1.14.1 - /@sentry/hub@7.102.0: - resolution: {integrity: sha512-yhdH+fFU073Ll86eGyZsosK2UnEam82YkirOENbcNKGKIsSsuF0AFe27XnYiJfOAIohqBigLBXEmN2b1OO2tFA==} + /@sentry/hub@7.105.0: + resolution: {integrity: sha512-68jGwj33/71TAvf5Z2R3rg2Iy2cHvuNktjZPCj9QsnPuqewgJ3shOZIJUs096fzcxaA0LkXnt+zxbivipiQ9/w==} engines: {node: '>=8'} dependencies: - '@sentry/core': 7.102.0 - '@sentry/types': 7.102.0 - '@sentry/utils': 7.102.0 + '@sentry/core': 7.105.0 + '@sentry/types': 7.105.0 + '@sentry/utils': 7.105.0 dev: true /@sentry/minimal@5.30.0: @@ -1554,14 +1554,14 @@ packages: transitivePeerDependencies: - supports-color - /@sentry/node@7.102.0: - resolution: {integrity: sha512-ZS1s2uO/+K4rHkmWjyqm5Jtl6dT7klbZSMvn4tfIpkfWuqrs7pP0jaATyvmF+96z3lpq6fRAJliV5tRqPy7w5Q==} + /@sentry/node@7.105.0: + resolution: {integrity: sha512-b0QwZ7vT4hcJi6LmNRh3dcaYpLtXnkYXkL0rfhMb8hN8sUx8zuOWFMI7j0cfAloVThUeJVwGyv9dERfzGS2r2w==} engines: {node: '>=8'} dependencies: - '@sentry-internal/tracing': 7.102.0 - '@sentry/core': 7.102.0 - '@sentry/types': 7.102.0 - '@sentry/utils': 7.102.0 + '@sentry-internal/tracing': 7.105.0 + '@sentry/core': 7.105.0 + '@sentry/types': 7.105.0 + '@sentry/utils': 7.105.0 dev: true /@sentry/tracing@5.30.0: @@ -1578,8 +1578,8 @@ packages: resolution: {integrity: sha512-R8xOqlSTZ+htqrfteCWU5Nk0CDN5ApUTvrlvBuiH1DyP6czDZ4ktbZB0hAgBlVcK0U+qpD3ag3Tqqpa5Q67rPw==} engines: {node: '>=6'} - /@sentry/types@7.102.0: - resolution: {integrity: sha512-FPfFBP0x3LkPARw1/6cWySLq1djIo8ao3Qo2KNBeE9CHdq8bsS1a8zzjJLuWG4Ww+wieLP8/lY3WTgrCz4jowg==} + /@sentry/types@7.105.0: + resolution: {integrity: sha512-80o0KMVM+X2Ym9hoQxvJetkJJwkpCg7o6tHHFXI+Rp7fawc2iCMTa0IRQMUiSkFvntQLYIdDoNNuKdzz2PbQGA==} engines: {node: '>=8'} dev: true @@ -1590,11 +1590,11 @@ packages: '@sentry/types': 5.30.0 tslib: 1.14.1 - /@sentry/utils@7.102.0: - resolution: {integrity: sha512-cp5KCRe0slOVMwG4iP2Z4UajQkjryRTiFskZ5H7Q3X9R5voM8+DAhiDcIW88GL9NxqyUrAJOjmKdeLK2vM+bdA==} + /@sentry/utils@7.105.0: + resolution: {integrity: sha512-YVAV0c2KLM8+VZCicQ/E/P2+J9Vs0hGhrXwV7w6ZEAtvxrg4oF270toL1WRhvcaf8JO4J1v4V+LuU6Txs4uEeQ==} engines: {node: '>=8'} dependencies: - '@sentry/types': 7.102.0 + '@sentry/types': 7.105.0 dev: true /@sindresorhus/is@0.14.0: @@ -1669,7 +1669,7 @@ packages: optional: true dependencies: '@babel/generator': 7.17.7 - '@babel/parser': 7.23.9 + '@babel/parser': 7.24.0 '@babel/traverse': 7.23.2 '@babel/types': 7.17.0 javascript-natural-sort: 0.7.1 @@ -1741,18 +1741,18 @@ packages: /@types/adm-zip@0.5.5: resolution: {integrity: sha512-YCGstVMjc4LTY5uK9/obvxBya93axZOVOyf2GSUulADzmLhYE45u2nAssCs/fWBs1Ifq5Vat75JTPwd5XZoPJw==} dependencies: - '@types/node': 20.11.19 + '@types/node': 20.11.24 dev: true /@types/bn.js@4.11.6: resolution: {integrity: sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==} dependencies: - '@types/node': 20.11.19 + '@types/node': 20.11.24 /@types/bn.js@5.1.5: resolution: {integrity: sha512-V46N0zwKRF5Q00AZ6hWtN0T8gGmDUaUzLWQvHFo5yThtVwK/VCenFY3wXVbOvNfajEpsTfQM4IN9k/d6gUVX3A==} dependencies: - '@types/node': 20.11.19 + '@types/node': 20.11.24 /@types/cacheable-request@6.0.3: resolution: {integrity: sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==} @@ -1760,20 +1760,20 @@ packages: dependencies: '@types/http-cache-semantics': 4.0.4 '@types/keyv': 3.1.4 - '@types/node': 20.11.19 + '@types/node': 20.11.24 '@types/responselike': 1.0.3 dev: true optional: true - /@types/chai@4.3.11: - resolution: {integrity: sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ==} + /@types/chai@4.3.12: + resolution: {integrity: sha512-zNKDHG/1yxm8Il6uCCVsm+dRdEsJlFoDu73X17y09bId6UwoYww+vFBsAcRzl8knM1sab3Dp1VRikFQwDOtDDw==} dev: true /@types/glob@7.2.0: resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==} dependencies: '@types/minimatch': 5.1.2 - '@types/node': 20.11.19 + '@types/node': 20.11.24 dev: true /@types/http-cache-semantics@4.0.4: @@ -1798,7 +1798,7 @@ packages: resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} requiresBuild: true dependencies: - '@types/node': 20.11.19 + '@types/node': 20.11.24 dev: true optional: true @@ -1816,7 +1816,7 @@ packages: /@types/mkdirp@0.5.2: resolution: {integrity: sha512-U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg==} dependencies: - '@types/node': 20.11.19 + '@types/node': 20.11.24 dev: true /@types/mocha@10.0.6: @@ -1826,7 +1826,7 @@ packages: /@types/node-fetch@2.6.11: resolution: {integrity: sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g==} dependencies: - '@types/node': 20.11.19 + '@types/node': 20.11.24 form-data: 4.0.0 dev: true @@ -1836,8 +1836,8 @@ packages: dev: true optional: true - /@types/node@20.11.19: - resolution: {integrity: sha512-7xMnVEcZFu0DikYjWOlRq7NTPETrm7teqUT2WkQjrTIkEgUyyGdWsj/Zg8bEJt5TNklzbPD1X3fqfsHw3SpapQ==} + /@types/node@20.11.24: + resolution: {integrity: sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==} dependencies: undici-types: 5.26.5 @@ -1852,49 +1852,49 @@ packages: /@types/pbkdf2@3.1.2: resolution: {integrity: sha512-uRwJqmiXmh9++aSu1VNEn3iIxWOhd8AHXNSdlaLfdAAdSTY9jYVeGWnzejM3dvrkbqE3/hyQkQQ29IFATEGlew==} dependencies: - '@types/node': 20.11.19 + '@types/node': 20.11.24 /@types/prettier@2.7.3: resolution: {integrity: sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==} dev: true - /@types/qs@6.9.11: - resolution: {integrity: sha512-oGk0gmhnEJK4Yyk+oI7EfXsLayXatCWPHary1MtcmbAifkobT9cM9yutG/hZKIseOU0MqbIwQ/u2nn/Gb+ltuQ==} + /@types/qs@6.9.12: + resolution: {integrity: sha512-bZcOkJ6uWrL0Qb2NAWKa7TBU+mJHPzhx9jjLL1KHF+XpzEcR7EXHvjbHlGtR/IsP1vyPrehuS6XqkmaePy//mg==} dev: true /@types/readable-stream@2.3.15: resolution: {integrity: sha512-oM5JSKQCcICF1wvGgmecmHldZ48OZamtMxcGGVICOJA8o8cahXC1zEVAif8iwoc5j8etxFaRFnf095+CDsuoFQ==} dependencies: - '@types/node': 20.11.19 + '@types/node': 20.11.24 safe-buffer: 5.1.2 /@types/resolve@0.0.8: resolution: {integrity: sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==} dependencies: - '@types/node': 20.11.19 + '@types/node': 20.11.24 dev: true /@types/responselike@1.0.3: resolution: {integrity: sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==} requiresBuild: true dependencies: - '@types/node': 20.11.19 + '@types/node': 20.11.24 dev: true optional: true /@types/secp256k1@4.0.6: resolution: {integrity: sha512-hHxJU6PAEUn0TP4S/ZOzuTUvJWuZ6eIKeNKb5RBpODvSl6hp1Wrw4s7ATY50rklRCScUDpHzVA/DQdSjJ3UoYQ==} dependencies: - '@types/node': 20.11.19 + '@types/node': 20.11.24 - /@types/semver@7.5.7: - resolution: {integrity: sha512-/wdoPq1QqkSj9/QOeKkFquEuPzQbHTWAMPH/PaUMB+JuR31lXhlWXRZ52IpfDYVlDOUBvX09uBrPwxGT1hjNBg==} + /@types/semver@7.5.8: + resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==} dev: true /@types/sinon-chai@3.2.12: resolution: {integrity: sha512-9y0Gflk3b0+NhQZ/oxGtaAJDvRywCa5sIyaVnounqLvmf93yBF4EgIRspePtkMs3Tr844nCclYMlcCNmLCvjuQ==} dependencies: - '@types/chai': 4.3.11 + '@types/chai': 4.3.12 '@types/sinon': 17.0.3 dev: true @@ -1923,7 +1923,7 @@ packages: '@types/underscore': 1.11.15 dev: true - /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.56.0)(typescript@5.3.3): + /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.57.0)(typescript@5.3.3): resolution: {integrity: sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1935,12 +1935,12 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/parser': 5.62.0(eslint@8.57.0)(typescript@5.3.3) '@typescript-eslint/scope-manager': 5.62.0 - '@typescript-eslint/type-utils': 5.62.0(eslint@8.56.0)(typescript@5.3.3) - '@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/type-utils': 5.62.0(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.3.3) debug: 4.3.4(supports-color@8.1.1) - eslint: 8.56.0 + eslint: 8.57.0 graphemer: 1.4.0 ignore: 5.3.1 natural-compare-lite: 1.4.0 @@ -1951,7 +1951,7 @@ packages: - supports-color dev: true - /@typescript-eslint/parser@5.62.0(eslint@8.56.0)(typescript@5.3.3): + /@typescript-eslint/parser@5.62.0(eslint@8.57.0)(typescript@5.3.3): resolution: {integrity: sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1965,7 +1965,7 @@ packages: '@typescript-eslint/types': 5.62.0 '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.3.3) debug: 4.3.4(supports-color@8.1.1) - eslint: 8.56.0 + eslint: 8.57.0 typescript: 5.3.3 transitivePeerDependencies: - supports-color @@ -1979,7 +1979,7 @@ packages: '@typescript-eslint/visitor-keys': 5.62.0 dev: true - /@typescript-eslint/type-utils@5.62.0(eslint@8.56.0)(typescript@5.3.3): + /@typescript-eslint/type-utils@5.62.0(eslint@8.57.0)(typescript@5.3.3): resolution: {integrity: sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1990,9 +1990,9 @@ packages: optional: true dependencies: '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.3.3) - '@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.3.3) debug: 4.3.4(supports-color@8.1.1) - eslint: 8.56.0 + eslint: 8.57.0 tsutils: 3.21.0(typescript@5.3.3) typescript: 5.3.3 transitivePeerDependencies: @@ -2025,19 +2025,19 @@ packages: - supports-color dev: true - /@typescript-eslint/utils@5.62.0(eslint@8.56.0)(typescript@5.3.3): + /@typescript-eslint/utils@5.62.0(eslint@8.57.0)(typescript@5.3.3): resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) '@types/json-schema': 7.0.15 - '@types/semver': 7.5.7 + '@types/semver': 7.5.8 '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/types': 5.62.0 '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.3.3) - eslint: 8.56.0 + eslint: 8.57.0 eslint-scope: 5.1.1 semver: 7.6.0 transitivePeerDependencies: @@ -2341,7 +2341,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.22.4 + es-abstract: 1.22.5 get-intrinsic: 1.2.4 is-string: 1.0.7 dev: true @@ -2362,7 +2362,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.22.4 + es-abstract: 1.22.5 es-array-method-boxes-properly: 1.0.0 is-string: 1.0.7 dev: true @@ -2373,7 +2373,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.22.4 + es-abstract: 1.22.5 es-errors: 1.3.0 es-shim-unscopables: 1.0.2 dev: true @@ -2384,7 +2384,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.22.4 + es-abstract: 1.22.5 es-shim-unscopables: 1.0.2 dev: true @@ -2394,7 +2394,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.22.4 + es-abstract: 1.22.5 es-shim-unscopables: 1.0.2 dev: true @@ -2404,7 +2404,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.22.4 + es-abstract: 1.22.5 es-array-method-boxes-properly: 1.0.0 is-string: 1.0.7 dev: true @@ -2416,7 +2416,7 @@ packages: array-buffer-byte-length: 1.0.1 call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.22.4 + es-abstract: 1.22.5 es-errors: 1.3.0 get-intrinsic: 1.2.4 is-array-buffer: 3.0.4 @@ -3155,28 +3155,6 @@ packages: /bn.js@5.2.1: resolution: {integrity: sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==} - /body-parser@1.20.1: - resolution: {integrity: sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==} - engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} - requiresBuild: true - dependencies: - bytes: 3.1.2 - content-type: 1.0.5 - debug: 2.6.9 - depd: 2.0.0 - destroy: 1.2.0 - http-errors: 2.0.0 - iconv-lite: 0.4.24 - on-finished: 2.4.1 - qs: 6.11.0 - raw-body: 2.5.1 - type-is: 1.6.18 - unpipe: 1.0.0 - transitivePeerDependencies: - - supports-color - dev: true - optional: true - /body-parser@1.20.2: resolution: {integrity: sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==} engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} @@ -3309,8 +3287,8 @@ packages: resolution: {integrity: sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==} hasBin: true dependencies: - caniuse-lite: 1.0.30001589 - electron-to-chromium: 1.4.679 + caniuse-lite: 1.0.30001593 + electron-to-chromium: 1.4.690 dev: true /bs58@4.0.1: @@ -3475,8 +3453,8 @@ packages: resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==} engines: {node: '>=10'} - /caniuse-lite@1.0.30001589: - resolution: {integrity: sha512-vNQWS6kI+q6sBlHbh71IIeC+sRwK2N3EDySc/updIGhIee2x5z00J4c1242/5/d6EpEMdOnk/m+6tuk4/tcsqg==} + /caniuse-lite@1.0.30001593: + resolution: {integrity: sha512-UWM1zlo3cZfkpBysd7AS+z+v007q9G1+fLTUU42rQnY6t2axoogPW/xol6T7juU5EUoOhML4WgBIdG+9yYqAjQ==} dev: true /case@1.6.3: @@ -4018,11 +3996,12 @@ packages: resolution: {integrity: sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==} dev: true - /d@1.0.1: - resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==} + /d@1.0.2: + resolution: {integrity: sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==} + engines: {node: '>=0.12'} dependencies: - es5-ext: 0.10.62 - type: 1.2.0 + es5-ext: 0.10.64 + type: 2.7.2 dev: true /dashdash@1.14.1: @@ -4130,7 +4109,7 @@ packages: is-arguments: 1.1.1 is-date-object: 1.0.5 is-regex: 1.1.4 - object-is: 1.1.5 + object-is: 1.1.6 object-keys: 1.1.1 regexp.prototype.flags: 1.5.2 dev: true @@ -4341,8 +4320,8 @@ packages: keccak: 3.0.4 dev: true - /electron-to-chromium@1.4.679: - resolution: {integrity: sha512-NhQMsz5k0d6m9z3qAxnsOR/ebal4NAGsrNVRwcDo4Kc/zQ7KdsTKZUxZoygHcVRb0QDW3waEDIcE3isZ79RP6g==} + /electron-to-chromium@1.4.690: + resolution: {integrity: sha512-+2OAGjUx68xElQhydpcbqH50hE8Vs2K6TkAeLhICYfndb67CVH0UsZaijmRUE3rHlIxU1u0jxwhgVe6fK3YANA==} dev: true /elliptic@6.5.4: @@ -4421,8 +4400,8 @@ packages: is-arrayish: 0.2.1 dev: true - /es-abstract@1.22.4: - resolution: {integrity: sha512-vZYJlk2u6qHYxBOTjAeg7qUxHdNfih64Uu2J8QqWgXZ2cri0ZpJAkzDUK/q593+mvKwlxyaxr6F1Q+3LKoQRgg==} + /es-abstract@1.22.5: + resolution: {integrity: sha512-oW69R+4q2wG+Hc3KZePPZxOiisRIqfKBVo/HLx94QcJeWGU/8sZhCvc829rd1kS366vlJbzBfXf9yWwf0+Ko7w==} engines: {node: '>= 0.4'} dependencies: array-buffer-byte-length: 1.0.1 @@ -4506,28 +4485,30 @@ packages: is-symbol: 1.0.4 dev: true - /es5-ext@0.10.62: - resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==} + /es5-ext@0.10.64: + resolution: {integrity: sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==} engines: {node: '>=0.10'} requiresBuild: true dependencies: es6-iterator: 2.0.3 - es6-symbol: 3.1.3 + es6-symbol: 3.1.4 + esniff: 2.0.1 next-tick: 1.1.0 dev: true /es6-iterator@2.0.3: resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==} dependencies: - d: 1.0.1 - es5-ext: 0.10.62 - es6-symbol: 3.1.3 + d: 1.0.2 + es5-ext: 0.10.64 + es6-symbol: 3.1.4 dev: true - /es6-symbol@3.1.3: - resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==} + /es6-symbol@3.1.4: + resolution: {integrity: sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==} + engines: {node: '>=0.12'} dependencies: - d: 1.0.1 + d: 1.0.2 ext: 1.7.0 dev: true @@ -4562,25 +4543,25 @@ packages: source-map: 0.2.0 dev: true - /eslint-compat-utils@0.1.2(eslint@8.56.0): + /eslint-compat-utils@0.1.2(eslint@8.57.0): resolution: {integrity: sha512-Jia4JDldWnFNIru1Ehx1H5s9/yxiRHY/TimCuUc0jNexew3cF1gI6CYZil1ociakfWO3rRqFjl1mskBblB3RYg==} engines: {node: '>=12'} peerDependencies: eslint: '>=6.0.0' dependencies: - eslint: 8.56.0 + eslint: 8.57.0 dev: true - /eslint-config-prettier@8.10.0(eslint@8.56.0): + /eslint-config-prettier@8.10.0(eslint@8.57.0): resolution: {integrity: sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==} hasBin: true peerDependencies: eslint: '>=7.0.0' dependencies: - eslint: 8.56.0 + eslint: 8.57.0 dev: true - /eslint-config-standard@17.1.0(eslint-plugin-import@2.29.1)(eslint-plugin-n@16.6.2)(eslint-plugin-promise@6.1.1)(eslint@8.56.0): + /eslint-config-standard@17.1.0(eslint-plugin-import@2.29.1)(eslint-plugin-n@16.6.2)(eslint-plugin-promise@6.1.1)(eslint@8.57.0): resolution: {integrity: sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==} engines: {node: '>=12.0.0'} peerDependencies: @@ -4589,10 +4570,10 @@ packages: eslint-plugin-n: '^15.0.0 || ^16.0.0 ' eslint-plugin-promise: ^6.0.0 dependencies: - eslint: 8.56.0 - eslint-plugin-import: 2.29.1(@typescript-eslint/parser@5.62.0)(eslint@8.56.0) - eslint-plugin-n: 16.6.2(eslint@8.56.0) - eslint-plugin-promise: 6.1.1(eslint@8.56.0) + eslint: 8.57.0 + eslint-plugin-import: 2.29.1(@typescript-eslint/parser@5.62.0)(eslint@8.57.0) + eslint-plugin-n: 16.6.2(eslint@8.57.0) + eslint-plugin-promise: 6.1.1(eslint@8.57.0) dev: true /eslint-import-resolver-node@0.3.9: @@ -4605,8 +4586,8 @@ packages: - supports-color dev: true - /eslint-module-utils@2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint@8.56.0): - resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==} + /eslint-module-utils@2.8.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint@8.57.0): + resolution: {integrity: sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==} engines: {node: '>=4'} peerDependencies: '@typescript-eslint/parser': '*' @@ -4626,27 +4607,27 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/parser': 5.62.0(eslint@8.57.0)(typescript@5.3.3) debug: 3.2.7 - eslint: 8.56.0 + eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 transitivePeerDependencies: - supports-color dev: true - /eslint-plugin-es-x@7.5.0(eslint@8.56.0): + /eslint-plugin-es-x@7.5.0(eslint@8.57.0): resolution: {integrity: sha512-ODswlDSO0HJDzXU0XvgZ3lF3lS3XAZEossh15Q2UHjwrJggWeBoKqqEsLTZLXl+dh5eOAozG0zRcYtuE35oTuQ==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: eslint: '>=8' dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) '@eslint-community/regexpp': 4.10.0 - eslint: 8.56.0 - eslint-compat-utils: 0.1.2(eslint@8.56.0) + eslint: 8.57.0 + eslint-compat-utils: 0.1.2(eslint@8.57.0) dev: true - /eslint-plugin-import@2.29.1(@typescript-eslint/parser@5.62.0)(eslint@8.56.0): + /eslint-plugin-import@2.29.1(@typescript-eslint/parser@5.62.0)(eslint@8.57.0): resolution: {integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==} engines: {node: '>=4'} peerDependencies: @@ -4656,16 +4637,16 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/parser': 5.62.0(eslint@8.57.0)(typescript@5.3.3) array-includes: 3.1.7 array.prototype.findlastindex: 1.2.4 array.prototype.flat: 1.3.2 array.prototype.flatmap: 1.3.2 debug: 3.2.7 doctrine: 2.1.0 - eslint: 8.56.0 + eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint@8.56.0) + eslint-module-utils: 2.8.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint@8.57.0) hasown: 2.0.1 is-core-module: 2.13.1 is-glob: 4.0.3 @@ -4681,27 +4662,27 @@ packages: - supports-color dev: true - /eslint-plugin-mocha@10.3.0(eslint@8.56.0): + /eslint-plugin-mocha@10.3.0(eslint@8.57.0): resolution: {integrity: sha512-IWzbg2K6B1Q7h37Ih4zMyW+nhmw1JvUlHlbCUUUu6PfOOAUGCB0gxmvv7/U+TQQ6e8yHUv+q7KMdIIum4bx+PA==} engines: {node: '>=14.0.0'} peerDependencies: eslint: '>=7.0.0' dependencies: - eslint: 8.56.0 - eslint-utils: 3.0.0(eslint@8.56.0) + eslint: 8.57.0 + eslint-utils: 3.0.0(eslint@8.57.0) rambda: 7.5.0 dev: true - /eslint-plugin-n@16.6.2(eslint@8.56.0): + /eslint-plugin-n@16.6.2(eslint@8.57.0): resolution: {integrity: sha512-6TyDmZ1HXoFQXnhCTUjVFULReoBPOAjpuiKELMkeP40yffI/1ZRO+d9ug/VC6fqISo2WkuIBk3cvuRPALaWlOQ==} engines: {node: '>=16.0.0'} peerDependencies: eslint: '>=7.0.0' dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) builtins: 5.0.1 - eslint: 8.56.0 - eslint-plugin-es-x: 7.5.0(eslint@8.56.0) + eslint: 8.57.0 + eslint-plugin-es-x: 7.5.0(eslint@8.57.0) get-tsconfig: 4.7.2 globals: 13.24.0 ignore: 5.3.1 @@ -4712,13 +4693,13 @@ packages: semver: 7.6.0 dev: true - /eslint-plugin-promise@6.1.1(eslint@8.56.0): + /eslint-plugin-promise@6.1.1(eslint@8.57.0): resolution: {integrity: sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^7.0.0 || ^8.0.0 dependencies: - eslint: 8.56.0 + eslint: 8.57.0 dev: true /eslint-scope@5.1.1: @@ -4737,13 +4718,13 @@ packages: estraverse: 5.3.0 dev: true - /eslint-utils@3.0.0(eslint@8.56.0): + /eslint-utils@3.0.0(eslint@8.57.0): resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==} engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0} peerDependencies: eslint: '>=5' dependencies: - eslint: 8.56.0 + eslint: 8.57.0 eslint-visitor-keys: 2.1.0 dev: true @@ -4757,15 +4738,15 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /eslint@8.56.0: - resolution: {integrity: sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==} + /eslint@8.57.0: + resolution: {integrity: sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) '@eslint-community/regexpp': 4.10.0 '@eslint/eslintrc': 2.1.4 - '@eslint/js': 8.56.0 + '@eslint/js': 8.57.0 '@humanwhocodes/config-array': 0.11.14 '@humanwhocodes/module-importer': 1.0.1 '@nodelib/fs.walk': 1.2.8 @@ -4804,6 +4785,16 @@ packages: - supports-color dev: true + /esniff@2.0.1: + resolution: {integrity: sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==} + engines: {node: '>=0.10'} + dependencies: + d: 1.0.2 + es5-ext: 0.10.64 + event-emitter: 0.3.5 + type: 2.7.2 + dev: true + /espree@9.6.1: resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -5306,6 +5297,13 @@ packages: is-hex-prefixed: 1.0.0 strip-hex-prefix: 1.0.0 + /event-emitter@0.3.5: + resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==} + dependencies: + d: 1.0.2 + es5-ext: 0.10.64 + dev: true + /event-target-shim@5.0.1: resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==} engines: {node: '>=6'} @@ -5347,14 +5345,14 @@ packages: engines: {node: '>=6'} dev: true - /express@4.18.2: - resolution: {integrity: sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==} + /express@4.18.3: + resolution: {integrity: sha512-6VyCijWQ+9O7WuVMTRBTl+cjNNIzD5cY5mQ1WM8r/LEkI2u8EYpOotESNwzNlyCn3g+dmjKYI6BmNneSr/FSRw==} engines: {node: '>= 0.10.0'} requiresBuild: true dependencies: accepts: 1.3.8 array-flatten: 1.1.1 - body-parser: 1.20.1 + body-parser: 1.20.2 content-disposition: 0.5.4 content-type: 1.0.5 cookie: 0.5.0 @@ -5761,7 +5759,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.22.4 + es-abstract: 1.22.5 functions-have-names: 1.2.3 dev: true @@ -5959,7 +5957,6 @@ packages: minimatch: 3.1.2 once: 1.4.0 path-is-absolute: 1.0.1 - dev: true /glob@8.1.0: resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==} @@ -6181,7 +6178,7 @@ packages: '@ethersproject/solidity': 5.7.0 '@ethersproject/transactions': 5.7.0 '@ethersproject/wallet': 5.7.0 - '@types/qs': 6.9.11 + '@types/qs': 6.9.12 axios: 0.21.4(debug@4.3.4) chalk: 4.1.2 chokidar: 3.6.0 @@ -6277,7 +6274,7 @@ packages: solc: 0.7.3(debug@4.3.4) source-map-support: 0.5.21 stacktrace-parser: 0.1.10 - ts-node: 10.9.2(@types/node@20.11.19)(typescript@5.3.3) + ts-node: 10.9.2(@types/node@20.11.24)(typescript@5.3.3) tsort: 0.0.1 typescript: 5.3.3 undici: 5.28.3 @@ -6565,7 +6562,7 @@ packages: dependencies: es-errors: 1.3.0 hasown: 2.0.1 - side-channel: 1.0.5 + side-channel: 1.0.6 dev: true /interpret@1.4.0: @@ -7913,8 +7910,8 @@ packages: resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==} dev: true - /node-abi@3.55.0: - resolution: {integrity: sha512-uPEjtyh2tFEvWYt4Jw7McOD5FPcHkcxm/tHZc5PWaDB3JYq0rGFUbgaAK+CT5pYpQddBfsZVWI08OwoRfdfbcQ==} + /node-abi@3.56.0: + resolution: {integrity: sha512-fZjdhDOeRcaS+rcpve7XuwHBmktS1nS1gzgghwKUQQ8nTy2FdSDr6ZT8k6YhvlJeHmmQMYiT/IH9hfco5zeW2Q==} engines: {node: '>=10'} dependencies: semver: 7.6.0 @@ -7968,7 +7965,7 @@ packages: dependencies: bindings: 1.5.0 node-addon-api: 3.2.1 - prebuild-install: 7.1.1 + prebuild-install: 7.1.2 dev: true /nofilter@3.1.0: @@ -8055,8 +8052,8 @@ packages: /object-inspect@1.13.1: resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==} - /object-is@1.1.5: - resolution: {integrity: sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==} + /object-is@1.1.6: + resolution: {integrity: sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.7 @@ -8095,7 +8092,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.22.4 + es-abstract: 1.22.5 dev: true /object.getownpropertydescriptors@2.1.7: @@ -8105,7 +8102,7 @@ packages: array.prototype.reduce: 1.0.6 call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.22.4 + es-abstract: 1.22.5 safe-array-concat: 1.1.0 dev: true @@ -8115,7 +8112,7 @@ packages: array.prototype.filter: 1.0.3 call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.22.4 + es-abstract: 1.22.5 es-errors: 1.3.0 dev: true @@ -8132,7 +8129,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.22.4 + es-abstract: 1.22.5 dev: true /obliterator@2.0.4: @@ -8485,8 +8482,8 @@ packages: requiresBuild: true dev: true - /prebuild-install@7.1.1: - resolution: {integrity: sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==} + /prebuild-install@7.1.2: + resolution: {integrity: sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==} engines: {node: '>=10'} hasBin: true dependencies: @@ -8496,7 +8493,7 @@ packages: minimist: 1.2.8 mkdirp-classic: 0.5.3 napi-build-utils: 1.0.2 - node-abi: 3.55.0 + node-abi: 3.56.0 pump: 3.0.0 rc: 1.2.8 simple-get: 4.0.1 @@ -8687,7 +8684,7 @@ packages: engines: {node: '>=0.6'} requiresBuild: true dependencies: - side-channel: 1.0.5 + side-channel: 1.0.6 dev: true optional: true @@ -8695,7 +8692,7 @@ packages: resolution: {integrity: sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==} engines: {node: '>=0.6'} dependencies: - side-channel: 1.0.5 + side-channel: 1.0.6 /qs@6.5.3: resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==} @@ -8748,18 +8745,6 @@ packages: dev: true optional: true - /raw-body@2.5.1: - resolution: {integrity: sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==} - engines: {node: '>= 0.8'} - requiresBuild: true - dependencies: - bytes: 3.1.2 - http-errors: 2.0.0 - iconv-lite: 0.4.24 - unpipe: 1.0.0 - dev: true - optional: true - /raw-body@2.5.2: resolution: {integrity: sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==} engines: {node: '>= 0.8'} @@ -9058,7 +9043,7 @@ packages: resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==} hasBin: true dependencies: - glob: 7.2.0 + glob: 7.2.3 /rimraf@3.0.2: resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==} @@ -9265,7 +9250,7 @@ packages: dependencies: body-parser: 1.20.2 cors: 2.8.5 - express: 4.18.2 + express: 4.18.3 request: 2.88.2 xhr: 2.6.0 transitivePeerDependencies: @@ -9360,8 +9345,8 @@ packages: rechoir: 0.6.2 dev: true - /side-channel@1.0.5: - resolution: {integrity: sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ==} + /side-channel@1.0.6: + resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.7 @@ -9546,8 +9531,8 @@ packages: resolution: {integrity: sha512-htM7Vn6LhHreR+EglVMd2s+sZhcXAirB1Zlyrv5zBuTxieCvjfnRpd7iZk75m/u6NOlEyQ94C6TWbBn2cY7w8g==} dev: true - /solidity-coverage@0.8.8(hardhat@2.15.0): - resolution: {integrity: sha512-7RN6/8YAFMQNeMdSulARtE0VC5JitBAUMwvkr10FkOK+nux5q+WykrgSZntkWrX/VHzRa096P4OOViO0T9Q9Cw==} + /solidity-coverage@0.8.10(hardhat@2.15.0): + resolution: {integrity: sha512-6nvlWLnCjBIVnCgTZiIo2XBI62O3YJuU83xj+bklnH/B+dXGTjuQB7SccZfysUC3LFkjtZO/KjzUJ/hiSlkXWw==} hasBin: true peerDependencies: hardhat: ^2.11.0 @@ -9752,7 +9737,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.22.4 + es-abstract: 1.22.5 dev: true /string.prototype.trimend@1.0.7: @@ -9760,7 +9745,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.22.4 + es-abstract: 1.22.5 dev: true /string.prototype.trimstart@1.0.7: @@ -9768,7 +9753,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.22.4 + es-abstract: 1.22.5 dev: true /string_decoder@0.10.31: @@ -10140,7 +10125,7 @@ packages: ts-essentials: 1.0.4 dev: true - /ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3): + /ts-node@10.9.2(@types/node@20.11.24)(typescript@5.3.3): resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} hasBin: true peerDependencies: @@ -10159,7 +10144,7 @@ packages: '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 20.11.19 + '@types/node': 20.11.24 acorn: 8.11.3 acorn-walk: 8.3.2 arg: 4.1.3 @@ -10257,10 +10242,6 @@ packages: dev: true optional: true - /type@1.2.0: - resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==} - dev: true - /type@2.7.2: resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==} dev: true @@ -10425,7 +10406,7 @@ packages: resolution: {integrity: sha512-3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA==} engines: {node: '>=14.0'} dependencies: - '@fastify/busboy': 2.1.0 + '@fastify/busboy': 2.1.1 /union-value@1.0.1: resolution: {integrity: sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==} @@ -10968,7 +10949,7 @@ packages: dependencies: bufferutil: 4.0.8 debug: 2.6.9 - es5-ext: 0.10.62 + es5-ext: 0.10.64 typedarray-to-buffer: 3.1.5 utf-8-validate: 5.0.10 yaeti: 0.0.6 diff --git a/test/forge/CarbonController.t.sol b/test/forge/CarbonController.t.sol index 840e68c7..4315c508 100644 --- a/test/forge/CarbonController.t.sol +++ b/test/forge/CarbonController.t.sol @@ -20,27 +20,12 @@ contract CarbonControllerTest is TestFixture { uint16 private constant CONTROLLER_TYPE = 1; uint32 private constant TRADING_FEE_PPM = 2000; - // Events - /** - * @dev Emitted when the pause is triggered by `account`. - */ - event Paused(address account); - - /** - * @dev Emitted when the pause is lifted by `account`. - */ - event Unpaused(address account); - /// @dev function to set up state before tests function setUp() public virtual { // Set up tokens and users systemFixture(); // Deploy Carbon Controller and Voucher setupCarbonController(); - // Grant emergency stopper role - vm.startPrank(admin); - carbonController.grantRole(carbonController.roleEmergencyStopper(), emergencyStopper); - vm.stopPrank(); } /** @@ -52,16 +37,13 @@ contract CarbonControllerTest is TestFixture { assertEq(version, 2); bytes32 adminRole = keccak256("ROLE_ADMIN"); - bytes32 emergencyStopperRole = keccak256("ROLE_EMERGENCY_STOPPER"); bytes32 feesManagerRole = keccak256("ROLE_FEES_MANAGER"); assertEq(adminRole, carbonController.roleAdmin()); - assertEq(emergencyStopperRole, carbonController.roleEmergencyStopper()); assertEq(feesManagerRole, carbonController.roleFeesManager()); assertEq(admin, carbonController.getRoleMember(adminRole, 0)); assertEq(1, carbonController.getRoleMemberCount(adminRole)); - assertEq(1, carbonController.getRoleMemberCount(emergencyStopperRole)); assertEq(0, carbonController.getRoleMemberCount(feesManagerRole)); assertEq(CONTROLLER_TYPE, carbonController.controllerType()); @@ -73,47 +55,6 @@ contract CarbonControllerTest is TestFixture { carbonController.initialize(); } - /** - * @dev pausing / unpausing - */ - - /// @dev test emergency stopper should be able to pause - function testShouldBeAbleToPause() public { - vm.prank(emergencyStopper); - vm.expectEmit(); - emit Paused(emergencyStopper); - carbonController.pause(); - bool paused = carbonController.paused(); - assertTrue(paused); - } - - /// @dev test emergency stopper should be able to unpause - function testShouldBeAbleToUnpause() public { - vm.startPrank(emergencyStopper); - carbonController.pause(); - - vm.expectEmit(); - emit Unpaused(emergencyStopper); - carbonController.unpause(); - bool paused = carbonController.paused(); - assertFalse(paused); - vm.stopPrank(); - } - - /// @dev test pausing should be restricted to emergency stopper role only - function testShouldRestrictPausing() public { - vm.prank(user1); - vm.expectRevert(AccessDenied.selector); - carbonController.pause(); - } - - /// @dev test unpausing should be restricted to emergency stopper role only - function testShouldRestrictUnpausing() public { - vm.prank(user1); - vm.expectRevert(AccessDenied.selector); - carbonController.unpause(); - } - /** * @dev other */ diff --git a/test/forge/Pairs.t.sol b/test/forge/Pairs.t.sol index eb0bb835..5f0cd478 100644 --- a/test/forge/Pairs.t.sol +++ b/test/forge/Pairs.t.sol @@ -70,20 +70,6 @@ contract PairsTest is TestFixture { vm.stopPrank(); } - /// @dev test that pair creation reverts when contract is paused - function testShouldRevertWhenContractIsPaused() public { - vm.startPrank(admin); - carbonController.grantRole(carbonController.roleEmergencyStopper(), emergencyStopper); - vm.stopPrank(); - - vm.prank(emergencyStopper); - carbonController.pause(); - - vm.prank(admin); - vm.expectRevert("Pausable: paused"); - carbonController.createPair(token0, token1); - } - /// @dev test that pair creation emits event and creates a pair function testShouldCreateAPair() public { vm.startPrank(admin); diff --git a/test/forge/Strategies.t.sol b/test/forge/Strategies.t.sol index 68a196b6..edd17df2 100644 --- a/test/forge/Strategies.t.sol +++ b/test/forge/Strategies.t.sol @@ -435,18 +435,6 @@ contract StrategiesTest is TestFixture { vm.stopPrank(); } - function testStrategyCreationRevertsWhenPaused() public { - vm.startPrank(admin); - carbonController.grantRole(carbonController.roleEmergencyStopper(), user2); - vm.stopPrank(); - vm.prank(user2); - carbonController.pause(); - - Order memory order = generateTestOrder(); - vm.expectRevert("Pausable: paused"); - carbonController.createStrategy(token0, token1, [order, order]); - } - function testStrategyCreationRevertsWhenCapacityIsSmallerThanLiquidity(bool order0Insufficient) public { vm.startPrank(user1); @@ -861,25 +849,6 @@ contract StrategiesTest is TestFixture { vm.stopPrank(); } - function testStrategyUpdateRevertsWhenPaused() public { - vm.prank(user1); - Order memory order = generateTestOrder(); - // create strategy - uint256 strategyId = carbonController.createStrategy(token0, token1, [order, order]); - - vm.startPrank(admin); - carbonController.grantRole(carbonController.roleEmergencyStopper(), user2); - vm.stopPrank(); - vm.prank(user2); - carbonController.pause(); - - Order memory newOrder = generateTestOrder(); - newOrder.y += 1000; - - vm.expectRevert("Pausable: paused"); - carbonController.updateStrategy(strategyId, [order, order], [newOrder, newOrder]); - } - function testStrategyUpdateRevertsWhenTryingToUpdateANonExistingStrategyOnAnExistingPair() public { vm.startPrank(user1); Order memory order = generateTestOrder(); @@ -1208,22 +1177,6 @@ contract StrategiesTest is TestFixture { vm.stopPrank(); } - function testStrategyDeletionRevertsWhenPaused() public { - vm.prank(user1); - Order memory order = generateTestOrder(); - // create strategy - uint256 strategyId = carbonController.createStrategy(token0, token1, [order, order]); - - vm.startPrank(admin); - carbonController.grantRole(carbonController.roleEmergencyStopper(), user2); - vm.stopPrank(); - vm.prank(user2); - carbonController.pause(); - - vm.expectRevert("Pausable: paused"); - carbonController.deleteStrategy(strategyId); - } - /** * @dev trading fee tests */ @@ -1693,21 +1646,6 @@ contract StrategiesTest is TestFixture { * @dev withdraw fees tests */ - function testFeeWithdrawalRevertsWhenPaused() public { - vm.startPrank(admin); - carbonController.grantRole(carbonController.roleEmergencyStopper(), user2); - vm.stopPrank(); - vm.prank(user1); - Order memory order = generateTestOrder(); - carbonController.createStrategy(token0, token1, [order, order]); - vm.prank(user2); - carbonController.pause(); - - vm.prank(admin); - vm.expectRevert("Pausable: paused"); - carbonController.withdrawFees(token0, 1, admin); - } - function testFeeWithdrawalRevertsWhenCallerIsMissingTheRequiredRole() public { vm.prank(user1); vm.expectRevert(AccessDenied.selector); diff --git a/test/forge/TestFixture.t.sol b/test/forge/TestFixture.t.sol index 58c8c0f1..13d5276c 100644 --- a/test/forge/TestFixture.t.sol +++ b/test/forge/TestFixture.t.sol @@ -49,7 +49,6 @@ contract TestFixture is Test { address payable internal admin; address payable internal user1; address payable internal user2; - address payable internal emergencyStopper; address internal constant NATIVE_TOKEN_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE; uint256 internal constant MAX_SOURCE_AMOUNT = 100_000_000 ether; @@ -61,7 +60,6 @@ contract TestFixture is Test { admin = users[0]; user1 = users[1]; user2 = users[2]; - emergencyStopper = users[3]; // deploy contracts from admin vm.startPrank(admin); diff --git a/test/forge/Trading.t.sol b/test/forge/Trading.t.sol index 927f03d0..154131c2 100644 --- a/test/forge/Trading.t.sol +++ b/test/forge/Trading.t.sol @@ -149,20 +149,6 @@ contract TradingTest is TestFixture { vm.stopPrank(); } - /// @dev test that trading reverts when the contract is paused - function testTradingRevertsWhenPaused(bool byTargetAmount) public { - vm.startPrank(admin); - carbonController.grantRole(carbonController.roleEmergencyStopper(), user2); - vm.stopPrank(); - vm.prank(user2); - carbonController.pause(); - - vm.startPrank(user1); - vm.expectRevert("Pausable: paused"); - simpleTrade(token0, token1, byTargetAmount, 1, 1); - vm.stopPrank(); - } - /// @dev test that trading reverts if insufficient native token was sent function testTradingRevertsIfInsufficientNativeTokenWasSent(bool byTargetAmount) public { vm.startPrank(user1); diff --git a/test/forge/Voucher.t.sol b/test/forge/Voucher.t.sol index bce23478..d0b4843b 100644 --- a/test/forge/Voucher.t.sol +++ b/test/forge/Voucher.t.sol @@ -18,16 +18,6 @@ contract VoucherTest is TestFixture { uint256 private constant FETCH_AMOUNT = 5; // Events - /** - * @dev Emitted when the pause is triggered by `account`. - */ - event Paused(address account); - - /** - * @dev Emitted when the pause is lifted by `account`. - */ - event Unpaused(address account); - /** @dev triggered when updating useGlobalURI */ diff --git a/utils/Roles.ts b/utils/Roles.ts index 2cbf3144..9a86bbc5 100644 --- a/utils/Roles.ts +++ b/utils/Roles.ts @@ -8,7 +8,6 @@ export const Roles = { }, CarbonController: { - ROLE_EMERGENCY_STOPPER: id('ROLE_EMERGENCY_STOPPER'), ROLE_FEES_MANAGER: id('ROLE_FEES_MANAGER') }, From cde258418646b96f89a743c07f2e1057dcff91de Mon Sep 17 00:00:00 2001 From: Ivan Zhelyazkov Date: Tue, 5 Mar 2024 10:47:46 +0200 Subject: [PATCH 02/11] fix hardhat config values --- .env.example | 4 ++-- hardhat.config.ts | 58 +++++++++++++++++++++++------------------------ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.env.example b/.env.example index db7e5b4c..5a723bba 100644 --- a/.env.example +++ b/.env.example @@ -2,7 +2,7 @@ HARDHAT_NETWORK= VERIFY_API_KEY= # Custom gas price for deployments -GAS_PRICE= +GAS_PRICE=auto # Config for Tenderly - testing environment TENDERLY_FORK_ID= @@ -13,6 +13,6 @@ TENDERLY_TEST_PROJECT= TENDERLY_TEMP_PROJECT= # What network to fork from, default to 'mainnet' -TENDERLY_NETWORK_NAME= +TENDERLY_NETWORK_NAME=mainnet # Dev addresses to fund on tenderly forks or testnets DEV_ADDRESSES= diff --git a/hardhat.config.ts b/hardhat.config.ts index d8083d24..9ea1540a 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -35,7 +35,7 @@ interface EnvOptions { const { TENDERLY_TESTNET_PROVIDER_URL = '', VERIFY_API_KEY = '', - GAS_PRICE: gasPrice = 'auto', + GAS_PRICE = 'auto', TENDERLY_FORK_ID = '', TENDERLY_PROJECT = '', TENDERLY_TEST_PROJECT = '', @@ -73,7 +73,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Mainnet]: { chainId: chainIds[DeploymentNetwork.Mainnet], url: rpcUrls[DeploymentNetwork.Mainnet], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Mainnet}`], @@ -86,7 +86,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Optimism]: { chainId: chainIds[DeploymentNetwork.Optimism], url: rpcUrls[DeploymentNetwork.Optimism], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Optimism}`], @@ -99,7 +99,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Cronos]: { chainId: chainIds[DeploymentNetwork.Cronos], url: rpcUrls[DeploymentNetwork.Cronos], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Cronos}`], @@ -112,7 +112,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Rootstock]: { chainId: chainIds[DeploymentNetwork.Rootstock], url: rpcUrls[DeploymentNetwork.Rootstock], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Rootstock}`], @@ -125,7 +125,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Telos]: { chainId: chainIds[DeploymentNetwork.Telos], url: rpcUrls[DeploymentNetwork.Telos], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Telos}`], @@ -138,7 +138,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.BSC]: { chainId: chainIds[DeploymentNetwork.BSC], url: rpcUrls[DeploymentNetwork.BSC], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.BSC}`], @@ -151,7 +151,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Gnosis]: { chainId: chainIds[DeploymentNetwork.Gnosis], url: rpcUrls[DeploymentNetwork.Gnosis], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Gnosis}`], @@ -164,7 +164,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Polygon]: { chainId: chainIds[DeploymentNetwork.Polygon], url: rpcUrls[DeploymentNetwork.Polygon], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Polygon}`], @@ -177,7 +177,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Fantom]: { chainId: chainIds[DeploymentNetwork.Fantom], url: rpcUrls[DeploymentNetwork.Fantom], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Fantom}`], @@ -190,7 +190,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Hedera]: { chainId: chainIds[DeploymentNetwork.Hedera], url: rpcUrls[DeploymentNetwork.Hedera], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Hedera}`], @@ -203,7 +203,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.ZkSync]: { chainId: chainIds[DeploymentNetwork.ZkSync], url: rpcUrls[DeploymentNetwork.ZkSync], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.ZkSync}`], @@ -216,7 +216,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.PulseChain]: { chainId: chainIds[DeploymentNetwork.PulseChain], url: rpcUrls[DeploymentNetwork.PulseChain], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.PulseChain}`], @@ -229,7 +229,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Astar]: { chainId: chainIds[DeploymentNetwork.Astar], url: rpcUrls[DeploymentNetwork.Astar], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Astar}`], @@ -242,7 +242,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Metis]: { chainId: chainIds[DeploymentNetwork.Metis], url: rpcUrls[DeploymentNetwork.Metis], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Metis}`], @@ -255,7 +255,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Moonbeam]: { chainId: chainIds[DeploymentNetwork.Moonbeam], url: rpcUrls[DeploymentNetwork.Moonbeam], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Moonbeam}`], @@ -268,7 +268,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Kava]: { chainId: chainIds[DeploymentNetwork.Kava], url: rpcUrls[DeploymentNetwork.Kava], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Kava}`], @@ -281,7 +281,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Mantle]: { chainId: chainIds[DeploymentNetwork.Mantle], url: rpcUrls[DeploymentNetwork.Mantle], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Mantle}`], @@ -294,7 +294,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Canto]: { chainId: chainIds[DeploymentNetwork.Canto], url: rpcUrls[DeploymentNetwork.Canto], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Canto}`], @@ -307,7 +307,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Klaytn]: { chainId: chainIds[DeploymentNetwork.Klaytn], url: rpcUrls[DeploymentNetwork.Klaytn], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Klaytn}`], @@ -320,7 +320,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Base]: { chainId: chainIds[DeploymentNetwork.Base], url: rpcUrls[DeploymentNetwork.Base], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Base}`], @@ -333,7 +333,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Fusion]: { chainId: chainIds[DeploymentNetwork.Fusion], url: rpcUrls[DeploymentNetwork.Fusion], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Fusion}`], @@ -346,7 +346,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Mode]: { chainId: chainIds[DeploymentNetwork.Mode], url: rpcUrls[DeploymentNetwork.Mode], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Mode}`], @@ -359,7 +359,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Arbitrum]: { chainId: chainIds[DeploymentNetwork.Arbitrum], url: rpcUrls[DeploymentNetwork.Arbitrum], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Arbitrum}`], @@ -372,7 +372,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Celo]: { chainId: chainIds[DeploymentNetwork.Celo], url: rpcUrls[DeploymentNetwork.Celo], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Celo}`], @@ -385,7 +385,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Avalanche]: { chainId: chainIds[DeploymentNetwork.Avalanche], url: rpcUrls[DeploymentNetwork.Avalanche], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Avalanche}`], @@ -398,7 +398,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Linea]: { chainId: chainIds[DeploymentNetwork.Linea], url: rpcUrls[DeploymentNetwork.Linea], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Linea}`], @@ -411,7 +411,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Scroll]: { chainId: chainIds[DeploymentNetwork.Scroll], url: rpcUrls[DeploymentNetwork.Scroll], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Scroll}`], @@ -424,7 +424,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Aurora]: { chainId: chainIds[DeploymentNetwork.Aurora], url: rpcUrls[DeploymentNetwork.Aurora], - gasPrice, + gasPrice: GAS_PRICE, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Aurora}`], From 346d1dd50d82607251ad1048b1c9a0b889bd9286 Mon Sep 17 00:00:00 2001 From: Ivan Zhelyazkov Date: Tue, 5 Mar 2024 10:47:55 +0200 Subject: [PATCH 03/11] run format and lint --- contracts/carbon/CarbonController.sol | 5 +---- test/forge/CarbonController.t.sol | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/contracts/carbon/CarbonController.sol b/contracts/carbon/CarbonController.sol index ff87371d..0783eb59 100644 --- a/contracts/carbon/CarbonController.sol +++ b/contracts/carbon/CarbonController.sol @@ -150,10 +150,7 @@ contract CarbonController is /** * @inheritdoc ICarbonController */ - function createPair( - Token token0, - Token token1 - ) external nonReentrant onlyProxyDelegate returns (Pair memory) { + function createPair(Token token0, Token token1) external nonReentrant onlyProxyDelegate returns (Pair memory) { _validateInputTokens(token0, token1); return _createPair(token0, token1); } diff --git a/test/forge/CarbonController.t.sol b/test/forge/CarbonController.t.sol index 4315c508..42efb419 100644 --- a/test/forge/CarbonController.t.sol +++ b/test/forge/CarbonController.t.sol @@ -7,7 +7,7 @@ import { TestFixture } from "./TestFixture.t.sol"; import { Order, TradeAction } from "../../contracts/carbon/Strategies.sol"; -import { AccessDenied, InvalidAddress } from "../../contracts/utility/Utils.sol"; +import { InvalidAddress } from "../../contracts/utility/Utils.sol"; import { OnlyProxyDelegate } from "../../contracts/utility/OnlyProxyDelegate.sol"; import { TestCarbonController } from "../../contracts/helpers/TestCarbonController.sol"; From 4c28c1be1c25367cf76171597a605b742f4c8c36 Mon Sep 17 00:00:00 2001 From: Ivan Zhelyazkov Date: Tue, 5 Mar 2024 12:15:50 +0200 Subject: [PATCH 04/11] add mainnet tenderly fork test deploy --- data/named-accounts.ts | 2 +- deploy/tests/mainnet/carbon.ts | 10 ++++++++-- package.json | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/data/named-accounts.ts b/data/named-accounts.ts index 32ebdaab..46771466 100644 --- a/data/named-accounts.ts +++ b/data/named-accounts.ts @@ -82,7 +82,7 @@ const TestNamedAccounts = { ...getAddress(mantle, '0xf89d7b9c864f589bbF53a82105107622B35EaA40') }, daiWhale: { - ...getAddress(mainnet, '0x1B7BAa734C00298b9429b518D621753Bb0f6efF2'), + ...getAddress(mainnet, '0x60FaAe176336dAb62e284Fe19B885B095d29fB7F'), ...getAddress(base, '0xe9b14a1Be94E70900EDdF1E22A4cB8c56aC9e10a'), ...getAddress(arbitrum, '0xd85E038593d7A098614721EaE955EC2022B9B91B'), ...getAddress(mantle, ZERO_ADDRESS) diff --git a/deploy/tests/mainnet/carbon.ts b/deploy/tests/mainnet/carbon.ts index 45643554..5da36f6b 100644 --- a/deploy/tests/mainnet/carbon.ts +++ b/deploy/tests/mainnet/carbon.ts @@ -26,7 +26,13 @@ import { STRATEGY_UPDATE_REASON_TRADE, ZERO_ADDRESS } from '../../../utils/Constants'; -import { DeployedContracts, fundAccount, getNamedSigners, isLive, runPendingDeployments } from '../../../utils/Deploy'; +import { + DeployedContracts, + fundAccount, + getNamedSigners, + isTenderly, + runPendingDeployments +} from '../../../utils/Deploy'; import { NATIVE_TOKEN_ADDRESS, TokenData, TokenSymbol } from '../../../utils/TokenData'; import { toWei } from '../../../utils/Types'; import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers'; @@ -35,7 +41,7 @@ import Decimal from 'decimal.js'; import { BigNumber, BigNumberish } from 'ethers'; import { ethers, getNamedAccounts } from 'hardhat'; -(isLive() ? describe : describe.skip)('network', async () => { +(isTenderly() ? describe : describe.skip)('network', async () => { let carbonController: CarbonController; let voucher: Voucher; let carbonVortex: CarbonVortex; diff --git a/package.json b/package.json index 7791b411..c3a07a2e 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "test:coverage:nightly": "NIGHTLY=1 pnpm test:coverage", "test:nightly": "NIGHTLY=1 CI=1 forge test", "test:deploy": "TEST_FORK=1 ./deployments/run-fork.sh HARDHAT_NETWORK=tenderly mocha --require hardhat/register --extension ts --recursive --exit --timeout 600000 --bail --no-exit 'deploy/tests/network/**/*.ts'", + "test:deploy:mainnet": "TEST_FORK=1 ./deployments/run-fork.sh HARDHAT_NETWORK=tenderly mocha --require hardhat/register --extension ts --recursive --exit --timeout 600000 --bail --no-exit 'deploy/tests/mainnet/**/*.ts'", "test:health": "pnpm test:deploy", "export:storage": "pnpm cleanbuild && hardhat run deployments/storage-layout.ts", "deploy:prepare": "rm -rf ./node_modules && rm pnpm-lock.yaml && pnpm install && pnpm cleanbuild", From c8eae701b9e9aa26df3675e0b55724ba541f090e Mon Sep 17 00:00:00 2001 From: Ivan Zhelyazkov Date: Thu, 7 Mar 2024 14:03:22 +0200 Subject: [PATCH 05/11] fix gasPrice alias --- hardhat.config.ts | 58 +++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/hardhat.config.ts b/hardhat.config.ts index 9ea1540a..d8083d24 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -35,7 +35,7 @@ interface EnvOptions { const { TENDERLY_TESTNET_PROVIDER_URL = '', VERIFY_API_KEY = '', - GAS_PRICE = 'auto', + GAS_PRICE: gasPrice = 'auto', TENDERLY_FORK_ID = '', TENDERLY_PROJECT = '', TENDERLY_TEST_PROJECT = '', @@ -73,7 +73,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Mainnet]: { chainId: chainIds[DeploymentNetwork.Mainnet], url: rpcUrls[DeploymentNetwork.Mainnet], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Mainnet}`], @@ -86,7 +86,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Optimism]: { chainId: chainIds[DeploymentNetwork.Optimism], url: rpcUrls[DeploymentNetwork.Optimism], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Optimism}`], @@ -99,7 +99,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Cronos]: { chainId: chainIds[DeploymentNetwork.Cronos], url: rpcUrls[DeploymentNetwork.Cronos], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Cronos}`], @@ -112,7 +112,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Rootstock]: { chainId: chainIds[DeploymentNetwork.Rootstock], url: rpcUrls[DeploymentNetwork.Rootstock], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Rootstock}`], @@ -125,7 +125,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Telos]: { chainId: chainIds[DeploymentNetwork.Telos], url: rpcUrls[DeploymentNetwork.Telos], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Telos}`], @@ -138,7 +138,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.BSC]: { chainId: chainIds[DeploymentNetwork.BSC], url: rpcUrls[DeploymentNetwork.BSC], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.BSC}`], @@ -151,7 +151,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Gnosis]: { chainId: chainIds[DeploymentNetwork.Gnosis], url: rpcUrls[DeploymentNetwork.Gnosis], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Gnosis}`], @@ -164,7 +164,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Polygon]: { chainId: chainIds[DeploymentNetwork.Polygon], url: rpcUrls[DeploymentNetwork.Polygon], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Polygon}`], @@ -177,7 +177,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Fantom]: { chainId: chainIds[DeploymentNetwork.Fantom], url: rpcUrls[DeploymentNetwork.Fantom], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Fantom}`], @@ -190,7 +190,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Hedera]: { chainId: chainIds[DeploymentNetwork.Hedera], url: rpcUrls[DeploymentNetwork.Hedera], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Hedera}`], @@ -203,7 +203,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.ZkSync]: { chainId: chainIds[DeploymentNetwork.ZkSync], url: rpcUrls[DeploymentNetwork.ZkSync], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.ZkSync}`], @@ -216,7 +216,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.PulseChain]: { chainId: chainIds[DeploymentNetwork.PulseChain], url: rpcUrls[DeploymentNetwork.PulseChain], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.PulseChain}`], @@ -229,7 +229,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Astar]: { chainId: chainIds[DeploymentNetwork.Astar], url: rpcUrls[DeploymentNetwork.Astar], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Astar}`], @@ -242,7 +242,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Metis]: { chainId: chainIds[DeploymentNetwork.Metis], url: rpcUrls[DeploymentNetwork.Metis], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Metis}`], @@ -255,7 +255,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Moonbeam]: { chainId: chainIds[DeploymentNetwork.Moonbeam], url: rpcUrls[DeploymentNetwork.Moonbeam], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Moonbeam}`], @@ -268,7 +268,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Kava]: { chainId: chainIds[DeploymentNetwork.Kava], url: rpcUrls[DeploymentNetwork.Kava], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Kava}`], @@ -281,7 +281,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Mantle]: { chainId: chainIds[DeploymentNetwork.Mantle], url: rpcUrls[DeploymentNetwork.Mantle], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Mantle}`], @@ -294,7 +294,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Canto]: { chainId: chainIds[DeploymentNetwork.Canto], url: rpcUrls[DeploymentNetwork.Canto], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Canto}`], @@ -307,7 +307,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Klaytn]: { chainId: chainIds[DeploymentNetwork.Klaytn], url: rpcUrls[DeploymentNetwork.Klaytn], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Klaytn}`], @@ -320,7 +320,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Base]: { chainId: chainIds[DeploymentNetwork.Base], url: rpcUrls[DeploymentNetwork.Base], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Base}`], @@ -333,7 +333,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Fusion]: { chainId: chainIds[DeploymentNetwork.Fusion], url: rpcUrls[DeploymentNetwork.Fusion], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Fusion}`], @@ -346,7 +346,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Mode]: { chainId: chainIds[DeploymentNetwork.Mode], url: rpcUrls[DeploymentNetwork.Mode], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Mode}`], @@ -359,7 +359,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Arbitrum]: { chainId: chainIds[DeploymentNetwork.Arbitrum], url: rpcUrls[DeploymentNetwork.Arbitrum], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Arbitrum}`], @@ -372,7 +372,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Celo]: { chainId: chainIds[DeploymentNetwork.Celo], url: rpcUrls[DeploymentNetwork.Celo], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Celo}`], @@ -385,7 +385,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Avalanche]: { chainId: chainIds[DeploymentNetwork.Avalanche], url: rpcUrls[DeploymentNetwork.Avalanche], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Avalanche}`], @@ -398,7 +398,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Linea]: { chainId: chainIds[DeploymentNetwork.Linea], url: rpcUrls[DeploymentNetwork.Linea], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Linea}`], @@ -411,7 +411,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Scroll]: { chainId: chainIds[DeploymentNetwork.Scroll], url: rpcUrls[DeploymentNetwork.Scroll], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Scroll}`], @@ -424,7 +424,7 @@ const config: HardhatUserConfig = { [DeploymentNetwork.Aurora]: { chainId: chainIds[DeploymentNetwork.Aurora], url: rpcUrls[DeploymentNetwork.Aurora], - gasPrice: GAS_PRICE, + gasPrice, saveDeployments: true, live: true, deploy: [`deploy/scripts/${DeploymentNetwork.Aurora}`], From a910ed4baba43a19c3dc0bf040c39299dfb6fb2f Mon Sep 17 00:00:00 2001 From: Yudi Levi Date: Fri, 8 Mar 2024 11:35:22 +0000 Subject: [PATCH 06/11] removed PausableUpgradeable parent from CarbonController --- contracts/carbon/CarbonController.sol | 8 ++-- pnpm-lock.yaml | 68 ++++++++++++++++++--------- 2 files changed, 50 insertions(+), 26 deletions(-) diff --git a/contracts/carbon/CarbonController.sol b/contracts/carbon/CarbonController.sol index 0783eb59..ea1952b6 100644 --- a/contracts/carbon/CarbonController.sol +++ b/contracts/carbon/CarbonController.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: SEE LICENSE IN LICENSE pragma solidity 0.8.19; import { ReentrancyGuardUpgradeable } from "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol"; -import { PausableUpgradeable } from "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol"; +import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol"; import { IVersioned } from "../utility/interfaces/IVersioned.sol"; import { Pairs, Pair } from "./Pairs.sol"; import { Token } from "../token/Token.sol"; @@ -22,7 +22,6 @@ contract CarbonController is Strategies, Upgradeable, ReentrancyGuardUpgradeable, - PausableUpgradeable, OnlyProxyDelegate, Utils { @@ -31,6 +30,10 @@ contract CarbonController is uint16 private constant CONTROLLER_TYPE = 1; + // deprecated parent storage vars + bool private deprecated; + uint256[49] private __deprecated; + // the voucher contract IVoucher private immutable _voucher; @@ -69,7 +72,6 @@ contract CarbonController is __Strategies_init(); __Upgradeable_init(); __ReentrancyGuard_init(); - __Pausable_init(); __CarbonController_init_unchained(); } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5503529f..be728f22 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2423,14 +2423,13 @@ packages: is-shared-array-buffer: 1.0.3 dev: true - /asn1.js@5.4.1: - resolution: {integrity: sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==} + /asn1.js@4.10.1: + resolution: {integrity: sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==} requiresBuild: true dependencies: bn.js: 4.12.0 inherits: 2.0.4 minimalistic-assert: 1.0.1 - safer-buffer: 2.1.2 dev: true optional: true @@ -3275,9 +3274,9 @@ packages: browserify-rsa: 4.1.0 create-hash: 1.2.0 create-hmac: 1.1.7 - elliptic: 6.5.4 + elliptic: 6.5.5 inherits: 2.0.4 - parse-asn1: 5.1.6 + parse-asn1: 5.1.7 readable-stream: 3.6.2 safe-buffer: 5.2.1 dev: true @@ -3287,8 +3286,8 @@ packages: resolution: {integrity: sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==} hasBin: true dependencies: - caniuse-lite: 1.0.30001593 - electron-to-chromium: 1.4.690 + caniuse-lite: 1.0.30001594 + electron-to-chromium: 1.4.692 dev: true /bs58@4.0.1: @@ -3453,8 +3452,8 @@ packages: resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==} engines: {node: '>=10'} - /caniuse-lite@1.0.30001593: - resolution: {integrity: sha512-UWM1zlo3cZfkpBysd7AS+z+v007q9G1+fLTUU42rQnY6t2axoogPW/xol6T7juU5EUoOhML4WgBIdG+9yYqAjQ==} + /caniuse-lite@1.0.30001594: + resolution: {integrity: sha512-VblSX6nYqyJVs8DKFMldE2IVCJjZ225LW00ydtUWwh5hk9IfkTOffO6r8gJNsH0qqqeAF8KrbMYA2VEwTlGW5g==} dev: true /case@1.6.3: @@ -3919,7 +3918,7 @@ packages: requiresBuild: true dependencies: bn.js: 4.12.0 - elliptic: 6.5.4 + elliptic: 6.5.5 dev: true optional: true @@ -4320,8 +4319,8 @@ packages: keccak: 3.0.4 dev: true - /electron-to-chromium@1.4.690: - resolution: {integrity: sha512-+2OAGjUx68xElQhydpcbqH50hE8Vs2K6TkAeLhICYfndb67CVH0UsZaijmRUE3rHlIxU1u0jxwhgVe6fK3YANA==} + /electron-to-chromium@1.4.692: + resolution: {integrity: sha512-d5rZRka9n2Y3MkWRN74IoAsxR0HK3yaAt7T50e3iT9VZmCCQDT3geXUO5ZRMhDToa1pkCeQXuNo+0g+NfDOVPA==} dev: true /elliptic@6.5.4: @@ -4335,6 +4334,17 @@ packages: minimalistic-assert: 1.0.1 minimalistic-crypto-utils: 1.0.1 + /elliptic@6.5.5: + resolution: {integrity: sha512-7EjbcmUm17NQFu4Pmgmq2olYMj8nwMnpcddByChSUjArp8F5DQWcIcpriwO4ZToLNAJig0yiyjswfyGNje/ixw==} + dependencies: + bn.js: 4.12.0 + brorand: 1.1.0 + hash.js: 1.1.7 + hmac-drbg: 1.0.1 + inherits: 2.0.4 + minimalistic-assert: 1.0.1 + minimalistic-crypto-utils: 1.0.1 + /emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} @@ -4916,7 +4926,7 @@ packages: requiresBuild: true dependencies: bn.js: 4.12.0 - elliptic: 6.5.4 + elliptic: 6.5.5 nano-json-stream-parser: 0.1.2 servify: 0.1.12 ws: 3.3.3 @@ -4933,7 +4943,7 @@ packages: requiresBuild: true dependencies: bn.js: 4.12.0 - elliptic: 6.5.4 + elliptic: 6.5.5 xhr-request-promise: 0.1.3 dev: true optional: true @@ -4958,7 +4968,7 @@ packages: deprecated: Deprecated in favor of '@metamask/eth-sig-util' dependencies: buffer: 5.7.1 - elliptic: 6.5.4 + elliptic: 6.5.5 ethereumjs-abi: 0.6.5 ethereumjs-util: 5.2.1 tweetnacl: 1.0.3 @@ -5152,7 +5162,7 @@ packages: dependencies: bn.js: 4.12.0 create-hash: 1.2.0 - elliptic: 6.5.4 + elliptic: 6.5.5 ethereum-cryptography: 0.1.3 rlp: 2.2.7 dev: true @@ -5162,7 +5172,7 @@ packages: dependencies: bn.js: 4.12.0 create-hash: 1.2.0 - elliptic: 6.5.4 + elliptic: 6.5.5 ethereum-cryptography: 0.1.3 ethjs-util: 0.1.6 rlp: 2.2.7 @@ -5175,7 +5185,7 @@ packages: '@types/bn.js': 4.11.6 bn.js: 4.12.0 create-hash: 1.2.0 - elliptic: 6.5.4 + elliptic: 6.5.5 ethereum-cryptography: 0.1.3 ethjs-util: 0.1.6 rlp: 2.2.7 @@ -6373,6 +6383,16 @@ packages: engines: {node: '>= 0.4.0'} dev: true + /hash-base@3.0.4: + resolution: {integrity: sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==} + engines: {node: '>=4'} + requiresBuild: true + dependencies: + inherits: 2.0.4 + safe-buffer: 5.2.1 + dev: true + optional: true + /hash-base@3.1.0: resolution: {integrity: sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==} engines: {node: '>=4'} @@ -8260,13 +8280,15 @@ packages: callsites: 3.1.0 dev: true - /parse-asn1@5.1.6: - resolution: {integrity: sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==} + /parse-asn1@5.1.7: + resolution: {integrity: sha512-CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg==} + engines: {node: '>= 0.10'} requiresBuild: true dependencies: - asn1.js: 5.4.1 + asn1.js: 4.10.1 browserify-aes: 1.2.0 evp_bytestokey: 1.0.3 + hash-base: 3.0.4 pbkdf2: 3.1.2 safe-buffer: 5.2.1 dev: true @@ -8611,7 +8633,7 @@ packages: bn.js: 4.12.0 browserify-rsa: 4.1.0 create-hash: 1.2.0 - parse-asn1: 5.1.6 + parse-asn1: 5.1.7 randombytes: 2.1.0 safe-buffer: 5.2.1 dev: true @@ -9167,7 +9189,7 @@ packages: engines: {node: '>=10.0.0'} requiresBuild: true dependencies: - elliptic: 6.5.4 + elliptic: 6.5.5 node-addon-api: 2.0.2 node-gyp-build: 4.8.0 From 561c134d712eb8854561cbb6d823fc7eb365f25a Mon Sep 17 00:00:00 2001 From: Yudi Levi Date: Fri, 8 Mar 2024 11:56:56 +0000 Subject: [PATCH 07/11] updated named accounts --- data/named-accounts.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/named-accounts.ts b/data/named-accounts.ts index 46771466..14fb52d8 100644 --- a/data/named-accounts.ts +++ b/data/named-accounts.ts @@ -82,7 +82,7 @@ const TestNamedAccounts = { ...getAddress(mantle, '0xf89d7b9c864f589bbF53a82105107622B35EaA40') }, daiWhale: { - ...getAddress(mainnet, '0x60FaAe176336dAb62e284Fe19B885B095d29fB7F'), + ...getAddress(mainnet, '0x66F62574ab04989737228D18C3624f7FC1edAe14'), ...getAddress(base, '0xe9b14a1Be94E70900EDdF1E22A4cB8c56aC9e10a'), ...getAddress(arbitrum, '0xd85E038593d7A098614721EaE955EC2022B9B91B'), ...getAddress(mantle, ZERO_ADDRESS) From 4156953e34dbf50c9f7814cfc849868e69f94e22 Mon Sep 17 00:00:00 2001 From: Yudi Levi Date: Fri, 8 Mar 2024 12:00:48 +0000 Subject: [PATCH 08/11] removed legacy import --- contracts/carbon/CarbonController.sol | 1 - 1 file changed, 1 deletion(-) diff --git a/contracts/carbon/CarbonController.sol b/contracts/carbon/CarbonController.sol index ea1952b6..306aff67 100644 --- a/contracts/carbon/CarbonController.sol +++ b/contracts/carbon/CarbonController.sol @@ -1,7 +1,6 @@ // SPDX-License-Identifier: SEE LICENSE IN LICENSE pragma solidity 0.8.19; import { ReentrancyGuardUpgradeable } from "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol"; -import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol"; import { IVersioned } from "../utility/interfaces/IVersioned.sol"; import { Pairs, Pair } from "./Pairs.sol"; import { Token } from "../token/Token.sol"; From 2a27e10d4793224425739659cf5b4efb95fe2cbc Mon Sep 17 00:00:00 2001 From: Yudi Levi Date: Fri, 8 Mar 2024 12:08:03 +0000 Subject: [PATCH 09/11] renamed a deprecated var --- contracts/carbon/CarbonController.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/carbon/CarbonController.sol b/contracts/carbon/CarbonController.sol index 306aff67..27be5000 100644 --- a/contracts/carbon/CarbonController.sol +++ b/contracts/carbon/CarbonController.sol @@ -30,7 +30,7 @@ contract CarbonController is uint16 private constant CONTROLLER_TYPE = 1; // deprecated parent storage vars - bool private deprecated; + bool private _deprecated; uint256[49] private __deprecated; // the voucher contract From 2a5b63efaa115dd22565bd7c23b5f44dd4e7c222 Mon Sep 17 00:00:00 2001 From: Yudi Levi Date: Fri, 8 Mar 2024 20:42:54 +0000 Subject: [PATCH 10/11] updated named accounts --- data/named-accounts.ts | 2 +- pnpm-lock.yaml | 302 +++++++++++++++++++++-------------------- 2 files changed, 153 insertions(+), 151 deletions(-) diff --git a/data/named-accounts.ts b/data/named-accounts.ts index 14fb52d8..f5999299 100644 --- a/data/named-accounts.ts +++ b/data/named-accounts.ts @@ -99,7 +99,7 @@ const TestNamedAccounts = { ...getAddress(mantle, '0xa6b12425F236EE85c6E0E60df9c422C9e603cf80') }, bntWhale: { - ...getAddress(mainnet, '0x221A0e3C9AcEa6B3f1CC9DfC7063509c89bE7BC3'), + ...getAddress(mainnet, '0x6cC5F688a315f3dC28A7781717a9A798a59fDA7b'), ...getAddress(mantle, ZERO_ADDRESS) }, linkWhale: { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index be728f22..9928f255 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,7 +12,7 @@ overrides: dependencies: hardhat: specifier: 2.15.0 - version: 2.15.0(ts-node@10.9.2)(typescript@5.3.3) + version: 2.15.0(ts-node@10.9.2)(typescript@5.4.2) devDependencies: '@anders-t/ethers-ledger': @@ -35,7 +35,7 @@ devDependencies: version: 3.1.8(hardhat@2.15.0) '@nomiclabs/hardhat-solhint': specifier: ^3.0.1 - version: 3.0.1(hardhat@2.15.0)(typescript@5.3.3) + version: 3.0.1(hardhat@2.15.0)(typescript@5.4.2) '@nomiclabs/hardhat-waffle': specifier: 2.0.4 version: 2.0.4(ethereum-waffle@3.4.4)(ethers@5.7.2)(hardhat-deploy-ethers@0.3.0-beta.13)(hardhat@2.15.0) @@ -47,16 +47,16 @@ devDependencies: version: 4.9.2 '@sentry/hub': specifier: ^7.56.0 - version: 7.105.0 + version: 7.106.0 '@sentry/node': specifier: ^7.56.0 - version: 7.105.0 + version: 7.106.0 '@sentry/types': specifier: ^7.56.0 - version: 7.105.0 + version: 7.106.0 '@sentry/utils': specifier: ^7.56.0 - version: 7.105.0 + version: 7.106.0 '@tenderly/hardhat-tenderly': specifier: 1.1.6 version: 1.1.6(hardhat@2.15.0) @@ -65,7 +65,7 @@ devDependencies: version: 4.3.0(prettier@2.8.8) '@typechain/ethers-v5': specifier: ^11.0.0 - version: 11.1.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(ethers@5.7.2)(typechain@8.3.2)(typescript@5.3.3) + version: 11.1.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(ethers@5.7.2)(typechain@8.3.2)(typescript@5.4.2) '@typechain/hardhat': specifier: ^6.1.5 version: 6.1.6(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@typechain/ethers-v5@11.1.2)(ethers@5.7.2)(hardhat@2.15.0)(typechain@8.3.2) @@ -86,13 +86,13 @@ devDependencies: version: 10.0.6 '@types/node': specifier: ^20.3.1 - version: 20.11.24 + version: 20.11.25 '@typescript-eslint/eslint-plugin': specifier: ^5.60.0 - version: 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.57.0)(typescript@5.3.3) + version: 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.57.0)(typescript@5.4.2) '@typescript-eslint/parser': specifier: ^5.60.0 - version: 5.62.0(eslint@8.57.0)(typescript@5.3.3) + version: 5.62.0(eslint@8.57.0)(typescript@5.4.2) adm-zip: specifier: ^0.5.10 version: 0.5.10 @@ -128,7 +128,7 @@ devDependencies: version: 2.29.1(@typescript-eslint/parser@5.62.0)(eslint@8.57.0) eslint-plugin-mocha: specifier: ^10.1.0 - version: 10.3.0(eslint@8.57.0) + version: 10.4.1(eslint@8.57.0) eslint-plugin-n: specifier: ^16.0.0 version: 16.6.2(eslint@8.57.0) @@ -137,7 +137,7 @@ devDependencies: version: 6.1.1(eslint@8.57.0) ethereum-waffle: specifier: ^3.4.4 - version: 3.4.4(typescript@5.3.3) + version: 3.4.4(typescript@5.4.2) ethereumjs-util: specifier: ^7.1.5 version: 7.1.5 @@ -194,19 +194,19 @@ devDependencies: version: 0.8.19 solhint: specifier: ^3.3.8 - version: 3.6.2(typescript@5.3.3) + version: 3.6.2(typescript@5.4.2) solidity-coverage: specifier: ^0.8.2 - version: 0.8.10(hardhat@2.15.0) + version: 0.8.11(hardhat@2.15.0) ts-node: specifier: ^10.9.1 - version: 10.9.2(@types/node@20.11.24)(typescript@5.3.3) + version: 10.9.2(@types/node@20.11.25)(typescript@5.4.2) typechain: specifier: ^8.1.1 - version: 8.3.2(typescript@5.3.3) + version: 8.3.2(typescript@5.4.2) typescript: specifier: ^5.1.3 - version: 5.3.3 + version: 5.4.2 packages: @@ -457,7 +457,7 @@ packages: - utf-8-validate dev: true - /@ethereum-waffle/compiler@3.4.4(typescript@5.3.3): + /@ethereum-waffle/compiler@3.4.4(typescript@5.4.2): resolution: {integrity: sha512-RUK3axJ8IkD5xpWjWoJgyHclOeEzDLQFga6gKpeGxiS/zBu+HB0W2FvsrrLalTFIaPw/CGYACRBSIxqiCqwqTQ==} engines: {node: '>=10.0'} dependencies: @@ -471,7 +471,7 @@ packages: node-fetch: 2.7.0 solc: 0.6.12 ts-generator: 0.1.1 - typechain: 3.0.0(typescript@5.3.3) + typechain: 3.0.0(typescript@5.4.2) transitivePeerDependencies: - bufferutil - encoding @@ -1363,7 +1363,7 @@ packages: chalk: 2.4.2 debug: 4.3.4(supports-color@8.1.1) fs-extra: 7.0.1 - hardhat: 2.15.0(ts-node@10.9.2)(typescript@5.3.3) + hardhat: 2.15.0(ts-node@10.9.2)(typescript@5.4.2) lodash: 4.17.21 semver: 6.3.1 table: 6.8.1 @@ -1372,13 +1372,13 @@ packages: - supports-color dev: true - /@nomiclabs/hardhat-solhint@3.0.1(hardhat@2.15.0)(typescript@5.3.3): + /@nomiclabs/hardhat-solhint@3.0.1(hardhat@2.15.0)(typescript@5.4.2): resolution: {integrity: sha512-GqDoStxL1aA9hZul9HRdk+3eEZ/XLBwvIlz3/EJUusUsoadNYEnio9aYOsBeNeZWo+B/Fd3EgMXgbf9wWQLyRA==} peerDependencies: hardhat: ^2.0.0 dependencies: - hardhat: 2.15.0(ts-node@10.9.2)(typescript@5.3.3) - solhint: 3.6.2(typescript@5.3.3) + hardhat: 2.15.0(ts-node@10.9.2)(typescript@5.4.2) + solhint: 3.6.2(typescript@5.4.2) transitivePeerDependencies: - typescript dev: true @@ -1394,9 +1394,9 @@ packages: '@nomiclabs/hardhat-ethers': /hardhat-deploy-ethers@0.3.0-beta.13(ethers@5.7.2)(hardhat@2.15.0) '@types/sinon-chai': 3.2.12 '@types/web3': 1.0.19 - ethereum-waffle: 3.4.4(typescript@5.3.3) + ethereum-waffle: 3.4.4(typescript@5.4.2) ethers: 5.7.2 - hardhat: 2.15.0(ts-node@10.9.2)(typescript@5.3.3) + hardhat: 2.15.0(ts-node@10.9.2)(typescript@5.4.2) dev: true /@openzeppelin/contracts-upgradeable@4.9.2: @@ -1486,13 +1486,13 @@ packages: '@scure/base': 1.1.5 dev: true - /@sentry-internal/tracing@7.105.0: - resolution: {integrity: sha512-b+AFYB7Bc9vmyxl2jbmuT4esX5G0oPfpz35A0sxFzmJIhvMg1YMDNio2c81BtKN+VSPORCnKMLhfk3kyKKvWMQ==} + /@sentry-internal/tracing@7.106.0: + resolution: {integrity: sha512-O8Es6Sa/tP80nfl+8soNfWzeRNFcT484SvjLR8BS3pHM9KDAlwNXyoQhFr2BKNYL1irbq6UF6eku4xCnUKVmqA==} engines: {node: '>=8'} dependencies: - '@sentry/core': 7.105.0 - '@sentry/types': 7.105.0 - '@sentry/utils': 7.105.0 + '@sentry/core': 7.106.0 + '@sentry/types': 7.106.0 + '@sentry/utils': 7.106.0 dev: true /@sentry/core@5.30.0: @@ -1505,12 +1505,12 @@ packages: '@sentry/utils': 5.30.0 tslib: 1.14.1 - /@sentry/core@7.105.0: - resolution: {integrity: sha512-5xsaTG6jZincTeJUmZomlv20mVRZUEF1U/g89lmrSOybyk2+opEnB1JeBn4ODwnvmSik8r2QLr6/RiYlaxRJCg==} + /@sentry/core@7.106.0: + resolution: {integrity: sha512-Dc13XtnyFaXup2E4vCbzuG0QKAVjrJBk4qfGwvSJaTuopEaEWBs2MpK6hRzFhsz9S3T0La7c1F/62NptvTUWsQ==} engines: {node: '>=8'} dependencies: - '@sentry/types': 7.105.0 - '@sentry/utils': 7.105.0 + '@sentry/types': 7.106.0 + '@sentry/utils': 7.106.0 dev: true /@sentry/hub@5.30.0: @@ -1521,13 +1521,13 @@ packages: '@sentry/utils': 5.30.0 tslib: 1.14.1 - /@sentry/hub@7.105.0: - resolution: {integrity: sha512-68jGwj33/71TAvf5Z2R3rg2Iy2cHvuNktjZPCj9QsnPuqewgJ3shOZIJUs096fzcxaA0LkXnt+zxbivipiQ9/w==} + /@sentry/hub@7.106.0: + resolution: {integrity: sha512-4e7R4wpOTbK2r5hzSZSAu1KeQ3ehcfQuBkMdbYRzMqCRISG6mY17OgeJY0ZcMEkbXe2QQQ2nxgBv38+fnKKmEQ==} engines: {node: '>=8'} dependencies: - '@sentry/core': 7.105.0 - '@sentry/types': 7.105.0 - '@sentry/utils': 7.105.0 + '@sentry/core': 7.106.0 + '@sentry/types': 7.106.0 + '@sentry/utils': 7.106.0 dev: true /@sentry/minimal@5.30.0: @@ -1554,14 +1554,14 @@ packages: transitivePeerDependencies: - supports-color - /@sentry/node@7.105.0: - resolution: {integrity: sha512-b0QwZ7vT4hcJi6LmNRh3dcaYpLtXnkYXkL0rfhMb8hN8sUx8zuOWFMI7j0cfAloVThUeJVwGyv9dERfzGS2r2w==} + /@sentry/node@7.106.0: + resolution: {integrity: sha512-4DIqbu5K7//lK/k2nV8lqKeGQzhu2T1OpJFmiUrjN6fUKWivGFjZrcmQDS7tvhAAyJezkL3LlrNU4tjPHUElPA==} engines: {node: '>=8'} dependencies: - '@sentry-internal/tracing': 7.105.0 - '@sentry/core': 7.105.0 - '@sentry/types': 7.105.0 - '@sentry/utils': 7.105.0 + '@sentry-internal/tracing': 7.106.0 + '@sentry/core': 7.106.0 + '@sentry/types': 7.106.0 + '@sentry/utils': 7.106.0 dev: true /@sentry/tracing@5.30.0: @@ -1578,8 +1578,8 @@ packages: resolution: {integrity: sha512-R8xOqlSTZ+htqrfteCWU5Nk0CDN5ApUTvrlvBuiH1DyP6czDZ4ktbZB0hAgBlVcK0U+qpD3ag3Tqqpa5Q67rPw==} engines: {node: '>=6'} - /@sentry/types@7.105.0: - resolution: {integrity: sha512-80o0KMVM+X2Ym9hoQxvJetkJJwkpCg7o6tHHFXI+Rp7fawc2iCMTa0IRQMUiSkFvntQLYIdDoNNuKdzz2PbQGA==} + /@sentry/types@7.106.0: + resolution: {integrity: sha512-oKTkDaL6P9xJC5/zHLRemHTWboUqRYjkJNaZCN63j4kJqGy56wee4vDtDese/NWWn4U4C1QV1h+Mifm2HmDcQg==} engines: {node: '>=8'} dev: true @@ -1590,11 +1590,11 @@ packages: '@sentry/types': 5.30.0 tslib: 1.14.1 - /@sentry/utils@7.105.0: - resolution: {integrity: sha512-YVAV0c2KLM8+VZCicQ/E/P2+J9Vs0hGhrXwV7w6ZEAtvxrg4oF270toL1WRhvcaf8JO4J1v4V+LuU6Txs4uEeQ==} + /@sentry/utils@7.106.0: + resolution: {integrity: sha512-bVsePsXLpFu/1sH4rpJrPcnVxW2fXXfGfGxKs6Bm+dkOMbuVTlk/KAzIbdjCDIpVlrMDJmMNEv5xgTFjgWDkjw==} engines: {node: '>=8'} dependencies: - '@sentry/types': 7.105.0 + '@sentry/types': 7.106.0 dev: true /@sindresorhus/is@0.14.0: @@ -1649,7 +1649,7 @@ packages: axios: 0.21.4(debug@4.3.4) ethers: 5.7.2 fs-extra: 9.1.0 - hardhat: 2.15.0(ts-node@10.9.2)(typescript@5.3.3) + hardhat: 2.15.0(ts-node@10.9.2)(typescript@5.4.2) hardhat-deploy: 0.11.34 js-yaml: 3.14.1 transitivePeerDependencies: @@ -1691,7 +1691,7 @@ packages: /@tsconfig/node16@1.0.4: resolution: {integrity: sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==} - /@typechain/ethers-v5@11.1.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(ethers@5.7.2)(typechain@8.3.2)(typescript@5.3.3): + /@typechain/ethers-v5@11.1.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(ethers@5.7.2)(typechain@8.3.2)(typescript@5.4.2): resolution: {integrity: sha512-ID6pqWkao54EuUQa0P5RgjvfA3MYqxUQKpbGKERbsjBW5Ra7EIXvbMlPp2pcP5IAdUkyMCFYsP2SN5q7mPdLDQ==} peerDependencies: '@ethersproject/abi': ^5.0.0 @@ -1704,9 +1704,9 @@ packages: '@ethersproject/providers': 5.7.2 ethers: 5.7.2 lodash: 4.17.21 - ts-essentials: 7.0.3(typescript@5.3.3) - typechain: 8.3.2(typescript@5.3.3) - typescript: 5.3.3 + ts-essentials: 7.0.3(typescript@5.4.2) + typechain: 8.3.2(typescript@5.4.2) + typescript: 5.4.2 dev: true /@typechain/ethers-v5@2.0.0(ethers@5.7.2)(typechain@3.0.0): @@ -1716,7 +1716,7 @@ packages: typechain: ^3.0.0 dependencies: ethers: 5.7.2 - typechain: 3.0.0(typescript@5.3.3) + typechain: 3.0.0(typescript@5.4.2) dev: true /@typechain/hardhat@6.1.6(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@typechain/ethers-v5@11.1.2)(ethers@5.7.2)(hardhat@2.15.0)(typechain@8.3.2): @@ -1731,28 +1731,28 @@ packages: dependencies: '@ethersproject/abi': 5.7.0 '@ethersproject/providers': 5.7.2 - '@typechain/ethers-v5': 11.1.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(ethers@5.7.2)(typechain@8.3.2)(typescript@5.3.3) + '@typechain/ethers-v5': 11.1.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(ethers@5.7.2)(typechain@8.3.2)(typescript@5.4.2) ethers: 5.7.2 fs-extra: 9.1.0 - hardhat: 2.15.0(ts-node@10.9.2)(typescript@5.3.3) - typechain: 8.3.2(typescript@5.3.3) + hardhat: 2.15.0(ts-node@10.9.2)(typescript@5.4.2) + typechain: 8.3.2(typescript@5.4.2) dev: true /@types/adm-zip@0.5.5: resolution: {integrity: sha512-YCGstVMjc4LTY5uK9/obvxBya93axZOVOyf2GSUulADzmLhYE45u2nAssCs/fWBs1Ifq5Vat75JTPwd5XZoPJw==} dependencies: - '@types/node': 20.11.24 + '@types/node': 20.11.25 dev: true /@types/bn.js@4.11.6: resolution: {integrity: sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==} dependencies: - '@types/node': 20.11.24 + '@types/node': 20.11.25 /@types/bn.js@5.1.5: resolution: {integrity: sha512-V46N0zwKRF5Q00AZ6hWtN0T8gGmDUaUzLWQvHFo5yThtVwK/VCenFY3wXVbOvNfajEpsTfQM4IN9k/d6gUVX3A==} dependencies: - '@types/node': 20.11.24 + '@types/node': 20.11.25 /@types/cacheable-request@6.0.3: resolution: {integrity: sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==} @@ -1760,7 +1760,7 @@ packages: dependencies: '@types/http-cache-semantics': 4.0.4 '@types/keyv': 3.1.4 - '@types/node': 20.11.24 + '@types/node': 20.11.25 '@types/responselike': 1.0.3 dev: true optional: true @@ -1773,7 +1773,7 @@ packages: resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==} dependencies: '@types/minimatch': 5.1.2 - '@types/node': 20.11.24 + '@types/node': 20.11.25 dev: true /@types/http-cache-semantics@4.0.4: @@ -1798,7 +1798,7 @@ packages: resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} requiresBuild: true dependencies: - '@types/node': 20.11.24 + '@types/node': 20.11.25 dev: true optional: true @@ -1816,7 +1816,7 @@ packages: /@types/mkdirp@0.5.2: resolution: {integrity: sha512-U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg==} dependencies: - '@types/node': 20.11.24 + '@types/node': 20.11.25 dev: true /@types/mocha@10.0.6: @@ -1826,7 +1826,7 @@ packages: /@types/node-fetch@2.6.11: resolution: {integrity: sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g==} dependencies: - '@types/node': 20.11.24 + '@types/node': 20.11.25 form-data: 4.0.0 dev: true @@ -1836,8 +1836,8 @@ packages: dev: true optional: true - /@types/node@20.11.24: - resolution: {integrity: sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==} + /@types/node@20.11.25: + resolution: {integrity: sha512-TBHyJxk2b7HceLVGFcpAUjsa5zIdsPWlR6XHfyGzd0SFu+/NFgQgMAl96MSDZgQDvJAvV6BKsFOrt6zIL09JDw==} dependencies: undici-types: 5.26.5 @@ -1852,7 +1852,7 @@ packages: /@types/pbkdf2@3.1.2: resolution: {integrity: sha512-uRwJqmiXmh9++aSu1VNEn3iIxWOhd8AHXNSdlaLfdAAdSTY9jYVeGWnzejM3dvrkbqE3/hyQkQQ29IFATEGlew==} dependencies: - '@types/node': 20.11.24 + '@types/node': 20.11.25 /@types/prettier@2.7.3: resolution: {integrity: sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==} @@ -1865,27 +1865,27 @@ packages: /@types/readable-stream@2.3.15: resolution: {integrity: sha512-oM5JSKQCcICF1wvGgmecmHldZ48OZamtMxcGGVICOJA8o8cahXC1zEVAif8iwoc5j8etxFaRFnf095+CDsuoFQ==} dependencies: - '@types/node': 20.11.24 + '@types/node': 20.11.25 safe-buffer: 5.1.2 /@types/resolve@0.0.8: resolution: {integrity: sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==} dependencies: - '@types/node': 20.11.24 + '@types/node': 20.11.25 dev: true /@types/responselike@1.0.3: resolution: {integrity: sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==} requiresBuild: true dependencies: - '@types/node': 20.11.24 + '@types/node': 20.11.25 dev: true optional: true /@types/secp256k1@4.0.6: resolution: {integrity: sha512-hHxJU6PAEUn0TP4S/ZOzuTUvJWuZ6eIKeNKb5RBpODvSl6hp1Wrw4s7ATY50rklRCScUDpHzVA/DQdSjJ3UoYQ==} dependencies: - '@types/node': 20.11.24 + '@types/node': 20.11.25 /@types/semver@7.5.8: resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==} @@ -1923,7 +1923,7 @@ packages: '@types/underscore': 1.11.15 dev: true - /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.57.0)(typescript@5.3.3): + /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1935,23 +1935,23 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 5.62.0(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/parser': 5.62.0(eslint@8.57.0)(typescript@5.4.2) '@typescript-eslint/scope-manager': 5.62.0 - '@typescript-eslint/type-utils': 5.62.0(eslint@8.57.0)(typescript@5.3.3) - '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/type-utils': 5.62.0(eslint@8.57.0)(typescript@5.4.2) + '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.4.2) debug: 4.3.4(supports-color@8.1.1) eslint: 8.57.0 graphemer: 1.4.0 ignore: 5.3.1 natural-compare-lite: 1.4.0 semver: 7.6.0 - tsutils: 3.21.0(typescript@5.3.3) - typescript: 5.3.3 + tsutils: 3.21.0(typescript@5.4.2) + typescript: 5.4.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser@5.62.0(eslint@8.57.0)(typescript@5.3.3): + /@typescript-eslint/parser@5.62.0(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1963,10 +1963,10 @@ packages: dependencies: '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.3.3) + '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.4.2) debug: 4.3.4(supports-color@8.1.1) eslint: 8.57.0 - typescript: 5.3.3 + typescript: 5.4.2 transitivePeerDependencies: - supports-color dev: true @@ -1979,7 +1979,7 @@ packages: '@typescript-eslint/visitor-keys': 5.62.0 dev: true - /@typescript-eslint/type-utils@5.62.0(eslint@8.57.0)(typescript@5.3.3): + /@typescript-eslint/type-utils@5.62.0(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1989,12 +1989,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.3.3) - '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.4.2) + '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.4.2) debug: 4.3.4(supports-color@8.1.1) eslint: 8.57.0 - tsutils: 3.21.0(typescript@5.3.3) - typescript: 5.3.3 + tsutils: 3.21.0(typescript@5.4.2) + typescript: 5.4.2 transitivePeerDependencies: - supports-color dev: true @@ -2004,7 +2004,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree@5.62.0(typescript@5.3.3): + /@typescript-eslint/typescript-estree@5.62.0(typescript@5.4.2): resolution: {integrity: sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2019,13 +2019,13 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.6.0 - tsutils: 3.21.0(typescript@5.3.3) - typescript: 5.3.3 + tsutils: 3.21.0(typescript@5.4.2) + typescript: 5.4.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils@5.62.0(eslint@8.57.0)(typescript@5.3.3): + /@typescript-eslint/utils@5.62.0(eslint@8.57.0)(typescript@5.4.2): resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2036,7 +2036,7 @@ packages: '@types/semver': 7.5.8 '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.3.3) + '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.4.2) eslint: 8.57.0 eslint-scope: 5.1.1 semver: 7.6.0 @@ -3265,9 +3265,9 @@ packages: dev: true optional: true - /browserify-sign@4.2.2: - resolution: {integrity: sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==} - engines: {node: '>= 4'} + /browserify-sign@4.2.3: + resolution: {integrity: sha512-JWCZW6SKhfhjJxO8Tyiiy+XYB7cqd2S5/+WeYHsKdNKFlCBhKbblba1A/HN/90YwtxKc8tCErjffZl++UNmGiw==} + engines: {node: '>= 0.12'} requiresBuild: true dependencies: bn.js: 5.2.1 @@ -3275,9 +3275,10 @@ packages: create-hash: 1.2.0 create-hmac: 1.1.7 elliptic: 6.5.5 + hash-base: 3.0.4 inherits: 2.0.4 parse-asn1: 5.1.7 - readable-stream: 3.6.2 + readable-stream: 2.3.8 safe-buffer: 5.2.1 dev: true optional: true @@ -3286,8 +3287,8 @@ packages: resolution: {integrity: sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==} hasBin: true dependencies: - caniuse-lite: 1.0.30001594 - electron-to-chromium: 1.4.692 + caniuse-lite: 1.0.30001596 + electron-to-chromium: 1.4.699 dev: true /bs58@4.0.1: @@ -3452,8 +3453,8 @@ packages: resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==} engines: {node: '>=10'} - /caniuse-lite@1.0.30001594: - resolution: {integrity: sha512-VblSX6nYqyJVs8DKFMldE2IVCJjZ225LW00ydtUWwh5hk9IfkTOffO6r8gJNsH0qqqeAF8KrbMYA2VEwTlGW5g==} + /caniuse-lite@1.0.30001596: + resolution: {integrity: sha512-zpkZ+kEr6We7w63ORkoJ2pOfBwBkY/bJrG/UZ90qNb45Isblu8wzDgevEOrRL1r9dWayHjYiiyCMEXPn4DweGQ==} dev: true /case@1.6.3: @@ -3892,7 +3893,7 @@ packages: yaml: 1.10.2 dev: true - /cosmiconfig@8.3.6(typescript@5.3.3): + /cosmiconfig@8.3.6(typescript@5.4.2): resolution: {integrity: sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==} engines: {node: '>=14'} peerDependencies: @@ -3905,7 +3906,7 @@ packages: js-yaml: 4.1.0 parse-json: 5.2.0 path-type: 4.0.0 - typescript: 5.3.3 + typescript: 5.4.2 dev: true /crc-32@1.2.2: @@ -3978,7 +3979,7 @@ packages: requiresBuild: true dependencies: browserify-cipher: 1.0.1 - browserify-sign: 4.2.2 + browserify-sign: 4.2.3 create-ecdh: 4.0.4 create-hash: 1.2.0 create-hmac: 1.1.7 @@ -4319,8 +4320,8 @@ packages: keccak: 3.0.4 dev: true - /electron-to-chromium@1.4.692: - resolution: {integrity: sha512-d5rZRka9n2Y3MkWRN74IoAsxR0HK3yaAt7T50e3iT9VZmCCQDT3geXUO5ZRMhDToa1pkCeQXuNo+0g+NfDOVPA==} + /electron-to-chromium@1.4.699: + resolution: {integrity: sha512-I7q3BbQi6e4tJJN5CRcyvxhK0iJb34TV8eJQcgh+fR2fQ8miMgZcEInckCo1U9exDHbfz7DLDnFn8oqH/VcRKw==} dev: true /elliptic@6.5.4: @@ -4617,7 +4618,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/parser': 5.62.0(eslint@8.57.0)(typescript@5.4.2) debug: 3.2.7 eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 @@ -4647,7 +4648,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/parser': 5.62.0(eslint@8.57.0)(typescript@5.4.2) array-includes: 3.1.7 array.prototype.findlastindex: 1.2.4 array.prototype.flat: 1.3.2 @@ -4672,14 +4673,15 @@ packages: - supports-color dev: true - /eslint-plugin-mocha@10.3.0(eslint@8.57.0): - resolution: {integrity: sha512-IWzbg2K6B1Q7h37Ih4zMyW+nhmw1JvUlHlbCUUUu6PfOOAUGCB0gxmvv7/U+TQQ6e8yHUv+q7KMdIIum4bx+PA==} + /eslint-plugin-mocha@10.4.1(eslint@8.57.0): + resolution: {integrity: sha512-G85ALUgKaLzuEuHhoW3HVRgPTmia6njQC3qCG6CEvA8/Ja9PDZnRZOuzekMki+HaViEQXINuYsmhp5WR5/4MfA==} engines: {node: '>=14.0.0'} peerDependencies: eslint: '>=7.0.0' dependencies: eslint: 8.57.0 eslint-utils: 3.0.0(eslint@8.57.0) + globals: 13.24.0 rambda: 7.5.0 dev: true @@ -4693,7 +4695,7 @@ packages: builtins: 5.0.1 eslint: 8.57.0 eslint-plugin-es-x: 7.5.0(eslint@8.57.0) - get-tsconfig: 4.7.2 + get-tsconfig: 4.7.3 globals: 13.24.0 ignore: 5.3.1 is-builtin-module: 3.2.1 @@ -5050,13 +5052,13 @@ packages: '@scure/bip39': 1.2.2 dev: true - /ethereum-waffle@3.4.4(typescript@5.3.3): + /ethereum-waffle@3.4.4(typescript@5.4.2): resolution: {integrity: sha512-PA9+jCjw4WC3Oc5ocSMBj5sXvueWQeAbvCA+hUlb6oFgwwKyq5ka3bWQ7QZcjzIX+TdFkxP4IbFmoY2D8Dkj9Q==} engines: {node: '>=10.0'} hasBin: true dependencies: '@ethereum-waffle/chai': 3.4.4 - '@ethereum-waffle/compiler': 3.4.4(typescript@5.3.3) + '@ethereum-waffle/compiler': 3.4.4(typescript@5.4.2) '@ethereum-waffle/mock-contract': 3.4.4 '@ethereum-waffle/provider': 3.4.4 ethers: 5.7.2 @@ -5873,8 +5875,8 @@ packages: get-intrinsic: 1.2.4 dev: true - /get-tsconfig@4.7.2: - resolution: {integrity: sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==} + /get-tsconfig@4.7.3: + resolution: {integrity: sha512-ZvkrzoUA0PQZM6fy6+/Hce561s+faD1rsNwhnO5FelNjyy7EMGJ3Rz1AQ8GYDWjhRs/7dBLOEJvhK8MiEJOAFg==} dependencies: resolve-pkg-maps: 1.0.0 dev: true @@ -6137,7 +6139,7 @@ packages: dependencies: chalk: 4.1.2 cli-table3: 0.6.3 - hardhat: 2.15.0(ts-node@10.9.2)(typescript@5.3.3) + hardhat: 2.15.0(ts-node@10.9.2)(typescript@5.4.2) strip-ansi: 6.0.1 dev: true @@ -6147,7 +6149,7 @@ packages: peerDependencies: hardhat: ^2.0.0 dependencies: - hardhat: 2.15.0(ts-node@10.9.2)(typescript@5.3.3) + hardhat: 2.15.0(ts-node@10.9.2)(typescript@5.4.2) dev: true /hardhat-deploy-ethers@0.3.0-beta.13(ethers@5.7.2)(hardhat@2.15.0): @@ -6157,7 +6159,7 @@ packages: hardhat: ^2.0.0 dependencies: ethers: 5.7.2 - hardhat: 2.15.0(ts-node@10.9.2)(typescript@5.3.3) + hardhat: 2.15.0(ts-node@10.9.2)(typescript@5.4.2) dev: true /hardhat-deploy-tenderly@0.2.0(hardhat-deploy@0.11.34)(hardhat@2.15.0): @@ -6167,7 +6169,7 @@ packages: hardhat-deploy: ^0.11.10 dependencies: axios: 0.24.0 - hardhat: 2.15.0(ts-node@10.9.2)(typescript@5.3.3) + hardhat: 2.15.0(ts-node@10.9.2)(typescript@5.4.2) hardhat-deploy: 0.11.34 js-yaml: 4.1.0 transitivePeerDependencies: @@ -6199,7 +6201,7 @@ packages: fs-extra: 10.1.0 match-all: 1.2.6 murmur-128: 0.2.1 - qs: 6.11.2 + qs: 6.12.0 zksync-web3: 0.14.4(ethers@5.7.2) transitivePeerDependencies: - bufferutil @@ -6213,7 +6215,7 @@ packages: hardhat: ^2.0.3 dependencies: console-table-printer: 2.12.0 - hardhat: 2.15.0(ts-node@10.9.2)(typescript@5.3.3) + hardhat: 2.15.0(ts-node@10.9.2)(typescript@5.4.2) dev: true /hardhat-watcher@2.5.0(hardhat@2.15.0): @@ -6222,10 +6224,10 @@ packages: hardhat: ^2.0.0 dependencies: chokidar: 3.6.0 - hardhat: 2.15.0(ts-node@10.9.2)(typescript@5.3.3) + hardhat: 2.15.0(ts-node@10.9.2)(typescript@5.4.2) dev: true - /hardhat@2.15.0(ts-node@10.9.2)(typescript@5.3.3): + /hardhat@2.15.0(ts-node@10.9.2)(typescript@5.4.2): resolution: {integrity: sha512-cC9tM/N10YaES04zPOp7yR13iX3YibqaNmi0//Ep40Nt9ELIJx3kFpQmucur0PAIfXYpGnw5RuXHNLkxpnVHEw==} engines: {node: '>=14.0.0'} hasBin: true @@ -6277,16 +6279,16 @@ packages: mnemonist: 0.38.5 mocha: 10.3.0 p-map: 4.0.0 - qs: 6.11.2 + qs: 6.12.0 raw-body: 2.5.2 resolve: 1.17.0 semver: 6.3.1 solc: 0.7.3(debug@4.3.4) source-map-support: 0.5.21 stacktrace-parser: 0.1.10 - ts-node: 10.9.2(@types/node@20.11.24)(typescript@5.3.3) + ts-node: 10.9.2(@types/node@20.11.25)(typescript@5.4.2) tsort: 0.0.1 - typescript: 5.3.3 + typescript: 5.4.2 undici: 5.28.3 uuid: 8.3.2 ws: 7.5.9 @@ -8710,8 +8712,8 @@ packages: dev: true optional: true - /qs@6.11.2: - resolution: {integrity: sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==} + /qs@6.12.0: + resolution: {integrity: sha512-trVZiI6RMOkO476zLGaBIzszOdFPnCCXHPG9kn0yuS1uz6xdVxPfZdB3vUig9pxPFDM9BRAgz/YUIVQ1/vuiUg==} engines: {node: '>=0.6'} dependencies: side-channel: 1.0.6 @@ -9522,7 +9524,7 @@ packages: - debug dev: true - /solhint@3.6.2(typescript@5.3.3): + /solhint@3.6.2(typescript@5.4.2): resolution: {integrity: sha512-85EeLbmkcPwD+3JR7aEMKsVC9YrRSxd4qkXuMzrlf7+z2Eqdfm1wHWq1ffTuo5aDhoZxp2I9yF3QkxZOxOL7aQ==} hasBin: true dependencies: @@ -9532,7 +9534,7 @@ packages: ast-parents: 0.0.1 chalk: 4.1.2 commander: 10.0.1 - cosmiconfig: 8.3.6(typescript@5.3.3) + cosmiconfig: 8.3.6(typescript@5.4.2) fast-diff: 1.3.0 glob: 8.1.0 ignore: 5.3.1 @@ -9553,8 +9555,8 @@ packages: resolution: {integrity: sha512-htM7Vn6LhHreR+EglVMd2s+sZhcXAirB1Zlyrv5zBuTxieCvjfnRpd7iZk75m/u6NOlEyQ94C6TWbBn2cY7w8g==} dev: true - /solidity-coverage@0.8.10(hardhat@2.15.0): - resolution: {integrity: sha512-6nvlWLnCjBIVnCgTZiIo2XBI62O3YJuU83xj+bklnH/B+dXGTjuQB7SccZfysUC3LFkjtZO/KjzUJ/hiSlkXWw==} + /solidity-coverage@0.8.11(hardhat@2.15.0): + resolution: {integrity: sha512-yy0Yk+olovBbXn0Me8BWULmmv7A69ZKkP5aTOJGOO8u61Tu2zS989erfjtFlUjDnfWtxRAVkd8BsQD704yLWHw==} hasBin: true peerDependencies: hardhat: ^2.11.0 @@ -9568,7 +9570,7 @@ packages: ghost-testrpc: 0.0.2 global-modules: 2.0.0 globby: 10.0.2 - hardhat: 2.15.0(ts-node@10.9.2)(typescript@5.3.3) + hardhat: 2.15.0(ts-node@10.9.2)(typescript@5.4.2) jsonschema: 1.4.1 lodash: 4.17.21 mocha: 10.3.0 @@ -10116,20 +10118,20 @@ packages: resolution: {integrity: sha512-q3N1xS4vZpRouhYHDPwO0bDW3EZ6SK9CrrDHxi/D6BPReSjpVgWIOpLS2o0gSBZm+7q/wyKp6RVM1AeeW7uyfQ==} dev: true - /ts-essentials@6.0.7(typescript@5.3.3): + /ts-essentials@6.0.7(typescript@5.4.2): resolution: {integrity: sha512-2E4HIIj4tQJlIHuATRHayv0EfMGK3ris/GRk1E3CFnsZzeNV+hUmelbaTZHLtXaZppM5oLhHRtO04gINC4Jusw==} peerDependencies: typescript: '>=3.7.0' dependencies: - typescript: 5.3.3 + typescript: 5.4.2 dev: true - /ts-essentials@7.0.3(typescript@5.3.3): + /ts-essentials@7.0.3(typescript@5.4.2): resolution: {integrity: sha512-8+gr5+lqO3G84KdiTSMRLtuyJ+nTBVRKuCrK4lidMPdVeEp0uqC875uE5NMcaA7YYMN7XsNiFQuMvasF8HT/xQ==} peerDependencies: typescript: '>=3.7.0' dependencies: - typescript: 5.3.3 + typescript: 5.4.2 dev: true /ts-generator@0.1.1: @@ -10147,7 +10149,7 @@ packages: ts-essentials: 1.0.4 dev: true - /ts-node@10.9.2(@types/node@20.11.24)(typescript@5.3.3): + /ts-node@10.9.2(@types/node@20.11.25)(typescript@5.4.2): resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} hasBin: true peerDependencies: @@ -10166,14 +10168,14 @@ packages: '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 20.11.24 + '@types/node': 20.11.25 acorn: 8.11.3 acorn-walk: 8.3.2 arg: 4.1.3 create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 5.3.3 + typescript: 5.4.2 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 @@ -10196,14 +10198,14 @@ packages: /tsort@0.0.1: resolution: {integrity: sha512-Tyrf5mxF8Ofs1tNoxA13lFeZ2Zrbd6cKbuH3V+MQ5sb6DtBj5FjrXVsRWT8YvNAQTqNoz66dz1WsbigI22aEnw==} - /tsutils@3.21.0(typescript@5.3.3): + /tsutils@3.21.0(typescript@5.4.2): resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} peerDependencies: typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' dependencies: tslib: 1.14.1 - typescript: 5.3.3 + typescript: 5.4.2 dev: true /tunnel-agent@0.6.0: @@ -10268,7 +10270,7 @@ packages: resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==} dev: true - /typechain@3.0.0(typescript@5.3.3): + /typechain@3.0.0(typescript@5.4.2): resolution: {integrity: sha512-ft4KVmiN3zH4JUFu2WJBrwfHeDf772Tt2d8bssDTo/YcckKW2D+OwFrHXRC6hJvO3mHjFQTihoMV6fJOi0Hngg==} hasBin: true dependencies: @@ -10277,14 +10279,14 @@ packages: fs-extra: 7.0.1 js-sha3: 0.8.0 lodash: 4.17.21 - ts-essentials: 6.0.7(typescript@5.3.3) + ts-essentials: 6.0.7(typescript@5.4.2) ts-generator: 0.1.1 transitivePeerDependencies: - supports-color - typescript dev: true - /typechain@8.3.2(typescript@5.3.3): + /typechain@8.3.2(typescript@5.4.2): resolution: {integrity: sha512-x/sQYr5w9K7yv3es7jo4KTX05CLxOf7TRWwoHlrjRh8H82G64g+k7VuWPJlgMo6qrjfCulOdfBjiaDtmhFYD/Q==} hasBin: true peerDependencies: @@ -10299,8 +10301,8 @@ packages: mkdirp: 1.0.4 prettier: 2.8.8 ts-command-line-args: 2.5.1 - ts-essentials: 7.0.3(typescript@5.3.3) - typescript: 5.3.3 + ts-essentials: 7.0.3(typescript@5.4.2) + typescript: 5.4.2 transitivePeerDependencies: - supports-color dev: true @@ -10359,8 +10361,8 @@ packages: resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==} dev: true - /typescript@5.3.3: - resolution: {integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==} + /typescript@5.4.2: + resolution: {integrity: sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==} engines: {node: '>=14.17'} hasBin: true @@ -10501,7 +10503,7 @@ packages: resolution: {integrity: sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==} dependencies: punycode: 1.4.1 - qs: 6.11.2 + qs: 6.12.0 dev: true /usb@2.9.0: From 4ed3caca3183f931ca18ef9490561c79c029ca87 Mon Sep 17 00:00:00 2001 From: Yudi Levi Date: Sun, 10 Mar 2024 10:06:19 +0000 Subject: [PATCH 11/11] updated deploy script docs --- deploy/scripts/mainnet/0013-CarbonController-upgrade.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/scripts/mainnet/0013-CarbonController-upgrade.ts b/deploy/scripts/mainnet/0013-CarbonController-upgrade.ts index b199bea6..00ff64a0 100644 --- a/deploy/scripts/mainnet/0013-CarbonController-upgrade.ts +++ b/deploy/scripts/mainnet/0013-CarbonController-upgrade.ts @@ -3,7 +3,7 @@ import { DeployFunction } from 'hardhat-deploy/types'; import { HardhatRuntimeEnvironment } from 'hardhat/types'; /** - * @dev trade by source extended input upgrade + * @dev remove pause functionality */ const func: DeployFunction = async ({ getNamedAccounts }: HardhatRuntimeEnvironment) => { const { deployer } = await getNamedAccounts();