Factorise the PopVerify() gas-price.

zilliqa/src/constants.rs

@@ -15,6 +15,9 @@ pub const EVM_MAX_INIT_CODE_SIZE: usize = 2 * EVM_MAX_CODE_SIZE;
 // Minimum gas required for EVM transaction (without input data)
 pub const EVM_MIN_GAS_UNITS: EvmGas = EvmGas(21000);
 
+// Gas used for verifying proof of posession
+pub const EVM_POP_VERIFY_GAS_PRICE: EvmGas = EvmGas(1_000_000);
+
 // Maximum code size allowed for zil transactions (imported from ZQ1)
 pub const ZIL_MAX_CODE_SIZE: usize = 76800;
 

zilliqa/src/precompiles/pop_verify.rs

@@ -9,19 +9,18 @@ use revm::{
     ContextStatefulPrecompile, InnerEvmContext,
 };
 
-use crate::state::State;
+use crate::{constants::EVM_POP_VERIFY_GAS_PRICE, state::State};
 
 pub struct PopVerify;
 
 // keep in-sync with zilliqa/src/contracts/deposit.sol
 impl PopVerify {
-    const POP_VERIFY_GAS_PRICE: u64 = 1_000_000u64; // FIXME: Gas Price?
     fn pop_verify(
         input: &[u8],
         gas_limit: u64,
         _context: &mut InnerEvmContext<&State>,
     ) -> PrecompileResult {
-        if gas_limit < Self::POP_VERIFY_GAS_PRICE {
+        if gas_limit < EVM_POP_VERIFY_GAS_PRICE.0 {
             return Err(PrecompileErrors::Error(PrecompileError::OutOfGas));
         }
 
@@ -47,10 +46,9 @@ impl PopVerify {
 
         let result = pop.verify(pk).is_ok();
 
-        // FIXME: Gas?
         let output = encode(&[Token::Bool(result)]);
         Ok(PrecompileOutput::new(
-            Self::POP_VERIFY_GAS_PRICE,
+            EVM_POP_VERIFY_GAS_PRICE.0,
             output.into(),
         ))
     }