Ape Staking Vault

.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"
   }
 }

.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)

.nvmrc

@@ -1 +1 @@
-18
+18.16.0

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:
@@ -264,9 +264,9 @@ test-ape-staking:
 test-auto-compound-ape:
 	make TEST_TARGET=auto_compound_ape.spec.ts test
 
-.PHONY: test-p2p-pair-staking
-test-p2p-pair-staking:
-	make TEST_TARGET=p2p_pair_staking.spec.ts test
+.PHONY: test-para-ape-staking
+test-para-aper-staking:
+	make TEST_TARGET=para_ape_staking.spec.ts test
 
 .PHONY: test-sape-operation
 test-sape-operation:
@@ -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:
@@ -384,9 +384,9 @@ deploy-blur-exchange:
 deploy-flashClaimRegistry:
 	make TASK_NAME=deploy:flash-claim-registry run-task
 
-.PHONY: deploy-p2p-pair-staking
-deploy-p2p-pair-staking:
-	make TASK_NAME=deploy:P2PPairStaking run-task
+.PHONY: deploy-para-ape-staking
+deploy-para-ape-staking:
+	make TASK_NAME=deploy:ParaApeStaking run-task
 
 .PHONY: deploy-timelock
 deploy-timelock:
@@ -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
@@ -636,9 +648,9 @@ upgrade-auto-compound-ape:
 upgrade-timelock:
 	make TASK_NAME=upgrade:timelock run-task
 
-.PHONY: upgrade-p2p-pair-staking
-upgrade-p2p-pair-staking:
-	make TASK_NAME=upgrade:p2p-pair-staking run-task
+.PHONY: upgrade-para-ape-staking
+upgrade-para-ape-staking:
+	make TASK_NAME=upgrade:para-ape-staking run-task
 
 .PHONY: upgrade-ntoken
 upgrade-ntoken:
@@ -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

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";

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";