Fix hash computation when calldata are split into several APDUs

starknet/src/transaction.rs

@@ -227,6 +227,7 @@ pub enum SetCallError {
     TooManyCalls = 0xFF01,
 }
 
+#[derive(PartialEq)]
 pub enum SetCallStep {
     New = 0x00,
     Add = 0x01,
@@ -322,26 +323,28 @@ fn set_calldata_invoke(
             }
             let mut call = Call::default();
             let mut iter = data.chunks(FIELD_ELEMENT_SIZE);
-
             call.to = iter.next().unwrap().into();
-            hasher.update(call.to);
             call.selector = iter.next().unwrap().into();
-            hasher.update(call.selector);
-            hasher.update(FieldElement::from(iter.len() as u8));
             for d in iter {
                 call.calldata.push(d.into());
-                hasher.update(d.into());
             }
             calls.push(call);
             Ok(())
         }
         SetCallStep::Add | SetCallStep::End => {
             let idx = calls.len() - 1;
-            let call = calls.get_mut(idx).unwrap();
+            let call: &mut Call = calls.get_mut(idx).unwrap();
             let iter = data.chunks(FIELD_ELEMENT_SIZE);
             for d in iter {
                 call.calldata.push(d.into());
-                hasher.update(d.into());
+            }
+            if p2 == SetCallStep::End {
+                hasher.update(call.to);
+                hasher.update(call.selector);
+                hasher.update(FieldElement::from(call.calldata.len() as u8));
+                for d in &call.calldata {
+                    hasher.update(*d);
+                }
             }
             Ok(())
         }