Merge branch 'main' into deniallugo-move-storage-view

matter-labs · Dec 18, 2023 · 1ff7a97 · 1ff7a97
2 parents a44b974 + 7a4722f
commit 1ff7a97
Show file tree

Hide file tree

Showing 144 changed files with 12,854 additions and 2,066 deletions.
diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
@@ -40,7 +40,7 @@ jobs:
         os: [ubuntu-latest, macos-latest]
     steps:
       - uses: actions/checkout@v3
-      
+
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -25,37 +25,9 @@ jobs:
       uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         toolchain: nightly-2023-07-21
-    
+
     - name: Install cargo-nextest
       run: cargo install cargo-nextest
-        
+
     - name: Run tests
       run: cargo nextest run
-
-  smoke-test:
-    name: smoke-test
-    runs-on: ubuntu-22.04-github-hosted-16core
-    env:
-      TEST_REPO_DIR: test-repo
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4 
-      with:
-        path: ${{ env.TEST_REPO_DIR }}
-        ref: ${{ github.event.pull_request.head.sha }}
-
-    - name: Install Rust
-      uses: actions-rust-lang/setup-rust-toolchain@v1
-      with:
-        toolchain: nightly-2023-07-23
-
-    - name: Run smoke-test
-      env:
-        TEST_REPO: ${{ github.event.repository.name }}
-        TEST_REPO_DIR: "../${{ env.TEST_REPO_DIR }}"
-        RUST_BACKTRACE: full
-      run: |
-        git clone https://github.com/matter-labs/zkfoundry-smoke-test
-        cd zkfoundry-smoke-test
-        ./smoke-test.sh
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,14 +11,14 @@ categories = ["cryptography"]
 publish = false # We don't want to publish our binaries.
 
 [dependencies]
-zksync_basic_types = { git = "https://github.com/matter-labs/zksync-era.git", rev = "6c26612279698a572afcdd54132e7cbf58a9c332" }
-zksync_core = { git = "https://github.com/matter-labs/zksync-era.git", rev = "6c26612279698a572afcdd54132e7cbf58a9c332" }
-multivm = { git = "https://github.com/matter-labs/zksync-era.git", rev = "6c26612279698a572afcdd54132e7cbf58a9c332" }
-zksync_contracts = { git = "https://github.com/matter-labs/zksync-era.git", rev = "6c26612279698a572afcdd54132e7cbf58a9c332" }
-zksync_types = { git = "https://github.com/matter-labs/zksync-era.git", rev = "6c26612279698a572afcdd54132e7cbf58a9c332" }
-zksync_utils = { git = "https://github.com/matter-labs/zksync-era.git", rev = "6c26612279698a572afcdd54132e7cbf58a9c332" }
-zksync_state = { git = "https://github.com/matter-labs/zksync-era.git", rev = "6c26612279698a572afcdd54132e7cbf58a9c332" }
-zksync_web3_decl = { git = "https://github.com/matter-labs/zksync-era.git", rev = "6c26612279698a572afcdd54132e7cbf58a9c332" }
+zksync_basic_types = { git = "https://github.com/matter-labs/zksync-era.git", rev = "357957df341820a30521c9a9c8df7c805a6ba43e" }
+zksync_core = { git = "https://github.com/matter-labs/zksync-era.git", rev = "357957df341820a30521c9a9c8df7c805a6ba43e" }
+multivm = { git = "https://github.com/matter-labs/zksync-era.git", rev = "357957df341820a30521c9a9c8df7c805a6ba43e" }
+zksync_contracts = { git = "https://github.com/matter-labs/zksync-era.git", rev = "357957df341820a30521c9a9c8df7c805a6ba43e" }
+zksync_types = { git = "https://github.com/matter-labs/zksync-era.git", rev = "357957df341820a30521c9a9c8df7c805a6ba43e" }
+zksync_utils = { git = "https://github.com/matter-labs/zksync-era.git", rev = "357957df341820a30521c9a9c8df7c805a6ba43e" }
+zksync_state = { git = "https://github.com/matter-labs/zksync-era.git", rev = "357957df341820a30521c9a9c8df7c805a6ba43e" }
+zksync_web3_decl = { git = "https://github.com/matter-labs/zksync-era.git", rev = "357957df341820a30521c9a9c8df7c805a6ba43e" }
 sha3 = "0.10.6"
 
 

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # Build the system contracts
 build-contracts:
