@@ -4,8 +4,8 @@ use num_traits::{FromPrimitive, Zero};
44use openvm_circuit:: {
55 arch:: {
66 AirInventory , AirInventoryError , ChipInventory , ChipInventoryError ,
7- ExecutorInventoryBuilder , ExecutorInventoryError , RowMajorMatrixArena , VmCircuitExtension ,
8- VmExecutionExtension , VmProverExtension ,
7+ ExecutorInventoryBuilder , ExecutorInventoryError , VmCircuitExtension , VmExecutionExtension ,
8+ VmProverExtension ,
99 } ,
1010 system:: phantom:: PhantomExecutor ,
1111} ;
@@ -19,12 +19,7 @@ use openvm_pairing_guest::{
1919 bn254:: { BN254_ECC_STRUCT_NAME , BN254_MODULUS , BN254_ORDER , BN254_XI_ISIZE } ,
2020} ;
2121use openvm_pairing_transpiler:: PairingPhantom ;
22- use openvm_stark_backend:: {
23- config:: { StarkGenericConfig , Val } ,
24- engine:: StarkEngine ,
25- p3_field:: { Field , PrimeField32 } ,
26- prover:: cpu:: { CpuBackend , CpuDevice } ,
27- } ;
22+ use openvm_stark_backend:: { config:: StarkGenericConfig , engine:: StarkEngine , p3_field:: Field } ;
2823use serde:: { Deserialize , Serialize } ;
2924use strum:: FromRepr ;
3025
@@ -74,7 +69,7 @@ pub enum PairingExtensionExecutor<F: Field> {
7469 Phantom ( PhantomExecutor < F > ) ,
7570}
7671
77- impl < F : PrimeField32 > VmExecutionExtension < F > for PairingExtension {
72+ impl < F : Field > VmExecutionExtension < F > for PairingExtension {
7873 type Executor = PairingExtensionExecutor < F > ;
7974
8075 fn extend_execution (
@@ -95,18 +90,15 @@ impl<SC: StarkGenericConfig> VmCircuitExtension<SC> for PairingExtension {
9590 }
9691}
9792
98- pub struct PairingCpuProverExt ;
99- impl < E , SC , RA > VmProverExtension < E , RA , PairingExtension > for PairingCpuProverExt
93+ pub struct PairingProverExt ;
94+ impl < E , RA > VmProverExtension < E , RA , PairingExtension > for PairingProverExt
10095where
101- SC : StarkGenericConfig ,
102- E : StarkEngine < SC = SC , PB = CpuBackend < SC > , PD = CpuDevice < SC > > ,
103- RA : RowMajorMatrixArena < Val < SC > > ,
104- Val < SC > : PrimeField32 ,
96+ E : StarkEngine ,
10597{
10698 fn extend_prover (
10799 & self ,
108100 _: & PairingExtension ,
109- _inventory : & mut ChipInventory < SC , RA , CpuBackend < SC > > ,
101+ _inventory : & mut ChipInventory < E :: SC , RA , E :: PB > ,
110102 ) -> Result < ( ) , ChipInventoryError > {
111103 Ok ( ( ) )
112104 }
@@ -132,14 +124,14 @@ pub(crate) mod phantom {
132124 pairing:: { FinalExp , MultiMillerLoop } ,
133125 } ;
134126 use openvm_rv32im_circuit:: adapters:: { memory_read, read_rv32_register} ;
135- use openvm_stark_backend:: p3_field:: PrimeField32 ;
127+ use openvm_stark_backend:: p3_field:: Field ;
136128 use rand:: rngs:: StdRng ;
137129
138130 use super :: PairingCurve ;
139131
140132 pub struct PairingHintSubEx ;
141133
142- impl < F : PrimeField32 > PhantomSubExecutor < F > for PairingHintSubEx {
134+ impl < F : Field > PhantomSubExecutor < F > for PairingHintSubEx {
143135 fn phantom_execute (
144136 & self ,
145137 memory : & GuestMemory ,
@@ -156,7 +148,7 @@ pub(crate) mod phantom {
156148 }
157149 }
158150
159- fn hint_pairing < F : PrimeField32 > (
151+ fn hint_pairing < F : Field > (
160152 memory : & GuestMemory ,
161153 hint_stream : & mut VecDeque < F > ,
162154 rs1 : u32 ,
0 commit comments