Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
dd378a1
created interfaces for Account recovery feature
Oct 16, 2023
37e2c9d
guardian interface and contract
Oct 17, 2023
1b09442
added test suite for Guardian.sol
Oct 20, 2023
3f4e74c
Merge branch 'thirdweb-dev:main' into account-social-recovery
alfheimrShiven Oct 20, 2023
a3cc320
AccountGuardian contract
Oct 20, 2023
f22fb72
added test suite for AccountGuardian contract
Oct 21, 2023
d3e6fe0
dependency injection for social recovery feature
Oct 21, 2023
3dba350
account lock req creation, signature validation and acceptance check
Oct 24, 2023
2ee0e32
Chainlink automation for lock request evaluation and lock account fea…
Oct 26, 2023
c642267
refactored deploy script for smart account util contracts
Oct 27, 2023
c476031
Deploy script for util contracts and its test
Oct 28, 2023
d7bd5d6
added link to feature doc in Readme
Oct 28, 2023
5bd148f
Merge pull request #1 from alfheimrShiven/account-social-recovery
alfheimrShiven Oct 30, 2023
14dfa8f
fixing..
Oct 30, 2023
8395b06
brought back DeployGuardian as DeploySmartAccountUtilContracts script…
Oct 30, 2023
b106090
Merge pull request #2 from alfheimrShiven/account-social-recovery
alfheimrShiven Oct 30, 2023
8001b8b
moved account util contract deployments to Account.sol, commented out…
Nov 1, 2023
c72f748
switched AccountLock to single instance deployment (as per the system…
Nov 2, 2023
a8ca25f
Merge pull request #3 from alfheimrShiven/account-social-recovery
alfheimrShiven Nov 2, 2023
19f18e3
restoring to util contract deployments to createAccount()
Nov 4, 2023
0ddb444
Changed the approach of calling Account.sol from AccountLock.sol
Nov 8, 2023
9c15308
added modifier to restrict an Account's lock status change by Account…
Nov 8, 2023
493001e
Merge pull request #4 from alfheimrShiven/account-social-recovery
alfheimrShiven Nov 8, 2023
f6b4843
made AccountGuardianTest compatible with deployment of AccountGuardia…
Nov 8, 2023
53b9588
replaced DeployGuardian script with DeploySmartAccountUtilContracts s…
Nov 10, 2023
38e568d
Merge pull request #5 from alfheimrShiven/account-social-recovery
alfheimrShiven Nov 10, 2023
3f763ed
sending AccountLock address while initilizing Account clones for acco…
Nov 14, 2023
665f243
Merge pull request #6 from alfheimrShiven/account-social-recovery
alfheimrShiven Nov 14, 2023
bb6c8ba
AccountLock tests: createLockRequest() unit tests
Nov 14, 2023
dc9a859
[Buggy] ECDSA.recover(hash, signature) throwing error
Nov 16, 2023
5a7d6aa
Merge pull request #7 from alfheimrShiven/account-social-recovery
alfheimrShiven Nov 16, 2023
a6f7e33
foundry error
codypharm Nov 17, 2023
82c9281
depencies added but errors persist
codypharm Nov 17, 2023
598de03
error comntinues
codypharm Nov 17, 2023
3be95eb
build error persists
codypharm Nov 17, 2023
896717d
updated chainlink remappings
Nov 17, 2023
b15ce17
ECDSA.recover(...) bug fixed, made lockRequest hash EIP 191 compatibl…
Nov 17, 2023
fe87435
Merge pull request #8 from alfheimrShiven/account-social-recovery
alfheimrShiven Nov 17, 2023
819a0a7
unlock request feature, refactored concensys evaluation to both lock/…
Nov 18, 2023
a764396
Merge pull request #9 from alfheimrShiven/account-social-recovery
alfheimrShiven Nov 18, 2023
4ae52bb
added unit tests for account unlock feature
Nov 18, 2023
a50e537
Merge pull request #10 from alfheimrShiven/account-social-recovery
alfheimrShiven Nov 19, 2023
0aee37b
Makefile
Nov 21, 2023
ad2a9b1
Merge pull request #11 from alfheimrShiven/account-social-recovery
alfheimrShiven Nov 22, 2023
cb6691e
cross chain transaction now includes estimated amount deposit
codypharm Nov 28, 2023
11c2173
slippage calvualtion added
codypharm Nov 29, 2023
1687b2f
bugs fixed
codypharm Nov 30, 2023
0bc9b51
stopped at this stage
codypharm Dec 4, 2023
20e1477
added IAccountRecovery
Dec 5, 2023
ecab36c
native payment intiation done
codypharm Dec 5, 2023
c3c5a31
link transfer initiator done
codypharm Dec 5, 2023
e822483
Account Recovery interface
Dec 5, 2023
42322c5
stock with userOp
codypharm Dec 5, 2023
0f95847
external signing implemented
codypharm Dec 5, 2023
37c3a36
recovery request guardian signature collection & concensus evaluation
Dec 7, 2023
78bb350
used isValidSignature but review is needed
codypharm Dec 7, 2023
7ceeb42
comments added and code made more dynamic
codypharm Dec 7, 2023
0bf4596
private key restoration
Dec 8, 2023
fc7af00
now using just one estimate function
codypharm Dec 9, 2023
4d4a248
proceed now has _
codypharm Dec 9, 2023
5c6ada8
Merge pull request #13 from alfheimrShiven/account-social-recovery
alfheimrShiven Dec 9, 2023
aaee738
Merge branch 'main' into cross-chain-transactions
codypharm Dec 9, 2023
b81a628
cross chain contracts deployed with accessible address
codypharm Dec 10, 2023
921b5c8
merge added
codypharm Dec 10, 2023
706d43e
getter added for account lock
codypharm Dec 10, 2023
c48ef73
Merge pull request #12 from alfheimrShiven/cross-chain-transactions
codypharm Dec 10, 2023
b818a8b
cross chain script sample added
codypharm Dec 10, 2023
faed719
Merge pull request #14 from alfheimrShiven/cross-chain-script
codypharm Dec 10, 2023
67ab98b
interface changes
Dec 10, 2023
e838c6d
Updated contract deploy script, fixed backward compatibility issues d…
Dec 10, 2023
318e840
Code optimized
codypharm Dec 10, 2023
7ec5c55
restructured functions
codypharm Dec 10, 2023
c036372
link address also added to constructot
codypharm Dec 10, 2023
3ad8a0b
master deployment updated
codypharm Dec 11, 2023
648be6c
one step skipped
codypharm Dec 11, 2023
e426334
last trial
codypharm Dec 11, 2023
21c1db4
Merge pull request #16 from alfheimrShiven/Fix-compilation
alfheimrShiven Dec 11, 2023
13454b1
Merge pull request #15 from alfheimrShiven/account-social-recovery
alfheimrShiven Dec 11, 2023
9994ac3
Update README.md
alfheimrShiven Dec 11, 2023
ddf5634
building cancelling
codypharm Dec 16, 2023
4e07d7c
resolved conflicts with main
Dec 18, 2023
4d11bd3
added AccountRecovery to deploy script
Dec 19, 2023
d968a8b
commented out both CCIP contracts [build still failing]
Dec 19, 2023
b17bd89
[FIX]: Fixed the stack too deep error by removing the _router, _link …
Dec 19, 2023
4b0133d
updating owner of smart account
Dec 22, 2023
89d12a4
Email verification to generate recovery request
Dec 24, 2023
669d16f
uncommented the CCIP contracts
Dec 24, 2023
15718b2
moved the deployment of CCIP contracts from BaseAccountFactory to non…
Dec 24, 2023
6a28d89
Merge pull request #17 from alfheimrShiven/revert/debugging
alfheimrShiven Dec 24, 2023
6413321
merged with main
Dec 24, 2023
14cc533
Merge pull request #18 from alfheimrShiven/account-social-recovery
alfheimrShiven Dec 24, 2023
a91ba30
updated account util deploy script and test
Dec 25, 2023
e12640a
Moved smart account creation to deploy script, updated deployment scr…
Dec 27, 2023
ab94b18
Merge pull request #19 from alfheimrShiven/account-social-recovery
alfheimrShiven Dec 27, 2023
17ed4de
generateRecoveryReq(..) tests
Dec 31, 2023
b9b472e
collectGuardianSignaturesOnRecoveryRequest(..) unit tests
Dec 31, 2023
b5490d4
refactored AccountRecovery unit tests
Dec 31, 2023
6abbb81
Consensus evaluation tests
Dec 31, 2023
f694b4f
Merge pull request #20 from alfheimrShiven/account-social-recovery
alfheimrShiven Dec 31, 2023
abbeeff
fixed Account::updateAdmin() function signature and call from Account…
Jan 3, 2024
6454a6c
Merge pull request #21 from alfheimrShiven/account-social-recovery
alfheimrShiven Jan 3, 2024
625340b
removed _generateSalt dependency on account admin, as it can get upda…
Jan 4, 2024
b0d399a
finished AccountRecovery unit tests. Coverage: 92%
Jan 4, 2024
af976db
Merge pull request #22 from alfheimrShiven/account-social-recovery
alfheimrShiven Jan 4, 2024
faf0a62
reduced params for commitEmailVerificationHash()
Jan 5, 2024
41099ca
Merge pull request #23 from alfheimrShiven/account-social-recovery
alfheimrShiven Jan 5, 2024
047eac0
updated Readme: Problem statement, Architecture
Jan 6, 2024
548776e
Merge pull request #24 from alfheimrShiven/account-social-recovery
alfheimrShiven Jan 6, 2024
d4162c5
updated Readme: Benefits of smart wallets
Jan 8, 2024
d54fdb5
Readme touchups
Jan 8, 2024
8b9536a
Merge pull request #25 from alfheimrShiven/account-social-recovery
alfheimrShiven Jan 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
building cancelling
  • Loading branch information
codypharm committed Dec 16, 2023
commit ddf5634595bbab9b63db1502bda4e6726fb20c1f
6 changes: 3 additions & 3 deletions contracts/prebuilts/account/utils/AccountLock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import { ECDSA } from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
import { MockV3Aggregator } from "@chainlink/contracts/src/v0.8/tests/MockV3Aggregator.sol";
import { MockLinkToken } from "@chainlink/contracts/src/v0.8/mocks/MockLinkToken.sol";
import { AutomationCompatibleInterface } from "@chainlink/contracts/src/v0.8/interfaces/automation/AutomationCompatibleInterface.sol";
import { KeeperRegistryBase2_0Mock } from "@chainlink/contracts/src/v0.8/mocks/KeeperRegistryBase2_0Mock.sol";
import { KeeperRegistry2_0Mock } from "@chainlink/contracts/src/v0.8/mocks/KeeperRegistry2_0Mock.sol";
import { KeeperRegistrar2_0Mock } from "@chainlink/contracts/src/v0.8/mocks/KeeperRegistrar2_0Mock.sol";
// import { KeeperRegistryBase2_0Mock } from "@chainlink/contracts/src/v0.8/mocks/KeeperRegistryBase2_0Mock.sol";
// import { KeeperRegistry2_0Mock } from "@chainlink/contracts/src/v0.8/mocks/KeeperRegistry2_0Mock.sol";
// import { KeeperRegistrar2_0Mock } from "@chainlink/contracts/src/v0.8/mocks/KeeperRegistrar2_0Mock.sol";
import "forge-std/console.sol";

struct RegistrationParams {
Expand Down
332 changes: 332 additions & 0 deletions contracts/prebuilts/account/utils/CrossChainTokenTransfer.sol

Large diffs are not rendered by default.

255 changes: 255 additions & 0 deletions contracts/prebuilts/account/utils/CrossChainTokenTransferMaster..sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,255 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.12;
// Account Abstraction setup for smart wallets.
import { EntryPoint, IEntryPoint } from "contracts/prebuilts/account/utils/Entrypoint.sol";
import { UserOperation } from "contracts/prebuilts/account/utils/UserOperation.sol";
import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
import "@openzeppelin/contracts/access/Ownable.sol";
import { AccountExtension } from "contracts/prebuilts/account/utils/AccountExtension.sol";

/**
* @title CrossChainTokenTransferMaster
* @dev This is a smart contract that controls the activities of the cross chain token transfer contract
*/

contract CrossChainTokenTransferMaster is AccountExtension, Ownable {
// Target contracts
EntryPoint private entrypoint;
//contract states
address payable private beneficiary = payable(address(0x45654));
mapping(address => UserOperation) private userOPS;
event HashGenerated(address indexed owner, bytes32 hash);
event RoleChanged(SignerPermissionRequest req);
uint192 private nonceValue = 1;
address _ccip;
address _link;
uint public callGasLimit = 500_000;
uint public verificationGasLimit = 500_000;
uint public preVerificationGas = 500_000;
uint public maxFeePerGas = 0;
uint public maxPriorityFeePerGas = 0;

struct TokenParams {
address _token;
address _receiver;
uint _tokenAmount;
}
uint linkCount = 3;
uint nativecount = 2;

constructor(address ccip, address link) {
_ccip = ccip;
_link = link;
}

function setCallGasLimit(uint _value) external onlyOwner {
callGasLimit = _value;
}

function setVerificationGasLimit(uint _value) external onlyOwner {
verificationGasLimit = _value;
}

function setPreVerificationGas(uint _value) external onlyOwner {
preVerificationGas = _value;
}

function setMaxFeePerGas(uint _value) external onlyOwner {
maxFeePerGas = _value;
}

function setMaxPriorityPerGas(uint _value) external onlyOwner {
maxPriorityFeePerGas = _value;
}

/**
* @dev Sets beneficiary of the transaction
* @param _beneficiary Address of the beneficiary
*/
function setBeneficiary(address _beneficiary) external onlyOwner {
beneficiary = payable(_beneficiary);
}

/**
* @dev Generates userOP objects
* @param _initCode Guide for entry point
* @param _callDataForEntrypoint The calls to be performed
* @param _sender The smart wallet address
*/
function _setupUserOp(bytes memory _initCode, bytes memory _callDataForEntrypoint, address _sender) internal {
uint256 nonce = entrypoint.getNonce(_sender, nonceValue);

//increase nonce
nonceValue++;

// Get user op fields
UserOperation memory op = UserOperation({
sender: _sender,
nonce: nonce,
initCode: _initCode,
callData: _callDataForEntrypoint,
callGasLimit: callGasLimit,
verificationGasLimit: verificationGasLimit,
preVerificationGas: preVerificationGas,
maxFeePerGas: maxFeePerGas,
maxPriorityFeePerGas: maxPriorityFeePerGas,
paymasterAndData: bytes(""),
signature: bytes("")
});

//store userOP
userOPS[_sender] = op;

//emit event for user op generation
emit HashGenerated(_sender, ECDSA.toEthSignedMessageHash(EntryPoint(entrypoint).getUserOpHash(op)));
}

/**
* @dev Set of the transaction batch
* @param _initCode Guide for entry point
* @param _target The target contracts array
* @param _sender The smart wallet address
* @param _callData The call to be performed
*/
// function _setupUserOpExecuteBatch(
// bytes memory _initCode,
// address[] memory _target,
// uint256[] memory _value,
// bytes[] memory _callData,
// address _sender
// ) internal {
// // Encode the batch execution call data
// bytes memory callDataForEntrypoint = abi.encodeWithSignature(
// "executeBatch(address[],uint256[],bytes[])",
// _target,
// _value,
// _callData
// );

// // Call the main setup function with the encoded call data
// _setupUserOp(_initCode, callDataForEntrypoint, _sender);
// }

/**
* @dev Initiate token transfer with Link payment
* @param _smartWalletAccount The smart wallet address
* @param _destinationChainSelector The destination chain selector
* @param _tokenParams The struct containing token parameters
* @param _linkAmount The estimated link token required for the transaction
*/
function _initiateTokenTransferWithLink(
address _smartWalletAccount,
uint64 _destinationChainSelector,
uint _linkAmount,
TokenParams memory _tokenParams
) public {
// Arrays to store target addresses, values, and call data for the batch
address[] memory targets = new address[](linkCount);
uint256[] memory values = new uint256[](linkCount);
bytes[] memory callData = new bytes[](linkCount);

//approve link tokens for chain token transfer contract
targets[0] = _link;
values[0] = 0;
callData[0] = abi.encodeWithSignature("approve(address, uint)", _ccip, _linkAmount);

//approve erc20 for chain token transfer contract
targets[1] = _tokenParams._token;
values[1] = 0;
callData[1] = abi.encodeWithSignature("approve(address, uint)", _ccip, _tokenParams._tokenAmount);

//start cross chain transfer
targets[2] = _ccip;
values[2] = 0;
callData[2] = abi.encodeWithSignature(
"transferTokensPayLINK(uint64 , address ,uint256 , TokenParams )",
_destinationChainSelector,
_smartWalletAccount,
_linkAmount,
TokenParams(_tokenParams._token, _tokenParams._receiver, _tokenParams._tokenAmount)
);

//generate user OP
// _setupUserOpExecuteBatch(bytes(""), targets, values, callData, _smartWalletAccount);

bytes memory callDataForEntrypoint = abi.encodeWithSignature(
"executeBatch(address[],uint256[],bytes[])",
targets,
values,
callData
);

// Call the main setup function with the encoded call data
_setupUserOp(bytes(""), callDataForEntrypoint, _smartWalletAccount);
}

/**
* @dev Initiate token transfer with native payment
* @param _smartWalletAccount The smart wallet address
* @param _destinationChainSelector The destination chain selector
* @param _tokenParams The is the struct that contains token info
* @param _estimatedAmount The estimated native token required for the transaction
*/
function _initiateTokenTransferWithNativeToken(
address _smartWalletAccount,
uint64 _destinationChainSelector,
uint _estimatedAmount,
TokenParams memory _tokenParams
) public {
// Arrays to store target addresses, values, and call data for the batch
address[] memory targets = new address[](nativecount);
uint256[] memory values = new uint256[](nativecount);
bytes[] memory callData = new bytes[](nativecount);

//approve token for cross chain token transfer contract
targets[0] = _tokenParams._token;
values[0] = 0;
callData[0] = abi.encodeWithSignature("approve(address, uint)", _ccip, _tokenParams._tokenAmount);

// start the cross chain transfer
targets[1] = _ccip;
values[1] = _estimatedAmount;
callData[1] = abi.encodeWithSignature(
"transferTokensPayNative( uint64 , address , TokenParams )",
_destinationChainSelector,
_smartWalletAccount,
TokenParams(_tokenParams._token, _tokenParams._receiver, _tokenParams._tokenAmount)
);

//set up userOP
// _setupUserOpExecuteBatch(bytes(""), targets, values, callData, _smartWalletAccount);
bytes memory callDataForEntrypoint = abi.encodeWithSignature(
"executeBatch(address[],uint256[],bytes[])",
targets,
values,
callData
);

// Call the main setup function with the encoded call data
_setupUserOp(bytes(""), callDataForEntrypoint, _smartWalletAccount);
}

/**
* @dev Complete transaction after it has been signed
* @param _messageHash The hash of the userOp
* @param _signature The signature of the signer
*/
function _proceed(bytes32 _messageHash, bytes memory _signature) external {
// Recover the signer from the signature
address signer = ECDSA.recover(_messageHash, _signature);

// Verify signature using isValidSignature function
require(isValidSignature(_messageHash, _signature) == MAGICVALUE, "Invalid Signer");

//get user op
UserOperation storage userOP = userOPS[signer];

//array of userOPs
UserOperation[] memory ops = new UserOperation[](1);

userOP.signature = _signature;
ops[0] = userOP;
//pass operation to entry point
EntryPoint(entrypoint).handleOps(ops, beneficiary);
}
}
Loading