Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ts): TS structs for merge and root rollups structs #81

Merged
merged 1 commit into from
Mar 23, 2023

Conversation

spalladino
Copy link
Contributor

Description

Structs in typescript or the merge and root rollups.

Fixes #45
Fixes #44

Depends on #77

Checklist:

  • I have reviewed my diff in github, line by line.
  • Every change is related to the PR description.
  • I have linked this pull request to the issue(s) that it resolves.
  • There are no unexpected formatting changes, superfluous debug logs, or commented-out code.
  • There are no circuit changes, OR specifications in /specs have been updated.
  • There are no circuit changes, OR a cryptographer has been assigned for review.
  • I've updated any terraform that needs updating (e.g. environment variables) for deployment.
  • The branch has been rebased against the head of its merge target.
  • I'm happy for the PR to be merged at the reviewer's next convenience.
  • New functions, classes, etc. have been documented according to the doxygen comment format. Classes and structs must have @brief describing the intended functionality.
  • If existing code has been modified, such documentation has been added or updated.

Note
If you are updating the submodule, please make sure you do it in its own special PR and avoid making changes to the submodule as a part of other PRs.
To update a submodule, you can run the following commands:

$ git submodule update --recursive

Alternatively, you can select a particular commit in barretenberg/aztec3 that you wish to point to:

$ cd barretenberg
$ git pull origin aztec3        # This will point to the latest commit in `barretenberg/aztec3`
$ git checkout <commit_hash>    # Use this if you wish to point to a particular commit.
$ cd ..
$ git add . && git commit -m <commit_msg>
$ git push

@spalladino spalladino changed the base branch from master to palla/rollup-output March 22, 2023 14:52
spalladino added a commit to AztecProtocol/aztec-packages that referenced this pull request Mar 22, 2023
spalladino added a commit to AztecProtocol/aztec-packages that referenced this pull request Mar 23, 2023
Copy link
Contributor

@dbanks12 dbanks12 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

@spalladino spalladino force-pushed the palla/rollup-output branch from 7948a0a to a056600 Compare March 23, 2023 13:32
Base automatically changed from palla/rollup-output to master March 23, 2023 13:42
@spalladino spalladino force-pushed the palla/merge-root-rollup-abis-ts branch from 4324c15 to 2f912d3 Compare March 23, 2023 13:49
@spalladino spalladino merged commit c1e8acf into master Mar 23, 2023
@spalladino spalladino deleted the palla/merge-root-rollup-abis-ts branch March 23, 2023 13:51
ludamad added a commit to AztecProtocol/aztec-packages that referenced this pull request Mar 24, 2023
* Init sequencer client

* Update circuits to "TS structs for merge and root rollups structs"

See AztecProtocol/aztec3-circuits#81

* Symlink circuits/ts into yarn-project

* Fix archiver main

* Expose p2p client state and fix typo

* Rename aztec-ethereumjs-tx-sender

* Sequencer client wip

* Include full output of private kernel circuit in p2p pool txs

* Remove hardcoded deps and block builder (wip)

* Update circuits to palla/aztec3-packages branch

* Update l1-contracts

* Update sequencer to use new method names

* Update archiver to use current l1 contract abi

* Add archiver integration test

* Update circuits package

* Update yarn.lock

* Lose lastBlock view method in rollup contract and remove syncStatus from archiver in favor of latestBlockNum

* Archiver TODOs for when we move to mainnet

* Update rollup contract to latest

* Fix archiver test

* WIP

* Use components and serialization from circuits package for L2Block

* WIP

* WIP

* Format archiver

* Check consistency of block number in block parsed from calldata

* Make linter happy

* Format

* WIP

* Add missing reference

* WIP

* WIP

* Move references in archiver to base tsconfig

* Add formatting:fix tasks here and there

* Fix build issues

* WIP

* WIP

* WIP

* Fix build issues on integration test and move to separate folder

* WIP

* WIP

* Update rollup contract to handle blocks with id 0

* Fix settled block num in integration test

* Use aztec debug logger and add inspect method for L2block

* Fix bug in block builder due to bad ordering of ctor args

* Stop sequencer when aztec node stops

* Add integration test for processing 3 txs

* Apply changes to all trees on world state synchroniser

* Formatting

