thirdweb-dev · codypharm · Oct 16, 2023 · Oct 17, 2023 · Oct 20, 2023 · Oct 20, 2023
diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/Makefile b/Makefile
@@ -25,15 +25,15 @@ build:; forge build
 
 test :; forge test 
 
-test_anvil :; forge test --rpc-url $(ANVIL_RPC_URL)
+test_anvil :; forge test --rpc-url $(SEPOLIA_RPC_URL)
 
 snapshot :; forge snapshot
 
 format :; forge fmt
 
 anvil :; anvil -m 'test test test test test test test test test test test junk' --steps-tracing --block-time 1
 
-NETWORK_ARGS := --rpc-url $(ANVIL_RPC_URL) --private-key $(ANVIL_PRIVATE_KEY) --broadcast
+SEPOLIA_NETWORK_ARGS := --rpc-url $(SEPOLIA_RPC_URL) --private-key $(SEPOLIA_PRIVATE_KEY) --broadcast
 
 # ifeq ($(findstring --network sepolia,$(ARGS)),--network sepolia)
 # 	NETWORK_ARGS := --rpc-url $(SEPOLIA_RPC_URL) --private-key $(SEPOLIA_PRIVATE_KEY) --broadcast --verify --etherscan-api-key $(ETHERSCAN_API_KEY) -vvvv
@@ -44,4 +44,4 @@ NETWORK_ARGS := --rpc-url $(ANVIL_RPC_URL) --private-key $(ANVIL_PRIVATE_KEY) --
 # endif
 
 deploy:
-	@forge script scripts/DeploySmartAccountUtilContracts.s.sol:DeploySmartAccountUtilContracts $(NETWORK_ARGS)
+	@forge script scripts/DeploySmartAccountUtilContracts.s.sol:DeploySmartAccountUtilContracts $(SEPOLIA_NETWORK_ARGS)
diff --git a/README.md b/README.md
@@ -1,146 +1,30 @@
 <p align="center">
 <br />
-<a href="https://thirdweb.com"><img src="https://github.com/thirdweb-dev/typescript-sdk/blob/main/logo.svg?raw=true" width="200" alt=""/></a>
+<h1 align="center">CryptoPhoenix Smart Wallet Contracts</h1>
+<p align="center"><strong>CryptoPhoenix Wallet SDK is a rollup to thirdweb's smart wallet contracts by offering features like: <br />
+- Cross-chain payments using Chainlink's CCIP <br />
+- Social Account Recovery</strong><br />
 <br />
