Skip to content

Commit

Permalink
Sync up with dev
Browse files Browse the repository at this point in the history
  • Loading branch information
StanislavBreadless committed Mar 22, 2021
2 parents db21a14 + b19c207 commit ac2e53b
Show file tree
Hide file tree
Showing 170 changed files with 2,380 additions and 4,076 deletions.
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,5 @@
!contracts/artifacts
!infrastructure/explorer/index.html
!infrastructure/explorer/dist
!infrastructure/fee-seller
!infrastructure/zk
!sdk/zksync-rs
18 changes: 2 additions & 16 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
# about codeowners:
# https://help.github.com/articles/about-codeowners/

# notify about changes in codeowners file
/.github/ @dvush @pozpxc

# notify about any circuit, prover and server changes
/core/circuit/ @alexander-movchan
/core @dvush @popzxc

# dev tools
/bin @dvush @popzxc
/Makefile @dvush @popzxc

# js
/infrastructure/ @dvush @popzxc

# notify dvush about contracts changes
/contracts/ @dvush @popzxc
# Changes in smart contracts
/contracts/contracts @dvush @popzxc
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "sdk/binaryen"]
path = sdk/binaryen
url = [email protected]:WebAssembly/binaryen.git
198 changes: 198 additions & 0 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ members = [
"core/lib/config",
"core/lib/contracts",
"core/lib/api_client",
"core/lib/balancer",

# Test infrastructure
"core/tests/test_account",
Expand Down
7 changes: 1 addition & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,7 @@ To learn how to use zkSync, please refer to the [zkSync SDK documentation](https

## Development Documentation

The following guides for developers are available:

- Installing development dependencies: [docs/setup-dev.md](docs/setup-dev.md).
- Launching zkSync locally: [docs/launch.md](docs/launch.md).
- Development guide: [docs/development.md](docs/development.md).
- Repository architecture overview: [docs/architecture.md](docs/architecture.md).
The repository architecture overview is available: [docs/architecture.md](docs/architecture.md).

## Projects

Expand Down
11 changes: 11 additions & 0 deletions changelog/core.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,27 @@ All notable changes to the core components will be documented in this file.
### Changed

- (`loadtest`): `zksync_fee` has been moved to `[main_wallet]` section from the `[network]` section.
- A special balancer for FeeTicker was replaced with a generic balancer.
- (`eth_client`): `web3` field was made private in `ETHDirectClient`. `testkit` and `loadtest` don't use it directly
now.
- (`api_server`): Make `submit_txs_batch` send only one signature request.
- Fast withdrawals now can trigger aggregated block execution.

### Added

- (`loadtest`): Added `zksync_fee` option into the `[scenario]` section to set fee for each scenario individually, added
`fee_token` option into the `[main_wallet]` section to set token that is used to pay fees for the main wallet
operations.
- (`eth_client`): Added `get_tx`, `create_contract` methods to `EthereumGateway`, `get_web3_transport` method to
ETHDirectClient.
- (`api_server`): Support for accounts that don't have to pay fees (e.g. network service accounts) was added.
- Added `BlockMetadata` structure and corresponding table to track block data that is not related to protocol.

### Fixed

- (`zksync_api`): Internal error with tokens not listed on CoinGecko.
- Fix wrong block info cache behavior in the `api_server`.

## Release 2021-02-19

### Removed
Expand Down
Loading

0 comments on commit ac2e53b

Please sign in to comment.