Skip to content

Commit 4716476

Browse files
committed
Change method to use witness
1 parent fd12704 commit 4716476

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

packages/protocol/src/prover/statetransition/StateTransitionProver.ts

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import {
2727
StateTransitionProverPublicInput,
2828
StateTransitionProverPublicOutput,
2929
} from "./StateTransitionProvable";
30-
import { StateTransitionWitnessProvider } from "./StateTransitionWitnessProvider";
3130
import { StateTransitionWitnessProviderReference } from "./StateTransitionWitnessProviderReference";
3231

3332
const errors = {
@@ -132,14 +131,6 @@ export class StateTransitionProverProgrammable extends ZkProgrammable<
132131
];
133132
}
134133

135-
private get witnessProvider(): StateTransitionWitnessProvider {
136-
const provider = this.witnessProviderReference.getWitnessProvider();
137-
if (provider === undefined) {
138-
throw errors.noWitnessProviderSet();
139-
}
140-
return provider;
141-
}
142-
143134
/**
144135
* Applies the state transitions to the current stateRoot
145136
* and returns the new prover state
@@ -168,12 +159,19 @@ export class StateTransitionProverProgrammable extends ZkProgrammable<
168159

169160
const transitions = transitionBatch.batch;
170161
const types = transitionBatch.transitionTypes;
162+
const merkleWitness = transitionBatch.merkleWitnesses;
171163
for (
172164
let index = 0;
173165
index < constants.stateTransitionProverBatchSize;
174166
index++
175167
) {
176-
this.applyTransition(state, transitions[index], types[index], index);
168+
this.applyTransition(
169+
state,
170+
transitions[index],
171+
types[index],
172+
merkleWitness[index],
173+
index
174+
);
177175
}
178176

179177
return state;
@@ -187,12 +185,9 @@ export class StateTransitionProverProgrammable extends ZkProgrammable<
187185
state: StateTransitionProverExecutionState,
188186
transition: ProvableStateTransition,
189187
type: ProvableStateTransitionType,
188+
witness: RollupMerkleTreeWitness,
190189
index = 0
191190
) {
192-
const witness = Provable.witness(RollupMerkleTreeWitness, () =>
193-
this.witnessProvider.getWitness(transition.path)
194-
);
195-
196191
const membershipValid = witness.checkMembership(
197192
state.stateRoot,
198193
transition.path,

0 commit comments

Comments
 (0)