Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
493936a
Init sequencer client
spalladino Mar 21, 2023
5e35d48
Update circuits to "TS structs for merge and root rollups structs"
spalladino Mar 22, 2023
56b5fb5
Symlink circuits/ts into yarn-project
spalladino Mar 22, 2023
b0d9d7f
Fix archiver main
spalladino Mar 22, 2023
365d7f9
Expose p2p client state and fix typo
spalladino Mar 22, 2023
98631a3
Rename aztec-ethereumjs-tx-sender
spalladino Mar 22, 2023
a38ed30
Sequencer client wip
spalladino Mar 22, 2023
e787605
Include full output of private kernel circuit in p2p pool txs
spalladino Mar 22, 2023
d3ab25f
Remove hardcoded deps and block builder (wip)
spalladino Mar 22, 2023
205a682
Update circuits to palla/aztec3-packages branch
spalladino Mar 22, 2023
ba2ed55
Update l1-contracts
spalladino Mar 23, 2023
4d8c7cb
Update sequencer to use new method names
spalladino Mar 23, 2023
95022c4
Update archiver to use current l1 contract abi
spalladino Mar 23, 2023
89e36c0
Add archiver integration test
spalladino Mar 23, 2023
a66601a
Update circuits package
spalladino Mar 23, 2023
0733ffe
Update yarn.lock
spalladino Mar 23, 2023
027fd2d
Lose lastBlock view method in rollup contract and remove syncStatus f…
spalladino Mar 23, 2023
27e0b11
Archiver TODOs for when we move to mainnet
spalladino Mar 23, 2023
0125221
Update rollup contract to latest
spalladino Mar 23, 2023
41fed57
Fix archiver test
spalladino Mar 23, 2023
2819e8f
WIP
PhilWindle Mar 23, 2023
6189f48
Merge branch 'palla/sequencer-client-2' of github.com:AztecProtocol/a…
PhilWindle Mar 23, 2023
b8fd59d
Use components and serialization from circuits package for L2Block
spalladino Mar 23, 2023
7f3f940
WIP
PhilWindle Mar 23, 2023
7c6a84a
Merge branch 'palla/sequencer-client-2' of github.com:AztecProtocol/a…
PhilWindle Mar 23, 2023
9dfc56e
WIP
PhilWindle Mar 23, 2023
c396c47
Format archiver
spalladino Mar 23, 2023
b28ebe8
Check consistency of block number in block parsed from calldata
spalladino Mar 23, 2023
153cd1e
Make linter happy
spalladino Mar 23, 2023
dd567de
Merge branch 'palla/sequencer-client-2' of github.com:AztecProtocol/a…
PhilWindle Mar 23, 2023
68d9267
Format
spalladino Mar 23, 2023
57abbeb
Merge branch 'palla/sequencer-client-2' of github.com:AztecProtocol/a…
PhilWindle Mar 23, 2023
0707bf9
WIP
PhilWindle Mar 23, 2023
1da71ac
Add missing reference
spalladino Mar 23, 2023
ccc7dbc
WIP
PhilWindle Mar 23, 2023
54b73ce
WIP
PhilWindle Mar 23, 2023
7d72073
Move references in archiver to base tsconfig
spalladino Mar 23, 2023
50c1897
Add formatting:fix tasks here and there
spalladino Mar 23, 2023
acbd92a
Fix build issues
spalladino Mar 23, 2023
4d345fc
WIP
PhilWindle Mar 23, 2023
accc5e7
WIP
PhilWindle Mar 23, 2023
5b8f128
WIP
PhilWindle Mar 23, 2023
654fe9a
Fix build issues on integration test and move to separate folder
spalladino Mar 23, 2023
5f98a8c
WIP
PhilWindle Mar 23, 2023
d3388fc
WIP
PhilWindle Mar 23, 2023
acbecb8
Update rollup contract to handle blocks with id 0
spalladino Mar 23, 2023
2b93a5b
Fix settled block num in integration test
spalladino Mar 23, 2023
6b562a8
Use aztec debug logger and add inspect method for L2block
spalladino Mar 23, 2023
6c20f23
Fix bug in block builder due to bad ordering of ctor args
spalladino Mar 23, 2023
e2a32eb
Stop sequencer when aztec node stops
spalladino Mar 23, 2023
75c7e97
Add integration test for processing 3 txs
spalladino Mar 23, 2023
6068c65
Apply changes to all trees on world state synchroniser
spalladino Mar 23, 2023
54737fa
Formatting
spalladino Mar 23, 2023
e8a44fb
Working Aztec Node
PhilWindle Mar 24, 2023
42213ae
Minor refactor
PhilWindle Mar 24, 2023
0d4b62c
Lint fix
PhilWindle Mar 24, 2023
8bbcb6d
Merge branch 'master' into palla/sequencer-client-2
PhilWindle Mar 24, 2023
213de67
Yarn lockfile
PhilWindle Mar 24, 2023
b3137ea
Merge fixes
PhilWindle Mar 24, 2023
bc317a0
Project references
PhilWindle Mar 24, 2023
6190487
Build order
PhilWindle Mar 24, 2023
f524e11
Docker file
PhilWindle Mar 24, 2023
209be94
Test rename
PhilWindle Mar 24, 2023
086b338
Test logging
PhilWindle Mar 24, 2023
1b1750a
fix: build (attempt)
ludamad0 Mar 24, 2023
54977e9
fix: build (attempt)
ludamad0 Mar 24, 2023
757d061
fix: build (attempt)
ludamad0 Mar 24, 2023
da4b8cd
fix: build (attempt)
ludamad0 Mar 24, 2023
741875c
fix: build (attempt)
ludamad0 Mar 24, 2023
55b2f48
fix: build (attempt)
ludamad0 Mar 24, 2023
eb55a9c
fix: build (attempt)
ludamad0 Mar 24, 2023
3ef802a
fix: build (attempt)
ludamad0 Mar 24, 2023
672a34f
fix: build (attempt)
ludamad0 Mar 24, 2023
cf3c8ef
fix: build by refactoring .yalc usage
ludamad0 Mar 24, 2023
6bc9cb7
fix: build by refactoring .yalc usage
ludamad0 Mar 24, 2023
d161809
Revert l1-contracts
ludamad Mar 24, 2023
36805b0
Update Dockerfile
ludamad Mar 24, 2023
ec4bbcb
Update circuits
ludamad Mar 24, 2023
91fe01a
Update circuits
ludamad Mar 24, 2023
f319936
fix: circuits.js ref
ludamad Mar 24, 2023
85b2ccf
fix: misc build
ludamad Mar 24, 2023
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
4 changes: 3 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ checkout: &checkout
git fetch --depth 50 --filter=blob:none origin $CIRCLE_SHA1
git checkout FETCH_HEAD
# Initialize submodules recursively
git submodule update --init --recursive build-system yarn-project/foundation
git submodule update --init --recursive circuits build-system yarn-project/foundation
# We have build problems with symlinks in yarn-project. Resolve them.
rm yarn-project/circuits.js && cp -r circuits/ts yarn-project/circuits.js