-	cd etc/system-contracts && yarn; yarn install; yarn build; yarn preprocess; yarn build-bootloader
+	cd etc/system-contracts && yarn; yarn install; yarn build
 	./scripts/refresh_contracts.sh
 
 # Clean the system contracts
@@ -10,7 +10,7 @@ clean-contracts:
 
 # Rebuild the system contracts
 rebuild-contracts:
-	cd etc/system-contracts && yarn build; yarn preprocess; yarn build-bootloader
+	cd etc/system-contracts && yarn build
 	./scripts/refresh_contracts.sh
 	./scripts/refresh_test_contracts.sh
 

diff --git a/SUPPORTED_APIS.md b/SUPPORTED_APIS.md
@@ -64,8 +64,8 @@ The `status` options are:
 | [`ETH`](#eth-namespace) | [`eth_newBlockFilter`](#`eth_newblockfilter) | `SUPPORTED` | Creates a filter in the node, to notify when a new block arrives |
 | [`ETH`](#eth-namespace) | [`eth_newFilter`](#`eth_newfilter) | `SUPPORTED` | Creates a filter object, based on filter options, to notify when the state changes (logs) |
 | [`ETH`](#eth-namespace) | [`eth_newPendingTransactionFilter`](#`eth_newpendingtransactionfilter) | `SUPPORTED` | Creates a filter in the node, to notify when new pending transactions arrive |
-| [`ETH`](#eth-namespace)` | [`eth_protocolVersion`](#eth_protocolversion) | `SUPPORTED` | Returns the current ethereum protocol version |
-| `ETH` | `eth_sendTransaction` | `NOT IMPLEMENTED` | Creates new message call transaction or a contract creation, if the data field contains code |
+| [`ETH`](#eth-namespace) | [`eth_protocolVersion`](#eth_protocolversion) | `SUPPORTED` | Returns the current ethereum protocol version |
+| [`ETH`](#eth-namespace) | [`eth_sendTransaction`](#eth_sendtransaction) | `SUPPORTED` | Creates new message call transaction or a contract creation, if the data field contains code |
 | `ETH` | `eth_sign` | `NOT IMPLEMENTED` | The sign method calculates an Ethereum specific signature with: `sign(keccak256("\x19Ethereum Signed Message:\n" + message.length + message)))` |
 | `ETH` | `eth_signTransaction` | `NOT IMPLEMENTED` | Signs a transaction that can be submitted to the network at a later time using `eth_sendRawTransaction` |
 | `ETH` | `eth_signTypedData` | `NOT IMPLEMENTED` | Identical to `eth_signTypedData_v4` |
@@ -1392,6 +1392,34 @@ curl --request POST \
 }'
 ```
 
+### `eth_sendTransaction`
+
+[source](src/node/eth.rs)
+
+Creates new message call transaction or a contract creation, if the data field contains code.
+
+#### Arguments
+
++ `transaction: TransactionRequest`
+
+#### Status
+
+`SUPPORTED`
+
+#### Example
+
+```bash
+curl --request POST \
+  --url http://localhost:8011/ \
+  --header 'content-type: application/json' \
+  --data '{
+    "jsonrpc": "2.0",
+    "id": "1",
+    "method": "eth_sendTransaction",
+    "params": ["..."]
+}'
+```
+
 ## `HARDHAT NAMESPACE`
 
 ### `hardhat_setBalance`