rename message member (account -> sender)

OpenZeppelin · Oct 26, 2021 · a3c5a5b · a3c5a5b
1 parent e94c44d
commit a3c5a5b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/contracts/Account.cairo b/contracts/Account.cairo
@@ -13,11 +13,11 @@ from starkware.starknet.common.storage import Storage
 #
 
 struct Message:
+    member sender: felt
     member to: felt
     member selector: felt
     member calldata: felt*
     member calldata_size: felt
-    member this: felt
     member nonce: felt
 end
 
@@ -185,11 +185,11 @@ func execute{
     local _current_nonce = _current_nonce
 
     local message: Message = Message(
+        _address,
         to,
         selector,
         calldata,
         calldata_size=calldata_len,
-        _address,
         _current_nonce
     )
 
@@ -213,13 +213,13 @@ end
 
 func hash_message{pedersen_ptr : HashBuiltin*}(message: Message*) -> (res: felt):
     alloc_locals
-    let (res) = hash2{hash_ptr=pedersen_ptr}(message.to, message.selector)
+    let (res) = hash2{hash_ptr=pedersen_ptr}(message.sender, message.to)
+    let (res) = hash2{hash_ptr=pedersen_ptr}(res, message.selector)
     # we need to make `res` local
     # to prevent the reference from being revoked
     local res = res
     let (res_calldata) = hash_calldata(message.calldata, message.calldata_size)
     let (res) = hash2{hash_ptr=pedersen_ptr}(res, res_calldata)
-    let (res) = hash2{hash_ptr=pedersen_ptr}(res, message.this)
     let (res) = hash2{hash_ptr=pedersen_ptr}(res, message.nonce)
     return (res=res)
 end

diff --git a/test/utils/Signer.py b/test/utils/Signer.py
@@ -16,17 +16,17 @@ async def send_transaction(self, account, to, selector_name, calldata, nonce=Non
 
         selector = get_selector_from_name(selector_name)
         message_hash = hash_message(
-            to, selector, calldata, account.contract_address, nonce)
+            account.contract_address, to, selector, calldata, nonce)
         sig_r, sig_s = self.sign(message_hash)
 
         return await account.execute(to, selector, calldata, [sig_r, sig_s]).invoke()
 
 
-def hash_message(to, selector, calldata, account_address, nonce):
-    res = pedersen_hash(to, selector)
+def hash_message(sender, to, selector, calldata, nonce):
+    res = pedersen_hash(sender, to)
+    res = pedersen_hash(res, selector)
     res_calldata = hash_calldata(calldata)
     res = pedersen_hash(res, res_calldata)
-    res = pedersen_hash(res, account_address)
     return pedersen_hash(res, nonce)