# Called setup_env to setup a bunch of global variables used throughout the rest of the build process.
# It takes the required CCI environment variables as inputs, and gives them normalised names for the rest of
Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,5 +124,6 @@
},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
},
"cmake.sourceDirectory": "${workspaceFolder}/barretenberg/cpp"
}
19 changes: 10 additions & 9 deletions bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,28 +41,29 @@ yarn install --immutable
cd ..

# make sure to run yarn install from foundation, has its own yarn.lock
pushd yarn-project/foundation >/dev/null
yarn install
popd >/dev/null
cd yarn-project/foundation
yarn install --immutable
cd ../..

# We only bootstrap projects that produce artefacts needed for running end-to-end tests.
PROJECTS=(
# "circuits:./bootstrap.sh db_cli rollup_cli"
# "yarn-project/acir-simulator:yarn build"
# "yarn-project/aztec-cli:yarn build"
"yarn-project/aztec.js:yarn build"
"yarn-project/archiver:yarn build"
"yarn-project/ethereum.js:yarn build"
"yarn-project/foundation:yarn build"
"yarn-project/l1-contracts:yarn build"
"yarn-project/aztec.js:yarn build"
"yarn-project/ethereum.js:yarn build"
"yarn-project/archiver:yarn build"
# "yarn-project/kernel-simulator:yarn build"
"yarn-project/key-store:yarn build"
"yarn-project/merkle-tree:yarn build"
"yarn-project/p2p:yarn build"
# "yarn-project/prover-client:yarn build"
"yarn-project/aztec-node:yarn build"
# "yarn-project/sequencer-client:yarn build"
# "yarn-project/prover-client:yarn build"
# "yarn-project/wallet:yarn build"
"yarn-project/world-state:yarn build"
"yarn-project/sequencer-client:yarn build"
"yarn-project/aztec-node:yarn build"
)

