𒀭 1x

Moloch-Mystics · Jul 4, 2024 · d39dde7 · d39dde7
1 parent 405e4eb
commit d39dde7
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 37 deletions.
diff --git a/Dagon.pdf b/Dagon.pdf
diff --git a/README.md b/README.md
@@ -5,11 +5,11 @@
 
 Built with *[Foundry](https://github.com/foundry-rs/forge-std)* and *[Solady](https://github.com/vectorized/solady)*.
 
-## [Beta Deployment](https://contractscan.xyz/contract/0x0000000000001ADDcB933DD5028159dc965b5b7f)
+## [Beta Deployment](https://contractscan.xyz/contract/0x000000000000FEb893BB5D63bA33323EdCC237cE)
 
 Chains           | Address                                 | 
 ----------------|-----------------------------------------|
-Ethereum, Arbitrum, Optimism, Base, Blast, Zora, Gnosis, Polygon, Avalanche and BNB (& testnets) | [0x0000000000001ADDcB933DD5028159dc965b5b7f](https://etherscan.io/address/0x0000000000001ADDcB933DD5028159dc965b5b7f#code) |
+Ethereum, Arbitrum, Optimism, Base, Blast, Zora, Gnosis, Polygon, Avalanche and BNB (& testnets) | [0x000000000000FEb893BB5D63bA33323EdCC237cE](https://etherscan.io/address/0x000000000000FEb893BB5D63bA33323EdCC237cE#code) |
 
 Dagon deployments are generated as [efficient create2 addresses](https://medium.com/coinmonks/on-efficient-ethereum-addresses-3fef0596e263) through the [canonical create2 factory](https://etherscan.io/address/0x0000000000ffe8b47b3e2130213b802212439497#code). As such they share the same exact address and code on every blockchain.
 

diff --git a/docs/src/README.md b/docs/src/README.md
@@ -5,14 +5,11 @@
 
 Built with *[Foundry](https://github.com/foundry-rs/forge-std)* and *[Solady](https://github.com/vectorized/solady)*.
 
-## [Beta Deployment](https://contractscan.xyz/contract/0x0000000000001ADDcB933DD5028159dc965b5b7f)
-> *Signature Validation Limit: ~1774 signatures*
+## [Beta Deployment](https://contractscan.xyz/contract/0x000000000000FEb893BB5D63bA33323EdCC237cE)
 
 Chains           | Address                                 | 
 ----------------|-----------------------------------------|
-Ethereum, Arbitrum, Optimism, Base, Blast, Zora, Gnosis, Polygon, Avalanche and BNB (& testnets) | [0x0000000000001ADDcB933DD5028159dc965b5b7f](https://etherscan.io/address/0x0000000000001ADDcB933DD5028159dc965b5b7f#code) |
-
-> Summoner: [0x0000000000008de57636b43B33b2d6007Df5576e](https://etherscan.io/address/0x0000000000008de57636b43B33b2d6007Df5576e#code)
+Ethereum, Arbitrum, Optimism, Base, Blast, Zora, Gnosis, Polygon, Avalanche and BNB (& testnets) | [0x000000000000FEb893BB5D63bA33323EdCC237cE](https://etherscan.io/address/0x000000000000FEb893BB5D63bA33323EdCC237cE#code) |
 
 Dagon deployments are generated as [efficient create2 addresses](https://medium.com/coinmonks/on-efficient-ethereum-addresses-3fef0596e263) through the [canonical create2 factory](https://etherscan.io/address/0x0000000000ffe8b47b3e2130213b802212439497#code). As such they share the same exact address and code on every blockchain.
 

diff --git a/docs/src/SUMMARY.md b/docs/src/SUMMARY.md
@@ -4,5 +4,3 @@
   - [Dagon](src/Dagon.sol/contract.Dagon.md)
   - [IAuth](src/Dagon.sol/interface.IAuth.md)
   - [IOwnable](src/Dagon.sol/interface.IOwnable.md)
-  - [Summoner](src/Summoner.sol/contract.Summoner.md)
-  - [IAccounts](src/Summoner.sol/interface.IAccounts.md)
diff --git a/docs/src/src/Dagon.sol/contract.Dagon.md b/docs/src/src/Dagon.sol/contract.Dagon.md
@@ -1,10 +1,10 @@
 # Dagon
-[Git Source](https://github.com/Moloch-Mystics/dagon/blob/efc921a89c26d7bf4ef258e73ffcf64e1bdef80a/src/Dagon.sol)
+[Git Source](https://github.com/Moloch-Mystics/dagon/blob/405e4eb5a2a407d3f2421047d8b8f778ad336343/src/Dagon.sol)
 
 **Inherits:**
 ERC6909
 
-Simple ownership singleton for smart accounts. Version 1.
+Simple ownership singleton for smart accounts. Version 1x.
 
 
 ## State Variables
@@ -30,20 +30,21 @@ mapping(address account => Settings) internal _settings;
 
 
 ### votingTally
-*Stores mapping of voting tallies to signed userOp hashes.*
+*Stores mapping of voting tallies to account operation hashes.*
 
 
 ```solidity
-mapping(bytes32 signedHash => uint256) public votingTally;
+mapping(address account => mapping(bytes32 hash => uint256)) public votingTally;
 ```
 
 
 ### voted
-*Stores mapping of account owner voting shares cast on signed userOp hashes.*
+*Stores mapping of account owner shares cast on account operation hashes.*
 
 
 ```solidity
-mapping(address owner => mapping(bytes32 signedHash => uint256 shares)) public voted;
+mapping(address account => mapping(address owner => mapping(bytes32 hash => uint256 shares))) public
+    voted;
 ```
 
 
@@ -123,7 +124,6 @@ note: This is expected to be called in a validator plugin-like userOp flow.*
 ```solidity
 function validateUserOp(PackedUserOperation calldata userOp, bytes32 userOpHash, uint256)
     public
-    payable
     virtual
     returns (uint256 validationData);
 ```
@@ -141,17 +141,25 @@ function _validateReturn(bool success) internal pure virtual returns (bytes4 res
 
 ===================== VOTING OPERATIONS ===================== ///
 
-*Casts account owner voting shares on a given ERC4337 userOp hash.*
+*Casts account owners' voting shares on a given operation hash.*
 
 
 ```solidity
-function vote(address account, bytes32 userOpHash, bytes calldata signature)
+function vote(address account, bytes32 hash, bytes calldata signature)
     public
-    payable
     virtual
     returns (uint256);
 ```
 
+### vote
+
+*Casts caller voting shares on a given operation hash and returns tally.*
+
+
+```solidity
+function vote(address account, bytes32 hash) public virtual returns (uint256);
+```
+
 ### install
 
 ======================== INSTALLATION ======================== ///
@@ -165,7 +173,6 @@ https://github.com/Vectorized/solady/blob/main/src/auth/Ownable.sol*
 ```solidity
 function install(Ownership[] calldata owners, Settings calldata setting, Metadata calldata meta)
     public
-    payable
     virtual;
 ```
 
@@ -186,7 +193,7 @@ function getSettings(address account) public view virtual returns (address, uint
 
 
 ```solidity
-function setAuth(IAuth auth) public payable virtual;
+function setAuth(IAuth auth) public virtual;
 ```
 
 ### setToken
@@ -195,7 +202,7 @@ function setAuth(IAuth auth) public payable virtual;
 
 
 ```solidity
-function setToken(address token, Standard standard) public payable virtual;
+function setToken(address token, Standard standard) public virtual;
 ```
 
 ### setThreshold
@@ -204,7 +211,7 @@ function setToken(address token, Standard standard) public payable virtual;
 
 
 ```solidity
-function setThreshold(uint88 threshold) public payable virtual;
+function setThreshold(uint88 threshold) public virtual;
 ```
 
 ### getMetadata
@@ -228,7 +235,7 @@ function getMetadata(address account)
 
 
 ```solidity
-function mint(address owner, uint96 shares) public payable virtual;
+function mint(address owner, uint96 shares) public virtual;
 ```
 
 ### burn
@@ -237,7 +244,7 @@ function mint(address owner, uint96 shares) public payable virtual;
 
 
 ```solidity
-function burn(address owner, uint96 shares) public payable virtual;
+function burn(address owner, uint96 shares) public virtual;
 ```
 
 ### setURI
@@ -246,7 +253,7 @@ function burn(address owner, uint96 shares) public payable virtual;
 
 
 ```solidity
-function setURI(string calldata uri) public payable virtual;
+function setURI(string calldata uri) public virtual;
 ```
 
 ### _balanceOf
@@ -311,22 +318,22 @@ function _beforeTokenTransfer(address from, address to, uint256 id, uint256 amou
 ```
 
 ## Events
-### AuthSet
+### URI
 =========================== EVENTS =========================== ///
 
-*Logs new authority contract for an account.*
+*Logs new metadata for an account ID.*
 
 
 ```solidity
-event AuthSet(address indexed account, IAuth auth);
+event URI(string uri, uint256 indexed id);
 ```
 
-### URISet
-*Logs new token uri settings for an account.*
+### AuthSet
+*Logs new authority contract for an account.*
 
 
 ```solidity
-event URISet(address indexed account, string uri);
+event AuthSet(address indexed account, IAuth auth);
 ```
 
 ### ThresholdSet
@@ -384,6 +391,17 @@ struct Ownership {
 }
 ```
 
+### Signature
+*The signature struct.*
+
+
+```solidity
+struct Signature {
+    address owner;
+    bytes sigData;
+}
+```
+
 ### Settings
 *The account ownership settings struct.*
 

diff --git a/docs/src/src/Dagon.sol/interface.IAuth.md b/docs/src/src/Dagon.sol/interface.IAuth.md
@@ -1,5 +1,5 @@
 # IAuth
-[Git Source](https://github.com/Moloch-Mystics/dagon/blob/efc921a89c26d7bf4ef258e73ffcf64e1bdef80a/src/Dagon.sol)
+[Git Source](https://github.com/Moloch-Mystics/dagon/blob/405e4eb5a2a407d3f2421047d8b8f778ad336343/src/Dagon.sol)
 
 Simple authority interface for contracts.
 

diff --git a/docs/src/src/Dagon.sol/interface.IOwnable.md b/docs/src/src/Dagon.sol/interface.IOwnable.md
@@ -1,5 +1,5 @@
 # IOwnable
-[Git Source](https://github.com/Moloch-Mystics/dagon/blob/efc921a89c26d7bf4ef258e73ffcf64e1bdef80a/src/Dagon.sol)
+[Git Source](https://github.com/Moloch-Mystics/dagon/blob/405e4eb5a2a407d3f2421047d8b8f778ad336343/src/Dagon.sol)
 
 Simple ownership interface for handover requests.
 

diff --git a/docs/src/src/README.md b/docs/src/src/README.md
@@ -4,5 +4,3 @@
 - [Dagon](Dagon.sol/contract.Dagon.md)
 - [IAuth](Dagon.sol/interface.IAuth.md)
 - [IOwnable](Dagon.sol/interface.IOwnable.md)
-- [Summoner](Summoner.sol/contract.Summoner.md)
-- [IAccounts](Summoner.sol/interface.IAccounts.md)
diff --git a/etherscan.json b/etherscan.json