Cross chain transactions

.env_example

@@ -0,0 +1,4 @@
+ANVIL_PRIVATE_KEY=
+ANVIL_PUBLIC_KEY=
+ANVIL_RPC_URL=http://127.0.0.1:8545
+

.gitmodules

@@ -24,3 +24,6 @@
 [submodule "lib/dynamic-contracts"]
 	path = lib/dynamic-contracts
 	url = https://github.com/thirdweb-dev/dynamic-contracts
+[submodule "lib/solmate"]
+	path = lib/solmate
+	url = https://github.com/transmissions11/solmate

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

Makefile

@@ -0,0 +1,45 @@
+-include .env
+
+.PHONY: all test test_anvil clean deploy fund help install snapshot format anvil 
+
+help:
+	@echo "Usage:"
+	@echo "  make deploy [ARGS=...]\n    example: make deploy ARGS=\"--network sepolia\""
+	@echo ""
+	@echo "  make fund [ARGS=...]\n    example: make deploy ARGS=\"--network sepolia\""
+
+all: clean remove update build deploy
+
+# Clean the repo
+clean  :; forge clean
+
+# Remove modules
+remove :; rm -rf .gitmodules && rm -rf .git/modules/* && rm -rf lib && touch .gitmodules && git add . && git commit -m "modules"
+
+# Update Dependencies
+update:; forge update
+
+build:; forge build
+
+test :; forge test 
+
+test_anvil :; forge test --rpc-url $(ANVIL_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
+
+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
+endif
+
+ifeq ($(findstring --network ganache,$(ARGS)),--network ganache)
+	NETWORK_ARGS := --rpc-url $(GANACHE_RPC_URL) --private-key $(GANACHE_PRIVATE_KEY) --broadcast -vvvv
+endif
+
+deploy:
+	@forge script scripts/DeploySmartAccountUtilContracts.s.sol:DeploySmartAccountUtilContracts $(NETWORK_ARGS)

README.md

@@ -1,143 +1,68 @@
 <p align="center">
+<h1 align="center">CryptoPhoenix Smart Wallet Contracts</h1>
+<p>CryptoPhoenix Wallet SDK is a rollup to thirdweb's smart wallet contracts and offers: <br />
+<ol>
+<li>Smart Accounts</li>
+<li>Social Account Locking</li>
+<li>Social Account Recovery</li>
+<li>Guardian Management</li>
+</ol>
+
+## Problem Statement
+As we all know, a wallet is a gateway to web3 but the wallet experience is unfortunately broken! For a user to interact with a blockchain, they not only have to **create a wallet but also secure their private keys and seed phrase, purchase native tokes to pay for gas, and sign every single action** that they take on a dApp. 
+
+Such an intimidating user experience for newcomers is a big obstacle in the mass adoption of web3 and CryptoPhoenix Wallet SDK is here to change this through its **Account abstraction technology.**
+
+## Smart wallets and its features
+Smart wallets are wallets that are controlled by a smart contract and have the following key benefits-
+<ol>
+<li>
+<h4>Abstracted user experience: </h4>
+Eliminates the need to manage private keys or seed phrase, making it easier and safer for users to experience Dapps.
+</li>
+<li>
+<h4>Enable gasless transactions:</h4>
+Dapps providing smart account can sponser gas on behalf of their users therefore reducing investment to entry and drastically improving user experience as users now don't have to approve each transaction they make with the Dapp.
+</li>
+<li> 
+<h4>Enhanced security through account locking, social recovery and multisig: </h4>
+In case the user lose access to their wallet, they can immediately lock their account assets, holding all withdrawal transactions, and can even recover access to their accounts through concensus of their account guardians (trusted people who the user allots to help recover their account in case required). <br />
+Smart accounts can also provide multisig capabilities, requiring multiple signatures on a transaction, before it's executed, thus enchancing security.
+
+<li><h4>Automation of transactions</h4>
+Enables self executing transactions when certain defined conditions are met like approving a predefined number of tokens to an entity based on fixed time intervals, stop loss and take profit orders, recurring subscriptions, etc.
+</li>
+</ol>
+
+## Architecture
+
+<img src="./images/architecture.png" width="600" alt="cryptophoenix_architecture">
+<br/>
 <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>
-<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 />
-
-## 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
+[![YouTube](https://img.shields.io/badge/YouTube-Video-red?style=for-the-badge&logo=youtube)](https://youtu.be/0zq2YdOYFUo?si=Ng6favRkGL9faG_Y)
 
-- [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
+## Contracts
+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> <b>Account.sol:</b>This is the smart contract that powers the smart wallet by offering features like executing single or batched transactions, locking account assets and updating the owner of the smart account incase of an account recovery is made.</li>
+<li> <b>AccountGuardian.sol:</b> Used by the user to assign guardians for smart wallet accounts. </li>
+<li> <b>Guardian.sol:</b> Powers the guardian interactions, like attending to account lock & recovery requests for the account they are guarding. </li>
+<li> <b>AccountLock.sol:</b> Adds features like creating account lock requests and evaluating concensus on them followed by locking/unlocking the account assets.</li>
+<li> <b>AccountRecovery.sol:</b> One of the most important contracts adding features like creating account recovery requests and evaluating concensus on them. Once the concensus is achieved, a new embedded wallet is created and made the owner of the smart contract holding all user assets, thus recovering the account.</li>
 
-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.
 
-## Feedback
+## Documentation 
 
-If you have any feedback, please reach out to us at [email protected].
+[**CryptoPhoenix Smart Wallet Contract Docs**](https://0xshiven.gitbook.io/cryptophoenix/)
 
-## Authors
+## Author: 
+### Shivendra Singh
+[![GitHub](https://img.shields.io/badge/GitHub-Profile-black?logo=github)](https://github.com/alfheimrShiven)
+[![LinkedIn](https://img.shields.io/badge/LinkedIn-Profile-blue?logo=linkedin)](https://www.linkedin.com/in/shivends)
+[![Twitter](https://img.shields.io/badge/Twitter-Profile-blue?logo=twitter)](https://twitter.com/0xShiven)
+[![Substack](https://img.shields.io/badge/Substack-Newsletter-orange?logo=substack)](https://0xshiven.substack.com/)
 
-- [thirdweb](https://thirdweb.com)
 
 ## License
 

contracts/extension/upgradeable/AccountPermissions.sol

@@ -73,7 +73,7 @@ abstract contract AccountPermissions is IAccountPermissions, EIP712 {
             //isAdmin > 1, remove admin
             bool _isAdmin = _req.isAdmin == 1;
 
-            _setAdmin(targetSigner, _isAdmin);
+            _setAdmin(targetSigner, _isAdmin, bytes(""));
             return;
         }
 
@@ -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);
     }
@@ -214,7 +212,7 @@ abstract contract AccountPermissions is IAccountPermissions, EIP712 {
     function _afterSignerPermissionsUpdate(SignerPermissionRequest calldata _req) internal virtual;
 
     /// @notice Makes the given account an admin.
-    function _setAdmin(address _account, bool _isAdmin) internal virtual {
+    function _setAdmin(address _account, bool _isAdmin, bytes memory _data) internal virtual {
         _accountPermissionsStorage().isAdmin[_account] = _isAdmin;
 
         if (_isAdmin) {

contracts/prebuilts/account/dynamic/DynamicAccount.sol

@@ -23,18 +23,23 @@ contract DynamicAccount is AccountCore, BaseRouter {
                     Constructor and Initializer
     //////////////////////////////////////////////////////////////*/
 