for E in "${PROJECTS[@]}"; do
Expand Down
29 changes: 24 additions & 5 deletions build_manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"projectDir": "yarn-project/archiver",
"dockerfile": "archiver/Dockerfile",
"rebuildPatterns": ["^yarn-project/archiver/"],
"dependencies": ["yarn-project-base", "ethereum.js"]
"dependencies": ["yarn-project-base", "ethereum.js", "l1-contracts"]
},
"aztec-cli": {
"buildDir": "yarn-project",
Expand Down Expand Up @@ -120,7 +120,7 @@
"projectDir": "yarn-project/p2p",
"dockerfile": "p2p/Dockerfile",
"rebuildPatterns": ["^yarn-project/p2p/"],
"dependencies": ["yarn-project-base", "archiver"]
"dependencies": ["yarn-project-base", "archiver", "foundation"]
},
"prover-client": {
"buildDir": "yarn-project",
Expand All @@ -134,14 +134,28 @@
"projectDir": "yarn-project/aztec-node",
"dockerfile": "aztec-node/Dockerfile",
"rebuildPatterns": ["^yarn-project/aztec-node/"],
"dependencies": ["yarn-project-base"]
"dependencies": [
"yarn-project-base",
"archiver",
"world-state",
"p2p",
"sequencer-client",
"ethereum.js",
"circuits.js"
]
},
"sequencer-client": {
"buildDir": "yarn-project",
"projectDir": "yarn-project/sequencer-client",
"dockerfile": "sequencer-client/Dockerfile",
"rebuildPatterns": ["^yarn-project/sequencer-client/"],
"dependencies": ["yarn-project-base"]
"dependencies": [
"yarn-project-base",
"world-state",
"foundation",
"p2p",
"archiver"
]
},
"wallet": {
"buildDir": "yarn-project",
Expand All @@ -155,6 +169,11 @@
"projectDir": "yarn-project/world-state",
"dockerfile": "world-state/Dockerfile",
"rebuildPatterns": ["^yarn-project/world-state/"],
"dependencies": ["yarn-project-base", "merkle-tree"]
"dependencies": [
"yarn-project-base",
"merkle-tree",
"archiver",
"foundation"
]
}
}
2 changes: 1 addition & 1 deletion circuits
Submodule circuits updated 651 files
6 changes: 6 additions & 0 deletions yarn-project/.yalc/@aztec/wasm/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
require('@rushstack/eslint-patch/modern-module-resolution');

module.exports = {
extends: ['@aztec/eslint-config'],
parserOptions: { tsconfigRootDir: __dirname },
};
1 change: 1 addition & 0 deletions yarn-project/.yalc/@aztec/wasm/.tsbuildinfo

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions yarn-project/.yalc/@aztec/wasm/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder

COPY wasm wasm
WORKDIR /usr/src/yarn-project/wasm
RUN yarn build && yarn formatting && yarn test

