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

Develop #296

Closed
wants to merge 34 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
fe8af17
initial banana
invocamanman May 22, 2024
f6a98fb
banana changes
invocamanman May 22, 2024
dbe6f84
clean
invocamanman May 22, 2024
10b6bd4
clean
invocamanman May 22, 2024
115f831
test+fix chainID feature
ignasirv May 22, 2024
0009824
Merge pull request #259 from 0xPolygonHermez/feature/chainID-test
invocamanman May 22, 2024
960ba93
Fix all tests except rollup manager
ignasirv May 22, 2024
52af114
Merge pull request #260 from 0xPolygonHermez/feature/fix-tests
invocamanman May 23, 2024
6ddcc4d
lint
invocamanman May 22, 2024
6060a73
mini update
invocamanman May 22, 2024
63a23e5
fix
invocamanman May 22, 2024
55a6a5b
initialize
invocamanman May 23, 2024
b24c006
mini fix
invocamanman May 24, 2024
342ece5
Merge pull request #261 from 0xPolygonHermez/feature/bananaMiniUpdate
invocamanman Jun 6, 2024
a6ae212
update
invocamanman Jun 7, 2024
0ab3f10
mini udpates
invocamanman Jun 10, 2024
4f06270
mini validium udpate
invocamanman Jun 10, 2024
c4eda49
fix upsie
invocamanman Jun 11, 2024
ac968ab
mini test
invocamanman Jun 11, 2024
4ed59b2
Fix all tests except rollup manager
ignasirv May 22, 2024
98011e8
Fixed all tests except upgrade
ignasirv Jun 13, 2024
57f3184
finish test, add audit fixe
invocamanman Jun 17, 2024
5184e5b
fix update totalVerifiedBatches!
invocamanman Jun 18, 2024
027f5fd
Merge pull request #266 from 0xPolygonHermez/feature/fix-tests
invocamanman Jun 19, 2024
6cbe0dd
Merge pull request #258 from 0xPolygonHermez/feature/banana
invocamanman Jun 19, 2024
0c78d12
rename depositCount to leafIndex
joanestebanr Jul 10, 2024
5336413
Merge pull request #274 from 0xPolygonHermez/feature/rename_depositcount
invocamanman Jul 12, 2024
c3aa262
Merge pull request #277 from 0xPolygonHermez/feature/banana
invocamanman Jul 16, 2024
87db591
add event updateL1InfotreeV2
krlosMata Jul 19, 2024
9094f21
Merge pull request #290 from 0xPolygonHermez/feature/update-l1-info-t…
invocamanman Jul 22, 2024
e307104
add support for forkID in the tool 'deployVerifier'
krlosMata Jul 16, 2024
9d18f3d
rebase fixes
invocamanman Jul 22, 2024
7fb18b1
codeowners & update gha actions versions
krlosMata Jul 22, 2024
ff61ce2
Merge pull request #293 from 0xPolygonHermez/feature/rebase-main2
krlosMata Jul 22, 2024
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
5 changes: 5 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# global owner
* @invocamanman

# src owners
/contracts/ @invocamanman @krlosMata @ignasirv @laisolizq
102 changes: 51 additions & 51 deletions .github/workflows/build-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,57 +4,57 @@
name: Build-Docker image

on:
push:
branches: [main]
push:
branches: [main]
jobs:
build:
runs-on: ubuntu-latest
build:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x]
strategy:
matrix:
node-version: [16.x]

steps:
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Set int-bot SSH key
run: |
touch /tmp/ssh-key
echo "${{ secrets.INT_BOT_SSH_KEY }}" > /tmp/ssh-key
chmod 400 /tmp/ssh-key
eval "$(ssh-agent -s)"
ssh-add /tmp/ssh-key
- name: Checkout code
uses: actions/checkout@v2
- name: setup
run: |
eval "$(ssh-agent -s)"
ssh-add /tmp/ssh-key
npm i
sudo curl -L "https://github.com/docker/compose/releases/download/1.26.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build docker
run: npm run docker:contracts
- name: Push docker image
run: npm run push:docker:contracts
# Steps to push multi-platform image, it relies on the previous step:
# npm run docker:contracts
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Build and push
uses: docker/build-push-action@v2
with:
platforms: linux/amd64,linux/arm64
push: true
tags: hermeznetwork/geth-zkevm-contracts:1.5-integration
file: docker/Dockerfile
context: .
steps:
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- name: Set int-bot SSH key
run: |
touch /tmp/ssh-key
echo "${{ secrets.INT_BOT_SSH_KEY }}" > /tmp/ssh-key
chmod 400 /tmp/ssh-key
eval "$(ssh-agent -s)"
ssh-add /tmp/ssh-key
- name: Checkout code
uses: actions/checkout@v3
- name: setup
run: |
eval "$(ssh-agent -s)"
ssh-add /tmp/ssh-key
npm i
sudo curl -L "https://github.com/docker/compose/releases/download/1.26.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build docker
run: npm run docker:contracts
- name: Push docker image
run: npm run push:docker:contracts
# Steps to push multi-platform image, it relies on the previous step:
# npm run docker:contracts
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Build and push
uses: docker/build-push-action@v2
with:
platforms: linux/amd64,linux/arm64
push: true
tags: hermeznetwork/geth-zkevm-contracts:1.5-integration
file: docker/Dockerfile
context: .
32 changes: 32 additions & 0 deletions .github/workflows/compile.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Main CI

on:
push:
branches: [feature/ongoingPP]
pull_request:
branches: [feature/ongoingPP]

jobs:
lint-and-test:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x]

steps:
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- name: Checkout code
uses: actions/checkout@v3
- name: setup
run: npm i
- name: linter
run: npm run lint
- name: compile
run: npm run compile
45 changes: 22 additions & 23 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,29 @@
name: Main CI

on:
push:
branches: [main, develop]
pull_request:
branches: [main, develop]
push:
branches: [main, develop]
pull_request:
branches: [main, develop]

jobs:
lint-and-test:
runs-on: ubuntu-latest
lint-and-test:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x]
strategy:
matrix:
node-version: [16.x]

steps:
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Checkout code
uses: actions/checkout@v2
- name: setup
run: npm i
- name: linter
run: npm run lint
- name: test
run: npm run test

steps:
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- name: Checkout code
uses: actions/checkout@v3
- name: setup
run: npm i
- name: linter
run: npm run lint
- name: test
run: npm run test
4 changes: 2 additions & 2 deletions compiled-contracts/ClaimCompressor.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions compiled-contracts/FflonkVerifier.json

Large diffs are not rendered by default.

Loading
Loading