Merge branch 'main' into account-abstraction

parallel-finance · Aug 23, 2023 · 3a6d53c · 3a6d53c
2 parents d0e7c96 + 67a0f41
commit 3a6d53c
Show file tree

Hide file tree

Showing 550 changed files with 7,177 additions and 6,287 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -14,6 +14,7 @@
     "node/no-missing-import": "off",
     "no-unpublished-import": "off",
     "no-case-declarations": "off",
-    "@typescript-eslint/no-non-null-assertion": "off"
+    "@typescript-eslint/no-non-null-assertion": "off",
+    "@typescript-eslint/no-non-null-asserted-optional-chain": "off"
   }
 }
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,10 @@ coverage.json
 /coverage
 dist
 
+artifacts-zk/
+cache-zk/
+zk-libraries.json
+
 keystore/
 
 # Setting for non zero-installs (https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored)

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-18
+18.16.0
diff --git a/Makefile b/Makefile
@@ -19,27 +19,27 @@ init: submodules
 
 .PHONY: test
 test:
-	npx hardhat test ./test/${TEST_TARGET} --network ${NETWORK} # --verbose
-
+	npx hardhat test ./test/${TEST_TARGET} --network ${NETWORK} --no-compile
 .PHONY: local-test
 local-test:
 	make MOCHA_JOBS=0 DB_PATH=deployed-contracts.json DEPLOY_START=21 NETWORK=localhost test
 
 .PHONY: slow-test
 slow-test:
-	MOCHA_JOBS=0 DB_PATH=deployed-contracts.json npx hardhat test ./test/${TEST_TARGET} --network ${NETWORK} # --verbose
+	MOCHA_JOBS=0 DB_PATH=deployed-contracts.json npx hardhat test ./test/${TEST_TARGET} --network ${NETWORK} --no-compile
 
 .PHONY: fast-test
 fast-test:
-	MOCHA_JOBS=4 DB_PATH=:memory: npx hardhat test ./test/${TEST_TARGET} --network ${NETWORK} # --verbose
+	MOCHA_JOBS=4 DB_PATH=:memory: npx hardhat test ./test/${TEST_TARGET} --network ${NETWORK} --no-compile
 
 .PHONY: size
 size:
 	yarn size
 
 .PHONY: build
 build: clean
-	yarn build
+	yarn build --network ${NETWORK}
+	yarn typechain
 
 .PHONY: doc
 doc:
@@ -52,7 +52,7 @@ lint:
 
 .PHONY: coverage
 coverage:
-	yarn coverage
+	yarn coverage --no-compile
 
 .PHONY: format
 format:
@@ -286,7 +286,7 @@ test-stakefish-nft:
 
 .PHONY: run
 run:
-	npx hardhat run $(SCRIPT_PATH) --network $(NETWORK)
+	npx hardhat run $(SCRIPT_PATH) --network $(NETWORK) --no-compile
 
 .PHONY: run-task
 run-task:
@@ -396,6 +396,10 @@ deploy-timelock:
 deploy-renounceOwnership:
 	make TASK_NAME=deploy:renounce-ownership run-task
 
+.PHONY: deploy-all-libraries
+deploy-all-libraries:
+	make TASK_NAME=deploy:all-libraries run-task
+
 .PHONY: ad-hoc
 ad-hoc:
 	make SCRIPT_PATH=./scripts/dev/1.ad-hoc.ts run
@@ -444,6 +448,14 @@ set-timelock-strategy:
 acl:
 	make SCRIPT_PATH=./scripts/dev/13.acl.ts run
 
+.PHONY: zksync-bytecode-hashes
+zksync-bytecode-hashes:
+	make SCRIPT_PATH=./scripts/dev/14.zksync-bytecode-hashes.ts run
+
+.PHONY: redeploy-market
+redeploy-market:
+	make SCRIPT_PATH=./scripts/dev/15.redeploy-market.ts run
+
 .PHONY: transfer-tokens
 transfer-tokens:
 	make SCRIPT_PATH=./scripts/dev/2.transfer-tokens.ts run
@@ -671,15 +683,16 @@ hardhat:
 .PHONY: anvil
 anvil:
 	anvil \
-		$(if $(FORK),--fork-url https://eth-$(FORK).alchemyapi.io/v2/$(ALCHEMY_KEY) --no-rate-limit,) \
-		$(if $(FORK),--chain-id 522,--chain-id 31337) \
-		--tracing \
+		$(if $(FORK),--fork-url https://eth-$(FORK).alchemyapi.io/v2/$(ALCHEMY_KEY) --chain-id 522 --no-rate-limit,--chain-id 31337) \
+		$(if $(FORK_BLOCK_NUMBER),--fork-block-number $(FORK_BLOCK_NUMBER),) \
+		$(if $(DEPLOYER_MNEMONIC),--mnemonic "${DEPLOYER_MNEMONIC}",--mnemonic "test test test test test test test test test test test junk") \
 		--host 0.0.0.0 \
 		--state-interval 60 \
 		--dump-state state.json \
 		$(if $(wildcard state.json),--load-state state.json,) \
 		--disable-block-gas-limit \
 		--code-size-limit 100000 \
+		--timeout 9000000
 
 .PHONY: image
 image:
@@ -701,7 +714,7 @@ shutdown:
 	docker-compose \
 		down \
 		--remove-orphans > /dev/null 2>&1 || true
-	docker volume prune -f
+	docker volume prune -f || true
 	sudo rm -fr redis-data || true
 	sudo rm -fr logs || true
 	sudo rm -fr state.json || true

diff --git a/contracts/apestaking/AutoCompoundApe.sol b/contracts/apestaking/AutoCompoundApe.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.10;
+pragma solidity ^0.8.0;
 
 import "../dependencies/openzeppelin/upgradeability/Initializable.sol";
 import "../dependencies/openzeppelin/upgradeability/OwnableUpgradeable.sol";

diff --git a/contracts/apestaking/AutoYieldApe.sol b/contracts/apestaking/AutoYieldApe.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.10;
+pragma solidity ^0.8.0;
 
 import "../dependencies/openzeppelin/upgradeability/Initializable.sol";
 import "../dependencies/openzeppelin/upgradeability/ERC20Upgradeable.sol";
@@ -8,7 +8,7 @@ import "../dependencies/openzeppelin/contracts/IERC20.sol";
 import "../dependencies/openzeppelin/contracts/SafeERC20.sol";
 import "../dependencies/openzeppelin/contracts/SafeCast.sol";
 import "../dependencies/openzeppelin/contracts/Address.sol";
-import "../dependencies/univ3/interfaces/ISwapRouter.sol";
+import "../dependencies/uniswapv3-periphery/interfaces/ISwapRouter.sol";
 import "../dependencies/yoga-labs/ApeCoinStaking.sol";
 import "../interfaces/IAutoYieldApe.sol";
 import "../interfaces/IYieldInfo.sol";

diff --git a/contracts/apestaking/P2PPairStaking.sol b/contracts/apestaking/P2PPairStaking.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.10;
+pragma solidity ^0.8.0;
 
 import "../dependencies/openzeppelin/upgradeability/Initializable.sol";
 import "../dependencies/openzeppelin/upgradeability/OwnableUpgradeable.sol";

diff --git a/contracts/apestaking/base/CApe.sol b/contracts/apestaking/base/CApe.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.10;
+pragma solidity ^0.8.0;
 
 import "../../dependencies/openzeppelin/upgradeability/ContextUpgradeable.sol";
 import "../../dependencies/openzeppelin/upgradeability/PausableUpgradeable.sol";

diff --git a/contracts/dependencies/benddao/contracts/interfaces/ILendPool.sol b/contracts/dependencies/benddao/contracts/interfaces/ILendPool.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: agpl-3.0
-pragma solidity 0.8.10;
+pragma solidity ^0.8.0;
 
 import {BDaoDataTypes} from "../libraries/types/BDaoDataTypes.sol";
 

diff --git a/contracts/dependencies/benddao/contracts/interfaces/ILendPoolLoan.sol b/contracts/dependencies/benddao/contracts/interfaces/ILendPoolLoan.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: agpl-3.0
-pragma solidity 0.8.10;
+pragma solidity ^0.8.0;
 
 import {BDaoDataTypes} from "../libraries/types/BDaoDataTypes.sol";
 

diff --git a/contracts/dependencies/benddao/contracts/libraries/types/BDaoDataTypes.sol b/contracts/dependencies/benddao/contracts/libraries/types/BDaoDataTypes.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: agpl-3.0
-pragma solidity 0.8.10;
+pragma solidity ^0.8.0;
 
 library BDaoDataTypes {
   struct ReserveData {

diff --git a/contracts/dependencies/benddao/contracts/libraries/types/ConfigTypes.sol b/contracts/dependencies/benddao/contracts/libraries/types/ConfigTypes.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: agpl-3.0
-pragma solidity 0.8.10;
+pragma solidity ^0.8.0;
 
 library ConfigTypes {
   struct InitReserveInput {

diff --git a/contracts/dependencies/blur-exchange/BlurExchange.sol b/contracts/dependencies/blur-exchange/BlurExchange.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.10;
+pragma solidity ^0.8.0;
 
 import "../openzeppelin/upgradeability/Initializable.sol";
 import "../openzeppelin/upgradeability/UUPSUpgradeable.sol";

diff --git a/contracts/dependencies/blur-exchange/EIP712.sol b/contracts/dependencies/blur-exchange/EIP712.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.10;
+pragma solidity ^0.8.0;
 
 import {Order, Fee} from "./OrderStructs.sol";
 

diff --git a/contracts/dependencies/blur-exchange/ExecutionDelegate.sol b/contracts/dependencies/blur-exchange/ExecutionDelegate.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.10;
+pragma solidity ^0.8.0;
 
 import "../openzeppelin/contracts/IERC20.sol";
 import "../openzeppelin/contracts/IERC721.sol";

diff --git a/contracts/dependencies/blur-exchange/IBlurExchange.sol b/contracts/dependencies/blur-exchange/IBlurExchange.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.10;
+pragma solidity ^0.8.0;
 
 import {Input, Order} from "./OrderStructs.sol";
 import "./IExecutionDelegate.sol";

diff --git a/contracts/dependencies/blur-exchange/IExecutionDelegate.sol b/contracts/dependencies/blur-exchange/IExecutionDelegate.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.10;
+pragma solidity ^0.8.0;
 
 interface IExecutionDelegate {
     function approveContract(address _contract) external;

diff --git a/contracts/dependencies/blur-exchange/IMatchingPolicy.sol b/contracts/dependencies/blur-exchange/IMatchingPolicy.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.10;
+pragma solidity ^0.8.0;
 
 import {Order, AssetType} from "./OrderStructs.sol";
 

diff --git a/contracts/dependencies/blur-exchange/IPolicyManager.sol b/contracts/dependencies/blur-exchange/IPolicyManager.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.10;
+pragma solidity ^0.8.0;
 
 interface IPolicyManager {
     function addPolicy(address policy) external;

diff --git a/contracts/dependencies/blur-exchange/MerkleVerifier.sol b/contracts/dependencies/blur-exchange/MerkleVerifier.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.10;
+pragma solidity ^0.8.0;
 
 /**
  * @title MerkleVerifier

diff --git a/contracts/dependencies/blur-exchange/OrderStructs.sol b/contracts/dependencies/blur-exchange/OrderStructs.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.10;
+pragma solidity ^0.8.0;
 
 enum Side { Buy, Sell }
 enum SignatureVersion { Single, Bulk }

diff --git a/contracts/dependencies/blur-exchange/PolicyManager.sol b/contracts/dependencies/blur-exchange/PolicyManager.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.10;
+pragma solidity ^0.8.0;
 
 import {Ownable} from "../openzeppelin/contracts/Ownable.sol";
 import {EnumerableSet} from "../openzeppelin/contracts/EnumerableSet.sol";

diff --git a/contracts/dependencies/blur-exchange/StandardPolicyERC721.sol b/contracts/dependencies/blur-exchange/StandardPolicyERC721.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.10;
+pragma solidity ^0.8.0;
 
 import {Order, AssetType} from "./OrderStructs.sol";
 import {IMatchingPolicy} from "./IMatchingPolicy.sol";

diff --git a/contracts/dependencies/chainlink/AggregatorInterface.sol b/contracts/dependencies/chainlink/AggregatorInterface.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 // Chainlink Contracts v0.8
-pragma solidity ^0.8.10;
+pragma solidity ^0.8.0;
 
 interface AggregatorInterface {
     function latestAnswer() external view returns (int256);

diff --git a/contracts/dependencies/chainlink/AggregatorV2V3Interface.sol b/contracts/dependencies/chainlink/AggregatorV2V3Interface.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.10;
+pragma solidity ^0.8.0;
 
 import "./AggregatorInterface.sol";
 import "./AggregatorV3Interface.sol";

diff --git a/contracts/dependencies/chainlink/AggregatorV3Interface.sol b/contracts/dependencies/chainlink/AggregatorV3Interface.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.10;
+pragma solidity ^0.8.0;
 
 interface AggregatorV3Interface {
   function decimals() external view returns (uint8);

diff --git a/contracts/dependencies/chainlink/ICLSynchronicityPriceAdapter.sol b/contracts/dependencies/chainlink/ICLSynchronicityPriceAdapter.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.10;
+pragma solidity ^0.8.0;
 
 interface ICLSynchronicityPriceAdapter {
   /**

diff --git a/contracts/dependencies/delegation/DelegationRegistry.sol b/contracts/dependencies/delegation/DelegationRegistry.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: CC0-1.0
-pragma solidity ^0.8.10;
+pragma solidity ^0.8.0;
 
 import {IDelegationRegistry} from "./IDelegationRegistry.sol";
 import {EnumerableSet} from "../openzeppelin/contracts/EnumerableSet.sol";

diff --git a/contracts/dependencies/delegation/IDelegationRegistry.sol b/contracts/dependencies/delegation/IDelegationRegistry.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: CC0-1.0
-pragma solidity ^0.8.10;
+pragma solidity ^0.8.0;
 
 /**
  * @title An immutable registry contract to be deployed as a standalone primitive

diff --git a/contracts/dependencies/erc721-collections/IMoonBird.sol b/contracts/dependencies/erc721-collections/IMoonBird.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity 0.8.10;
+pragma solidity ^0.8.0;
 
 /**
     @title MoonBirds contract interface

diff --git a/contracts/dependencies/gnosis/contracts/GPv2SafeERC20.sol b/contracts/dependencies/gnosis/contracts/GPv2SafeERC20.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
-pragma solidity 0.8.10;
+pragma solidity ^0.8.0;
 
 import {IERC20} from "../../openzeppelin/contracts/IERC20.sol";
 

diff --git a/contracts/dependencies/looksrare/contracts/interfaces/IWETH.sol b/contracts/dependencies/looksrare/contracts/interfaces/IWETH.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU
-pragma solidity >=0.5.0;
+pragma solidity ^0.8.0;
 
 interface IWETH {
     function deposit() external payable;

diff --git a/contracts/dependencies/math/PRBMath.sol b/contracts/dependencies/math/PRBMath.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Unlicense
-pragma solidity >=0.8.4;
+pragma solidity ^0.8.0;
 
 /// @notice Emitted when the result overflows uint256.
 error PRBMath__MulDivFixedPointOverflow(uint256 prod1);

diff --git a/contracts/dependencies/math/PRBMathSD59x18.sol b/contracts/dependencies/math/PRBMathSD59x18.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Unlicense
-pragma solidity >=0.8.4;
+pragma solidity ^0.8.0;
 
 import "./PRBMath.sol";
 

diff --git a/contracts/dependencies/math/PRBMathUD60x18.sol b/contracts/dependencies/math/PRBMathUD60x18.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Unlicense
-pragma solidity >=0.8.4;
+pragma solidity ^0.8.0;
 
 import "./PRBMath.sol";
 

diff --git a/contracts/dependencies/math/SqrtLib.sol b/contracts/dependencies/math/SqrtLib.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.10;
+pragma solidity ^0.8.0;
 
 library SqrtLib {
     function sqrt(uint256 x) internal pure returns (uint256 z) {

diff --git a/contracts/dependencies/openzeppelin/contracts/AccessControl.sol b/contracts/dependencies/openzeppelin/contracts/AccessControl.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.10;
+pragma solidity ^0.8.0;
 
 import "./IAccessControl.sol";
 import "./Context.sol";

diff --git a/contracts/dependencies/openzeppelin/contracts/Address.sol b/contracts/dependencies/openzeppelin/contracts/Address.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v4.7.0) (utils/Address.sol)
 
-pragma solidity ^0.8.10;
+pragma solidity ^0.8.0;
 
 /**
  * @dev Collection of functions related to the address type

diff --git a/contracts/dependencies/openzeppelin/contracts/Base64.sol b/contracts/dependencies/openzeppelin/contracts/Base64.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v4.7.0) (utils/Base64.sol)
 
-pragma solidity ^0.8.10;
+pragma solidity ^0.8.0;
 
 /**
  * @dev Provides a set of functions to operate with Base64 strings.

diff --git a/contracts/dependencies/openzeppelin/contracts/Context.sol b/contracts/dependencies/openzeppelin/contracts/Context.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.10;
+pragma solidity ^0.8.0;
 
 /*
  * @dev Provides information about the current execution context, including the