# Prune dev dependencies. See comment in base image.
RUN yarn cache clean
RUN yarn workspaces focus --production > /dev/null

FROM alpine:latest
COPY --from=builder /usr/src/yarn-project/wasm /usr/src/yarn-project/wasm
WORKDIR /usr/src/yarn-project/wasm
ENTRYPOINT ["yarn"]
6 changes: 6 additions & 0 deletions yarn-project/.yalc/@aztec/wasm/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# wasm

Functionality to:

1. Call WebAssembly functions
2. Create asynchronous workers that host webassembly.
8 changes: 8 additions & 0 deletions yarn-project/.yalc/@aztec/wasm/dest/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
export { WebDataStore } from './worker/browser/index.js';
export { NodeDataStore } from './worker/node/index.js';
export { WasmWorker, WorkerPool } from './worker/index.js';
export { WasmModule } from './wasm/index.js';
export { AsyncCallState, AsyncFnState } from './wasm/index.js';
export { DispatchMsg, WorkerListener, TransportServer, NodeListener } from './transport/index.js';
export { Transfer, isTransferDescriptor } from './transport/interface/transferable.js';
//# sourceMappingURL=index.d.ts.map
1 change: 1 addition & 0 deletions yarn-project/.yalc/@aztec/wasm/dest/index.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions yarn-project/.yalc/@aztec/wasm/dest/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 46 additions & 0 deletions yarn-project/.yalc/@aztec/wasm/dest/memory_fifo.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/**
* A simple fifo queue. It can grow unbounded. It can have multiple producers and consumers.
* Putting an item onto the queue always succeeds, unless either end() or cancel() has been called in which case
* the item being pushed is simply discarded.
*/
export declare class MemoryFifo<T> {
private waiting;
private items;
private flushing;
/**
* Length of queue.
* @returns integer.
*/
length(): number;
/**
* Returns next item within the queue, or blocks until and item has been put into the queue.
* If given a timeout, the promise will reject if no item is received after `timeout` seconds.
* If the queue is flushing, `null` is returned.
* @param timeout - In seconds.
* @returns Promise of result.
*/
get(timeout?: number): Promise<T | null>;
/**
* Put an item onto back of the queue.
* @param item - The item to enqueue.
*/
put(item: T): void;
/**
* Once ended, no further items are added to queue. Consumers will consume remaining items within the queue.
* The queue is not reusable after calling `end()`.
* Any consumers waiting for an item receive null.
*/
end(): void;
/**
* Once cancelled, all items are discarded from the queue, and no further items are added to the queue.
* The queue is not reusable after calling `cancel()`.
* Any consumers waiting for an item receive null.
*/
cancel(): void;
/**
* Helper method that can be used to continously consume and process items on the queue.
* @param handler - The item handler function.
*/
process(handler: (item: T) => Promise<void>): Promise<void>;
}
//# sourceMappingURL=memory_fifo.d.ts.map
1 change: 1 addition & 0 deletions yarn-project/.yalc/@aztec/wasm/dest/memory_fifo.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

101 changes: 101 additions & 0 deletions yarn-project/.yalc/@aztec/wasm/dest/memory_fifo.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export * from './worker_connector.js';
export * from './worker_listener.js';
export * from './shared_worker_connector.js';
export * from './shared_worker_listener.js';
//# sourceMappingURL=index.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { Socket } from '../interface/socket.js';
/**
* An implementation of a TransportSocket using MessagePorts.
*/
export declare class MessagePortSocket implements Socket {
private port;
/**
* Create a MessagePortSocket.
* @param port - MessagePort object to wrap.
*/
constructor(port: MessagePort);
/**
* Send a message over our message port.
* @param msg - The message.
* @param transfer - Objects to transfer ownership of.
*/
send(msg: any, transfer?: Transferable[]): Promise<void>;
/**
* Add a message handler.
* @param cb - The handler.
*/
registerHandler(cb: (msg: any) => any): void;
/**
* Close this message port.
*/
close(): void;
}
//# sourceMappingURL=message_port_socket.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading