@@ -4,8 +4,8 @@ use num_traits::{FromPrimitive, Zero};
4
4
use openvm_circuit:: {
5
5
arch:: {
6
6
AirInventory , AirInventoryError , ChipInventory , ChipInventoryError ,
7
- ExecutorInventoryBuilder , ExecutorInventoryError , RowMajorMatrixArena , VmCircuitExtension ,
8
- VmExecutionExtension , VmProverExtension ,
7
+ ExecutorInventoryBuilder , ExecutorInventoryError , VmCircuitExtension , VmExecutionExtension ,
8
+ VmProverExtension ,
9
9
} ,
10
10
system:: phantom:: PhantomExecutor ,
11
11
} ;
@@ -19,12 +19,7 @@ use openvm_pairing_guest::{
19
19
bn254:: { BN254_ECC_STRUCT_NAME , BN254_MODULUS , BN254_ORDER , BN254_XI_ISIZE } ,
20
20
} ;
21
21
use 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 } ;
28
23
use serde:: { Deserialize , Serialize } ;
29
24
use strum:: FromRepr ;
30
25
@@ -74,7 +69,7 @@ pub enum PairingExtensionExecutor<F: Field> {
74
69
Phantom ( PhantomExecutor < F > ) ,
75
70
}
76
71
77
- impl < F : PrimeField32 > VmExecutionExtension < F > for PairingExtension {
72
+ impl < F : Field > VmExecutionExtension < F > for PairingExtension {
78
73
type Executor = PairingExtensionExecutor < F > ;
79
74
80
75
fn extend_execution (
@@ -95,18 +90,15 @@ impl<SC: StarkGenericConfig> VmCircuitExtension<SC> for PairingExtension {
95
90
}
96
91
}
97
92
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
100
95
where
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 ,
105
97
{
106
98
fn extend_prover (
107
99
& self ,
108
100
_: & PairingExtension ,
109
- _inventory : & mut ChipInventory < SC , RA , CpuBackend < SC > > ,
101
+ _inventory : & mut ChipInventory < E :: SC , RA , E :: PB > ,
110
102
) -> Result < ( ) , ChipInventoryError > {
111
103
Ok ( ( ) )
112
104
}
@@ -132,14 +124,14 @@ pub(crate) mod phantom {
132
124
pairing:: { FinalExp , MultiMillerLoop } ,
133
125
} ;
134
126
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 ;
136
128
use rand:: rngs:: StdRng ;
137
129
138
130
use super :: PairingCurve ;
139
131
140
132
pub struct PairingHintSubEx ;
141
133
142
- impl < F : PrimeField32 > PhantomSubExecutor < F > for PairingHintSubEx {
134
+ impl < F : Field > PhantomSubExecutor < F > for PairingHintSubEx {
143
135
fn phantom_execute (
144
136
& self ,
145
137
memory : & GuestMemory ,
@@ -156,7 +148,7 @@ pub(crate) mod phantom {
156
148
}
157
149
}
158
150
159
- fn hint_pairing < F : PrimeField32 > (
151
+ fn hint_pairing < F : Field > (
160
152
memory : & GuestMemory ,
161
153
hint_stream : & mut VecDeque < F > ,
162
154
rs1 : u32 ,
0 commit comments