Merge branch 'main' into feat/collateral-swap-2

.env.example

@@ -15,3 +15,4 @@ DEPLOY_END=24
 # FORK=mainnet
 RPC_URL=http://localhost:8545
 DEPLOY_INCREMENTAL=false
+STACKUP_KEY=aaaaaabbbbbbcccccddddd

.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:
@@ -51,7 +51,7 @@ lint:
 
 .PHONY: coverage
 coverage:
-	yarn coverage
+	yarn coverage --no-compile
 
 .PHONY: format
 format:
@@ -301,7 +301,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:
@@ -411,6 +411,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
@@ -459,6 +463,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
@@ -627,6 +639,10 @@ upgrade-pool-marketplace:
 upgrade-pool-ape-staking:
 	make TASK_NAME=upgrade:pool-ape-staking run-task
 
+.PHONY: upgrade-borrow_ape_and_stake
+upgrade-borrow_ape_and_stake:
+	make TASK_NAME=upgrade:borrow-ape-and-stake run-task
+
 .PHONY: upgrade-pool-parameters
 upgrade-pool-parameters:
 	make TASK_NAME=upgrade:pool-parameters run-task
@@ -651,6 +667,14 @@ upgrade-auto-compound-ape:
 upgrade-timelock:
 	make TASK_NAME=upgrade:timelock run-task
 
+.PHONY: upgrade-helper-contract
+upgrade-helper-contract:
+	make TASK_NAME=upgrade:helper-contract run-task
+
+.PHONY: upgrade-account-abstraction
+upgrade-account-abstraction:
+	make TASK_NAME=upgrade:account-abstraction run-task
+
 .PHONY: upgrade-p2p-pair-staking
 upgrade-p2p-pair-staking:
 	make TASK_NAME=upgrade:p2p-pair-staking run-task
@@ -686,15 +710,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:
@@ -716,7 +741,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

README.md

