fix: FundingInfo bytes length

zkLinkProtocol · Nov 14, 2023 · 155162e · 155162e
1 parent 5546dd5
commit 155162e
Show file tree

Hide file tree

Showing 2 changed files with 79 additions and 2 deletions.
diff --git a/types/src/tx_type/contract/funding.rs b/types/src/tx_type/contract/funding.rs
@@ -34,7 +34,7 @@ impl GetBytes for FundingInfo {
         let bytes_len = self.bytes_len();
         let mut funding_rate_encode = Vec::with_capacity(bytes_len);
         funding_rate_encode.push(*self.pair_id as u8);
-        funding_rate_encode.extend(pad_front(&self.price.to_be_bytes(), PRICE_BIT_WIDTH));
+        funding_rate_encode.extend(pad_front(&self.price.to_be_bytes(), PRICE_BIT_WIDTH / 8));
         // For the convenience of the circuit, we use the Original Code instead of the Two's Complement.
         let mut rate_bytes = self.funding_rate.unsigned_abs().to_be_bytes();
         if self.funding_rate.is_negative() {
@@ -46,7 +46,7 @@ impl GetBytes for FundingInfo {
     }
 
     fn bytes_len(&self) -> usize {
-        PAIR_BIT_WIDTH / 8 + FUNDING_RATE_BYTES
+        PAIR_BIT_WIDTH / 8 + PRICE_BIT_WIDTH / 8 + FUNDING_RATE_BYTES
     }
 }
 

diff --git a/types/src/tx_type/contract/update_global_var.rs b/types/src/tx_type/contract/update_global_var.rs
@@ -133,3 +133,80 @@ impl GetBytes for Parameter {
         unreachable!()
     }
 }
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::prelude::UpdateGlobalVarBuilder;
+
+    #[test]
+    fn test_get_bytes() {
+        let params = vec![
+            Parameter::FundingInfos {
+                infos: vec![
+                    FundingInfo {
+                        pair_id: PairId(0),
+                        price: 1000_000_000_000_000_000u128.into(),
+                        funding_rate: i16::MAX,
+                    },
+                    FundingInfo {
+                        pair_id: PairId(1),
+                        price: 1000_000_000_000_000u128.into(),
+                        funding_rate: 0,
+                    },
+                    FundingInfo {
+                        pair_id: PairId(2),
+                        price: 1000_000_000_000u128.into(),
+                        funding_rate: -1,
+                    },
+                    FundingInfo {
+                        pair_id: PairId(3),
+                        price: 1000_000_000u128.into(),
+                        funding_rate: 1,
+                    },
+                ],
+            },
+            Parameter::FeeAccount {
+                account_id: 10.into(),
+            },
+            Parameter::InsuranceFundAccount {
+                account_id: 9.into(),
+            },
+            Parameter::MarginInfo {
+                margin_id: 1.into(),
+                token_id: 9.into(),
+                ratio: 0,
+            },
+            Parameter::InitialMarginRate {
+                pair_id: 2.into(),
+                rate: 8,
+            },
+            Parameter::MaintenanceMarginRate {
+                pair_id: 2.into(),
+                rate: 100,
+            },
+        ];
+        let excepted_bytes = [
+            vec![
+                12, 1, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 13, 224, 182, 179, 167, 100, 0, 0, 127, 255,
+                1, 0, 0, 0, 0, 0, 0, 0, 0, 3, 141, 126, 164, 198, 128, 0, 0, 0, 2, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 232, 212, 165, 16, 0, 128, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                59, 154, 202, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
+            ],
+            vec![12, 1, 1, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0],
+            vec![12, 1, 1, 1, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0],
+            vec![12, 1, 1, 2, 1, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+        ];
+        for (param, excepted_bytes) in params.into_iter().zip(excepted_bytes) {
+            let builder = UpdateGlobalVarBuilder {
+                from_chain_id: ChainId(1),
+                sub_account_id: SubAccountId(1),
+                parameter: param,
+                serial_id: 0,
+            };
+            let tx = builder.build();
+            let bytes = tx.get_bytes();
+            assert_eq!(bytes, excepted_bytes);
+        }
+    }
+}