Skip to content

Commit

Permalink
fix: update compiled smart contracts to latest (#157)
Browse files Browse the repository at this point in the history
* Update compile smart contracts checked into source
* Hide Notes section of PR template by default
* Update e2e tests to also be run on MacOS
* Add commented link to YouTube video at the top of release notes
* Limit rust/clippy linting to only the era_test_node package/crate
* Re-enable e2e test for zks_estimateFee
* Add more trace level logs for gas estimation
  • Loading branch information
MexicanAce authored Oct 4, 2023
1 parent 166247d commit 4f627b5
Show file tree
Hide file tree
Showing 32 changed files with 73 additions and 72 deletions.
6 changes: 3 additions & 3 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# Evidence :camera:
Include screenshots, screen recordings, or `console` output here demonstrating that your changes work as intended

<!-- All sections below are optional. You can erase any section not applicable to your Pull Request. -->
<!-- All sections below are optional. You can uncomment any section applicable to your Pull Request. -->

# Notes :memo:
* Any notes/thoughts that the reviewers should know prior to reviewing the code?
<!-- # Notes :memo:
* Any notes/thoughts that the reviewers should know prior to reviewing the code? -->
10 changes: 7 additions & 3 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ on:

jobs:
e2e:
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest]
name: e2e
steps:
- uses: actions/checkout@v3
Expand All @@ -20,13 +24,13 @@ jobs:
- name: Download artifacts
uses: actions/download-artifact@v3
with:
name: era_test_node-ubuntu-latest.tar.gz
name: era_test_node-${{ matrix.os }}.tar.gz