* Working Aztec Node

* Minor refactor

* Lint fix

* Yarn lockfile

* Merge fixes

* Project references

* Build order

* Docker file

* Test rename

* Test logging

* fix: build (attempt)

* fix: build (attempt)

* fix: build (attempt)

* fix: build (attempt)

* fix: build (attempt)

* fix: build (attempt)

* fix: build (attempt)

* fix: build (attempt)

* fix: build (attempt)

* fix: build by refactoring .yalc usage

* fix: build by refactoring .yalc usage

* Revert l1-contracts

* Update Dockerfile

* Update circuits

* Update circuits

* fix: circuits.js ref

* fix: misc build

---------

Co-authored-by: Santiago Palladino <[email protected]>
Co-authored-by: Adam Domurad <[email protected]>
Co-authored-by: ludamad <[email protected]>
Co-authored-by: ludamad <[email protected]>
LeilaWang pushed a commit to AztecProtocol/aztec-packages that referenced this pull request Mar 25, 2023
* Working Aztec Node (#76)

* Init sequencer client

* Update circuits to "TS structs for merge and root rollups structs"

See AztecProtocol/aztec3-circuits#81

* Symlink circuits/ts into yarn-project

* Fix archiver main

* Expose p2p client state and fix typo

* Rename aztec-ethereumjs-tx-sender

* Sequencer client wip

* Include full output of private kernel circuit in p2p pool txs

* Remove hardcoded deps and block builder (wip)

* Update circuits to palla/aztec3-packages branch

* Update l1-contracts

* Update sequencer to use new method names

* Update archiver to use current l1 contract abi

* Add archiver integration test

* Update circuits package

* Update yarn.lock

* Lose lastBlock view method in rollup contract and remove syncStatus from archiver in favor of latestBlockNum

* Archiver TODOs for when we move to mainnet

* Update rollup contract to latest

* Fix archiver test

* WIP

* Use components and serialization from circuits package for L2Block

* WIP

* WIP

* Format archiver

* Check consistency of block number in block parsed from calldata

* Make linter happy

* Format

* WIP

* Add missing reference

* WIP

* WIP

* Move references in archiver to base tsconfig

* Add formatting:fix tasks here and there

* Fix build issues

* WIP

* WIP

* WIP

* Fix build issues on integration test and move to separate folder

* WIP

* WIP

* Update rollup contract to handle blocks with id 0

* Fix settled block num in integration test

* Use aztec debug logger and add inspect method for L2block

* Fix bug in block builder due to bad ordering of ctor args

* Stop sequencer when aztec node stops

* Add integration test for processing 3 txs

* Apply changes to all trees on world state synchroniser

* Formatting

* Working Aztec Node

* Minor refactor

* Lint fix

* Yarn lockfile

* Merge fixes

* Project references

* Build order

* Docker file

* Test rename

* Test logging

* fix: build (attempt)

* fix: build (attempt)

* fix: build (attempt)

* fix: build (attempt)

* fix: build (attempt)

* fix: build (attempt)

* fix: build (attempt)

* fix: build (attempt)

* fix: build (attempt)

* fix: build by refactoring .yalc usage

* fix: build by refactoring .yalc usage

* Revert l1-contracts

* Update Dockerfile

* Update circuits

* Update circuits

* fix: circuits.js ref

* fix: misc build

---------

Co-authored-by: Santiago Palladino <[email protected]>
Co-authored-by: Adam Domurad <[email protected]>
Co-authored-by: ludamad <[email protected]>
Co-authored-by: ludamad <[email protected]>

* post-merge

* post-merge

* post-merge

* post-merge

---------

Co-authored-by: PhilWindle <[email protected]>
Co-authored-by: Santiago Palladino <[email protected]>
Co-authored-by: Adam Domurad <[email protected]>
LeilaWang added a commit to AztecProtocol/aztec-packages that referenced this pull request Mar 26, 2023
* Update e2e test.

* Aztec.js and AztecRPCServer. (#67)

* Add ContractDeployer.

* Add aztec-rpc, remove wallet.

* Initial Aztec RPC Server.

* Use pre-generated abi in e2e.

* Update yarn.lock.

* Use aztec-node in aztec-rpc.

* Update dockerfiles.

* Fix dependencies.

* Update dockerfile.

* Update build manifest.

* Cleanup.

* Interface changes.

* Fix.

* Fix.

* Update eslintrc source.

* feat(sim): added skeleton of simulators to the aztec rpc server (#73)

* feat(acir): added skeleton for acir sim

* feat(sim): use callstackitem

* feat(sim): kernel prover skeleton

* merge milestone/1_1 into arv/simulators

* feat(sim): integrate sim skeleton with rpc

* refactor: remove unused comments

* chore: global skipLibCheck

* Revert "chore: global skipLibCheck"

This reverts commit fe27427.

* chore: renamed kernel-simulator to kernel-prover

* feat(rpc): fetch acir and portal from DB

* fix(prover): pass signature to kernel

* chore: added build of deps

* chore: fixed  dockerfile

* chore: master => milestone1-1 (#78)

* Working Aztec Node (#76)

* Init sequencer client

* Update circuits to "TS structs for merge and root rollups structs"

See AztecProtocol/aztec3-circuits#81

* Symlink circuits/ts into yarn-project

* Fix archiver main

* Expose p2p client state and fix typo

* Rename aztec-ethereumjs-tx-sender

* Sequencer client wip

* Include full output of private kernel circuit in p2p pool txs

* Remove hardcoded deps and block builder (wip)

* Update circuits to palla/aztec3-packages branch

* Update l1-contracts

* Update sequencer to use new method names

* Update archiver to use current l1 contract abi

* Add archiver integration test

* Update circuits package

* Update yarn.lock

* Lose lastBlock view method in rollup contract and remove syncStatus from archiver in favor of latestBlockNum

* Archiver TODOs for when we move to mainnet

* Update rollup contract to latest

* Fix archiver test

* WIP

* Use components and serialization from circuits package for L2Block

* WIP

* WIP

* Format archiver

* Check consistency of block number in block parsed from calldata

* Make linter happy

* Format

* WIP

* Add missing reference

* WIP

* WIP

* Move references in archiver to base tsconfig

* Add formatting:fix tasks here and there

* Fix build issues

* WIP

* WIP

* WIP

* Fix build issues on integration test and move to separate folder

* WIP

* WIP

* Update rollup contract to handle blocks with id 0

* Fix settled block num in integration test

* Use aztec debug logger and add inspect method for L2block

* Fix bug in block builder due to bad ordering of ctor args

* Stop sequencer when aztec node stops

* Add integration test for processing 3 txs

* Apply changes to all trees on world state synchroniser

* Formatting

* Working Aztec Node

* Minor refactor

* Lint fix

* Yarn lockfile

* Merge fixes

* Project references

* Build order

* Docker file

* Test rename

* Test logging

* fix: build (attempt)

* fix: build (attempt)

* fix: build (attempt)

* fix: build (attempt)

* fix: build (attempt)

* fix: build (attempt)

* fix: build (attempt)

* fix: build (attempt)

* fix: build (attempt)

* fix: build by refactoring .yalc usage

* fix: build by refactoring .yalc usage

* Revert l1-contracts

* Update Dockerfile

* Update circuits

* Update circuits

* fix: circuits.js ref

* fix: misc build

---------

Co-authored-by: Santiago Palladino <[email protected]>
Co-authored-by: Adam Domurad <[email protected]>
Co-authored-by: ludamad <[email protected]>
Co-authored-by: ludamad <[email protected]>

* post-merge

* post-merge

* post-merge

* post-merge

---------

Co-authored-by: PhilWindle <[email protected]>
Co-authored-by: Santiago Palladino <[email protected]>
Co-authored-by: Adam Domurad <[email protected]>

* Fix merge.

* Remove formatting from build script.

* Mark contract as deployed when block is settled.

* Update ts ref.

* Revert test.

* Update build manifest.

* Fix.

* Fix.

* Empty test.

---------

Co-authored-by: Álvaro Rodríguez <[email protected]>
Co-authored-by: ludamad <[email protected]>
Co-authored-by: PhilWindle <[email protected]>
Co-authored-by: Santiago Palladino <[email protected]>
Co-authored-by: Adam Domurad <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ABI structs for Root Rollup circuit (ts) ABI structs for Merge Rollup circuit (ts)
2 participants