Skip to content

Commit f486363

Browse files
committed
wip
2 parents 0ef160e + 66fb6b8 commit f486363

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

src/wallet.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2758,11 +2758,20 @@ pub fn encode_circle_paymaster_data(
27582758
) -> Vec<u8> {
27592759
let mut data = Vec::new();
27602760

2761+
<<<<<<< HEAD
27612762
// First, add the paymaster address (20 bytes) - this will be extracted by the bundler
27622763
data.extend_from_slice(paymaster.as_slice());
27632764

27642765
// Then add the ABI-encoded gas limits (what the paymaster actually expects)
27652766

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+
>>>>>>> 66fb6b87938620c790b3c23a12fa2d66f4ffbdd5
27662775
// Verification gas limit as uint256 (32 bytes)
27672776
let verification_gas_u256 = U256::from(verification_gas_limit);
27682777
data.extend_from_slice(&verification_gas_u256.to_be_bytes::<32>());

0 commit comments

Comments
 (0)