- name: Start the era_test_node
id: start_node
run: |
echo "Extracting era_test_node binary"
tar -xzf era_test_node-ubuntu-latest.tar.gz
tar -xzf era_test_node-${{ matrix.os }}.tar.gz
chmod +x era_test_node
echo "Starting node in background"
./era_test_node run 2>&1 | tee era_test_node_output.log &
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,9 @@ jobs:
body=$(cat <<- "ENDBODY"
Release: ${{ env.VERSION }}
<!--Watch Release Notes video below 👇
[![YouTube Release Notes](https://img.youtube.com/vi/FZefCZW7JJk/0.jpg)](https://www.youtube.com/watch?v=FZefCZW7JJk)-->
## 📋 Summary
🐛 **Bug Fixes:**
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ rust-doc:
lint:
cd e2e-tests && yarn && yarn lint && yarn fmt && yarn typecheck
cargo fmt --all -- --check
cargo clippy -Zunstable-options -- -D warnings --allow clippy::unwrap_used
cargo clippy -p era_test_node -Zunstable-options -- -D warnings --allow clippy::unwrap_used

# Fix lint errors for Rust code
lint-fix:
Expand Down
5 changes: 2 additions & 3 deletions e2e-tests/test/zks-apis.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ interface Fee {
max_priority_fee_per_gas: ethers.BigNumber;
}

// TODO: Investigate why this test is failing for CI vs local development
xdescribe("zks_estimateFee", function () {
describe("zks_estimateFee", function () {
it("Should return fee estimation data for transfer of 1 ETH", async function () {
// Arrange
const wallet = new Wallet(RichAccounts[0].PrivateKey, provider);
Expand All @@ -30,7 +29,7 @@ xdescribe("zks_estimateFee", function () {
const response: Fee = await provider.send("zks_estimateFee", [transaction]);

// Assert
expect(ethers.BigNumber.from(response.gas_limit)).to.eql(ethers.BigNumber.from("1233024"), "Unexpected gas_limit");
expect(ethers.BigNumber.from(response.gas_limit)).to.eql(ethers.BigNumber.from("1230957"), "Unexpected gas_limit");
expect(ethers.BigNumber.from(response.gas_per_pubdata_limit)).to.eql(
ethers.BigNumber.from("4080"),
"Unexpected gas_per_pubdata_limit"
Expand Down
21 changes: 0 additions & 21 deletions etc/system-contracts/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -486,27 +486,6 @@
"@nodelib/fs.scandir" "2.1.5"
fastq "^1.6.0"

"@nomicfoundation/[email protected]":
version "5.0.1"
resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-block/-/ethereumjs-block-5.0.1.tgz#6f89664f55febbd723195b6d0974773d29ee133d"
integrity sha512-u1Yioemi6Ckj3xspygu/SfFvm8vZEO8/Yx5a1QLzi6nVU0jz3Pg2OmHKJ5w+D9Ogk1vhwRiqEBAqcb0GVhCyHw==
dependencies:
"@nodelib/fs.stat" "2.0.5"
run-parallel "^1.1.9"

"@nodelib/[email protected]", "@nodelib/fs.stat@^2.0.2":
version "2.0.5"
resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==

"@nodelib/fs.walk@^1.2.3":
version "1.2.8"
resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
dependencies:
"@nodelib/fs.scandir" "2.1.5"
fastq "^1.6.0"

"@nomicfoundation/[email protected]":
version "5.0.2"
resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-block/-/ethereumjs-block-5.0.2.tgz#13a7968f5964f1697da941281b7f7943b0465d04"
Expand Down
4 changes: 2 additions & 2 deletions src/deps/contracts/AccountCodeStorage.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/deps/contracts/BootloaderUtilities.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/deps/contracts/BytecodeCompressor.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/deps/contracts/ComplexUpgrader.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/deps/contracts/Console.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/deps/contracts/ContractDeployer.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/deps/contracts/DefaultAccount.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/deps/contracts/DefaultAccountNoSecurity.json

Large diffs are not rendered by default.

Binary file modified src/deps/contracts/Ecrecover.yul.zbin
Binary file not shown.
4 changes: 2 additions & 2 deletions src/deps/contracts/EmptyContract.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"type": "receive"
}
],
"bytecode": "0x0000000101200190000000040000c13d0000000001000019000000110001042e0000008001000039000000400010043f0000000001000416000000000110004c0000000e0000c13d0000002001000039000001000010044300000120000004430000000501000041000000110001042e000000000100001900000012000104300000001000000432000000110001042e000000120001043000000000000000000000000200000000000000000000000000000040000001000000000000000000fbff6831aa3bbb8216e3eb0070b44f2a28903a6f2a0e47237a37b00681739cda",
"deployedBytecode": "0x0000000101200190000000040000c13d0000000001000019000000110001042e0000008001000039000000400010043f0000000001000416000000000110004c0000000e0000c13d0000002001000039000001000010044300000120000004430000000501000041000000110001042e000000000100001900000012000104300000001000000432000000110001042e000000120001043000000000000000000000000200000000000000000000000000000040000001000000000000000000fbff6831aa3bbb8216e3eb0070b44f2a28903a6f2a0e47237a37b00681739cda",
"bytecode": "0x0000000101200190000000040000c13d0000000001000019000000110001042e0000008001000039000000400010043f0000000001000416000000000101004b0000000e0000c13d0000002001000039000001000010044300000120000004430000000501000041000000110001042e000000000100001900000012000104300000001000000432000000110001042e000000120001043000000000000000000000000200000000000000000000000000000040000001000000000000000000e3ae5ad06522be4cb84e3c6b9f4e5b012f9bd4dc67057c16fdea29a244b4a70e",
"deployedBytecode": "0x0000000101200190000000040000c13d0000000001000019000000110001042e0000008001000039000000400010043f0000000001000416000000000101004b0000000e0000c13d0000002001000039000001000010044300000120000004430000000501000041000000110001042e000000000100001900000012000104300000001000000432000000110001042e000000120001043000000000000000000000000200000000000000000000000000000040000001000000000000000000e3ae5ad06522be4cb84e3c6b9f4e5b012f9bd4dc67057c16fdea29a244b4a70e",
"linkReferences": {},
"deployedLinkReferences": {},
"factoryDeps": {}
Expand Down
Binary file modified src/deps/contracts/EventWriter.yul.zbin
Binary file not shown.
4 changes: 2 additions & 2 deletions src/deps/contracts/ImmutableSimulator.json

Large diffs are not rendered by default.

Binary file modified src/deps/contracts/Keccak256.yul.zbin
Binary file not shown.
4 changes: 2 additions & 2 deletions src/deps/contracts/KnownCodesStorage.json

Large diffs are not rendered by default.

Loading

0 comments on commit 4f627b5

Please sign in to comment.