File tree Expand file tree Collapse file tree 1 file changed +9
-0
lines changed Expand file tree Collapse file tree 1 file changed +9
-0
lines changed Original file line number Diff line number Diff line change @@ -2758,11 +2758,20 @@ pub fn encode_circle_paymaster_data(
2758
2758
) -> Vec < u8 > {
2759
2759
let mut data = Vec :: new ( ) ;
2760
2760
2761
+ <<<<<<< HEAD
2761
2762
// First, add the paymaster address (20 bytes) - this will be extracted by the bundler
2762
2763
data. extend_from_slice( paymaster . as_slice( ) ) ;
2763
2764
2764
2765
// Then add the ABI-encoded gas limits (what the paymaster actually expects)
2765
2766
2767
+ =======
2768
+ // ABI encoding pads all values to 32 bytes
2769
+
2770
+ // Paymaster address (32 bytes - padded on the left with zeros)
2771
+ data. extend_from_slice( & [ 0u8 ; 12 ] ) ; // 12 bytes of padding
2772
+ data. extend_from_slice( paymaster. as_slice( ) ) ; // 20 bytes of address
2773
+
2774
+ >>>>>>> 66 fb6b87938620c790b3c23a12fa2d66f4ffbdd5
2766
2775
// Verification gas limit as uint256 (32 bytes)
2767
2776
let verification_gas_u256 = U256 :: from ( verification_gas_limit ) ;
2768
2777
data. extend_from_slice( & verification_gas_u256 . to_be_bytes:: < 32 > ( ) ) ;
You can’t perform that action at this time.
0 commit comments