-    constructor(IEntryPoint _entrypoint, Extension[] memory _defaultExtensions)
-        AccountCore(_entrypoint, msg.sender)
-        BaseRouter(_defaultExtensions)
-    {
+    constructor(
+        IEntryPoint _entrypoint,
+        Extension[] memory _defaultExtensions
+    ) AccountCore(_entrypoint, msg.sender) BaseRouter(_defaultExtensions) {
         _disableInitializers();
     }
 
     /// @notice Initializes the smart contract wallet.
-    function initialize(address _defaultAdmin, bytes calldata) public override initializer {
+    function initialize(
+        address _defaultAdmin,
+        address _commonGuardian,
+        address _accountLock,
+        bytes calldata
+    ) public override initializer {
         __BaseRouter_init();
         AccountCoreStorage.data().firstAdmin = _defaultAdmin;
-        _setAdmin(_defaultAdmin, true);
+        _setAdmin(_defaultAdmin, true, "");
     }
 
     /*///////////////////////////////////////////////////////////////

contracts/prebuilts/account/dynamic/DynamicAccountFactory.sol

@@ -26,9 +26,10 @@ contract DynamicAccountFactory is BaseAccountFactory, ContractMetadata, Permissi
                             Constructor
     //////////////////////////////////////////////////////////////*/
 
-    constructor(IEntryPoint _entrypoint, IExtension.Extension[] memory _defaultExtensions)
-        BaseAccountFactory(payable(address(new DynamicAccount(_entrypoint, _defaultExtensions))), address(_entrypoint))
-    {
+    constructor(
+        IEntryPoint _entrypoint,
+        IExtension.Extension[] memory _defaultExtensions
+    ) BaseAccountFactory(payable(address(new DynamicAccount(_entrypoint, _defaultExtensions))), address(_entrypoint)) {
         _setupRole(DEFAULT_ADMIN_ROLE, msg.sender);
     }
 
@@ -40,9 +41,10 @@ contract DynamicAccountFactory is BaseAccountFactory, ContractMetadata, Permissi
     function _initializeAccount(
         address _account,
         address _admin,
+        address _commonGuardian,
         bytes calldata _data
     ) internal override {
-        DynamicAccount(payable(_account)).initialize(_admin, _data);
+        DynamicAccount(payable(_account)).initialize(_admin, _commonGuardian, address(accountLock), _data);
     }
 
     /// @dev Returns whether contract metadata can be set in the given execution context.

contracts/prebuilts/account/interface/IAccount.sol

@@ -4,6 +4,12 @@ pragma solidity ^0.8.12;
 import "../utils/UserOperation.sol";
 
 interface IAccount {
+    ///////////////////////
+    //// Events //////////
+    ///////////////////////
+    event AccountLocked(address indexed account);
+    event AdminUpdated(address indexed newAdmin);
+
     /**
      * Validate user's signature and nonce
      * the entryPoint will make the call to the recipient only if this validation call returns successfully.