-</p>
-<h1 align="center">thirdweb Contracts</h1>
-<p align="center">
-<a href="https://www.npmjs.com/package/@thirdweb-dev/contracts"><img src="https://img.shields.io/npm/v/@thirdweb-dev/contracts?color=red&logo=npm" alt="npm version"/></a>
-<a href="https://github.com/thirdweb-dev/contracts/actions"><img alt="Build Status" src="https://github.com/thirdweb-dev/contracts/actions/workflows/tests.yml/badge.svg"/></a>
-<a href="https://discord.gg/thirdweb"><img alt="Join our Discord!" src="https://img.shields.io/discord/834227967404146718.svg?color=7289da&label=discord&logo=discord&style=flat"/></a>
-
-</p>
-<p align="center"><strong>Collection of smart contracts deployable via the thirdweb SDK, dashboard and CLI</strong></p>
-<br />
-
-## Social Account Recovery
-To understand the social account recovery feature and the contracts involved, kindly visit [Social Account Recovery docs](https://engineeringwithshiven.notion.site/Account-Recovery-for-Smart-wallets-9c57263c51514ca7abe26138a7005a0e)
-
-## Installation
-
-```shell
-# Forge projects
-forge install https://github.com/thirdweb-dev/contracts
-
-# Hardhat / npm based projects
-npm i @thirdweb-dev/contracts
-```
-
-```bash
-contracts
-|
-|-- extension: "extensions that can be inherited by NON-upgradeable contracts"
-|   |-- interface: "interfaces of all extension contracts"
-|   |-- upgradeable: "extensions that can be inherited by upgradeable contracts"
-|   |-- [$prebuilt-category]: "legacy extensions written specifically for a prebuilt contract"
-|
-|-- base: "NON-upgradeable base contracts to build on top of"
-|   |-- interface: "interfaces for all base contracts"
-|   |--  upgradeable: "upgradeable base contracts to build on top of"
-|
-|-- prebuilt: "audited, ready-to-deploy thirdweb smart contracts"
-|   |-- interface: "interfaces for all prebuilt contracts"
-|   |--[$prebuilt-category]: "feature-based group of prebuilt contracts"
-|   |-- unaudited: "yet-to-audit thirdweb smart contracts"
-|       |-- [$prebuilt-category]: "feature-based group of prebuilt contracts"
-|
-|-- infra: "onchain infrastructure contracts"
-|   |-- interface: "interfaces for all infrastructure contracts"
-|
-|-- eip: "implementations of relevant EIP standards"
-|   |-- interface "all interfaces of relevant EIP standards"
-|
-|-- lib: "Solidity libraries"
-|
-|-- external-deps: "modified / copied over external dependencies"
-|   |-- openzeppelin: "modified / copied over openzeppelin dependencies"
-|   |-- chainlink: "modified / copied over chainlink dependencies"
-|
-|-- legacy-contracts: "maintained legacy thirdweb contracts"
-```
-
-## Running Tests
-
-1. `yarn`: install contracts dependencies
-2. `forge install`: install tests dependencies
-3. `forge test`: run the tests
-
-This repository is a [forge](https://github.com/foundry-rs/foundry/tree/master/forge) project.
-
-First install the relevant dependencies of the project:
-
-```bash
-yarn
-
-forge install
-```
-
-To compile contracts, run:
-
-```bash
-forge build
-```
-
-To run tests:
-
-```bash
-forge test
-```
-
-## Pre-built Contracts
-
-Pre-built contracts are written by the thirdweb team, and cover the most common use cases for smart contracts.
-
-- [DropERC20](https://thirdweb.com/deployer.thirdweb.eth/DropERC20)
-- [DropERC721](https://thirdweb.com/deployer.thirdweb.eth/DropERC721)
-- [DropERC1155](https://thirdweb.com/deployer.thirdweb.eth/DropERC1155)
-- [SignatureDrop](https://thirdweb.com/deployer.thirdweb.eth/SignatureDrop)
-- [Marketplace](https://thirdweb.com/deployer.thirdweb.eth/Marketplace)
-- [Multiwrap](https://thirdweb.com/deployer.thirdweb.eth/Multiwrap)
-- [TokenERC20](https://thirdweb.com/deployer.thirdweb.eth/TokenERC20)
-- [TokenERC721](https://thirdweb.com/deployer.thirdweb.eth/TokenERC721)
-- [TokenERC1155](https://thirdweb.com/deployer.thirdweb.eth/TokenERC1155)
-- [VoteERC20](https://thirdweb.com/deployer.thirdweb.eth/VoteERC20)
-- [Split](https://thirdweb.com/deployer.thirdweb.eth/Split)
-
-[Learn more about pre-built contracts](https://portal.thirdweb.com/pre-built-contracts)
-
-## Extensions
-
-Extensions are building blocks that help enrich smart contracts with features.
-
-Some blocks come packaged together as Base Contracts, which come with a full set of features out of the box that you can modify and extend. These contracts are available at `contracts/base/`.
-
-Other (smaller) blocks are Features, which provide a way for you to pick and choose which individual pieces you want to put into your contract; with full customization of how those features work. These are available at `contracts/extension/`.
-
-[Learn more about extensions](https://portal.thirdweb.com/extensions)
-
-## Contract Audits
-
-- [Audit 1](audit-reports/audit-1.pdf)
-- [Audit 2](audit-reports/audit-2.pdf)
-- [Audit 3](audit-reports/audit-3.pdf)
-- [Audit 4](audit-reports/audit-4.pdf)
-- [Audit 5](audit-reports/audit-5.pdf)
-- [Audit 6](audit-reports/audit-6.pdf)
-- [Audit 7](audit-reports/audit-7.pdf)
-- [Audit 8](audit-reports/audit-8.pdf)
-- [Audit 9](audit-reports/audit-9.pdf)
-- [Audit 10](audit-reports/audit-10.pdf)
-- [Audit 11](audit-reports/audit-11.pdf)
-- [Audit 12](audit-reports/audit-12.pdf)
 
-## Bug reports
+## Inspiration
+As we all know, the wallet experience is such a crucial factor in the mass adoption of web3 dapps and services by internet users. For new users to interact with the blockchain, they must: create a wallet, store their private keys, purchase & transfer funds, pay gas fees, and sign every single action that they take on a dApp. With such an intimidating user experience for newcomers, something must change. CryptoPhoenix Wallet SDK is here to bring just that change!
 
-Found a security issue with our smart contracts? Send bug reports to [email protected] and we'll continue communicating with you from there. We're actively developing a bug bounty program; bug report payouts happen on a case by case basis, for now.
+## How we built it
+The wallet SDK is a rollup to thirdweb's smart wallet (ERC-4337) contracts. We've added the following contracts to extend it's functionality:
+<li> AccountGuardian.sol: Used to assign guardians for smart wallet accounts. </li>
+<li> Guardian.sol: Powers the guardian interactions, like attending to account lock & recovery requests. </li>
+<li> AccountLock.sol: Adds features like creating and evaluating account lock requests and locking the account assets, if consensus is achieved. </li>
+<li> AccountRecovery.sol: Offers the ability to back up account's private key shards, create and evaluate account recovery requests and help with account recovery overall. </li>
+<li> CrossChainTokenTransfer.sol: Provides creation of Chainlink's CCIP transfer request, signature verification, and finally implementation according to the ERC-4337 standards. </li>
 
-## Feedback
+## Documentation 
 
-If you have any feedback, please reach out to us at [email protected].
+[CryptoPhoenix Smart Wallet Contract Docs](https://chukwunonsos-personal-organizati.gitbook.io/cryptophoenix/)
 
 ## Authors
 
-- [thirdweb](https://thirdweb.com)
+- [Shiven](https://github.com/alfheimrShiven)
+- [William](https://github.com/techyNonso)
 
 ## License
 

diff --git a/contracts/extension/upgradeable/AccountPermissions.sol b/contracts/extension/upgradeable/AccountPermissions.sol
@@ -138,12 +138,10 @@ abstract contract AccountPermissions is IAccountPermissions, EIP712 {
     }
 
     /// @dev Verifies that a request is signed by an authorized account.
-    function verifySignerPermissionRequest(SignerPermissionRequest calldata req, bytes calldata signature)
-        public
-        view
-        virtual
-        returns (bool success, address signer)
-    {
+    function verifySignerPermissionRequest(
+        SignerPermissionRequest calldata req,
+        bytes calldata signature
+    ) public view virtual returns (bool success, address signer) {
         signer = _recoverAddress(_encodeRequest(req), signature);
         success = !_accountPermissionsStorage().executed[req.uid] && isAdmin(signer);
     }

diff --git a/contracts/prebuilts/account/non-upgradeable/AccountFactory.sol b/contracts/prebuilts/account/non-upgradeable/AccountFactory.sol
@@ -16,6 +16,11 @@ import "../interface/IEntrypoint.sol";
 // Smart wallet implementation
 import { Account } from "./Account.sol";
 
+// CCIP
+import { CrossChainTokenTransfer } from "../utils/CrossChainTokenTransfer.sol";
+import { CrossChainTokenTransferMaster } from "../utils/CrossChainTokenTransferMaster.sol";
+import { AccountRecovery } from "../utils/AccountRecovery.sol";
+
 import "forge-std/console.sol";
 
 //   $$\     $$\       $$\                 $$\                         $$\
@@ -28,14 +33,41 @@ import "forge-std/console.sol";
 //    \____/ \__|  \__|\__|\__|       \_______| \_____\____/  \_______|\_______/
 
 contract AccountFactory is BaseAccountFactory, ContractMetadata, PermissionsEnumerable {
+    // Events //
+    event AccountFactoryContractDeployed(address indexed);
+    event CrossChainTokenTransferContractDeployed(address indexed);
+    event CrossChainTokenTransferMasterContractDeployed(address indexed);
+
+    // States //
+    CrossChainTokenTransfer public crossChainTokenTransfer;
+    CrossChainTokenTransferMaster public crossChainTokenTransferMaster;
+
     /*///////////////////////////////////////////////////////////////
                             Constructor
     //////////////////////////////////////////////////////////////*/
 
     constructor(
-        IEntryPoint _entrypoint
+        IEntryPoint _entrypoint,
+        address _router,
+        address _link
     ) BaseAccountFactory(address(new Account(_entrypoint, address(this))), address(_entrypoint)) {
         _setupRole(DEFAULT_ADMIN_ROLE, msg.sender);
+        crossChainTokenTransfer = new CrossChainTokenTransfer(_router, _link);
+        crossChainTokenTransferMaster = new CrossChainTokenTransferMaster(address(crossChainTokenTransfer), _link);
+
+        emit AccountFactoryContractDeployed(address(this));
+        emit CrossChainTokenTransferContractDeployed(address(crossChainTokenTransfer));
+        emit CrossChainTokenTransferMasterContractDeployed(address(crossChainTokenTransferMaster));
+    }
+
+    ///@dev  returns cross chain contract details
+    function getCrossChainData() external view returns (address, address) {
+        return (address(crossChainTokenTransfer), address(crossChainTokenTransferMaster));
+    }
+
+    ///@dev  returns Account lock contract details
+    function getAccountLock() external view returns (address) {
+        return (address(accountLock));
     }
 
     /*///////////////////////////////////////////////////////////////