Skip to content

Commit

Permalink
⚡ Optimize Ext. Tokens
Browse files Browse the repository at this point in the history
  • Loading branch information
@z0r0z
z0r0z committed Jan 7, 2024
1 parent 4f68e80 commit 12e8aa8
Show file tree
Hide file tree
Showing 5 changed files with 258 additions and 215 deletions.
64 changes: 32 additions & 32 deletions .gas-snapshot
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
DagonTest:testBurn(address,uint96) (runs: 256, μ: 152748, ~: 152748)
DagonTest:testDeploy() (gas: 2329588)
DagonTest:testFailBurnOverBalance(address,uint96) (runs: 256, μ: 187296, ~: 188385)
DagonTest:testFailBurnOverThreshold(address,uint96) (runs: 256, μ: 218570, ~: 219659)
DagonTest:testFailInvalidThresholdExceedsSupply() (gas: 158828)
DagonTest:testFailInvalidThresholdExceedsSupply2() (gas: 163963)
DagonTest:testFailInvalidThresholdNull() (gas: 158876)
DagonTest:testFailIsValidSignature2of3ForInsufficientSignatures() (gas: 201375)
DagonTest:testFailIsValidSignatureOutOfOrder() (gas: 239185)
DagonTest:testFailIsValidSignatureWeighted() (gas: 230905)
DagonTest:testBurn(address,uint96) (runs: 256, μ: 153020, ~: 153020)
DagonTest:testDeploy() (gas: 2214530)
DagonTest:testFailBurnOverBalance(address,uint96) (runs: 256, μ: 187568, ~: 188657)
DagonTest:testFailBurnOverThreshold(address,uint96) (runs: 256, μ: 218842, ~: 219931)
DagonTest:testFailInvalidThresholdExceedsSupply() (gas: 159100)
DagonTest:testFailInvalidThresholdExceedsSupply2() (gas: 164235)
DagonTest:testFailInvalidThresholdNull() (gas: 159148)
DagonTest:testFailIsValidSignature2of3ForInsufficientSignatures() (gas: 201645)
DagonTest:testFailIsValidSignatureOutOfOrder() (gas: 239457)
DagonTest:testFailIsValidSignatureWeighted() (gas: 231175)
DagonTest:testFailIsValidSignatureWeightedERC1155() (gas: 36249)
DagonTest:testFailIsValidSignatureWeightedERC20() (gas: 240752)
DagonTest:testFailIsValidSignatureWeightedERC6909() (gas: 232654)
DagonTest:testFailIsValidSignatureWeightedERC721() (gas: 211786)
DagonTest:testFailSetTokenInvalidStd(address) (runs: 256, μ: 157825, ~: 157825)
DagonTest:testFailTransferFromInactiveAuth(address,address,uint96) (runs: 256, μ: 191898, ~: 192598)
DagonTest:testFailTransferOverBalance(address,address,uint96) (runs: 256, μ: 186406, ~: 187106)
DagonTest:testInstall() (gas: 137181)
DagonTest:testIsValidSignature() (gas: 150658)
DagonTest:testIsValidSignature2of3() (gas: 197147)
DagonTest:testIsValidSignature3of3() (gas: 204981)
DagonTest:testIsValidSignatureOnchain() (gas: 197344)
DagonTest:testIsValidSignatureWeighted() (gas: 234638)
DagonTest:testIsValidSignatureWeightedERC1155() (gas: 251092)
DagonTest:testIsValidSignatureWeightedERC20() (gas: 250684)
DagonTest:testIsValidSignatureWeightedERC6909() (gas: 251034)
DagonTest:testIsValidSignatureWeightedERC721() (gas: 210561)
DagonTest:testFailIsValidSignatureWeightedERC20() (gas: 235720)
DagonTest:testFailIsValidSignatureWeightedERC6909() (gas: 227331)
DagonTest:testFailIsValidSignatureWeightedERC721() (gas: 208929)
DagonTest:testFailSetTokenInvalidStd(address) (runs: 256, μ: 158097, ~: 158097)
DagonTest:testFailTransferFromInactiveAuth(address,address,uint96) (runs: 256, μ: 192092, ~: 192870)
DagonTest:testFailTransferOverBalance(address,address,uint96) (runs: 256, μ: 186600, ~: 187378)
DagonTest:testInstall() (gas: 137453)
DagonTest:testIsValidSignature() (gas: 150929)
DagonTest:testIsValidSignature2of3() (gas: 197418)
DagonTest:testIsValidSignature3of3() (gas: 205252)
DagonTest:testIsValidSignatureOnchain() (gas: 197594)
DagonTest:testIsValidSignatureWeighted() (gas: 234909)
DagonTest:testIsValidSignatureWeightedERC1155() (gas: 240555)
DagonTest:testIsValidSignatureWeightedERC20() (gas: 247619)
DagonTest:testIsValidSignatureWeightedERC6909() (gas: 240513)
DagonTest:testIsValidSignatureWeightedERC721() (gas: 207528)
DagonTest:testNameAndSymbolAndDecimals(uint256) (runs: 256, μ: 15035, ~: 15035)
DagonTest:testSetAuth(address) (runs: 256, μ: 145445, ~: 145445)
DagonTest:testSetThreshold() (gas: 147297)
DagonTest:testSetToken(address) (runs: 256, μ: 148060, ~: 148060)
DagonTest:testSetURI() (gas: 164803)
DagonTest:testTransfer(address,address,uint96) (runs: 256, μ: 175351, ~: 176362)
DagonTest:testTransferWithAuth(address,address,uint96) (runs: 256, μ: 179767, ~: 180642)
DagonTest:testSetAuth(address) (runs: 256, μ: 145717, ~: 145717)
DagonTest:testSetThreshold() (gas: 147569)
DagonTest:testSetToken(address) (runs: 256, μ: 148332, ~: 148332)
DagonTest:testSetURI() (gas: 165075)
DagonTest:testTransfer(address,address,uint96) (runs: 256, μ: 176123, ~: 176979)
DagonTest:testTransferWithAuth(address,address,uint96) (runs: 256, μ: 180185, ~: 180914)
2 changes: 1 addition & 1 deletion lib/accounts
Submodule accounts updated 4 files
+32 −32 .gas-snapshot
+1 −1 lib/solady
+98 −58 src/ownership/Owners.sol
+41 −40 test/ownership/Owners.t.sol
2 changes: 1 addition & 1 deletion lib/solady
Submodule solady updated 6 files
+48 −44 .gas-snapshot
+1 −0 README.md
+1 −0 src/Milady.sol
+1 −1 src/utils/DateTimeLib.sol
+32 −0 src/utils/ReentrancyGuard.sol
+42 −0 test/ReentrancyGuard.t.sol
160 changes: 100 additions & 60 deletions src/Dagon.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ pragma solidity ^0.8.19;
import {ERC6909} from "@solady/src/tokens/ERC6909.sol";
import {SignatureCheckerLib} from "@solady/src/utils/SignatureCheckerLib.sol";

