diff --git a/Makefile b/Makefile index 00ec4166..849bd68a 100644 --- a/Makefile +++ b/Makefile @@ -15,13 +15,26 @@ format: lint: cargo fmt --all -- --check - cargo clippy -- -D warnings -A clippy::derive_partial_eq_without_eq + cargo clippy --tests -- -D warnings -A clippy::derive_partial_eq_without_eq build: + make fetch-thirdparty + make compile-thirdparty cargo build test: cargo test fetch-thirdparty: - git submodule update --init \ No newline at end of file + git submodule update --init + cd thirdparty/account-abstraction && yarn install && cd ../.. + cd thirdparty/bundler && yarn && cd ../.. + +compile-thirdparty: + cd thirdparty/account-abstraction && yarn compile && cd ../.. + cd thirdparty/bundler && yarn preprocess && cd ../.. + +clean: + cd thirdparty/account-abstraction && yarn clean && cd ../.. + cd thirdparty/bundler && yarn clear && cd ../.. + cargo clean diff --git a/src/types/user_operation.rs b/src/types/user_operation.rs index c468c48f..4d62a5d3 100644 --- a/src/types/user_operation.rs +++ b/src/types/user_operation.rs @@ -118,7 +118,7 @@ mod tests { call_gas_limit: U256::from(200000), verification_gas_limit: U256::from(100000), pre_verification_gas: U256::from(21000), - max_fee_per_gas: U256::from(3000000000 as u64), + max_fee_per_gas: U256::from(3000000000_u64), max_priority_fee_per_gas: U256::from(1000000000), paymaster_and_data: Bytes::default(), signature: Bytes::from_str("0x7cb39607585dee8e297d0d7a669ad8c5e43975220b6773c10a138deadbc8ec864981de4b9b3c735288a217115fb33f8326a61ddabc60a534e3b5536515c70f931c").unwrap(), @@ -152,7 +152,7 @@ mod tests { call_gas_limit: U256::from(200000), verification_gas_limit: U256::from(100000), pre_verification_gas: U256::from(21000), - max_fee_per_gas: U256::from(3000000000 as u64), + max_fee_per_gas: U256::from(3000000000_u64), max_priority_fee_per_gas: U256::from(1000000000), paymaster_and_data: Bytes::default(), signature: Bytes::from_str("0x7cb39607585dee8e297d0d7a669ad8c5e43975220b6773c10a138deadbc8ec864981de4b9b3c735288a217115fb33f8326a61ddabc60a534e3b5536515c70f931c").unwrap(), @@ -186,7 +186,7 @@ mod tests { call_gas_limit: U256::from(200000), verification_gas_limit: U256::from(100000), pre_verification_gas: U256::from(21000), - max_fee_per_gas: U256::from(3000000000 as u64), + max_fee_per_gas: U256::from(3000000000_u64), max_priority_fee_per_gas: U256::from(1000000000), paymaster_and_data: Bytes::default(), signature: Bytes::from_str("0x7cb39607585dee8e297d0d7a669ad8c5e43975220b6773c10a138deadbc8ec864981de4b9b3c735288a217115fb33f8326a61ddabc60a534e3b5536515c70f931c").unwrap(),