Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support weighted keys #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support weighted keys #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions MultiSignatureWallet.yul
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ object "MultiSignatureWallet" {
sstore(address(), mload(0)) // map contract address => signatures required

for { let i := 96 } lt(i, add(96, mul(32, mload(64)))) { i := add(i, 32) } { // iterate through signatory addresses
sstore(mload(i), mload(i)) // map signer address => signer address
sstore(mload(i), 1) // map signer address => signer address
}

datacopy(0, dataoffset("Runtime"), datasize("Runtime")) // now switch over to runtime code from constructor
Expand All @@ -36,16 +36,18 @@ object "MultiSignatureWallet" {
let EIP712Hash := keccak256(0, 66) // EIP712 final signing hash
let previousAddress := 0 // comparison variable, used to check for duplicate signer accounts

for { let i := 0 } lt(i, sload(address())) { i := add(i, 1) } { // signature validation: loop through signatures (i < required signatures)
for { let i := 0 } lt(i, sload(address())) { } { // signature validation: loop through signatures (i < required signatures)
let memPosition := add(add(1064, mload(1160)), mul(i, 96)) // new memory position -32 bytes from sig start

mstore(memPosition, EIP712Hash) // place hash before each sig in memory: hash + v + r + s | hash + vN + rN + sN

let result := call(3000, 1, 0, memPosition, 128, 300, 32) // call ecrecover precompile with ecrecover(hash,v,r,s) | failing is okay here

if iszero(gt(sload(mload(300)), previousAddress)) { revert(0, 0) } // sload(current address) > prev address OR revert
let addr := mload(300)
if iszero(gt(addr, previousAddress)) { revert(0, 0) } // sload(current address) > prev address OR revert
i := add(i, sload(addr))

previousAddress := mload(300) // set previous address for future comparison
previousAddress := addr // set previous address for future comparison
}

sstore(add(address(), 1), add(1, mload(1032))) // increase nonce: nonce = nonce + 1
Expand Down