Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
e38f055
WIP
PhilWindle Mar 26, 2024
0abfe1c
Merge branch 'master' into pw/generate-keys
PhilWindle Mar 26, 2024
78b36ca
Merge fix
PhilWindle Mar 26, 2024
0a07ffb
WIP
PhilWindle Mar 26, 2024
029912a
WIP
PhilWindle Mar 26, 2024
04e5bcb
WIP
PhilWindle Mar 26, 2024
dce3bbf
Merge branch 'master' into pw/generate-keys
PhilWindle Mar 27, 2024
43022c1
WIP
PhilWindle Mar 28, 2024
c50d853
Merge branch 'master' into pw/generate-keys
PhilWindle Mar 28, 2024
e16c245
WIP
PhilWindle Mar 28, 2024
41cd872
WIP
PhilWindle Mar 28, 2024
5050114
WIP
PhilWindle Apr 8, 2024
86fd349
Merge branch 'master' into pw/generate-keys
PhilWindle Apr 8, 2024
64e6a39
WIP
PhilWindle Apr 10, 2024
660a21b
Fixes
PhilWindle Apr 10, 2024
d0af6b7
Fixes
PhilWindle Apr 10, 2024
5bb7de2
Cleanup
PhilWindle Apr 10, 2024
529ec78
Merge branch 'master' into pw/generate-keys
PhilWindle Apr 10, 2024
18b93b5
Revert bb changes
PhilWindle Apr 10, 2024
2966163
Revert further bb changes
PhilWindle Apr 10, 2024
cb54097
Some more cleanup
PhilWindle Apr 10, 2024
2352c24
Further cleanup
PhilWindle Apr 10, 2024
e0b33ce
Comments and cleanup
PhilWindle Apr 10, 2024
ff861d1
Fixes
PhilWindle Apr 10, 2024
4d263c8
Test fixes
PhilWindle Apr 11, 2024
2ea7278
Cleanup and breaking up test files
PhilWindle Apr 11, 2024
1ba8845
Formatting
PhilWindle Apr 11, 2024
3533c3a
Review fixes
PhilWindle Apr 11, 2024
ef6f80f
Review fixes
PhilWindle Apr 11, 2024
868a94f
Review changes
PhilWindle Apr 11, 2024
a6986f5
Reverted breakage
PhilWindle Apr 11, 2024
80aa850
Merge branch 'pw/generate-keys' of github.com:AztecProtocol/aztec-pac…
PhilWindle Apr 11, 2024
eba7378
Verify proof in test
PhilWindle Apr 11, 2024
9b07deb
Verify proof in test
PhilWindle Apr 11, 2024
ed3db50
Merge branch 'pw/generate-keys' of github.com:AztecProtocol/aztec-pac…
PhilWindle Apr 11, 2024
1a0bc82
Merge branch 'master' into pw/generate-keys
PhilWindle Apr 11, 2024
1d2cd6c
Merge fixes
PhilWindle Apr 11, 2024
82035e3
Merge fixes
PhilWindle Apr 11, 2024
cfc6ea1
Copy the ACVM in test dockerfile
PhilWindle Apr 11, 2024
cfeb8e1
Fixed dockerfile
PhilWindle Apr 11, 2024
6bb1942
Increased test timeouts
PhilWindle Apr 11, 2024
3838a0c
Test fixes
PhilWindle Apr 11, 2024
6080635
Debugging CI
PhilWindle Apr 12, 2024
e6a9bd3
Move prover client testing to it's own job
PhilWindle Apr 12, 2024
960b709
Fixes
PhilWindle Apr 12, 2024
0a049bb
Further debugging
PhilWindle Apr 12, 2024
dcf6755
More debugging
PhilWindle Apr 12, 2024
98755f4
Merge branch 'master' into pw/generate-keys
PhilWindle Apr 12, 2024
460c4e4
Update build manifest dependencies
PhilWindle Apr 12, 2024
f28abe8
Cleanup
PhilWindle Apr 12, 2024
c991c8d
Move public function simulation into simulator package and orchestrat…
PhilWindle Apr 13, 2024
54384b3
yarn lock
PhilWindle Apr 13, 2024
6cf7697
yarn prepare
PhilWindle Apr 13, 2024
48534f4
Formatting
PhilWindle Apr 13, 2024
9c76e9a
Merge branch 'master' into 04-11-feat_proving_the_public_kernel_circuits
PhilWindle Apr 13, 2024
4acf0f3
Merge fix
PhilWindle Apr 13, 2024
282c516
Formatting
PhilWindle Apr 13, 2024
9c0c87b
First test passing
PhilWindle Apr 13, 2024
2cf38d1
Tests
PhilWindle Apr 14, 2024
b19c093
Comments and refactoring
PhilWindle Apr 14, 2024
c5eea2a
Comment typo
PhilWindle Apr 14, 2024
0340ce3
Fix
PhilWindle Apr 14, 2024
cf6e3bb
Fixed imports
PhilWindle Apr 14, 2024
05705cd
Import fix
PhilWindle Apr 14, 2024
c907097
Cleanup
PhilWindle Apr 14, 2024
8f6fc0f
Typo
PhilWindle Apr 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions yarn-project/aztec-node/src/aztec-node/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,8 @@ import { initStoreForRollup, openTmpStore } from '@aztec/kv-store/utils';
import { SHA256Trunc, StandardTree } from '@aztec/merkle-tree';
import { AztecKVTxPool, type P2P, createP2PClient } from '@aztec/p2p';
import { DummyProver, TxProver } from '@aztec/prover-client';
import {
type GlobalVariableBuilder,
PublicProcessorFactory,
SequencerClient,
getGlobalVariableBuilder,
} from '@aztec/sequencer-client';
import { WASMSimulator } from '@aztec/simulator';
import { type GlobalVariableBuilder, SequencerClient, getGlobalVariableBuilder } from '@aztec/sequencer-client';
import { PublicProcessorFactory, WASMSimulator } from '@aztec/simulator';
import {
type ContractClassPublic,
type ContractDataSource,
Expand Down
1 change: 1 addition & 0 deletions yarn-project/circuit-types/src/tx/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ export * from './simulated_tx.js';
export * from './tx_hash.js';
export * from './tx_receipt.js';
export * from './processed_tx.js';
export * from './tx_validator.js';
1 change: 1 addition & 0 deletions yarn-project/circuit-types/src/tx/processed_tx.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {
* Used to communicate to the prover which type of circuit to prove
*/
export enum PublicKernelType {
NON_PUBLIC,
SETUP,
APP_LOGIC,
TEARDOWN,
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/prover-client/Dockerfile.test
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ RUN ln -s /usr/src/yarn-project/node_modules /usr/src/node_modules
ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true

RUN ./bootstrap.sh
RUN cd prover-client && LOG_LEVEL=verbose ACVM_WORKING_DIRECTORY='/tmp/acvm' BB_WORKING_DIRECTORY='/tmp/bb' yarn test
RUN cd prover-client && ACVM_WORKING_DIRECTORY='/tmp/acvm' BB_WORKING_DIRECTORY='/tmp/bb' yarn test

# Avoid pushing some huge container back to ecr.
FROM scratch
Expand Down
1 change: 1 addition & 0 deletions yarn-project/prover-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"@aztec/noir-protocol-circuits-types": "workspace:^",
"@aztec/simulator": "workspace:^",
"@aztec/world-state": "workspace:^",
"@noir-lang/types": "portal:../../noir/packages/types",
"commander": "^9.0.0",
"lodash.chunk": "^4.2.0",
"source-map-support": "^0.5.21",
Expand Down
Loading