feat: rework import linker with macros

Author: b33ngo

crates/runtime/src/runtime/strategy_runtime.rs

@@ -31,7 +31,7 @@ impl StrategyRuntime {
 
     pub fn execute(&mut self) -> Result<(), TrapCode> {
         self.strategy
-            .execute(&mut self.store, self.entrypoint, &[], &mut [], FuelConfig::default())
+            .execute(&mut self.store, self.entrypoint, &[], &mut [])
     }
 
     pub fn resume(&mut self, exit_code: i32) -> Result<(), TrapCode> {

crates/types/src/block_fuel.rs

@@ -1,5 +1,5 @@
 use crate::{SysFuncIdx, FUEL_DENOM_RATE};
-use rwasm::{instruction_set, InstructionSet, SyscallFuelParams, TrapCode};
+use rwasm::SyscallFuelParams;
 
 /// The maximum allowed value for the `x` parameter used in linear gas cost calculation
 /// of builtins.
@@ -22,51 +22,33 @@ const FUEL_MAX_LINEAR_X: u32 = 262_143; // 2^18 - 1
 /// visit_local_get).
 ///
 /// Word is defined as 32 bytes, the same as in the EVM.
-macro_rules! linear_fuel {
-    ($local_depth:expr, $base_cost:expr, $word_cost:expr) => {{
-        // compile-time overflow check
-        const _: () = {
-            assert!(
-                ($base_cost as u128) + ($word_cost as u128) * (FUEL_MAX_LINEAR_X as u128) <= (u32::MAX as u128),
-                "base_cost + word_cost * FUEL_MAX_LINEAR_X must fit into u32"
-            );
-        };
-
-        instruction_set! {
-            LocalGet($local_depth) // Compare x with FUEL_MAX_LINEAR_X
-            I32Const(FUEL_MAX_LINEAR_X)
-            I32GtU
-            BrIfEqz(2)
-            Trap(TrapCode::IntegerOverflow)
-
-            LocalGet($local_depth) // Calculate cost
-            I32Const(31)
-            I32Add
-            I32Const(32)
-            I32DivU
-            I32Const($word_cost)
-            I32Mul
-            I32Const($base_cost)
-            I32Add
-            I32Const(0) // Push two 32-bit values, which are interpreted as a single 64-bit value inside the builtin.
-            Call(SysFuncIdx::CHARGE_FUEL)
+macro_rules! no_fuel {
+    () => {
+        SyscallFuelParams {
+            base_fuel: 0,
+            param_index: 0,
+            linear_fuel: 0,
         }
-    }};
+    };
 }
 
 macro_rules! const_fuel {
-    ($cost:expr) => {
-        instruction_set! {
-            I32Const($cost)
-            I32Const(0) // Push two 32-bit values, which are interpreted as a single 64-bit value inside the builtin.
-            Call(SysFuncIdx::CHARGE_FUEL)
+    ($base:expr) => {
+        SyscallFuelParams {
+            base_fuel: $base as u64,
+            param_index: 0,
+            linear_fuel: 0,
         }
     };
 }
 
-macro_rules! no_fuel {
-    () => {
-        instruction_set! {}
+macro_rules! linear_fuel {
+    ($param_index:expr, $base:expr, $linear:expr) => {
+        SyscallFuelParams {
+            base_fuel: $base as u64,
+            param_index: $param_index,
+            linear_fuel: $linear as u64,
+        }
     };
 }
 
@@ -124,7 +106,7 @@ pub const BLS_MAP_G2_COST: u32 = 80_000 * FUEL_DENOM_RATE as u32;
 pub const UINT256_MUL_MOD_COST: u32 = 8 * FUEL_DENOM_RATE as u32;
 pub const UINT256_X2048_MUL_COST: u32 = 5_000 * FUEL_DENOM_RATE as u32;
 
-pub(crate) fn emit_fuel_procedure(sys_func_idx: SysFuncIdx) -> InstructionSet {
+pub(crate) fn calculate_syscall_fuel(sys_func_idx: SysFuncIdx) -> SyscallFuelParams {
     use SysFuncIdx::*;
     match sys_func_idx {
         // input/output & state control (0x00)
@@ -189,245 +171,3 @@ pub(crate) fn emit_fuel_procedure(sys_func_idx: SysFuncIdx) -> InstructionSet {
         _ => no_fuel!(),
     }
 }
-
-pub(crate) fn calculate_syscall_fuel(sys_func_idx: SysFuncIdx) -> SyscallFuelParams {
-    use SysFuncIdx::*;
-    match sys_func_idx {
-        // input/output & state control (0x00)
-        EXIT => SyscallFuelParams {
-            base_fuel: 0,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-        STATE => SyscallFuelParams {
-            base_fuel: LOW_FUEL_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-        READ_INPUT => SyscallFuelParams {
-            base_fuel: COPY_BASE_FUEL_COST as u64,
-            param_index: 1,
-            linear_fuel: COPY_WORD_FUEL_COST as u64,
-        },
-        INPUT_SIZE => SyscallFuelParams {
-            base_fuel: LOW_FUEL_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-        WRITE_OUTPUT => SyscallFuelParams {
-            base_fuel: COPY_BASE_FUEL_COST as u64,
-            param_index: 1,
-            linear_fuel: COPY_WORD_FUEL_COST as u64,
-        },
-        OUTPUT_SIZE => SyscallFuelParams {
-            base_fuel: LOW_FUEL_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-        READ_OUTPUT => SyscallFuelParams {
-            base_fuel: COPY_BASE_FUEL_COST as u64,
-            param_index: 1,
-            linear_fuel: COPY_WORD_FUEL_COST as u64,
-        },
-        EXEC => SyscallFuelParams {
-            base_fuel: 0,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-        RESUME => SyscallFuelParams {
-            base_fuel: 0,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-        FORWARD_OUTPUT => SyscallFuelParams {
-            base_fuel: COPY_BASE_FUEL_COST as u64,
-            param_index: 1,
-            linear_fuel: COPY_WORD_FUEL_COST as u64,
-        },
-        CHARGE_FUEL_MANUALLY => SyscallFuelParams {
-            base_fuel: 0,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-        FUEL => SyscallFuelParams {
-            base_fuel: LOW_FUEL_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-        DEBUG_LOG => SyscallFuelParams {
-            base_fuel: DEBUG_LOG_BASE_FUEL_COST as u64,
-            param_index: 1,
-            linear_fuel: DEBUG_LOG_WORD_FUEL_COST as u64,
-        },
-        CHARGE_FUEL => SyscallFuelParams {
-            base_fuel: CHARGE_FUEL_BASE_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-
-        // hashing functions (0x01)
-        KECCAK256 => SyscallFuelParams {
-            base_fuel: KECCAK_BASE_FUEL_COST as u64,
-            param_index: 2,
-            linear_fuel: KECCAK_WORD_FUEL_COST as u64,
-        },
-        KECCAK256_PERMUTE => SyscallFuelParams {
-            base_fuel: KECCAK_BASE_FUEL_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-        POSEIDON => SyscallFuelParams {
-            base_fuel: 100,
-            param_index: 2,
-            linear_fuel: 20,
-        },
-        SHA256_EXTEND => SyscallFuelParams {
-            base_fuel: SHA256_BASE_FUEL_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-        SHA256_COMPRESS => SyscallFuelParams {
-            base_fuel: SHA256_BASE_FUEL_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-        SHA256 => SyscallFuelParams {
-            base_fuel: SHA256_BASE_FUEL_COST as u64,
-            param_index: 2,
-            linear_fuel: SHA256_WORD_FUEL_COST as u64,
-        },
-        BLAKE3 => SyscallFuelParams {
-            base_fuel: BLAKE3_BASE_FUEL_COST as u64,
-            param_index: 2,
-            linear_fuel: BLAKE3_WORD_FUEL_COST as u64,
-        },
-
-        // ed25519 (0x02)
-        ED25519_DECOMPRESS => SyscallFuelParams {
-            base_fuel: ED25519_DECOMPRESS_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-        ED25519_ADD => SyscallFuelParams {
-            base_fuel: ED25519_ADD_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-
-        // fp1/fp2 tower field (0x03)
-        TOWER_FP1_BN254_ADD | TOWER_FP1_BN254_SUB => SyscallFuelParams {
-            base_fuel: FP1_ADD_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-        TOWER_FP1_BN254_MUL => SyscallFuelParams {
-            base_fuel: FP1_MUL_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-        TOWER_FP1_BLS12381_ADD | TOWER_FP1_BLS12381_SUB => SyscallFuelParams {
-            base_fuel: FP1_BLS_ADD_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-        TOWER_FP1_BLS12381_MUL => SyscallFuelParams {
-            base_fuel: FP1_BLS_MUL_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-        TOWER_FP2_BN254_ADD | TOWER_FP2_BN254_SUB => SyscallFuelParams {
-            base_fuel: FP2_ADD_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-        TOWER_FP2_BN254_MUL => SyscallFuelParams {
-            base_fuel: FP2_MUL_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-        TOWER_FP2_BLS12381_ADD | TOWER_FP2_BLS12381_SUB => SyscallFuelParams {
-            base_fuel: FP2_BLS_ADD_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-        TOWER_FP2_BLS12381_MUL => SyscallFuelParams {
-            base_fuel: FP2_BLS_MUL_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-
-        // secp256k1 (0x04)
-        SECP256K1_ADD => SyscallFuelParams {
-            base_fuel: SECP256K1_ADD_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-        SECP256K1_DECOMPRESS => SyscallFuelParams {
-            base_fuel: SECP256K1_DECOMPRESS_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-        SECP256K1_DOUBLE => SyscallFuelParams {
-            base_fuel: SECP256K1_DOUBLE_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-
-        // bls12381 (0x06)
-        BLS12381_ADD => SyscallFuelParams {
-            base_fuel: BLS_G1_ADD_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-        // BLS12381_G2_ADD => SyscallFuelParams {
-        //     base_fuel: BLS_G2_ADD_COST as u64,
-        //     param_index: 0,
-        //     linear_fuel: 0,
-        // },
-        // BLS12381_PAIRING => SyscallFuelParams {
-        //     base_fuel: BLS_PAIRING_COST as u64,
-        //     param_index: 0,
-        //     linear_fuel: 0,
-        // },
-        // BLS12381_MAP_G1 => SyscallFuelParams {
-        //     base_fuel: BLS_MAP_G1_COST as u64,
-        //     param_index: 0,
-        //     linear_fuel: 0,
-        // },
-        // BLS12381_MAP_G2 => SyscallFuelParams {
-        //     base_fuel: BLS_MAP_G2_COST as u64,
-        //     param_index: 0,
-        //     linear_fuel: 0,
-        // },
-
-        // bn254 (0x07)
-        BN254_ADD => SyscallFuelParams {
-            base_fuel: BN254_ADD_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-        BN254_DOUBLE => SyscallFuelParams {
-            base_fuel: BN254_DOUBLE_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-
-        // uint256 (0x08)
-        UINT256_MUL_MOD => SyscallFuelParams {
-            base_fuel: UINT256_MUL_MOD_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-        UINT256_X2048_MUL => SyscallFuelParams {
-            base_fuel: UINT256_X2048_MUL_COST as u64,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-
-        _ => SyscallFuelParams {
-            base_fuel: 0,
-            param_index: 0,
-            linear_fuel: 0,
-        },
-    }
-}