@@ -7,7 +7,7 @@
 [![CI](https://github.com/para-space/paraspace-core/workflows/CI/badge.svg)](https://github.com/para-space/paraspace-core/actions)
 [![License](https://img.shields.io/github/license/para-space/paraspace-core?color=green)](https://github.com/para-space/paraspace-core/blob/main/LICENSE)
 
-[![Twitter URL](https://img.shields.io/twitter/follow/Paraspace_Official?style=social)](https://twitter.com/paraspace_CM)
+[![Twitter URL](https://img.shields.io/twitter/follow/ParaSpace_NFT?style=social)](https://twitter.com/ParaSpace_NFT)
 [![Telegram](https://img.shields.io/badge/Telegram-gray?logo=telegram)](https://t.me/parallelfi_community)
 [![Medium](https://img.shields.io/badge/Medium-gray?logo=medium)](https://medium.com/@paraspace)
 [![Discourse](https://img.shields.io/badge/Forum-gray?logo=discourse)](https://discourse.para.space)

contracts/account-abstraction/Account.sol

@@ -0,0 +1,192 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity 0.8.17;
+
+import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
+import "@openzeppelin/contracts/proxy/utils/Initializable.sol";
+import "@openzeppelin/contracts/interfaces/IERC1271.sol";
+import {SignatureChecker} from "../dependencies/openzeppelin/contracts/SignatureChecker.sol";
+import "./base-account-abstraction/core/BaseAccount.sol";
+import "./callback/TokenCallbackHandler.sol";
+
+/**
+ * Address Owned Account.
+ *  this is sample minimal account.
+ *  has execute, eth handling methods
+ *  has a single signer that can send requests through the entryPoint.
+ */
+contract Account is BaseAccount, TokenCallbackHandler, IERC1271, Initializable {
+    using ECDSA for bytes32;
+
+    address public owner;
+
+    IEntryPoint private immutable _entryPoint;
+
+    event AccountInitialized(
+        IEntryPoint indexed entryPoint,
+        address indexed owner
+    );
+
+    modifier onlyOwner() {
+        _onlyOwner();
+        _;
+    }
+
+    /// @inheritdoc BaseAccount
+    function entryPoint() public view virtual override returns (IEntryPoint) {
+        return _entryPoint;
+    }
+
+    // solhint-disable-next-line no-empty-blocks
+    receive() external payable {}
+
+    constructor(IEntryPoint anEntryPoint) {
+        _entryPoint = anEntryPoint;
+        _disableInitializers();
+    }
+
+    function _onlyOwner() internal view {
+        //directly from EOA owner, or through the account itself (which gets redirected through execute())
+        require(
+            msg.sender == owner || msg.sender == address(this),
+            "only owner"
+        );
+    }
+
+    /**
+     * execute a transaction (called directly from owner, or by entryPoint)
+     */
+    function execute(
+        address dest,
+        uint256 value,
+        bytes calldata func
+    ) external {
+        _requireFromEntryPointOrOwner();
+
+        _call(dest, value, func);
+    }
+
+    /**
+     * execute a sequence of transactions
+     */
+    function executeBatch(
+        address[] calldata dest,
+        uint256[] calldata value,
+        bytes[] calldata func
+    ) external {
+        _requireFromEntryPointOrOwner();
+
+        require(
+            dest.length == func.length &&
+                (value.length == 0 || value.length == func.length),
+            "wrong array lengths"
+        );
+        if (value.length == 0) {
+            for (uint256 i = 0; i < dest.length; i++) {
+                _call(dest[i], 0, func[i]);
+            }
+        } else {
+            for (uint256 i = 0; i < dest.length; i++) {
+                _call(dest[i], value[i], func[i]);
+            }
+        }
+    }
+
+    /**
+     * @dev The _entryPoint member is immutable, to reduce gas consumption.  To upgrade EntryPoint,
+     * a new implementation of SimpleAccount must be deployed with the new EntryPoint address, then upgrading
+     * the implementation by calling `upgradeTo()`
+     */
+    function initialize(address anOwner) public virtual initializer {
+        _initialize(anOwner);
+    }
+
+    function _initialize(address anOwner) internal virtual {
+        owner = anOwner;
+        emit AccountInitialized(_entryPoint, owner);
+    }
+
+    // Require the function call went through EntryPoint or owner
+    function _requireFromEntryPointOrOwner() internal view {
+        require(
+            msg.sender == address(entryPoint()) || msg.sender == owner,
+            "account: not Owner or EntryPoint"
+        );
+    }
+
+    /// implement template method of BaseAccount
+    function _validateSignature(
+        UserOperation calldata userOp,
+        bytes32 userOpHash
+    ) internal virtual override returns (uint256 validationData) {
+        bytes32 hash = userOpHash;
+
+        address curOwner = owner;
+        if (curOwner.code.length == 0) {
+            hash = userOpHash.toEthSignedMessageHash();
+        }
+
+        bool isValid = SignatureChecker.isValidSignatureNow(
+            curOwner,
+            hash,
+            userOp.signature
+        );
+
+        if (isValid) {
+            return 0;
+        }
+
+        return SIG_VALIDATION_FAILED;
+    }
+
+    function isValidSignature(
+        bytes32 hash,
+        bytes memory signature
+    ) external view returns (bytes4) {
+        bool isValid = SignatureChecker.isValidSignatureNow(
+            owner,
+            hash,
+            signature
+        );
+
+        if (isValid) {
+            return IERC1271.isValidSignature.selector;
+        }
+
+        return "";
+    }
+
+    function _call(address target, uint256 value, bytes memory data) internal {
+        (bool success, bytes memory result) = target.call{value: value}(data);
+        if (!success) {
+            assembly {
+                revert(add(result, 32), mload(result))
+            }
+        }
+    }
+
+    /**
+     * check current account deposit in the entryPoint
+     */
+    function getDeposit() public view returns (uint256) {
+        return entryPoint().balanceOf(address(this));
+    }
+
+    /**
+     * deposit more funds for this account in the entryPoint
+     */
+    function addDeposit() public payable {
+        entryPoint().depositTo{value: msg.value}(address(this));
+    }
+
+    /**
+     * withdraw value from the account's deposit
+     * @param withdrawAddress target to send to
+     * @param amount to withdraw
+     */
+    function withdrawDepositTo(
+        address payable withdrawAddress,
+        uint256 amount
+    ) public onlyOwner {
+        entryPoint().withdrawTo(withdrawAddress, amount);
+    }
+}