/// @notice Simple ownership singleton for smart accounts. DAO-agnostic.
/// @dev Support for ERC-173, ERC-1271 and ERC-4337 is recommended for users.
/// @notice Simple ownership singleton for smart accounts.
/// @dev Integration is best by means of the ERC173 and ERC1271 methods.
/// @custom:version 0.0.0
contract Dagon is ERC6909 {
/// ======================= CUSTOM ERRORS ======================= ///

Expand All @@ -25,7 +26,7 @@ contract Dagon is ERC6909 {
event ThresholdSet(address indexed account, uint88 threshold);

/// @dev Logs new token ownership standard for an account.
event TokenSet(address indexed account, ITokenOwner tkn, TokenStandard std);
event TokenSet(address indexed account, address token, Standard standard);

/// ========================== STRUCTS ========================== ///

Expand All @@ -46,9 +47,9 @@ contract Dagon is ERC6909 {

/// @dev The account ownership settings struct.
struct Settings {
ITokenOwner tkn;
address token;
uint88 threshold;
TokenStandard std;
Standard standard;
}

/// @dev The ERC4337 user operation (userOp) struct.
Expand All @@ -69,7 +70,7 @@ contract Dagon is ERC6909 {
/// =========================== ENUMS =========================== ///

/// @dev The token standard interface enum.
enum TokenStandard {
enum Standard {
DAGON,
ERC20,
ERC721,
Expand Down Expand Up @@ -137,40 +138,29 @@ contract Dagon is ERC6909 {
address prev;
address owner;
uint256 tally;
// Check if the owners' signature is valid:
for (uint256 i; i != signature.length / 85; ++i) {
if (
SignatureCheckerLib.isValidSignatureNow(
owner = address(bytes20(signature[pos:pos + 20])),
hash,
signature[pos + 20:pos + 85]
) && prev < owner
) && prev < owner // Check double voting.
) {
pos += 85;
prev = owner;
tally += set.std == TokenStandard.DAGON
tally += set.standard == Standard.DAGON
? balanceOf(owner, uint256(uint160(msg.sender)))
: set.std == TokenStandard.ERC20 || set.std == TokenStandard.ERC721
? set.tkn.balanceOf(owner)
: set.tkn.balanceOf(owner, uint256(uint160(msg.sender)));
: set.standard == Standard.ERC20 || set.standard == Standard.ERC721
? _balanceOf(set.token, owner)
: _balanceOf(set.token, owner, uint256(uint160(msg.sender)));
} else {
return 0xffffffff; // Failure code.
}
}
// Check if the ownership tally has been met:
if (tally >= set.threshold) {
return this.isValidSignature.selector;
} else {
return 0xffffffff; // Failure code.
}
}
} else {
if (votingTally[hash] >= set.threshold) {
return this.isValidSignature.selector;
} else {
return 0xffffffff; // Failure code.
return _validateReturn(tally >= set.threshold);
}
}
return _validateReturn(votingTally[hash] >= set.threshold);
}

/// @dev Validates ERC4337 userOp with additional auth logic flow among owners.
Expand All @@ -193,6 +183,14 @@ contract Dagon is ERC6909 {
) validationData = 0x01; // Failure code.
}

/// @dev Returns validated signature result within the conventional ERC1271 syntax.
function _validateReturn(bool success) internal pure virtual returns (bytes4 result) {
assembly {
// `success ? bytes4(keccak256("isValidSignature(bytes32,bytes)")) : 0xffffffff`.
result := shl(224, or(0x1626ba7e, sub(0, iszero(success))))
}
}

/// ===================== VOTING OPERATIONS ===================== ///

/// @dev Casts account owner voting shares on a given ERC4337 userOp hash.
Expand All @@ -202,13 +200,12 @@ contract Dagon is ERC6909 {
virtual
returns (uint256)
{
bytes32 hash = SignatureCheckerLib.toEthSignedMessageHash(userOpHash);
Settings memory set = _settings[account];
bytes32 hash = SignatureCheckerLib.toEthSignedMessageHash(userOpHash);
unchecked {
uint256 pos;
address owner;
uint256 tally;
// Check if the owners' signature is valid:
for (uint256 i; i != signature.length / 85; ++i) {
if (
SignatureCheckerLib.isValidSignatureNow(
Expand All @@ -218,14 +215,14 @@ contract Dagon is ERC6909 {
) && voted[owner][hash] == 0 // Check double voting.
) {
pos += 85;
tally += voted[owner][hash] = set.std == TokenStandard.DAGON
tally += voted[owner][hash] = set.standard == Standard.DAGON
? balanceOf(owner, uint256(uint160(account)))
: set.std == TokenStandard.ERC20 || set.std == TokenStandard.ERC721
? set.tkn.balanceOf(owner)
: set.tkn.balanceOf(owner, uint256(uint160(account)));
: set.standard == Standard.ERC20 || set.standard == Standard.ERC721
? _balanceOf(set.token, owner)
: _balanceOf(set.token, owner, uint256(uint160(account)));
}
}
return votingTally[hash] += tally;
return votingTally[hash] += tally; // Return latest total tally.
}
}

Expand All @@ -250,17 +247,15 @@ contract Dagon is ERC6909 {
++i;
}
}
unchecked {
_metadata[id].totalSupply += supply;
}
_metadata[id].totalSupply += supply;
}
setToken(setting.tkn, setting.std);
setThreshold(setting.threshold);
if (bytes(meta.tokenURI).length != 0) setURI(meta.tokenURI);
setToken(setting.token, setting.standard);
if (bytes(meta.name).length != 0) {
_metadata[id].name = meta.name;
_metadata[id].symbol = meta.symbol;
}
if (bytes(meta.tokenURI).length != 0) setURI(meta.tokenURI);
if (meta.authority != IAuth(address(0))) _metadata[id].authority = meta.authority;
IOwnable(msg.sender).requestOwnershipHandover();
}
Expand Down Expand Up @@ -288,14 +283,9 @@ contract Dagon is ERC6909 {
/// ===================== OWNERSHIP SETTINGS ===================== ///

/// @dev Returns the account settings.
function getSettings(address account)
public
view
virtual
returns (ITokenOwner, uint88, TokenStandard)
{
function getSettings(address account) public view virtual returns (address, uint88, Standard) {
Settings storage set = _settings[account];
return (set.tkn, set.threshold, set.std);
return (set.token, set.threshold, set.standard);
}

/// @dev Returns the account metadata.
Expand All @@ -320,26 +310,84 @@ contract Dagon is ERC6909 {
if (
threshold
> (
set.std == TokenStandard.DAGON
set.standard == Standard.DAGON
? totalSupply(uint256(uint160(msg.sender)))
: set.std == TokenStandard.ERC20 || set.std == TokenStandard.ERC721
? set.tkn.totalSupply()
: set.tkn.totalSupply(uint256(uint160(msg.sender)))
: set.standard == Standard.ERC20 || set.standard == Standard.ERC721
? _totalSupply(set.token)
: _totalSupply(set.token, uint256(uint160(msg.sender)))
) || threshold == 0
) revert InvalidSetting();
emit ThresholdSet(msg.sender, (set.threshold = threshold));
}

/// @dev Sets new token ownership interface standard for the caller account.
function setToken(ITokenOwner tkn, TokenStandard std) public payable virtual {
emit TokenSet(msg.sender, _settings[msg.sender].tkn = tkn, _settings[msg.sender].std = std);
function setToken(address token, Standard standard) public payable virtual {
emit TokenSet(
msg.sender,
_settings[msg.sender].token = token,
_settings[msg.sender].standard = standard
);
}

/// @dev Sets new token URI metadata for the caller account.
function setURI(string calldata uri) public payable virtual {
emit URISet(msg.sender, (_metadata[uint256(uint160(msg.sender))].tokenURI = uri));
}

/// ======================= TOKEN HELPERS ======================= ///

/// @dev Returns the amount of ERC20/721 `token` owned by `account`.
function _balanceOf(address token, address account)
internal
view
virtual
returns (uint256 amount)
{
assembly ("memory-safe") {
mstore(0x14, account) // Store the `account` argument.
mstore(0x00, 0x70a08231000000000000000000000000) // `balanceOf(address)`.
pop(staticcall(gas(), token, 0x10, 0x24, 0x00, 0x20))
amount := mload(0x00)
}
}

/// @dev Returns the amount of ERC1155/6909 `token` `id` owned by `account`.
function _balanceOf(address token, address account, uint256 id)
internal
view
virtual
returns (uint256 amount)
{
assembly ("memory-safe") {
mstore(0x04, account) // Store the `account` argument.
mstore(0x18, id) // Store the `id` argument.
mstore(0x00, 0x00fdd58e) // `balanceOf(address,uint256)`.
amount := mload(staticcall(gas(), token, 0x00, 0x38, 0x00, 0x20))
}
}

/// @dev Returns the total supply of ERC20/721 `token`.
function _totalSupply(address token) internal view virtual returns (uint256 supply) {
assembly ("memory-safe") {
mstore(0x00, 0x72dd529b) // `totalSupply()`.
supply := mload(staticcall(gas(), token, 0x00, 0x04, 0x00, 0x20))
}
}

/// @dev Returns the total supply of ERC1155/6909 `token` `id`.
function _totalSupply(address token, uint256 id)
internal
view
virtual
returns (uint256 supply)
{
assembly ("memory-safe") {
mstore(0x04, id) // Store the `id` argument.
mstore(0x00, 0x3f053e2d) // `totalSupply(uint256)`.
supply := mload(staticcall(gas(), token, 0x00, 0x24, 0x00, 0x20))
}
}

/// ========================= OVERRIDES ========================= ///

/// @dev Hook that is called before any transfer of tokens.
Expand All @@ -354,11 +402,6 @@ contract Dagon is ERC6909 {
}
}

/// @notice Simple ownership interface for handover requests.
interface IOwnable {
function requestOwnershipHandover() external payable;
}

/// @notice Simple authority interface for contracts.
interface IAuth {
function validateTransfer(address, address, uint256, uint256)
Expand All @@ -371,10 +414,7 @@ interface IAuth {
returns (uint256);
}

/// @notice Generalized fungible token ownership interface.
interface ITokenOwner {
function balanceOf(address) external view returns (uint256);
function balanceOf(address, uint256) external view returns (uint256);
function totalSupply() external view returns (uint256);
function totalSupply(uint256) external view returns (uint256);
/// @notice Simple ownership interface for handover requests.
interface IOwnable {
function requestOwnershipHandover() external payable;
}
Loading

0 comments on commit 12e8aa8

Please sign in to comment.