From 03ae67ae4ef090d745df42aa46350421939f1218 Mon Sep 17 00:00:00 2001 From: Uacias Date: Tue, 3 Dec 2024 12:15:25 +0100 Subject: [PATCH 01/61] Modify workflows - tmp. --- .github/workflows/bench.yml | 8 +++-- .github/workflows/cargo-udeps.yml | 9 ++++-- .github/workflows/ci.yml | 11 ++++--- .github/workflows/devcontainer.yml | 27 +++++++++------- .github/workflows/openrpc-testgen.yml | 45 ++++++++++++++++++++++++++ .github/workflows/preview.yml | 3 ++ .github/workflows/release-dispatch.yml | 13 +++++--- .github/workflows/release.yml | 11 ++++--- 8 files changed, 97 insertions(+), 30 deletions(-) create mode 100644 .github/workflows/openrpc-testgen.yml diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index 39223eed52..a126a3aaf9 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -1,8 +1,12 @@ name: benchmark +# on: + # push: + # branches: [main] + on: - push: - branches: [main] + workflow_dispatch: + permissions: # deployments permission to deploy GitHub pages website diff --git a/.github/workflows/cargo-udeps.yml b/.github/workflows/cargo-udeps.yml index 656b097b03..4ee746c958 100644 --- a/.github/workflows/cargo-udeps.yml +++ b/.github/workflows/cargo-udeps.yml @@ -1,9 +1,12 @@ name: cargo-udeps +# on: +# schedule: +# # Triggers the workflow every Sunday +# - cron: "0 18 * * 0" + on: - schedule: - # Triggers the workflow every Sunday - - cron: "0 18 * * 0" + workflow_dispatch: env: CARGO_TERM_COLOR: always diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a991cb5f30..434a8ed1ee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,10 +1,13 @@ name: ci +# on: +# push: +# branches: +# - main +# pull_request: + on: - push: - branches: - - main - pull_request: + workflow_dispatch: env: CARGO_TERM_COLOR: always diff --git a/.github/workflows/devcontainer.yml b/.github/workflows/devcontainer.yml index ce4ccc1ec7..a9319a02c0 100644 --- a/.github/workflows/devcontainer.yml +++ b/.github/workflows/devcontainer.yml @@ -1,19 +1,22 @@ name: devcontainer +# on: +# workflow_dispatch: +# inputs: +# docker_tag: +# description: Descriptive name of the devcontainer for the Docker tag +# required: true +# type: string +# push: +# paths: +# - ".devcontainer/**" +# - ".github/workflows/devcontainer.yml" +# - "!.devcontainer/devcontainer.json" +# release: +# types: [published] + on: workflow_dispatch: - inputs: - docker_tag: - description: Descriptive name of the devcontainer for the Docker tag - required: true - type: string - push: - paths: - - ".devcontainer/**" - - ".github/workflows/devcontainer.yml" - - "!.devcontainer/devcontainer.json" - release: - types: [published] jobs: build-and-push: diff --git a/.github/workflows/openrpc-testgen.yml b/.github/workflows/openrpc-testgen.yml new file mode 100644 index 0000000000..44c971c2c6 --- /dev/null +++ b/.github/workflows/openrpc-testgen.yml @@ -0,0 +1,45 @@ +name: ci + +on: + workflow_dispatch: + +env: + CARGO_TERM_COLOR: always + RUST_VERSION: 1.80.0 + +jobs: + build: + runs-on: ubuntu-latest-4-cores + steps: + - uses: actions/checkout@v3 + - uses: Swatinem/rust-cache@v2 + - run: | + cargo build -r --bin katana + mkdir -p bins + cp ./target/release/katana bins/ + - uses: actions/upload-artifact@v4 + with: + name: dojo-bins + path: bins + + test: + needs: build + runs-on: ubuntu-latest-32-cores + container: + image: ghcr.io/dojoengine/dojo-dev:v1.0.2 + steps: + - uses: actions/checkout@v3 + - uses: Swatinem/rust-cache@v2 + - uses: actions/download-artifact@v4 + with: + name: dojo-bins + path: /tmp/bins + - run: | + export PATH=/tmp/bins:$PATH + chmod +x /tmp/bins/katana + + /tmp/bins/katana & + + # Uruchomienie testgen-runner z Twojego obrazu Docker + docker run --rm docker.io/uacias/katana-runner:v0.0.1 + diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 9719ce4e03..a5cf99d898 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -1,5 +1,8 @@ name: preview +# on: +# workflow_dispatch: + on: workflow_dispatch: diff --git a/.github/workflows/release-dispatch.yml b/.github/workflows/release-dispatch.yml index eede640d83..2283facb30 100644 --- a/.github/workflows/release-dispatch.yml +++ b/.github/workflows/release-dispatch.yml @@ -1,11 +1,14 @@ name: release-dispatch +# on: +# workflow_dispatch: +# inputs: +# version: +# description: Version to release +# required: true +# type: string + on: workflow_dispatch: - inputs: - version: - description: Version to release - required: true - type: string jobs: propose-release: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ac5ded5a7b..57a7157eb8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,11 +1,14 @@ name: release +# on: +# workflow_dispatch: +# pull_request: +# types: [closed] +# branches: +# - main + on: workflow_dispatch: - pull_request: - types: [closed] - branches: - - main env: CARGO_TERM_COLOR: always From bf946f96e151be9f9f5d6da25fcaf5d31cb9f61d Mon Sep 17 00:00:00 2001 From: Uacias Date: Tue, 3 Dec 2024 12:17:43 +0100 Subject: [PATCH 02/61] Modify name ci. --- .github/workflows/openrpc-testgen.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/openrpc-testgen.yml b/.github/workflows/openrpc-testgen.yml index 44c971c2c6..3f5b8f5deb 100644 --- a/.github/workflows/openrpc-testgen.yml +++ b/.github/workflows/openrpc-testgen.yml @@ -1,4 +1,4 @@ -name: ci +name: openrpc-testgen on: workflow_dispatch: From da023b40510a7cfcf99f5d2b31658e4ecae57c8d Mon Sep 17 00:00:00 2001 From: Uacias Date: Tue, 3 Dec 2024 12:54:06 +0100 Subject: [PATCH 03/61] Jobs runn on arc-runners. --- .github/workflows/openrpc-testgen.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/openrpc-testgen.yml b/.github/workflows/openrpc-testgen.yml index 3f5b8f5deb..2d1f86f366 100644 --- a/.github/workflows/openrpc-testgen.yml +++ b/.github/workflows/openrpc-testgen.yml @@ -9,7 +9,7 @@ env: jobs: build: - runs-on: ubuntu-latest-4-cores + runs-on: arc-runner steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 @@ -24,7 +24,7 @@ jobs: test: needs: build - runs-on: ubuntu-latest-32-cores + runs-on: arc-runner container: image: ghcr.io/dojoengine/dojo-dev:v1.0.2 steps: From 57e11d77b5821ca964bb87d4b735d11636e539c9 Mon Sep 17 00:00:00 2001 From: Uacias Date: Tue, 3 Dec 2024 14:10:30 +0100 Subject: [PATCH 04/61] arc runner set --- .github/workflows/openrpc-testgen.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/openrpc-testgen.yml b/.github/workflows/openrpc-testgen.yml index 2d1f86f366..653518a01f 100644 --- a/.github/workflows/openrpc-testgen.yml +++ b/.github/workflows/openrpc-testgen.yml @@ -9,7 +9,7 @@ env: jobs: build: - runs-on: arc-runner + runs-on: arc-runner-set steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 From 6358bf0e0e9f8eef31f88370426d812426ac603b Mon Sep 17 00:00:00 2001 From: Uacias Date: Tue, 3 Dec 2024 14:11:13 +0100 Subject: [PATCH 05/61] arc runner set --- .github/workflows/openrpc-testgen.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/openrpc-testgen.yml b/.github/workflows/openrpc-testgen.yml index 653518a01f..ed938bf2cf 100644 --- a/.github/workflows/openrpc-testgen.yml +++ b/.github/workflows/openrpc-testgen.yml @@ -24,7 +24,7 @@ jobs: test: needs: build - runs-on: arc-runner + runs-on: arc-runner-set container: image: ghcr.io/dojoengine/dojo-dev:v1.0.2 steps: @@ -40,6 +40,5 @@ jobs: /tmp/bins/katana & - # Uruchomienie testgen-runner z Twojego obrazu Docker docker run --rm docker.io/uacias/katana-runner:v0.0.1 From 9111e11a9c2ec5d522cc28185495467376c32d7b Mon Sep 17 00:00:00 2001 From: Uacias Date: Tue, 3 Dec 2024 14:20:40 +0100 Subject: [PATCH 06/61] Modify workflow. --- .github/workflows/openrpc-testgen.yml | 63 +++++++++++++++++++++------ 1 file changed, 50 insertions(+), 13 deletions(-) diff --git a/.github/workflows/openrpc-testgen.yml b/.github/workflows/openrpc-testgen.yml index ed938bf2cf..c257d547aa 100644 --- a/.github/workflows/openrpc-testgen.yml +++ b/.github/workflows/openrpc-testgen.yml @@ -11,13 +11,27 @@ jobs: build: runs-on: arc-runner-set steps: - - uses: actions/checkout@v3 - - uses: Swatinem/rust-cache@v2 - - run: | + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Install Rust + run: | + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y + source $HOME/.cargo/env + rustc --version + cargo --version + + - name: Cache Rust dependencies + uses: Swatinem/rust-cache@v2 + + - name: Build katana + run: | cargo build -r --bin katana mkdir -p bins cp ./target/release/katana bins/ - - uses: actions/upload-artifact@v4 + + - name: Upload katana binary + uses: actions/upload-artifact@v4 with: name: dojo-bins path: bins @@ -25,20 +39,43 @@ jobs: test: needs: build runs-on: arc-runner-set - container: - image: ghcr.io/dojoengine/dojo-dev:v1.0.2 steps: - - uses: actions/checkout@v3 - - uses: Swatinem/rust-cache@v2 - - uses: actions/download-artifact@v4 + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Install Rust + run: | + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y + source $HOME/.cargo/env + rustc --version + cargo --version + + - name: Cache Rust dependencies + uses: Swatinem/rust-cache@v2 + + - name: Download katana binary + uses: actions/download-artifact@v4 with: name: dojo-bins path: /tmp/bins - - run: | + + - name: Make katana executable + run: | export PATH=/tmp/bins:$PATH chmod +x /tmp/bins/katana - + + - name: Start katana node + run: | /tmp/bins/katana & - docker run --rm docker.io/uacias/katana-runner:v0.0.1 - + # Poczekaj aż katana będzie gotowa + until curl -s http://127.0.0.1:5050 >/dev/null; do + echo "Waiting for Katana to be ready..." + sleep 5 + done + + - name: Run testgen-runner Docker container + run: | + docker run --rm \ + uacias/katana-runner:v0.0.1 + From 8e04de685f58d978c02517ff24b7f33dcbb7deb2 Mon Sep 17 00:00:00 2001 From: Uacias Date: Tue, 3 Dec 2024 14:30:36 +0100 Subject: [PATCH 07/61] modify workflow. --- .github/workflows/openrpc-testgen.yml | 32 ++++++++++++++++++--------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/openrpc-testgen.yml b/.github/workflows/openrpc-testgen.yml index c257d547aa..b5fedbd144 100644 --- a/.github/workflows/openrpc-testgen.yml +++ b/.github/workflows/openrpc-testgen.yml @@ -14,12 +14,15 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Install Rust + - name: Install build dependencies run: | - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y - source $HOME/.cargo/env - rustc --version - cargo --version + sudo apt-get update + sudo apt-get install -y build-essential + + - name: Install Rust toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: stable - name: Cache Rust dependencies uses: Swatinem/rust-cache@v2 @@ -43,12 +46,15 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Install Rust + - name: Install build dependencies run: | - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y - source $HOME/.cargo/env - rustc --version - cargo --version + sudo apt-get update + sudo apt-get install -y build-essential + + - name: Install Rust toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: stable - name: Cache Rust dependencies uses: Swatinem/rust-cache@v2 @@ -68,7 +74,6 @@ jobs: run: | /tmp/bins/katana & - # Poczekaj aż katana będzie gotowa until curl -s http://127.0.0.1:5050 >/dev/null; do echo "Waiting for Katana to be ready..." sleep 5 @@ -79,3 +84,8 @@ jobs: docker run --rm \ uacias/katana-runner:v0.0.1 + - name: Upload Code Coverage Report + if: success() + uses: codecov/codecov-action@v4 + with: + token: ${{ secrets.CODECOV_TOKEN }} From a698dd6d428f8ffb585d490fa34b1eeacae02695 Mon Sep 17 00:00:00 2001 From: Uacias Date: Tue, 3 Dec 2024 14:43:20 +0100 Subject: [PATCH 08/61] Modify workflow. --- .github/workflows/openrpc-testgen.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/openrpc-testgen.yml b/.github/workflows/openrpc-testgen.yml index b5fedbd144..60f32c285b 100644 --- a/.github/workflows/openrpc-testgen.yml +++ b/.github/workflows/openrpc-testgen.yml @@ -17,7 +17,7 @@ jobs: - name: Install build dependencies run: | sudo apt-get update - sudo apt-get install -y build-essential + sudo apt-get install -y build-essential libclang-dev - name: Install Rust toolchain uses: actions-rs/toolchain@v1 @@ -49,7 +49,7 @@ jobs: - name: Install build dependencies run: | sudo apt-get update - sudo apt-get install -y build-essential + sudo apt-get install -y build-essential libclang-dev - name: Install Rust toolchain uses: actions-rs/toolchain@v1 From b94d3587869359336b5f3fd302cdb1e0b4f5772a Mon Sep 17 00:00:00 2001 From: Uacias Date: Wed, 4 Dec 2024 12:48:37 +0100 Subject: [PATCH 09/61] Use podman. --- .github/workflows/openrpc-testgen.yml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/workflows/openrpc-testgen.yml b/.github/workflows/openrpc-testgen.yml index 60f32c285b..5c630bf6de 100644 --- a/.github/workflows/openrpc-testgen.yml +++ b/.github/workflows/openrpc-testgen.yml @@ -19,6 +19,15 @@ jobs: sudo apt-get update sudo apt-get install -y build-essential libclang-dev + - name: Install Podman + run: | + . /etc/os-release + sudo sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/$ID\_$VERSION_ID/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" + wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/$ID\_$VERSION_ID/Release.key -O Release.key + sudo apt-key add - < Release.key + sudo apt-get update + sudo apt-get -y install podman + - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: @@ -51,6 +60,15 @@ jobs: sudo apt-get update sudo apt-get install -y build-essential libclang-dev + - name: Install Podman + run: | + . /etc/os-release + sudo sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/$ID\_$VERSION_ID/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" + wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/$ID\_$VERSION_ID/Release.key -O Release.key + sudo apt-key add - < Release.key + sudo apt-get update + sudo apt-get -y install podman + - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: @@ -79,9 +97,9 @@ jobs: sleep 5 done - - name: Run testgen-runner Docker container + - name: Run testgen-runner Podman container run: | - docker run --rm \ + podman run --rm \ uacias/katana-runner:v0.0.1 - name: Upload Code Coverage Report From 7c09e4982a06e1fdcb578641b189ddcec6519906 Mon Sep 17 00:00:00 2001 From: Uacias Date: Wed, 4 Dec 2024 12:54:53 +0100 Subject: [PATCH 10/61] Easier podmani nstall. --- .github/workflows/openrpc-testgen.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/openrpc-testgen.yml b/.github/workflows/openrpc-testgen.yml index 5c630bf6de..f2986c1d8b 100644 --- a/.github/workflows/openrpc-testgen.yml +++ b/.github/workflows/openrpc-testgen.yml @@ -21,12 +21,8 @@ jobs: - name: Install Podman run: | - . /etc/os-release - sudo sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/$ID\_$VERSION_ID/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" - wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/$ID\_$VERSION_ID/Release.key -O Release.key - sudo apt-key add - < Release.key sudo apt-get update - sudo apt-get -y install podman + sudo apt-get install -y podman - name: Install Rust toolchain uses: actions-rs/toolchain@v1 @@ -62,12 +58,7 @@ jobs: - name: Install Podman run: | - . /etc/os-release - sudo sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/$ID\_$VERSION_ID/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" - wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/$ID\_$VERSION_ID/Release.key -O Release.key - sudo apt-key add - < Release.key - sudo apt-get update - sudo apt-get -y install podman + sudo apt-get install -y podman - name: Install Rust toolchain uses: actions-rs/toolchain@v1 From 5b0a03f7dc7729fb29b44025595d94e94293ab9e Mon Sep 17 00:00:00 2001 From: Uacias Date: Wed, 4 Dec 2024 13:07:00 +0100 Subject: [PATCH 11/61] Sudo. --- .github/workflows/openrpc-testgen.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/openrpc-testgen.yml b/.github/workflows/openrpc-testgen.yml index f2986c1d8b..343aaecb78 100644 --- a/.github/workflows/openrpc-testgen.yml +++ b/.github/workflows/openrpc-testgen.yml @@ -90,11 +90,6 @@ jobs: - name: Run testgen-runner Podman container run: | - podman run --rm \ + sudo podman run --rm \ uacias/katana-runner:v0.0.1 - - name: Upload Code Coverage Report - if: success() - uses: codecov/codecov-action@v4 - with: - token: ${{ secrets.CODECOV_TOKEN }} From f68760770eecf991ed09a103be6c84b75200562b Mon Sep 17 00:00:00 2001 From: Uacias Date: Wed, 4 Dec 2024 13:34:03 +0100 Subject: [PATCH 12/61] v2 workflow. --- .github/workflows/openrpc-testgen-v2.yaml | 106 ++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 .github/workflows/openrpc-testgen-v2.yaml diff --git a/.github/workflows/openrpc-testgen-v2.yaml b/.github/workflows/openrpc-testgen-v2.yaml new file mode 100644 index 0000000000..1b99ec7644 --- /dev/null +++ b/.github/workflows/openrpc-testgen-v2.yaml @@ -0,0 +1,106 @@ +name: openrpc-testgen + +on: + workflow_dispatch: + +env: + CARGO_TERM_COLOR: always + RUST_VERSION: 1.80.0 + +jobs: + build: + runs-on: arc-runner-set + steps: + - name: Checkout main repository + uses: actions/checkout@v3 + + - name: Install build dependencies + run: | + sudo apt-get update + sudo apt-get install -y build-essential libclang-dev + + - name: Install Rust toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + + - name: Cache Rust dependencies + uses: Swatinem/rust-cache@v2 + + - name: Build katana + run: | + cargo build --release --bin katana + mkdir -p bins + cp ./target/release/katana bins/ + + - name: Upload katana binary + uses: actions/upload-artifact@v4 + with: + name: dojo-bins + path: bins + + test: + needs: build + runs-on: arc-runner-set + steps: + - name: Checkout main repository + uses: actions/checkout@v3 + + - name: Install build dependencies + run: | + sudo apt-get update + sudo apt-get install -y build-essential libclang-dev git + + - name: Install Rust toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + + - name: Cache Rust dependencies + uses: Swatinem/rust-cache@v2 + + - name: Download katana binary + uses: actions/download-artifact@v4 + with: + name: dojo-bins + path: /tmp/bins + + - name: Make katana executable + run: | + export PATH=/tmp/bins:$PATH + chmod +x /tmp/bins/katana + + - name: Start katana node + run: | + /tmp/bins/katana & + + until curl -s http://127.0.0.1:5050 >/dev/null; do + echo "Waiting for Katana to be ready..." + sleep 5 + done + + - name: Checkout katana-runner repository + uses: actions/checkout@v3 + with: + repository: neotheprogramist/starknet-rpc-tests + path: katana-runner + + - name: Build openrpc-testgen-runner + run: | + cd katana-runner + cargo build --release --features katana + + # - name: Make openrpc-testgen-runner executable + # run: | + # chmod +x /tmp/bins/openrpc-testgen-runner + + - name: Run openrpc-testgen-runner binary + run: | + target/release/openrpc-testgen-runner --urls "http://127.0.0.1:5050" --paymaster-account-address "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" --paymaster-private-key "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912" --udc-address "0x41a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf" --account-class-hash "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" + + + # - name: Upload Code Coverage Report + # if: success() + # uses: codecov/codecov-action@v4 + # with: + # token: ${{ secrets.CODECOV_TOKEN }} From fd0abb7461631a853ee6ec966884a46a6fb4cd39 Mon Sep 17 00:00:00 2001 From: Uacias Date: Wed, 4 Dec 2024 14:08:10 +0100 Subject: [PATCH 13/61] Add scarb. --- .github/workflows/openrpc-testgen-v2.yaml | 47 ++++++++++++++++------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/.github/workflows/openrpc-testgen-v2.yaml b/.github/workflows/openrpc-testgen-v2.yaml index 1b99ec7644..74d619be7d 100644 --- a/.github/workflows/openrpc-testgen-v2.yaml +++ b/.github/workflows/openrpc-testgen-v2.yaml @@ -1,4 +1,4 @@ -name: openrpc-testgen +name: openrpc-testgenv2 on: workflow_dispatch: @@ -59,6 +59,25 @@ jobs: - name: Cache Rust dependencies uses: Swatinem/rust-cache@v2 + - name: Install asdf + run: | + git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.14.1 + echo ". $HOME/.asdf/asdf.sh" >> ~/.bashrc + echo ". $HOME/.asdf/completions/asdf.bash" >> ~/.bashrc + source ~/.bashrc + + - name: Set PATH for asdf + run: | + echo "$HOME/.asdf/bin:$HOME/.asdf/shims" >> $GITHUB_ENV + + - name: Install Scarb + run: | + source ~/.asdf/asdf.sh + asdf plugin add scarb + asdf install scarb 2.8.4 + asdf global scarb 2.8.4 + shell: bash + - name: Download katana binary uses: actions/download-artifact@v4 with: @@ -88,19 +107,21 @@ jobs: - name: Build openrpc-testgen-runner run: | cd katana-runner - cargo build --release --features katana + scarb build && cargo build --release --features katana - # - name: Make openrpc-testgen-runner executable - # run: | - # chmod +x /tmp/bins/openrpc-testgen-runner + - name: Make openrpc-testgen-runner executable + run: | + chmod +x katana-runner/target/release/openrpc-testgen-runner - name: Run openrpc-testgen-runner binary run: | - target/release/openrpc-testgen-runner --urls "http://127.0.0.1:5050" --paymaster-account-address "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" --paymaster-private-key "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912" --udc-address "0x41a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf" --account-class-hash "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" - - - # - name: Upload Code Coverage Report - # if: success() - # uses: codecov/codecov-action@v4 - # with: - # token: ${{ secrets.CODECOV_TOKEN }} + cd katana-runner + ./target/release/openrpc-testgen-runner \ + --urls "http://127.0.0.1:5050" \ + --paymaster-account-address "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" \ + --paymaster-private-key "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912" \ + --udc-address "0x41a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf" \ + --account-class-hash "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" + + + From 3db23b0200f2dcab0de30db890d28c88a5bfefbb Mon Sep 17 00:00:00 2001 From: Uacias Date: Wed, 4 Dec 2024 14:34:04 +0100 Subject: [PATCH 14/61] Fix asdf. --- .github/workflows/openrpc-testgen-v2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/openrpc-testgen-v2.yaml b/.github/workflows/openrpc-testgen-v2.yaml index 74d619be7d..bb5515be69 100644 --- a/.github/workflows/openrpc-testgen-v2.yaml +++ b/.github/workflows/openrpc-testgen-v2.yaml @@ -68,7 +68,7 @@ jobs: - name: Set PATH for asdf run: | - echo "$HOME/.asdf/bin:$HOME/.asdf/shims" >> $GITHUB_ENV + echo "PATH=$HOME/.asdf/bin:$HOME/.asdf/shims:$PATH" >> $GITHUB_ENV - name: Install Scarb run: | From f01b611c53d74acb7f467abb4293565fe3dabba7 Mon Sep 17 00:00:00 2001 From: Uacias Date: Wed, 4 Dec 2024 14:58:45 +0100 Subject: [PATCH 15/61] run instant. --- .github/workflows/openrpc-testgen-v2.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/openrpc-testgen-v2.yaml b/.github/workflows/openrpc-testgen-v2.yaml index bb5515be69..9c673ee90c 100644 --- a/.github/workflows/openrpc-testgen-v2.yaml +++ b/.github/workflows/openrpc-testgen-v2.yaml @@ -115,8 +115,7 @@ jobs: - name: Run openrpc-testgen-runner binary run: | - cd katana-runner - ./target/release/openrpc-testgen-runner \ + katana-runner/target/release/openrpc-testgen-runner \ --urls "http://127.0.0.1:5050" \ --paymaster-account-address "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" \ --paymaster-private-key "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912" \ From b8bf98bb0d7c715bdeee225f5b13bc806ae3a742 Mon Sep 17 00:00:00 2001 From: Uacias Date: Wed, 4 Dec 2024 15:41:14 +0100 Subject: [PATCH 16/61] Verify build. --- .github/workflows/openrpc-testgen-v2.yaml | 31 ++++++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/.github/workflows/openrpc-testgen-v2.yaml b/.github/workflows/openrpc-testgen-v2.yaml index 9c673ee90c..788f03b17e 100644 --- a/.github/workflows/openrpc-testgen-v2.yaml +++ b/.github/workflows/openrpc-testgen-v2.yaml @@ -49,7 +49,7 @@ jobs: - name: Install build dependencies run: | sudo apt-get update - sudo apt-get install -y build-essential libclang-dev git + sudo apt-get install -y build-essential libclang-dev git curl bash - name: Install Rust toolchain uses: actions-rs/toolchain@v1 @@ -65,7 +65,7 @@ jobs: echo ". $HOME/.asdf/asdf.sh" >> ~/.bashrc echo ". $HOME/.asdf/completions/asdf.bash" >> ~/.bashrc source ~/.bashrc - + - name: Set PATH for asdf run: | echo "PATH=$HOME/.asdf/bin:$HOME/.asdf/shims:$PATH" >> $GITHUB_ENV @@ -78,6 +78,19 @@ jobs: asdf global scarb 2.8.4 shell: bash + - name: Verify Scarb installation + run: | + scarb --version + shell: bash + + - name: Cache target directory + uses: actions/cache@v3 + with: + path: katana-runner/target + key: ${{ runner.os }}-cargo-${{ hashFiles('katana-runner/Cargo.lock') }} + restore-keys: | + ${{ runner.os }}-cargo- + - name: Download katana binary uses: actions/download-artifact@v4 with: @@ -86,7 +99,6 @@ jobs: - name: Make katana executable run: | - export PATH=/tmp/bins:$PATH chmod +x /tmp/bins/katana - name: Start katana node @@ -104,10 +116,21 @@ jobs: repository: neotheprogramist/starknet-rpc-tests path: katana-runner + - name: Scarb build + run: | + cd katana-runner + scarb build + + - name: Verify Scarb build output + run: | + cd katana-runner + ls -la target/dev/ + shell: bash + - name: Build openrpc-testgen-runner run: | cd katana-runner - scarb build && cargo build --release --features katana + cargo build --release --features katana - name: Make openrpc-testgen-runner executable run: | From cf5e3f4752ddcbadcd187d4e8a3562a93934e33e Mon Sep 17 00:00:00 2001 From: Uacias Date: Wed, 4 Dec 2024 16:37:42 +0100 Subject: [PATCH 17/61] fix --- .github/workflows/openrpc-testgen-v2.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/openrpc-testgen-v2.yaml b/.github/workflows/openrpc-testgen-v2.yaml index 788f03b17e..34379892d9 100644 --- a/.github/workflows/openrpc-testgen-v2.yaml +++ b/.github/workflows/openrpc-testgen-v2.yaml @@ -138,7 +138,8 @@ jobs: - name: Run openrpc-testgen-runner binary run: | - katana-runner/target/release/openrpc-testgen-runner \ + cd katana-runner + target/release/openrpc-testgen-runner \ --urls "http://127.0.0.1:5050" \ --paymaster-account-address "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" \ --paymaster-private-key "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912" \ From d87d54a5fe9d6c21d1446d442d3971aaf2e3f11f Mon Sep 17 00:00:00 2001 From: Uacias Date: Thu, 5 Dec 2024 10:53:51 +0100 Subject: [PATCH 18/61] Simplify. --- .github/workflows/openrpc-testgen-v2.yaml | 26 +++++------------------ 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/.github/workflows/openrpc-testgen-v2.yaml b/.github/workflows/openrpc-testgen-v2.yaml index 34379892d9..14f739ff70 100644 --- a/.github/workflows/openrpc-testgen-v2.yaml +++ b/.github/workflows/openrpc-testgen-v2.yaml @@ -78,11 +78,6 @@ jobs: asdf global scarb 2.8.4 shell: bash - - name: Verify Scarb installation - run: | - scarb --version - shell: bash - - name: Cache target directory uses: actions/cache@v3 with: @@ -118,33 +113,22 @@ jobs: - name: Scarb build run: | - cd katana-runner scarb build - - - name: Verify Scarb build output - run: | - cd katana-runner - ls -la target/dev/ - shell: bash + working-directory: katana-runner - name: Build openrpc-testgen-runner run: | - cd katana-runner - cargo build --release --features katana - - - name: Make openrpc-testgen-runner executable - run: | - chmod +x katana-runner/target/release/openrpc-testgen-runner - + cargo build --release --features katana -p openrpc-testgen -p openrpc-testgen-runner + working-directory: katana-runner + - name: Run openrpc-testgen-runner binary run: | - cd katana-runner target/release/openrpc-testgen-runner \ --urls "http://127.0.0.1:5050" \ --paymaster-account-address "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" \ --paymaster-private-key "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912" \ --udc-address "0x41a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf" \ --account-class-hash "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" - + working-directory: katana-runner From 4a422aafe5f08ebc3f291c905f2e6a0bfc6ce408 Mon Sep 17 00:00:00 2001 From: Filip <87284279+Uacias@users.noreply.github.com> Date: Thu, 5 Dec 2024 12:29:04 +0100 Subject: [PATCH 19/61] Revert "Simplify." --- .github/workflows/openrpc-testgen-v2.yaml | 26 ++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/.github/workflows/openrpc-testgen-v2.yaml b/.github/workflows/openrpc-testgen-v2.yaml index 14f739ff70..34379892d9 100644 --- a/.github/workflows/openrpc-testgen-v2.yaml +++ b/.github/workflows/openrpc-testgen-v2.yaml @@ -78,6 +78,11 @@ jobs: asdf global scarb 2.8.4 shell: bash + - name: Verify Scarb installation + run: | + scarb --version + shell: bash + - name: Cache target directory uses: actions/cache@v3 with: @@ -113,22 +118,33 @@ jobs: - name: Scarb build run: | + cd katana-runner scarb build - working-directory: katana-runner + + - name: Verify Scarb build output + run: | + cd katana-runner + ls -la target/dev/ + shell: bash - name: Build openrpc-testgen-runner run: | - cargo build --release --features katana -p openrpc-testgen -p openrpc-testgen-runner - working-directory: katana-runner - + cd katana-runner + cargo build --release --features katana + + - name: Make openrpc-testgen-runner executable + run: | + chmod +x katana-runner/target/release/openrpc-testgen-runner + - name: Run openrpc-testgen-runner binary run: | + cd katana-runner target/release/openrpc-testgen-runner \ --urls "http://127.0.0.1:5050" \ --paymaster-account-address "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" \ --paymaster-private-key "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912" \ --udc-address "0x41a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf" \ --account-class-hash "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" - working-directory: katana-runner + From a7b5bbf9cbb03b8653b87bc169de53ff4d840640 Mon Sep 17 00:00:00 2001 From: Uacias Date: Thu, 5 Dec 2024 17:06:21 +0100 Subject: [PATCH 20/61] Make use of repo variables. --- .github/workflows/openrpc-testgen-v2.yaml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/openrpc-testgen-v2.yaml b/.github/workflows/openrpc-testgen-v2.yaml index 34379892d9..e5a31026bc 100644 --- a/.github/workflows/openrpc-testgen-v2.yaml +++ b/.github/workflows/openrpc-testgen-v2.yaml @@ -42,6 +42,11 @@ jobs: test: needs: build runs-on: arc-runner-set + env: + PAYMASTER_ACCOUNT_ADDRESS: ${{ vars.PAYMASTER_ACCOUNT_ADDRESS }} + PAYMASTER_PRIVATE_KEY: ${{ vars.PAYMASTER_PRIVATE_KEY }} + UDC_ADDRESS: ${{ vars.UDC_ADDRESS }} + ACCOUNT_CLASS_HASH: ${{ vars.ACCOUNT_CLASS_HASH }} steps: - name: Checkout main repository uses: actions/checkout@v3 @@ -141,10 +146,10 @@ jobs: cd katana-runner target/release/openrpc-testgen-runner \ --urls "http://127.0.0.1:5050" \ - --paymaster-account-address "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" \ - --paymaster-private-key "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912" \ - --udc-address "0x41a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf" \ - --account-class-hash "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" + --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ + --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ + --udc-address "${UDC_ADDRESS}" \ + --account-class-hash "${ACCOUNT_CLASS_HASH}" From 01ec474e795e2f342ece35acdc0b5cb26f9d07a3 Mon Sep 17 00:00:00 2001 From: Uacias Date: Thu, 5 Dec 2024 17:07:23 +0100 Subject: [PATCH 21/61] v3 vars. --- .github/workflows/openrpc-testgen-v2.yaml | 13 +- .github/workflows/openrpc-testgen-v3.yaml | 155 ++++++++++++++++++++++ 2 files changed, 159 insertions(+), 9 deletions(-) create mode 100644 .github/workflows/openrpc-testgen-v3.yaml diff --git a/.github/workflows/openrpc-testgen-v2.yaml b/.github/workflows/openrpc-testgen-v2.yaml index e5a31026bc..34379892d9 100644 --- a/.github/workflows/openrpc-testgen-v2.yaml +++ b/.github/workflows/openrpc-testgen-v2.yaml @@ -42,11 +42,6 @@ jobs: test: needs: build runs-on: arc-runner-set - env: - PAYMASTER_ACCOUNT_ADDRESS: ${{ vars.PAYMASTER_ACCOUNT_ADDRESS }} - PAYMASTER_PRIVATE_KEY: ${{ vars.PAYMASTER_PRIVATE_KEY }} - UDC_ADDRESS: ${{ vars.UDC_ADDRESS }} - ACCOUNT_CLASS_HASH: ${{ vars.ACCOUNT_CLASS_HASH }} steps: - name: Checkout main repository uses: actions/checkout@v3 @@ -146,10 +141,10 @@ jobs: cd katana-runner target/release/openrpc-testgen-runner \ --urls "http://127.0.0.1:5050" \ - --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ - --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ - --udc-address "${UDC_ADDRESS}" \ - --account-class-hash "${ACCOUNT_CLASS_HASH}" + --paymaster-account-address "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" \ + --paymaster-private-key "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912" \ + --udc-address "0x41a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf" \ + --account-class-hash "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" diff --git a/.github/workflows/openrpc-testgen-v3.yaml b/.github/workflows/openrpc-testgen-v3.yaml new file mode 100644 index 0000000000..d8ef4407d2 --- /dev/null +++ b/.github/workflows/openrpc-testgen-v3.yaml @@ -0,0 +1,155 @@ +name: openrpc-testgenv3 + +on: + workflow_dispatch: + +env: + CARGO_TERM_COLOR: always + RUST_VERSION: 1.80.0 + +jobs: + build: + runs-on: arc-runner-set + steps: + - name: Checkout main repository + uses: actions/checkout@v3 + + - name: Install build dependencies + run: | + sudo apt-get update + sudo apt-get install -y build-essential libclang-dev + + - name: Install Rust toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + + - name: Cache Rust dependencies + uses: Swatinem/rust-cache@v2 + + - name: Build katana + run: | + cargo build --release --bin katana + mkdir -p bins + cp ./target/release/katana bins/ + + - name: Upload katana binary + uses: actions/upload-artifact@v4 + with: + name: dojo-bins + path: bins + + test: + needs: build + runs-on: arc-runner-set + env: + PAYMASTER_ACCOUNT_ADDRESS: ${{ vars.PAYMASTER_ACCOUNT_ADDRESS }} + PAYMASTER_PRIVATE_KEY: ${{ vars.PAYMASTER_PRIVATE_KEY }} + UDC_ADDRESS: ${{ vars.UDC_ADDRESS }} + ACCOUNT_CLASS_HASH: ${{ vars.ACCOUNT_CLASS_HASH }} + steps: + - name: Checkout main repository + uses: actions/checkout@v3 + + - name: Install build dependencies + run: | + sudo apt-get update + sudo apt-get install -y build-essential libclang-dev git curl bash + + - name: Install Rust toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + + - name: Cache Rust dependencies + uses: Swatinem/rust-cache@v2 + + - name: Install asdf + run: | + git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.14.1 + echo ". $HOME/.asdf/asdf.sh" >> ~/.bashrc + echo ". $HOME/.asdf/completions/asdf.bash" >> ~/.bashrc + source ~/.bashrc + + - name: Set PATH for asdf + run: | + echo "PATH=$HOME/.asdf/bin:$HOME/.asdf/shims:$PATH" >> $GITHUB_ENV + + - name: Install Scarb + run: | + source ~/.asdf/asdf.sh + asdf plugin add scarb + asdf install scarb 2.8.4 + asdf global scarb 2.8.4 + shell: bash + + - name: Verify Scarb installation + run: | + scarb --version + shell: bash + + - name: Cache target directory + uses: actions/cache@v3 + with: + path: katana-runner/target + key: ${{ runner.os }}-cargo-${{ hashFiles('katana-runner/Cargo.lock') }} + restore-keys: | + ${{ runner.os }}-cargo- + + - name: Download katana binary + uses: actions/download-artifact@v4 + with: + name: dojo-bins + path: /tmp/bins + + - name: Make katana executable + run: | + chmod +x /tmp/bins/katana + + - name: Start katana node + run: | + /tmp/bins/katana & + + until curl -s http://127.0.0.1:5050 >/dev/null; do + echo "Waiting for Katana to be ready..." + sleep 5 + done + + - name: Checkout katana-runner repository + uses: actions/checkout@v3 + with: + repository: neotheprogramist/starknet-rpc-tests + path: katana-runner + + - name: Scarb build + run: | + cd katana-runner + scarb build + + - name: Verify Scarb build output + run: | + cd katana-runner + ls -la target/dev/ + shell: bash + + - name: Build openrpc-testgen-runner + run: | + cd katana-runner + cargo build --release --features katana + + - name: Make openrpc-testgen-runner executable + run: | + chmod +x katana-runner/target/release/openrpc-testgen-runner + + - name: Run openrpc-testgen-runner binary + run: | + cd katana-runner + target/release/openrpc-testgen-runner \ + --urls "http://127.0.0.1:5050" \ + --paymaster-account-address "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" \ + --paymaster-private-key "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912" \ + --udc-address "0x41a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf" \ + --account-class-hash "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" + + + From 5a7fa3484d10dab1a2ee18b3d723f5fa9b726239 Mon Sep 17 00:00:00 2001 From: Uacias Date: Thu, 5 Dec 2024 17:46:43 +0100 Subject: [PATCH 22/61] Envs in workflow. --- .github/workflows/openrpc-testgen-v3.yaml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/openrpc-testgen-v3.yaml b/.github/workflows/openrpc-testgen-v3.yaml index d8ef4407d2..07e279e0e9 100644 --- a/.github/workflows/openrpc-testgen-v3.yaml +++ b/.github/workflows/openrpc-testgen-v3.yaml @@ -43,10 +43,11 @@ jobs: needs: build runs-on: arc-runner-set env: - PAYMASTER_ACCOUNT_ADDRESS: ${{ vars.PAYMASTER_ACCOUNT_ADDRESS }} - PAYMASTER_PRIVATE_KEY: ${{ vars.PAYMASTER_PRIVATE_KEY }} - UDC_ADDRESS: ${{ vars.UDC_ADDRESS }} - ACCOUNT_CLASS_HASH: ${{ vars.ACCOUNT_CLASS_HASH }} + URLS: "http://127.0.0.1:5050" + PAYMASTER_PRIVATE_KEY: "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912" + PAYMASTER_ACCOUNT_ADDRESS: "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" + UDC_ADDRESS: "0x41a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf" + ACCOUNT_CLASS_HASH: "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" steps: - name: Checkout main repository uses: actions/checkout@v3 @@ -145,11 +146,8 @@ jobs: run: | cd katana-runner target/release/openrpc-testgen-runner \ - --urls "http://127.0.0.1:5050" \ - --paymaster-account-address "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" \ - --paymaster-private-key "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912" \ - --udc-address "0x41a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf" \ - --account-class-hash "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" - - - + --urls "${URLS}" \ + --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ + --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ + --udc-address "${UDC_ADDRESS}" \ + --account-class-hash "${ACCOUNT_CLASS_HASH}" From a2331b0bd88787245e29553387dca7c1881250c7 Mon Sep 17 00:00:00 2001 From: Uacias Date: Thu, 5 Dec 2024 18:07:12 +0100 Subject: [PATCH 23/61] Add cache v3. --- .github/workflows/openrpc-testgen-v3.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/openrpc-testgen-v3.yaml b/.github/workflows/openrpc-testgen-v3.yaml index 07e279e0e9..944425b316 100644 --- a/.github/workflows/openrpc-testgen-v3.yaml +++ b/.github/workflows/openrpc-testgen-v3.yaml @@ -14,6 +14,22 @@ jobs: - name: Checkout main repository uses: actions/checkout@v3 + - name: Cache APT lists + uses: actions/cache@v3 + with: + path: /var/lib/apt/lists + key: ${{ runner.os }}-apt-lists-${{ hashFiles('**/sources.list') }} + restore-keys: | + ${{ runner.os }}-apt-lists- + + - name: Cache APT archives + uses: actions/cache@v3 + with: + path: /var/cache/apt/archives + key: ${{ runner.os }}-apt-archives-${{ hashFiles('**/sources.list') }} + restore-keys: | + ${{ runner.os }}-apt-archives- + - name: Install build dependencies run: | sudo apt-get update From a1f4992088a78057b9ff13c19c2346d237c6c069 Mon Sep 17 00:00:00 2001 From: Filip <87284279+Uacias@users.noreply.github.com> Date: Thu, 5 Dec 2024 18:15:23 +0100 Subject: [PATCH 24/61] Revert "Add cache v3." --- .github/workflows/openrpc-testgen-v3.yaml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/openrpc-testgen-v3.yaml b/.github/workflows/openrpc-testgen-v3.yaml index 944425b316..07e279e0e9 100644 --- a/.github/workflows/openrpc-testgen-v3.yaml +++ b/.github/workflows/openrpc-testgen-v3.yaml @@ -14,22 +14,6 @@ jobs: - name: Checkout main repository uses: actions/checkout@v3 - - name: Cache APT lists - uses: actions/cache@v3 - with: - path: /var/lib/apt/lists - key: ${{ runner.os }}-apt-lists-${{ hashFiles('**/sources.list') }} - restore-keys: | - ${{ runner.os }}-apt-lists- - - - name: Cache APT archives - uses: actions/cache@v3 - with: - path: /var/cache/apt/archives - key: ${{ runner.os }}-apt-archives-${{ hashFiles('**/sources.list') }} - restore-keys: | - ${{ runner.os }}-apt-archives- - - name: Install build dependencies run: | sudo apt-get update From 97d82cf85f1422e59102a680b132700d5d31f43e Mon Sep 17 00:00:00 2001 From: Uacias Date: Thu, 5 Dec 2024 18:24:26 +0100 Subject: [PATCH 25/61] Install scarb cargo. --- .github/workflows/openrpc-testgen-v3.yaml | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/.github/workflows/openrpc-testgen-v3.yaml b/.github/workflows/openrpc-testgen-v3.yaml index 07e279e0e9..902d888939 100644 --- a/.github/workflows/openrpc-testgen-v3.yaml +++ b/.github/workflows/openrpc-testgen-v3.yaml @@ -65,24 +65,11 @@ jobs: - name: Cache Rust dependencies uses: Swatinem/rust-cache@v2 - - name: Install asdf - run: | - git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.14.1 - echo ". $HOME/.asdf/asdf.sh" >> ~/.bashrc - echo ". $HOME/.asdf/completions/asdf.bash" >> ~/.bashrc - source ~/.bashrc - - - name: Set PATH for asdf - run: | - echo "PATH=$HOME/.asdf/bin:$HOME/.asdf/shims:$PATH" >> $GITHUB_ENV - - name: Install Scarb run: | - source ~/.asdf/asdf.sh - asdf plugin add scarb - asdf install scarb 2.8.4 - asdf global scarb 2.8.4 - shell: bash + cargo install scarb --version 2.8.4 + echo 'export PATH="$HOME/.cargo/bin:$PATH"' >> $GITHUB_ENV + - name: Verify Scarb installation run: | From 5c1fe1444745a12c2d09925ee7f33a2b969a8f81 Mon Sep 17 00:00:00 2001 From: Uacias Date: Thu, 5 Dec 2024 18:28:22 +0100 Subject: [PATCH 26/61] not only dispatch. --- .github/workflows/openrpc-testgen-v3.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/openrpc-testgen-v3.yaml b/.github/workflows/openrpc-testgen-v3.yaml index 902d888939..2ce18caa14 100644 --- a/.github/workflows/openrpc-testgen-v3.yaml +++ b/.github/workflows/openrpc-testgen-v3.yaml @@ -1,7 +1,10 @@ name: openrpc-testgenv3 on: - workflow_dispatch: + push: + branches: + - 'uacias/**' + workflow_dispatch: env: CARGO_TERM_COLOR: always From 1b2e74626a3cf169562a755f2493500c3648c257 Mon Sep 17 00:00:00 2001 From: Uacias Date: Thu, 5 Dec 2024 19:41:07 +0100 Subject: [PATCH 27/61] Install scarb. --- .github/workflows/openrpc-testgen-v3.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/openrpc-testgen-v3.yaml b/.github/workflows/openrpc-testgen-v3.yaml index 2ce18caa14..0022271297 100644 --- a/.github/workflows/openrpc-testgen-v3.yaml +++ b/.github/workflows/openrpc-testgen-v3.yaml @@ -68,10 +68,11 @@ jobs: - name: Cache Rust dependencies uses: Swatinem/rust-cache@v2 - - name: Install Scarb + - name: Install Scarb via script run: | - cargo install scarb --version 2.8.4 - echo 'export PATH="$HOME/.cargo/bin:$PATH"' >> $GITHUB_ENV + export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$PATH" + curl --proto '=https' --tlsv1.2 -sSf https://docs.swmansion.com/scarb/install.sh | bash -s -- -v 2.8.4 + echo "$HOME/.local/bin" >> $GITHUB_PATH - name: Verify Scarb installation From 8f6b508fedec4b6d293b476ffb83ece3e9a95b54 Mon Sep 17 00:00:00 2001 From: Uacias Date: Thu, 5 Dec 2024 20:14:27 +0100 Subject: [PATCH 28/61] Rm permissions. --- .github/workflows/openrpc-testgen-v3.yaml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/openrpc-testgen-v3.yaml b/.github/workflows/openrpc-testgen-v3.yaml index 0022271297..7225a27044 100644 --- a/.github/workflows/openrpc-testgen-v3.yaml +++ b/.github/workflows/openrpc-testgen-v3.yaml @@ -74,12 +74,6 @@ jobs: curl --proto '=https' --tlsv1.2 -sSf https://docs.swmansion.com/scarb/install.sh | bash -s -- -v 2.8.4 echo "$HOME/.local/bin" >> $GITHUB_PATH - - - name: Verify Scarb installation - run: | - scarb --version - shell: bash - - name: Cache target directory uses: actions/cache@v3 with: @@ -94,10 +88,6 @@ jobs: name: dojo-bins path: /tmp/bins - - name: Make katana executable - run: | - chmod +x /tmp/bins/katana - - name: Start katana node run: | /tmp/bins/katana & @@ -129,10 +119,6 @@ jobs: cd katana-runner cargo build --release --features katana - - name: Make openrpc-testgen-runner executable - run: | - chmod +x katana-runner/target/release/openrpc-testgen-runner - - name: Run openrpc-testgen-runner binary run: | cd katana-runner From 9c8bd3fae54932f51f5451fee8a2d2847f51a86a Mon Sep 17 00:00:00 2001 From: Uacias Date: Thu, 5 Dec 2024 20:32:38 +0100 Subject: [PATCH 29/61] add exec. --- .github/workflows/openrpc-testgen-v3.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/openrpc-testgen-v3.yaml b/.github/workflows/openrpc-testgen-v3.yaml index 7225a27044..5e468f18a8 100644 --- a/.github/workflows/openrpc-testgen-v3.yaml +++ b/.github/workflows/openrpc-testgen-v3.yaml @@ -88,6 +88,10 @@ jobs: name: dojo-bins path: /tmp/bins + - name: Make katana executable + run: | + chmod +x /tmp/bins/katana + - name: Start katana node run: | /tmp/bins/katana & @@ -119,6 +123,10 @@ jobs: cd katana-runner cargo build --release --features katana + - name: Make openrpc-testgen-runner executable + run: | + chmod +x katana-runner/target/release/openrpc-testgen-runner + - name: Run openrpc-testgen-runner binary run: | cd katana-runner From cb8e99e24607e1bb958f6a349a5766d71ac01c9d Mon Sep 17 00:00:00 2001 From: Uacias Date: Fri, 6 Dec 2024 12:10:17 +0100 Subject: [PATCH 30/61] Check permissions. --- .github/workflows/openrpc-testgen-v3.yaml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/openrpc-testgen-v3.yaml b/.github/workflows/openrpc-testgen-v3.yaml index 5e468f18a8..4c53dec4ea 100644 --- a/.github/workflows/openrpc-testgen-v3.yaml +++ b/.github/workflows/openrpc-testgen-v3.yaml @@ -88,6 +88,10 @@ jobs: name: dojo-bins path: /tmp/bins + - name: Check katana permissions + run: | + ls -l /tmp/bins + - name: Make katana executable run: | chmod +x /tmp/bins/katana @@ -112,17 +116,15 @@ jobs: cd katana-runner scarb build - - name: Verify Scarb build output - run: | - cd katana-runner - ls -la target/dev/ - shell: bash - - name: Build openrpc-testgen-runner run: | cd katana-runner cargo build --release --features katana + - name: Check openrpc-testgen permissions + run: | + ls -l katana-runner/target/release + - name: Make openrpc-testgen-runner executable run: | chmod +x katana-runner/target/release/openrpc-testgen-runner From 2aa10f8802230130e187e13ff2be2d95ccdb2f47 Mon Sep 17 00:00:00 2001 From: Uacias Date: Fri, 6 Dec 2024 12:27:16 +0100 Subject: [PATCH 31/61] Simplify --- .github/workflows/openrpc-testgen-v3.yaml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/openrpc-testgen-v3.yaml b/.github/workflows/openrpc-testgen-v3.yaml index 4c53dec4ea..0cdcfe4d41 100644 --- a/.github/workflows/openrpc-testgen-v3.yaml +++ b/.github/workflows/openrpc-testgen-v3.yaml @@ -119,15 +119,7 @@ jobs: - name: Build openrpc-testgen-runner run: | cd katana-runner - cargo build --release --features katana - - - name: Check openrpc-testgen permissions - run: | - ls -l katana-runner/target/release - - - name: Make openrpc-testgen-runner executable - run: | - chmod +x katana-runner/target/release/openrpc-testgen-runner + cargo build --release --features katana -p openrpc-testgen -p openrpc-testgen-runner - name: Run openrpc-testgen-runner binary run: | From 388cae807ca4ce98f1c577c500840c2135d9df40 Mon Sep 17 00:00:00 2001 From: Uacias Date: Fri, 6 Dec 2024 12:38:53 +0100 Subject: [PATCH 32/61] Add openssl. --- .github/workflows/openrpc-testgen-v3.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/openrpc-testgen-v3.yaml b/.github/workflows/openrpc-testgen-v3.yaml index 0cdcfe4d41..9baef81a45 100644 --- a/.github/workflows/openrpc-testgen-v3.yaml +++ b/.github/workflows/openrpc-testgen-v3.yaml @@ -58,7 +58,7 @@ jobs: - name: Install build dependencies run: | sudo apt-get update - sudo apt-get install -y build-essential libclang-dev git curl bash + sudo apt-get install -y build-essential libclang-dev git curl bash openssl - name: Install Rust toolchain uses: actions-rs/toolchain@v1 @@ -88,11 +88,7 @@ jobs: name: dojo-bins path: /tmp/bins - - name: Check katana permissions - run: | - ls -l /tmp/bins - - - name: Make katana executable + - name: Set permissions for katana run: | chmod +x /tmp/bins/katana From 0b7512739d96aa9f07f1343bcbc84301610cbe90 Mon Sep 17 00:00:00 2001 From: Uacias Date: Fri, 6 Dec 2024 12:44:33 +0100 Subject: [PATCH 33/61] Add libssl-dev pkg-config. --- .github/workflows/openrpc-testgen-v3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/openrpc-testgen-v3.yaml b/.github/workflows/openrpc-testgen-v3.yaml index 9baef81a45..043b6e1626 100644 --- a/.github/workflows/openrpc-testgen-v3.yaml +++ b/.github/workflows/openrpc-testgen-v3.yaml @@ -58,7 +58,7 @@ jobs: - name: Install build dependencies run: | sudo apt-get update - sudo apt-get install -y build-essential libclang-dev git curl bash openssl + sudo apt-get install -y build-essential libclang-dev git curl bash libssl-dev pkg-config - name: Install Rust toolchain uses: actions-rs/toolchain@v1 From 2b7cbb3a4554878c168cc990adec26eb8cf07f7f Mon Sep 17 00:00:00 2001 From: Uacias Date: Fri, 6 Dec 2024 14:34:38 +0100 Subject: [PATCH 34/61] v4. --- .github/workflows/openrpc-testgen-v3.yaml | 6 +- .github/workflows/openrpc-testgen-v4.yaml | 162 ++++++++++++++++++++++ 2 files changed, 165 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/openrpc-testgen-v4.yaml diff --git a/.github/workflows/openrpc-testgen-v3.yaml b/.github/workflows/openrpc-testgen-v3.yaml index 043b6e1626..a7fda3e4de 100644 --- a/.github/workflows/openrpc-testgen-v3.yaml +++ b/.github/workflows/openrpc-testgen-v3.yaml @@ -1,9 +1,9 @@ name: openrpc-testgenv3 on: - push: - branches: - - 'uacias/**' + # push: + # branches: + # - 'uacias/**' workflow_dispatch: env: diff --git a/.github/workflows/openrpc-testgen-v4.yaml b/.github/workflows/openrpc-testgen-v4.yaml new file mode 100644 index 0000000000..f89510f31c --- /dev/null +++ b/.github/workflows/openrpc-testgen-v4.yaml @@ -0,0 +1,162 @@ +name: openrpc-testgenv4 + +on: + push: + branches: + - 'uacias/**' + workflow_dispatch: + +env: + CARGO_TERM_COLOR: always + RUST_VERSION: 1.80.0 + +jobs: + build-katana: + runs-on: arc-runner-set + steps: + - name: Checkout main repository + uses: actions/checkout@v3 + + - name: Install build dependencies + run: | + sudo apt-get update + sudo apt-get install -y build-essential libclang-dev + + - name: Install Rust toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + + - name: Cache Rust dependencies + uses: Swatinem/rust-cache@v2 + + - name: Build katana + run: | + cargo build --release --bin katana + mkdir -p bins + cp ./target/release/katana bins/ + + - name: Upload katana binary + uses: actions/upload-artifact@v4 + with: + name: dojo-bins + path: bins + + build-openrpc: + needs: build-katana + runs-on: arc-runner-set + steps: + - name: Checkout main repository + uses: actions/checkout@v3 + + - name: Install build dependencies + run: | + sudo apt-get update + sudo apt-get install -y build-essential libclang-dev git curl bash libssl-dev pkg-config + + - name: Install Rust toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + + - name: Cache Rust dependencies + uses: Swatinem/rust-cache@v2 + + - name: Install Scarb via script + run: | + export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$PATH" + curl --proto '=https' --tlsv1.2 -sSf https://docs.swmansion.com/scarb/install.sh | bash -s -- -v 2.8.4 + echo "$HOME/.local/bin" >> $GITHUB_PATH + + - name: Cache target directory + uses: actions/cache@v3 + with: + path: katana-runner/target + key: ${{ runner.os }}-cargo-${{ hashFiles('katana-runner/Cargo.lock') }} + restore-keys: | + ${{ runner.os }}-cargo- + + - name: Checkout katana-runner repository + uses: actions/checkout@v3 + with: + repository: neotheprogramist/starknet-rpc-tests + path: katana-runner + + - name: Scarb build + run: | + cd katana-runner + scarb build + + - name: Build openrpc-testgen + run: | + cd katana-runner + cargo build --release --features "katana katana_no_mining" -p openrpc-testgen + + - name: Build openrpc-testgen-runner + run: | + cd katana-runner + cargo build --release -p openrpc-testgen-runner + + - name: Upload openrpc artifacts + uses: actions/upload-artifact@v4 + with: + name: openrpc-artifacts + path: katana-runner/target + + run-openrpc-testgen: + needs: [build-openrpc, build-katana] + runs-on: arc-runner-set + env: + RLS: "http://127.0.0.1:5050" + PAYMASTER_PRIVATE_KEY: "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912" + PAYMASTER_ACCOUNT_ADDRESS: "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" + UDC_ADDRESS: "0x41a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf" + ACCOUNT_CLASS_HASH: "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" + steps: + - name: Download katana binary + uses: actions/download-artifact@v4 + with: + name: dojo-bins + path: /tmp/bins + + - name: Download openrpc artifacts + uses: actions/download-artifact@v4 + with: + name: openrpc-artifacts + path: /tmp/openrpc + + - name: Set permissions for katana + run: | + chmod +x /tmp/bins/katana + + - name: Install Rust toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + + - name: Cache Rust dependencies + uses: Swatinem/rust-cache@v2 + + - name: Build openrpc-testgen-runner with features + run: | + cd /tmp/openrpc + cargo build --release --features katana -p openrpc-testgen-runner + + - name: Start katana node + run: | + /tmp/bins/katana & + until curl -s http://127.0.0.1:5050 >/dev/null; do + echo "Waiting for Katana to be ready..." + sleep 5 + done + + - name: Run openrpc-testgen-runner binary + run: | + cd /tmp/openrpc + /target/release/openrpc-testgen-runner \ + --urls "${URLS}" \ + --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ + --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ + --udc-address "${UDC_ADDRESS}" \ + --account-class-hash "${ACCOUNT_CLASS_HASH}" \ + --features "katana katana_no_mining" From a3e445fdb0956ac56810c619fd544b2fa54f2156 Mon Sep 17 00:00:00 2001 From: Uacias Date: Fri, 6 Dec 2024 15:10:58 +0100 Subject: [PATCH 35/61] V4fix. --- .github/workflows/openrpc-testgen-v4.yaml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/openrpc-testgen-v4.yaml b/.github/workflows/openrpc-testgen-v4.yaml index f89510f31c..0b8802fdc9 100644 --- a/.github/workflows/openrpc-testgen-v4.yaml +++ b/.github/workflows/openrpc-testgen-v4.yaml @@ -11,7 +11,7 @@ env: RUST_VERSION: 1.80.0 jobs: - build-katana: + build: runs-on: arc-runner-set steps: - name: Checkout main repository @@ -42,8 +42,8 @@ jobs: name: dojo-bins path: bins - build-openrpc: - needs: build-katana + openrpctestgenb: + needs: build runs-on: arc-runner-set steps: - name: Checkout main repository @@ -104,10 +104,10 @@ jobs: path: katana-runner/target run-openrpc-testgen: - needs: [build-openrpc, build-katana] + needs: [build, openrpctestgenb] runs-on: arc-runner-set env: - RLS: "http://127.0.0.1:5050" + URLS: "http://127.0.0.1:5050" PAYMASTER_PRIVATE_KEY: "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912" PAYMASTER_ACCOUNT_ADDRESS: "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" UDC_ADDRESS: "0x41a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf" @@ -142,6 +142,10 @@ jobs: cd /tmp/openrpc cargo build --release --features katana -p openrpc-testgen-runner + - name: Check build with feature + run: | + ls -l /tmp/openrpc + - name: Start katana node run: | /tmp/bins/katana & @@ -153,7 +157,7 @@ jobs: - name: Run openrpc-testgen-runner binary run: | cd /tmp/openrpc - /target/release/openrpc-testgen-runner \ + target/release/openrpc-testgen-runner \ --urls "${URLS}" \ --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ From 3fbd79abd23ff39b6a616388a3f34b746e6e7535 Mon Sep 17 00:00:00 2001 From: Uacias Date: Fri, 6 Dec 2024 15:29:54 +0100 Subject: [PATCH 36/61] v4 ls. --- .github/workflows/openrpc-testgen-v4.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/openrpc-testgen-v4.yaml b/.github/workflows/openrpc-testgen-v4.yaml index 0b8802fdc9..fc8e652a1d 100644 --- a/.github/workflows/openrpc-testgen-v4.yaml +++ b/.github/workflows/openrpc-testgen-v4.yaml @@ -125,6 +125,10 @@ jobs: name: openrpc-artifacts path: /tmp/openrpc + - name: Check openrpc-artifacts + run: | + ls -l /tmp/openrpc + - name: Set permissions for katana run: | chmod +x /tmp/bins/katana From fa961aba5addfaaf736bf76b1ab5ad636ccba243 Mon Sep 17 00:00:00 2001 From: Uacias Date: Fri, 6 Dec 2024 17:04:01 +0100 Subject: [PATCH 37/61] v4 two suites. --- .github/workflows/openrpc-testgen-v2.yaml | 150 ---------------------- .github/workflows/openrpc-testgen-v4.yaml | 115 +++++++---------- .github/workflows/openrpc-testgen.yml | 95 -------------- 3 files changed, 46 insertions(+), 314 deletions(-) delete mode 100644 .github/workflows/openrpc-testgen-v2.yaml delete mode 100644 .github/workflows/openrpc-testgen.yml diff --git a/.github/workflows/openrpc-testgen-v2.yaml b/.github/workflows/openrpc-testgen-v2.yaml deleted file mode 100644 index 34379892d9..0000000000 --- a/.github/workflows/openrpc-testgen-v2.yaml +++ /dev/null @@ -1,150 +0,0 @@ -name: openrpc-testgenv2 - -on: - workflow_dispatch: - -env: - CARGO_TERM_COLOR: always - RUST_VERSION: 1.80.0 - -jobs: - build: - runs-on: arc-runner-set - steps: - - name: Checkout main repository - uses: actions/checkout@v3 - - - name: Install build dependencies - run: | - sudo apt-get update - sudo apt-get install -y build-essential libclang-dev - - - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - - name: Cache Rust dependencies - uses: Swatinem/rust-cache@v2 - - - name: Build katana - run: | - cargo build --release --bin katana - mkdir -p bins - cp ./target/release/katana bins/ - - - name: Upload katana binary - uses: actions/upload-artifact@v4 - with: - name: dojo-bins - path: bins - - test: - needs: build - runs-on: arc-runner-set - steps: - - name: Checkout main repository - uses: actions/checkout@v3 - - - name: Install build dependencies - run: | - sudo apt-get update - sudo apt-get install -y build-essential libclang-dev git curl bash - - - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - - name: Cache Rust dependencies - uses: Swatinem/rust-cache@v2 - - - name: Install asdf - run: | - git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.14.1 - echo ". $HOME/.asdf/asdf.sh" >> ~/.bashrc - echo ". $HOME/.asdf/completions/asdf.bash" >> ~/.bashrc - source ~/.bashrc - - - name: Set PATH for asdf - run: | - echo "PATH=$HOME/.asdf/bin:$HOME/.asdf/shims:$PATH" >> $GITHUB_ENV - - - name: Install Scarb - run: | - source ~/.asdf/asdf.sh - asdf plugin add scarb - asdf install scarb 2.8.4 - asdf global scarb 2.8.4 - shell: bash - - - name: Verify Scarb installation - run: | - scarb --version - shell: bash - - - name: Cache target directory - uses: actions/cache@v3 - with: - path: katana-runner/target - key: ${{ runner.os }}-cargo-${{ hashFiles('katana-runner/Cargo.lock') }} - restore-keys: | - ${{ runner.os }}-cargo- - - - name: Download katana binary - uses: actions/download-artifact@v4 - with: - name: dojo-bins - path: /tmp/bins - - - name: Make katana executable - run: | - chmod +x /tmp/bins/katana - - - name: Start katana node - run: | - /tmp/bins/katana & - - until curl -s http://127.0.0.1:5050 >/dev/null; do - echo "Waiting for Katana to be ready..." - sleep 5 - done - - - name: Checkout katana-runner repository - uses: actions/checkout@v3 - with: - repository: neotheprogramist/starknet-rpc-tests - path: katana-runner - - - name: Scarb build - run: | - cd katana-runner - scarb build - - - name: Verify Scarb build output - run: | - cd katana-runner - ls -la target/dev/ - shell: bash - - - name: Build openrpc-testgen-runner - run: | - cd katana-runner - cargo build --release --features katana - - - name: Make openrpc-testgen-runner executable - run: | - chmod +x katana-runner/target/release/openrpc-testgen-runner - - - name: Run openrpc-testgen-runner binary - run: | - cd katana-runner - target/release/openrpc-testgen-runner \ - --urls "http://127.0.0.1:5050" \ - --paymaster-account-address "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" \ - --paymaster-private-key "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912" \ - --udc-address "0x41a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf" \ - --account-class-hash "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" - - - diff --git a/.github/workflows/openrpc-testgen-v4.yaml b/.github/workflows/openrpc-testgen-v4.yaml index fc8e652a1d..2fde5caaf8 100644 --- a/.github/workflows/openrpc-testgen-v4.yaml +++ b/.github/workflows/openrpc-testgen-v4.yaml @@ -42,9 +42,17 @@ jobs: name: dojo-bins path: bins - openrpctestgenb: + test: needs: build runs-on: arc-runner-set + env: + KATANA_ADDR: "127.0.0.1" + KATANA_PORT: "5050" + KATANA_NO_MINING_PORT: "5051" + PAYMASTER_PRIVATE_KEY: "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912" + PAYMASTER_ACCOUNT_ADDRESS: "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" + UDC_ADDRESS: "0x41a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf" + ACCOUNT_CLASS_HASH: "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" steps: - name: Checkout main repository uses: actions/checkout@v3 @@ -76,95 +84,64 @@ jobs: restore-keys: | ${{ runner.os }}-cargo- - - name: Checkout katana-runner repository - uses: actions/checkout@v3 - with: - repository: neotheprogramist/starknet-rpc-tests - path: katana-runner - - - name: Scarb build - run: | - cd katana-runner - scarb build - - - name: Build openrpc-testgen - run: | - cd katana-runner - cargo build --release --features "katana katana_no_mining" -p openrpc-testgen - - - name: Build openrpc-testgen-runner - run: | - cd katana-runner - cargo build --release -p openrpc-testgen-runner - - - name: Upload openrpc artifacts - uses: actions/upload-artifact@v4 - with: - name: openrpc-artifacts - path: katana-runner/target - - run-openrpc-testgen: - needs: [build, openrpctestgenb] - runs-on: arc-runner-set - env: - URLS: "http://127.0.0.1:5050" - PAYMASTER_PRIVATE_KEY: "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912" - PAYMASTER_ACCOUNT_ADDRESS: "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" - UDC_ADDRESS: "0x41a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf" - ACCOUNT_CLASS_HASH: "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" - steps: - name: Download katana binary uses: actions/download-artifact@v4 with: name: dojo-bins path: /tmp/bins - - name: Download openrpc artifacts - uses: actions/download-artifact@v4 - with: - name: openrpc-artifacts - path: /tmp/openrpc - - - name: Check openrpc-artifacts - run: | - ls -l /tmp/openrpc - - name: Set permissions for katana run: | chmod +x /tmp/bins/katana - - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable + - name: Start katana nodes + run: | + /tmp/bins/katana \ + --http.port "${KATANA_PORT}" \ + --http.addr "${KATANA_ADDR}" \ + & + /tmp/bins/katana \ + --http.port "${KATANA_NO_MINING_PORT}" \ + --http.addr "${KATANA_ADDR}" \ + & - - name: Cache Rust dependencies - uses: Swatinem/rust-cache@v2 + - name: Checkout katana-runner repository + uses: actions/checkout@v3 + with: + repository: neotheprogramist/starknet-rpc-tests + path: katana-runner - - name: Build openrpc-testgen-runner with features + - name: Scarb build run: | - cd /tmp/openrpc - cargo build --release --features katana -p openrpc-testgen-runner + cd katana-runner + scarb build - - name: Check build with feature + - name: Build openrpc-testgen-runner run: | - ls -l /tmp/openrpc + cd katana-runner + cargo build --release --features "katana katana_no_mining" -p openrpc-testgen -p openrpc-testgen-runner - - name: Start katana node + - name: Run Katana Suite run: | - /tmp/bins/katana & - until curl -s http://127.0.0.1:5050 >/dev/null; do - echo "Waiting for Katana to be ready..." - sleep 5 - done + cd katana-runner + URLS="https://${KATANA_ADDR}:${KATANA_PORT},https://${KATANA_ADDR}:${KATANA_NO_MINING_PORT}" + target/release/openrpc-testgen-runner \ + --urls "${URLS}" \ + --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ + --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ + --udc-address "${UDC_ADDRESS}" \ + --account-class-hash "${ACCOUNT_CLASS_HASH}" + --suite katana - - name: Run openrpc-testgen-runner binary + - name: Run Katana No Mining Suite run: | - cd /tmp/openrpc + cd katana-runner + URLS="https://${KATANA_ADDR}:${KATANA_NO_MINING_PORT}" target/release/openrpc-testgen-runner \ --urls "${URLS}" \ --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ --udc-address "${UDC_ADDRESS}" \ - --account-class-hash "${ACCOUNT_CLASS_HASH}" \ - --features "katana katana_no_mining" + --account-class-hash "${ACCOUNT_CLASS_HASH}" + --suite katana-no-mining + diff --git a/.github/workflows/openrpc-testgen.yml b/.github/workflows/openrpc-testgen.yml deleted file mode 100644 index 343aaecb78..0000000000 --- a/.github/workflows/openrpc-testgen.yml +++ /dev/null @@ -1,95 +0,0 @@ -name: openrpc-testgen - -on: - workflow_dispatch: - -env: - CARGO_TERM_COLOR: always - RUST_VERSION: 1.80.0 - -jobs: - build: - runs-on: arc-runner-set - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Install build dependencies - run: | - sudo apt-get update - sudo apt-get install -y build-essential libclang-dev - - - name: Install Podman - run: | - sudo apt-get update - sudo apt-get install -y podman - - - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - - name: Cache Rust dependencies - uses: Swatinem/rust-cache@v2 - - - name: Build katana - run: | - cargo build -r --bin katana - mkdir -p bins - cp ./target/release/katana bins/ - - - name: Upload katana binary - uses: actions/upload-artifact@v4 - with: - name: dojo-bins - path: bins - - test: - needs: build - runs-on: arc-runner-set - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Install build dependencies - run: | - sudo apt-get update - sudo apt-get install -y build-essential libclang-dev - - - name: Install Podman - run: | - sudo apt-get install -y podman - - - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - - name: Cache Rust dependencies - uses: Swatinem/rust-cache@v2 - - - name: Download katana binary - uses: actions/download-artifact@v4 - with: - name: dojo-bins - path: /tmp/bins - - - name: Make katana executable - run: | - export PATH=/tmp/bins:$PATH - chmod +x /tmp/bins/katana - - - name: Start katana node - run: | - /tmp/bins/katana & - - until curl -s http://127.0.0.1:5050 >/dev/null; do - echo "Waiting for Katana to be ready..." - sleep 5 - done - - - name: Run testgen-runner Podman container - run: | - sudo podman run --rm \ - uacias/katana-runner:v0.0.1 - From 81a6d251e1697e3d22cda0ce7970ec0ac50df27e Mon Sep 17 00:00:00 2001 From: Uacias Date: Fri, 6 Dec 2024 17:14:50 +0100 Subject: [PATCH 38/61] v4 small fix. --- .github/workflows/openrpc-testgen-v4.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/openrpc-testgen-v4.yaml b/.github/workflows/openrpc-testgen-v4.yaml index 2fde5caaf8..875fa564b0 100644 --- a/.github/workflows/openrpc-testgen-v4.yaml +++ b/.github/workflows/openrpc-testgen-v4.yaml @@ -124,7 +124,7 @@ jobs: - name: Run Katana Suite run: | cd katana-runner - URLS="https://${KATANA_ADDR}:${KATANA_PORT},https://${KATANA_ADDR}:${KATANA_NO_MINING_PORT}" + URLS="https://${KATANA_ADDR}:${KATANA_PORT}" target/release/openrpc-testgen-runner \ --urls "${URLS}" \ --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ From 8b352045ba9b4f57c8bd67ef5ae5eab516468f46 Mon Sep 17 00:00:00 2001 From: Uacias Date: Fri, 6 Dec 2024 17:45:03 +0100 Subject: [PATCH 39/61] Small fix. --- .github/workflows/openrpc-testgen-v4.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/openrpc-testgen-v4.yaml b/.github/workflows/openrpc-testgen-v4.yaml index 875fa564b0..daacd3cd73 100644 --- a/.github/workflows/openrpc-testgen-v4.yaml +++ b/.github/workflows/openrpc-testgen-v4.yaml @@ -130,7 +130,7 @@ jobs: --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ --udc-address "${UDC_ADDRESS}" \ - --account-class-hash "${ACCOUNT_CLASS_HASH}" + --account-class-hash "${ACCOUNT_CLASS_HASH}" \ --suite katana - name: Run Katana No Mining Suite @@ -142,6 +142,6 @@ jobs: --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ --udc-address "${UDC_ADDRESS}" \ - --account-class-hash "${ACCOUNT_CLASS_HASH}" + --account-class-hash "${ACCOUNT_CLASS_HASH}" \ --suite katana-no-mining From d33fa469281a63a4ef20d5dfc66a6fe147590b00 Mon Sep 17 00:00:00 2001 From: Uacias Date: Fri, 6 Dec 2024 17:56:37 +0100 Subject: [PATCH 40/61] Rm https. --- .github/workflows/openrpc-testgen-v4.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/openrpc-testgen-v4.yaml b/.github/workflows/openrpc-testgen-v4.yaml index daacd3cd73..1a3e759552 100644 --- a/.github/workflows/openrpc-testgen-v4.yaml +++ b/.github/workflows/openrpc-testgen-v4.yaml @@ -136,7 +136,7 @@ jobs: - name: Run Katana No Mining Suite run: | cd katana-runner - URLS="https://${KATANA_ADDR}:${KATANA_NO_MINING_PORT}" + URLS="${KATANA_ADDR}:${KATANA_NO_MINING_PORT}" target/release/openrpc-testgen-runner \ --urls "${URLS}" \ --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ From 37744790a08b55d67e0372c727d32d3b86feddd8 Mon Sep 17 00:00:00 2001 From: Uacias Date: Fri, 6 Dec 2024 18:10:56 +0100 Subject: [PATCH 41/61] Fix url. --- .github/workflows/openrpc-testgen-v4.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/openrpc-testgen-v4.yaml b/.github/workflows/openrpc-testgen-v4.yaml index 1a3e759552..3b2584d61c 100644 --- a/.github/workflows/openrpc-testgen-v4.yaml +++ b/.github/workflows/openrpc-testgen-v4.yaml @@ -124,7 +124,7 @@ jobs: - name: Run Katana Suite run: | cd katana-runner - URLS="https://${KATANA_ADDR}:${KATANA_PORT}" + URLS="http://${KATANA_ADDR}:${KATANA_PORT}" target/release/openrpc-testgen-runner \ --urls "${URLS}" \ --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ @@ -136,7 +136,7 @@ jobs: - name: Run Katana No Mining Suite run: | cd katana-runner - URLS="${KATANA_ADDR}:${KATANA_NO_MINING_PORT}" + URLS="http://${KATANA_ADDR}:${KATANA_NO_MINING_PORT}" target/release/openrpc-testgen-runner \ --urls "${URLS}" \ --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ From 7070cbc20a84aa16fb1aae3272458b50aaeb5539 Mon Sep 17 00:00:00 2001 From: Uacias Date: Fri, 6 Dec 2024 18:25:24 +0100 Subject: [PATCH 42/61] set working directory --- .github/workflows/openrpc-testgen-v4.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/openrpc-testgen-v4.yaml b/.github/workflows/openrpc-testgen-v4.yaml index 3b2584d61c..3a985d1a9b 100644 --- a/.github/workflows/openrpc-testgen-v4.yaml +++ b/.github/workflows/openrpc-testgen-v4.yaml @@ -99,10 +99,14 @@ jobs: /tmp/bins/katana \ --http.port "${KATANA_PORT}" \ --http.addr "${KATANA_ADDR}" \ + --silent \ & /tmp/bins/katana \ --http.port "${KATANA_NO_MINING_PORT}" \ --http.addr "${KATANA_ADDR}" \ + --silent \ + --no-mining \ + --dev \ & - name: Checkout katana-runner repository @@ -113,17 +117,16 @@ jobs: - name: Scarb build run: | - cd katana-runner scarb build + working-directory: katana-runner - name: Build openrpc-testgen-runner run: | - cd katana-runner cargo build --release --features "katana katana_no_mining" -p openrpc-testgen -p openrpc-testgen-runner + working-directory: katana-runner - name: Run Katana Suite run: | - cd katana-runner URLS="http://${KATANA_ADDR}:${KATANA_PORT}" target/release/openrpc-testgen-runner \ --urls "${URLS}" \ @@ -132,10 +135,10 @@ jobs: --udc-address "${UDC_ADDRESS}" \ --account-class-hash "${ACCOUNT_CLASS_HASH}" \ --suite katana + working-directory: katana-runner - name: Run Katana No Mining Suite run: | - cd katana-runner URLS="http://${KATANA_ADDR}:${KATANA_NO_MINING_PORT}" target/release/openrpc-testgen-runner \ --urls "${URLS}" \ @@ -144,4 +147,5 @@ jobs: --udc-address "${UDC_ADDRESS}" \ --account-class-hash "${ACCOUNT_CLASS_HASH}" \ --suite katana-no-mining + working-directory: katana-runner From 5b6e5bd787df7e85440ad662c77d62049fbd5aaa Mon Sep 17 00:00:00 2001 From: Uacias Date: Mon, 9 Dec 2024 12:59:40 +0100 Subject: [PATCH 43/61] Add no fee & no acc validation suites. --- .github/workflows/openrpc-testgen-v4.yaml | 43 ++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/.github/workflows/openrpc-testgen-v4.yaml b/.github/workflows/openrpc-testgen-v4.yaml index 3a985d1a9b..88139a7cfd 100644 --- a/.github/workflows/openrpc-testgen-v4.yaml +++ b/.github/workflows/openrpc-testgen-v4.yaml @@ -49,6 +49,8 @@ jobs: KATANA_ADDR: "127.0.0.1" KATANA_PORT: "5050" KATANA_NO_MINING_PORT: "5051" + KATANA_NO_FEE_PORT: "5052" + KATANA_NO_ACCOUNT_VALIDATION_PORT: "5053" PAYMASTER_PRIVATE_KEY: "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912" PAYMASTER_ACCOUNT_ADDRESS: "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" UDC_ADDRESS: "0x41a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf" @@ -108,6 +110,21 @@ jobs: --no-mining \ --dev \ & + /tmp/bins/katana \ + --http.port "${KATANA_NO_FEE_PORT}" \ + --http.addr "${KATANA_ADDR}" \ + --silent \ + --dev \ + --dev.no-fee \ + & + /tmp/bins/katana \ + --http.port "${KATANA_NO_ACCOUNT_VALIDATION_PORT}" \ + --http.addr "${KATANA_ADDR}" \ + --silent \ + --no-mining \ + --dev \ + & + - name: Checkout katana-runner repository uses: actions/checkout@v3 @@ -122,7 +139,7 @@ jobs: - name: Build openrpc-testgen-runner run: | - cargo build --release --features "katana katana_no_mining" -p openrpc-testgen -p openrpc-testgen-runner + cargo build --release --features "katana katana_no_mining katana_no_fee katana_no_account_validation" -p openrpc-testgen -p openrpc-testgen-runner working-directory: katana-runner - name: Run Katana Suite @@ -149,3 +166,27 @@ jobs: --suite katana-no-mining working-directory: katana-runner + - name: Run Katana No Fee Suite + run: | + URLS="http://${KATANA_ADDR}:${KATANA_NO_FEE_PORT}" + target/release/openrpc-testgen-runner \ + --urls "${URLS}" \ + --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ + --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ + --udc-address "${UDC_ADDRESS}" \ + --account-class-hash "${ACCOUNT_CLASS_HASH}" \ + --suite katana-no-fee + working-directory: katana-runner + + - name: Run Katana No Account Validation Suite + run: | + URLS="http://${KATANA_ADDR}:${KATANA_NO_ACCOUNT_VALIDATION_PORT}" + target/release/openrpc-testgen-runner \ + --urls "${URLS}" \ + --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ + --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ + --udc-address "${UDC_ADDRESS}" \ + --account-class-hash "${ACCOUNT_CLASS_HASH}" \ + --suite katana-no-account-validation + working-directory: katana-runner + From 6a89226bdabf085868e35a61ee5bd2f6f08d25d1 Mon Sep 17 00:00:00 2001 From: Uacias Date: Mon, 9 Dec 2024 13:29:50 +0100 Subject: [PATCH 44/61] No acc validation. --- .github/workflows/openrpc-testgen-v4.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/openrpc-testgen-v4.yaml b/.github/workflows/openrpc-testgen-v4.yaml index 88139a7cfd..978f046d33 100644 --- a/.github/workflows/openrpc-testgen-v4.yaml +++ b/.github/workflows/openrpc-testgen-v4.yaml @@ -121,8 +121,8 @@ jobs: --http.port "${KATANA_NO_ACCOUNT_VALIDATION_PORT}" \ --http.addr "${KATANA_ADDR}" \ --silent \ - --no-mining \ --dev \ + --dev.no-account-validation \ & From c8e46cd93282f13cea72de15b49922f6a48572a3 Mon Sep 17 00:00:00 2001 From: Uacias Date: Mon, 9 Dec 2024 16:22:53 +0100 Subject: [PATCH 45/61] Echo test visoft. --- .github/workflows/openrpc-testgen-v4.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/openrpc-testgen-v4.yaml b/.github/workflows/openrpc-testgen-v4.yaml index 978f046d33..0874e7556f 100644 --- a/.github/workflows/openrpc-testgen-v4.yaml +++ b/.github/workflows/openrpc-testgen-v4.yaml @@ -190,3 +190,8 @@ jobs: --suite katana-no-account-validation working-directory: katana-runner + - name: Echo + run: | + echo "done" + working-directory: katana-runner + From a841a8b41081c142f8dc84ac9b9c293a96f533da Mon Sep 17 00:00:00 2001 From: Uacias Date: Mon, 9 Dec 2024 18:15:51 +0100 Subject: [PATCH 46/61] Rm echo. --- .github/workflows/openrpc-testgen-v4.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/openrpc-testgen-v4.yaml b/.github/workflows/openrpc-testgen-v4.yaml index 0874e7556f..978f046d33 100644 --- a/.github/workflows/openrpc-testgen-v4.yaml +++ b/.github/workflows/openrpc-testgen-v4.yaml @@ -190,8 +190,3 @@ jobs: --suite katana-no-account-validation working-directory: katana-runner - - name: Echo - run: | - echo "done" - working-directory: katana-runner - From d8dda27f0f1b632be35f782c77cb7b3971f721c4 Mon Sep 17 00:00:00 2001 From: Uacias Date: Mon, 9 Dec 2024 18:42:19 +0100 Subject: [PATCH 47/61] Echo. --- .github/workflows/openrpc-testgen-v4.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/openrpc-testgen-v4.yaml b/.github/workflows/openrpc-testgen-v4.yaml index 978f046d33..0874e7556f 100644 --- a/.github/workflows/openrpc-testgen-v4.yaml +++ b/.github/workflows/openrpc-testgen-v4.yaml @@ -190,3 +190,8 @@ jobs: --suite katana-no-account-validation working-directory: katana-runner + - name: Echo + run: | + echo "done" + working-directory: katana-runner + From 414de2023bac7f1a1bec6301b9cba645e7779885 Mon Sep 17 00:00:00 2001 From: Uacias Date: Mon, 9 Dec 2024 19:22:54 +0100 Subject: [PATCH 48/61] Echo rm --- .github/workflows/openrpc-testgen-v4.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/openrpc-testgen-v4.yaml b/.github/workflows/openrpc-testgen-v4.yaml index 0874e7556f..ad97909027 100644 --- a/.github/workflows/openrpc-testgen-v4.yaml +++ b/.github/workflows/openrpc-testgen-v4.yaml @@ -190,8 +190,4 @@ jobs: --suite katana-no-account-validation working-directory: katana-runner - - name: Echo - run: | - echo "done" - working-directory: katana-runner From fb19b14452fbe5cc90232571fa11011ffcc4bcd6 Mon Sep 17 00:00:00 2001 From: Uacias Date: Mon, 9 Dec 2024 19:43:06 +0100 Subject: [PATCH 49/61] Test. --- .github/workflows/openrpc-testgen-v4.yaml | 6 +- .github/workflows/v5.yaml | 193 ++++++++++++++++++++++ 2 files changed, 196 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/v5.yaml diff --git a/.github/workflows/openrpc-testgen-v4.yaml b/.github/workflows/openrpc-testgen-v4.yaml index ad97909027..d6e15f57eb 100644 --- a/.github/workflows/openrpc-testgen-v4.yaml +++ b/.github/workflows/openrpc-testgen-v4.yaml @@ -1,9 +1,9 @@ name: openrpc-testgenv4 on: - push: - branches: - - 'uacias/**' + # push: + # branches: + # - 'uacias/**' workflow_dispatch: env: diff --git a/.github/workflows/v5.yaml b/.github/workflows/v5.yaml new file mode 100644 index 0000000000..4bc043bf7b --- /dev/null +++ b/.github/workflows/v5.yaml @@ -0,0 +1,193 @@ +name: openrpc-testgenv5 + +on: + push: + branches: + - 'uacias/**' + workflow_dispatch: + +env: + CARGO_TERM_COLOR: always + RUST_VERSION: 1.80.0 + +jobs: + build: + runs-on: arc-runner-set + steps: + - name: Checkout main repository + uses: actions/checkout@v3 + + - name: Install build dependencies + run: | + sudo apt-get update + sudo apt-get install -y build-essential libclang-dev + + - name: Install Rust toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + + - name: Cache Rust dependencies + uses: Swatinem/rust-cache@v2 + + - name: Build katana + run: | + cargo build --release --bin katana + mkdir -p bins + cp ./target/release/katana bins/ + + - name: Upload katana binary + uses: actions/upload-artifact@v4 + with: + name: dojo-bins + path: bins + + test: + needs: build + runs-on: arc-runner-set + env: + KATANA_ADDR: "127.0.0.1" + KATANA_PORT: "5050" + KATANA_NO_MINING_PORT: "5051" + KATANA_NO_FEE_PORT: "5052" + KATANA_NO_ACCOUNT_VALIDATION_PORT: "5053" + PAYMASTER_PRIVATE_KEY: "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912" + PAYMASTER_ACCOUNT_ADDRESS: "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" + UDC_ADDRESS: "0x41a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf" + ACCOUNT_CLASS_HASH: "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" + steps: + - name: Checkout main repository + uses: actions/checkout@v3 + + - name: Install build dependencies + run: | + sudo apt-get update + sudo apt-get install -y build-essential libclang-dev git curl bash libssl-dev pkg-config + + - name: Install Rust toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + + - name: Cache Rust dependencies + uses: Swatinem/rust-cache@v2 + + - name: Install Scarb via script + run: | + export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$PATH" + curl --proto '=https' --tlsv1.2 -sSf https://docs.swmansion.com/scarb/install.sh | bash -s -- -v 2.8.4 + echo "$HOME/.local/bin" >> $GITHUB_PATH + + - name: Cache target directory + uses: actions/cache@v3 + with: + path: katana-runner/target + key: ${{ runner.os }}-cargo-${{ hashFiles('katana-runner/Cargo.lock') }} + restore-keys: | + ${{ runner.os }}-cargo- + + - name: Download katana binary + uses: actions/download-artifact@v4 + with: + name: dojo-bins + path: /tmp/bins + + - name: Set permissions for katana + run: | + chmod +x /tmp/bins/katana + + - name: Start katana nodes + run: | + /tmp/bins/katana \ + --http.port "${KATANA_PORT}" \ + --http.addr "${KATANA_ADDR}" \ + --silent \ + & + /tmp/bins/katana \ + --http.port "${KATANA_NO_MINING_PORT}" \ + --http.addr "${KATANA_ADDR}" \ + --silent \ + --no-mining \ + --dev \ + & + /tmp/bins/katana \ + --http.port "${KATANA_NO_FEE_PORT}" \ + --http.addr "${KATANA_ADDR}" \ + --silent \ + --dev \ + --dev.no-fee \ + & + /tmp/bins/katana \ + --http.port "${KATANA_NO_ACCOUNT_VALIDATION_PORT}" \ + --http.addr "${KATANA_ADDR}" \ + --silent \ + --dev \ + --dev.no-account-validation \ + & + + + - name: Checkout katana-runner repository + uses: actions/checkout@v3 + with: + repository: neotheprogramist/starknet-rpc-tests + path: katana-runner + + - name: Scarb build + run: | + scarb build + working-directory: katana-runner + + - name: Build openrpc-testgen-runner + run: | + cargo build --release --features "katana katana_no_mining katana_no_fee katana_no_account_validation" -p openrpc-testgen -p openrpc-testgen-runner + working-directory: katana-runner + + - name: Run Katana Suite + run: | + URLS="http://${KATANA_ADDR}:${KATANA_PORT}" + target/release/openrpc-testgen-runner \ + --urls "${URLS}" \ + --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ + --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ + --udc-address "${UDC_ADDRESS}" \ + --account-class-hash "${ACCOUNT_CLASS_HASH}" \ + --suite katana + working-directory: katana-runner + + - name: Run Katana No Mining Suite + run: | + URLS="http://${KATANA_ADDR}:${KATANA_NO_MINING_PORT}" + target/release/openrpc-testgen-runner \ + --urls "${URLS}" \ + --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ + --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ + --udc-address "${UDC_ADDRESS}" \ + --account-class-hash "${ACCOUNT_CLASS_HASH}" \ + --suite katana-no-mining + working-directory: katana-runner + + - name: Run Katana No Fee Suite + run: | + URLS="http://${KATANA_ADDR}:${KATANA_NO_FEE_PORT}" + target/release/openrpc-testgen-runner \ + --urls "${URLS}" \ + --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ + --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ + --udc-address "${UDC_ADDRESS}" \ + --account-class-hash "${ACCOUNT_CLASS_HASH}" \ + --suite katana-no-fee + working-directory: katana-runner + + - name: Run Katana No Account Validation Suite + run: | + URLS="http://${KATANA_ADDR}:${KATANA_NO_ACCOUNT_VALIDATION_PORT}" + target/release/openrpc-testgen-runner \ + --urls "${URLS}" \ + --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ + --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ + --udc-address "${UDC_ADDRESS}" \ + --account-class-hash "${ACCOUNT_CLASS_HASH}" \ + --suite katana-no-account-validation + working-directory: katana-runner + + From baf7d38eb75537b56da5cdd2f05fdadbc651505e Mon Sep 17 00:00:00 2001 From: Uacias Date: Mon, 9 Dec 2024 19:44:47 +0100 Subject: [PATCH 50/61] v5 --- .github/workflows/v5.yaml | 115 +++++++++++--------------------------- 1 file changed, 33 insertions(+), 82 deletions(-) diff --git a/.github/workflows/v5.yaml b/.github/workflows/v5.yaml index 4bc043bf7b..e41f7553f3 100644 --- a/.github/workflows/v5.yaml +++ b/.github/workflows/v5.yaml @@ -1,10 +1,10 @@ -name: openrpc-testgenv5 +name: v5 on: push: branches: - - 'uacias/**' - workflow_dispatch: + - 'uacias/**' + workflow_dispatch: env: CARGO_TERM_COLOR: always @@ -32,7 +32,7 @@ jobs: - name: Build katana run: | - cargo build --release --bin katana + cargo build --release --bin katana -j16 mkdir -p bins cp ./target/release/katana bins/ @@ -47,14 +47,21 @@ jobs: runs-on: arc-runner-set env: KATANA_ADDR: "127.0.0.1" - KATANA_PORT: "5050" - KATANA_NO_MINING_PORT: "5051" - KATANA_NO_FEE_PORT: "5052" - KATANA_NO_ACCOUNT_VALIDATION_PORT: "5053" PAYMASTER_PRIVATE_KEY: "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912" PAYMASTER_ACCOUNT_ADDRESS: "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" UDC_ADDRESS: "0x41a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf" ACCOUNT_CLASS_HASH: "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" + strategy: + matrix: + include: + - suite: "katana" + port: "5050" + - suite: "katana-no-mining" + port: "5051" + - suite: "katana-no-fee" + port: "5052" + - suite: "katana-no-account-validation" + port: "5053" steps: - name: Checkout main repository uses: actions/checkout@v3 @@ -96,35 +103,16 @@ jobs: run: | chmod +x /tmp/bins/katana - - name: Start katana nodes + - name: Start katana node for ${{ matrix.suite }} run: | /tmp/bins/katana \ - --http.port "${KATANA_PORT}" \ - --http.addr "${KATANA_ADDR}" \ - --silent \ - & - /tmp/bins/katana \ - --http.port "${KATANA_NO_MINING_PORT}" \ - --http.addr "${KATANA_ADDR}" \ - --silent \ - --no-mining \ - --dev \ - & - /tmp/bins/katana \ - --http.port "${KATANA_NO_FEE_PORT}" \ - --http.addr "${KATANA_ADDR}" \ - --silent \ - --dev \ - --dev.no-fee \ - & - /tmp/bins/katana \ - --http.port "${KATANA_NO_ACCOUNT_VALIDATION_PORT}" \ - --http.addr "${KATANA_ADDR}" \ - --silent \ - --dev \ - --dev.no-account-validation \ - & - + --http.port "${{ matrix.port }}" \ + --http.addr "${KATANA_ADDR}" \ + --silent \ + $( if [ "${{ matrix.suite }}" = "katana-no-mining" ]; then echo "--no-mining --dev"; fi ) \ + $( if [ "${{ matrix.suite }}" = "katana-no-fee" ]; then echo "--dev --dev.no-fee"; fi ) \ + $( if [ "${{ matrix.suite }}" = "katana-no-account-validation" ]; then echo "--dev --dev.no-account-validation"; fi ) \ + & - name: Checkout katana-runner repository uses: actions/checkout@v3 @@ -138,56 +126,19 @@ jobs: working-directory: katana-runner - name: Build openrpc-testgen-runner + # Use -j16 to speed up cargo build run: | - cargo build --release --features "katana katana_no_mining katana_no_fee katana_no_account_validation" -p openrpc-testgen -p openrpc-testgen-runner + cargo build --release -j16 --features "katana katana_no_mining katana_no_fee katana_no_account_validation" -p openrpc-testgen -p openrpc-testgen-runner working-directory: katana-runner - - name: Run Katana Suite + - name: Run ${{ matrix.suite }} Suite run: | - URLS="http://${KATANA_ADDR}:${KATANA_PORT}" + URLS="http://${KATANA_ADDR}:${{ matrix.port }}" target/release/openrpc-testgen-runner \ - --urls "${URLS}" \ - --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ - --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ - --udc-address "${UDC_ADDRESS}" \ - --account-class-hash "${ACCOUNT_CLASS_HASH}" \ - --suite katana + --urls "${URLS}" \ + --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ + --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ + --udc-address "${UDC_ADDRESS}" \ + --account-class-hash "${ACCOUNT_CLASS_HASH}" \ + --suite ${{ matrix.suite }} working-directory: katana-runner - - - name: Run Katana No Mining Suite - run: | - URLS="http://${KATANA_ADDR}:${KATANA_NO_MINING_PORT}" - target/release/openrpc-testgen-runner \ - --urls "${URLS}" \ - --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ - --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ - --udc-address "${UDC_ADDRESS}" \ - --account-class-hash "${ACCOUNT_CLASS_HASH}" \ - --suite katana-no-mining - working-directory: katana-runner - - - name: Run Katana No Fee Suite - run: | - URLS="http://${KATANA_ADDR}:${KATANA_NO_FEE_PORT}" - target/release/openrpc-testgen-runner \ - --urls "${URLS}" \ - --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ - --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ - --udc-address "${UDC_ADDRESS}" \ - --account-class-hash "${ACCOUNT_CLASS_HASH}" \ - --suite katana-no-fee - working-directory: katana-runner - - - name: Run Katana No Account Validation Suite - run: | - URLS="http://${KATANA_ADDR}:${KATANA_NO_ACCOUNT_VALIDATION_PORT}" - target/release/openrpc-testgen-runner \ - --urls "${URLS}" \ - --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ - --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ - --udc-address "${UDC_ADDRESS}" \ - --account-class-hash "${ACCOUNT_CLASS_HASH}" \ - --suite katana-no-account-validation - working-directory: katana-runner - - From 8f5382582623c5a42081a7e50c73ac279e80208b Mon Sep 17 00:00:00 2001 From: Uacias Date: Tue, 10 Dec 2024 11:03:15 +0100 Subject: [PATCH 51/61] Rm v3 v5 --- .github/workflows/openrpc-testgen-v3.yaml | 128 ------------------- .github/workflows/openrpc-testgen-v4.yaml | 6 +- .github/workflows/v5.yaml | 144 ---------------------- 3 files changed, 3 insertions(+), 275 deletions(-) delete mode 100644 .github/workflows/openrpc-testgen-v3.yaml delete mode 100644 .github/workflows/v5.yaml diff --git a/.github/workflows/openrpc-testgen-v3.yaml b/.github/workflows/openrpc-testgen-v3.yaml deleted file mode 100644 index a7fda3e4de..0000000000 --- a/.github/workflows/openrpc-testgen-v3.yaml +++ /dev/null @@ -1,128 +0,0 @@ -name: openrpc-testgenv3 - -on: - # push: - # branches: - # - 'uacias/**' - workflow_dispatch: - -env: - CARGO_TERM_COLOR: always - RUST_VERSION: 1.80.0 - -jobs: - build: - runs-on: arc-runner-set - steps: - - name: Checkout main repository - uses: actions/checkout@v3 - - - name: Install build dependencies - run: | - sudo apt-get update - sudo apt-get install -y build-essential libclang-dev - - - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - - name: Cache Rust dependencies - uses: Swatinem/rust-cache@v2 - - - name: Build katana - run: | - cargo build --release --bin katana - mkdir -p bins - cp ./target/release/katana bins/ - - - name: Upload katana binary - uses: actions/upload-artifact@v4 - with: - name: dojo-bins - path: bins - - test: - needs: build - runs-on: arc-runner-set - env: - URLS: "http://127.0.0.1:5050" - PAYMASTER_PRIVATE_KEY: "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912" - PAYMASTER_ACCOUNT_ADDRESS: "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" - UDC_ADDRESS: "0x41a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf" - ACCOUNT_CLASS_HASH: "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" - steps: - - name: Checkout main repository - uses: actions/checkout@v3 - - - name: Install build dependencies - run: | - sudo apt-get update - sudo apt-get install -y build-essential libclang-dev git curl bash libssl-dev pkg-config - - - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - - name: Cache Rust dependencies - uses: Swatinem/rust-cache@v2 - - - name: Install Scarb via script - run: | - export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$PATH" - curl --proto '=https' --tlsv1.2 -sSf https://docs.swmansion.com/scarb/install.sh | bash -s -- -v 2.8.4 - echo "$HOME/.local/bin" >> $GITHUB_PATH - - - name: Cache target directory - uses: actions/cache@v3 - with: - path: katana-runner/target - key: ${{ runner.os }}-cargo-${{ hashFiles('katana-runner/Cargo.lock') }} - restore-keys: | - ${{ runner.os }}-cargo- - - - name: Download katana binary - uses: actions/download-artifact@v4 - with: - name: dojo-bins - path: /tmp/bins - - - name: Set permissions for katana - run: | - chmod +x /tmp/bins/katana - - - name: Start katana node - run: | - /tmp/bins/katana & - - until curl -s http://127.0.0.1:5050 >/dev/null; do - echo "Waiting for Katana to be ready..." - sleep 5 - done - - - name: Checkout katana-runner repository - uses: actions/checkout@v3 - with: - repository: neotheprogramist/starknet-rpc-tests - path: katana-runner - - - name: Scarb build - run: | - cd katana-runner - scarb build - - - name: Build openrpc-testgen-runner - run: | - cd katana-runner - cargo build --release --features katana -p openrpc-testgen -p openrpc-testgen-runner - - - name: Run openrpc-testgen-runner binary - run: | - cd katana-runner - target/release/openrpc-testgen-runner \ - --urls "${URLS}" \ - --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ - --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ - --udc-address "${UDC_ADDRESS}" \ - --account-class-hash "${ACCOUNT_CLASS_HASH}" diff --git a/.github/workflows/openrpc-testgen-v4.yaml b/.github/workflows/openrpc-testgen-v4.yaml index d6e15f57eb..ad97909027 100644 --- a/.github/workflows/openrpc-testgen-v4.yaml +++ b/.github/workflows/openrpc-testgen-v4.yaml @@ -1,9 +1,9 @@ name: openrpc-testgenv4 on: - # push: - # branches: - # - 'uacias/**' + push: + branches: + - 'uacias/**' workflow_dispatch: env: diff --git a/.github/workflows/v5.yaml b/.github/workflows/v5.yaml deleted file mode 100644 index e41f7553f3..0000000000 --- a/.github/workflows/v5.yaml +++ /dev/null @@ -1,144 +0,0 @@ -name: v5 - -on: - push: - branches: - - 'uacias/**' - workflow_dispatch: - -env: - CARGO_TERM_COLOR: always - RUST_VERSION: 1.80.0 - -jobs: - build: - runs-on: arc-runner-set - steps: - - name: Checkout main repository - uses: actions/checkout@v3 - - - name: Install build dependencies - run: | - sudo apt-get update - sudo apt-get install -y build-essential libclang-dev - - - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - - name: Cache Rust dependencies - uses: Swatinem/rust-cache@v2 - - - name: Build katana - run: | - cargo build --release --bin katana -j16 - mkdir -p bins - cp ./target/release/katana bins/ - - - name: Upload katana binary - uses: actions/upload-artifact@v4 - with: - name: dojo-bins - path: bins - - test: - needs: build - runs-on: arc-runner-set - env: - KATANA_ADDR: "127.0.0.1" - PAYMASTER_PRIVATE_KEY: "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912" - PAYMASTER_ACCOUNT_ADDRESS: "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" - UDC_ADDRESS: "0x41a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf" - ACCOUNT_CLASS_HASH: "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" - strategy: - matrix: - include: - - suite: "katana" - port: "5050" - - suite: "katana-no-mining" - port: "5051" - - suite: "katana-no-fee" - port: "5052" - - suite: "katana-no-account-validation" - port: "5053" - steps: - - name: Checkout main repository - uses: actions/checkout@v3 - - - name: Install build dependencies - run: | - sudo apt-get update - sudo apt-get install -y build-essential libclang-dev git curl bash libssl-dev pkg-config - - - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - - name: Cache Rust dependencies - uses: Swatinem/rust-cache@v2 - - - name: Install Scarb via script - run: | - export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$PATH" - curl --proto '=https' --tlsv1.2 -sSf https://docs.swmansion.com/scarb/install.sh | bash -s -- -v 2.8.4 - echo "$HOME/.local/bin" >> $GITHUB_PATH - - - name: Cache target directory - uses: actions/cache@v3 - with: - path: katana-runner/target - key: ${{ runner.os }}-cargo-${{ hashFiles('katana-runner/Cargo.lock') }} - restore-keys: | - ${{ runner.os }}-cargo- - - - name: Download katana binary - uses: actions/download-artifact@v4 - with: - name: dojo-bins - path: /tmp/bins - - - name: Set permissions for katana - run: | - chmod +x /tmp/bins/katana - - - name: Start katana node for ${{ matrix.suite }} - run: | - /tmp/bins/katana \ - --http.port "${{ matrix.port }}" \ - --http.addr "${KATANA_ADDR}" \ - --silent \ - $( if [ "${{ matrix.suite }}" = "katana-no-mining" ]; then echo "--no-mining --dev"; fi ) \ - $( if [ "${{ matrix.suite }}" = "katana-no-fee" ]; then echo "--dev --dev.no-fee"; fi ) \ - $( if [ "${{ matrix.suite }}" = "katana-no-account-validation" ]; then echo "--dev --dev.no-account-validation"; fi ) \ - & - - - name: Checkout katana-runner repository - uses: actions/checkout@v3 - with: - repository: neotheprogramist/starknet-rpc-tests - path: katana-runner - - - name: Scarb build - run: | - scarb build - working-directory: katana-runner - - - name: Build openrpc-testgen-runner - # Use -j16 to speed up cargo build - run: | - cargo build --release -j16 --features "katana katana_no_mining katana_no_fee katana_no_account_validation" -p openrpc-testgen -p openrpc-testgen-runner - working-directory: katana-runner - - - name: Run ${{ matrix.suite }} Suite - run: | - URLS="http://${KATANA_ADDR}:${{ matrix.port }}" - target/release/openrpc-testgen-runner \ - --urls "${URLS}" \ - --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ - --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ - --udc-address "${UDC_ADDRESS}" \ - --account-class-hash "${ACCOUNT_CLASS_HASH}" \ - --suite ${{ matrix.suite }} - working-directory: katana-runner From 762233d11ccf7a6591571f80e025dcb8a2a9794c Mon Sep 17 00:00:00 2001 From: Uacias Date: Tue, 10 Dec 2024 14:32:14 +0100 Subject: [PATCH 52/61] Add openrpc. --- .github/workflows/openrpc-testgen-v4.yaml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/workflows/openrpc-testgen-v4.yaml b/.github/workflows/openrpc-testgen-v4.yaml index ad97909027..1fe3656650 100644 --- a/.github/workflows/openrpc-testgen-v4.yaml +++ b/.github/workflows/openrpc-testgen-v4.yaml @@ -51,6 +51,7 @@ jobs: KATANA_NO_MINING_PORT: "5051" KATANA_NO_FEE_PORT: "5052" KATANA_NO_ACCOUNT_VALIDATION_PORT: "5053" + KATANA_OPENRPC_PORT: "5054" PAYMASTER_PRIVATE_KEY: "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912" PAYMASTER_ACCOUNT_ADDRESS: "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" UDC_ADDRESS: "0x41a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf" @@ -104,6 +105,11 @@ jobs: --silent \ & /tmp/bins/katana \ + --http.port "${KATANA_OPENRPC_PORT}" \ + --http.addr "${KATANA_ADDR}" \ + --silent \ + & + /tmp/bins/katana \ --http.port "${KATANA_NO_MINING_PORT}" \ --http.addr "${KATANA_ADDR}" \ --silent \ @@ -139,7 +145,7 @@ jobs: - name: Build openrpc-testgen-runner run: | - cargo build --release --features "katana katana_no_mining katana_no_fee katana_no_account_validation" -p openrpc-testgen -p openrpc-testgen-runner + cargo build --release --features "openrpc katana katana_no_mining katana_no_fee katana_no_account_validation" -p openrpc-testgen -p openrpc-testgen-runner working-directory: katana-runner - name: Run Katana Suite @@ -154,6 +160,18 @@ jobs: --suite katana working-directory: katana-runner + - name: Run OpenRPC Suite + run: | + URLS="http://${KATANA_ADDR}:${KATANA_OPENRPC_PORT}" + target/release/openrpc-testgen-runner \ + --urls "${URLS}" \ + --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ + --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ + --udc-address "${UDC_ADDRESS}" \ + --account-class-hash "${ACCOUNT_CLASS_HASH}" \ + --suite open-rpc + working-directory: katana-runner + - name: Run Katana No Mining Suite run: | URLS="http://${KATANA_ADDR}:${KATANA_NO_MINING_PORT}" From cb743dc4a610611a25b052d99ef508a93ce4840e Mon Sep 17 00:00:00 2001 From: Uacias Date: Wed, 11 Dec 2024 22:58:01 +0100 Subject: [PATCH 53/61] Ci tmp. --- .github/workflows/ci.yml | 168 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 167 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 434a8ed1ee..e6b2fba837 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ env: jobs: build: - runs-on: ubuntu-latest-4-cores + runs-on: arc-runner-set steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 @@ -30,6 +30,172 @@ jobs: name: dojo-bins path: bins + dojo-tests: + needs: build + runs-on: arc-runner-set + env: + KATANA_ADDR: "127.0.0.1" + KATANA_PORT: "5050" + KATANA_NO_MINING_PORT: "5051" + KATANA_NO_FEE_PORT: "5052" + KATANA_NO_ACCOUNT_VALIDATION_PORT: "5053" + KATANA_OPENRPC_PORT: "5054" + PAYMASTER_PRIVATE_KEY: "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912" + PAYMASTER_ACCOUNT_ADDRESS: "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" + UDC_ADDRESS: "0x41a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf" + ACCOUNT_CLASS_HASH: "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" + steps: + - name: Checkout main repository + uses: actions/checkout@v3 + + - name: Install build dependencies + run: | + sudo apt-get update + sudo apt-get install -y build-essential libclang-dev git curl bash libssl-dev pkg-config + + - name: Install Rust toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + + - name: Cache Rust dependencies + uses: Swatinem/rust-cache@v2 + + - name: Install Scarb via script + run: | + export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$PATH" + curl --proto '=https' --tlsv1.2 -sSf https://docs.swmansion.com/scarb/install.sh | bash -s -- -v 2.8.4 + echo "$HOME/.local/bin" >> $GITHUB_PATH + + - name: Cache target directory + uses: actions/cache@v3 + with: + path: katana-runner/target + key: ${{ runner.os }}-cargo-${{ hashFiles('katana-runner/Cargo.lock') }} + restore-keys: | + ${{ runner.os }}-cargo- + + - name: Download katana binary + uses: actions/download-artifact@v4 + with: + name: dojo-bins + path: /tmp/bins + + - name: Set permissions for katana + run: | + chmod +x /tmp/bins/katana + + - name: Start katana nodes + run: | + /tmp/bins/katana \ + --http.port "${KATANA_PORT}" \ + --http.addr "${KATANA_ADDR}" \ + --silent \ + & + /tmp/bins/katana \ + --http.port "${KATANA_OPENRPC_PORT}" \ + --http.addr "${KATANA_ADDR}" \ + --silent \ + & + /tmp/bins/katana \ + --http.port "${KATANA_NO_MINING_PORT}" \ + --http.addr "${KATANA_ADDR}" \ + --silent \ + --no-mining \ + --dev \ + & + /tmp/bins/katana \ + --http.port "${KATANA_NO_FEE_PORT}" \ + --http.addr "${KATANA_ADDR}" \ + --silent \ + --dev \ + --dev.no-fee \ + & + /tmp/bins/katana \ + --http.port "${KATANA_NO_ACCOUNT_VALIDATION_PORT}" \ + --http.addr "${KATANA_ADDR}" \ + --silent \ + --dev \ + --dev.no-account-validation \ + & + + - name: Checkout katana-runner repository + uses: actions/checkout@v3 + with: + repository: neotheprogramist/starknet-rpc-tests + path: katana-runner + + - name: Scarb build + run: | + scarb build + working-directory: katana-runner + + - name: Build openrpc-testgen-runner + run: | + cargo build --release --features "openrpc katana katana_no_mining katana_no_fee katana_no_account_validation" -p openrpc-testgen -p openrpc-testgen-runner + working-directory: katana-runner + + - name: Run Katana Suite + run: | + URLS="http://${KATANA_ADDR}:${KATANA_PORT}" + target/release/openrpc-testgen-runner \ + --urls "${URLS}" \ + --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ + --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ + --udc-address "${UDC_ADDRESS}" \ + --account-class-hash "${ACCOUNT_CLASS_HASH}" \ + --suite katana + working-directory: katana-runner + + - name: Run OpenRPC Suite + run: | + URLS="http://${KATANA_ADDR}:${KATANA_OPENRPC_PORT}" + target/release/openrpc-testgen-runner \ + --urls "${URLS}" \ + --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ + --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ + --udc-address "${UDC_ADDRESS}" \ + --account-class-hash "${ACCOUNT_CLASS_HASH}" \ + --suite open-rpc + working-directory: katana-runner + + - name: Run Katana No Mining Suite + run: | + URLS="http://${KATANA_ADDR}:${KATANA_NO_MINING_PORT}" + target/release/openrpc-testgen-runner \ + --urls "${URLS}" \ + --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ + --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ + --udc-address "${UDC_ADDRESS}" \ + --account-class-hash "${ACCOUNT_CLASS_HASH}" \ + --suite katana-no-mining + working-directory: katana-runner + + - name: Run Katana No Fee Suite + run: | + URLS="http://${KATANA_ADDR}:${KATANA_NO_FEE_PORT}" + target/release/openrpc-testgen-runner \ + --urls "${URLS}" \ + --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ + --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ + --udc-address "${UDC_ADDRESS}" \ + --account-class-hash "${ACCOUNT_CLASS_HASH}" \ + --suite katana-no-fee + working-directory: katana-runner + + - name: Run Katana No Account Validation Suite + run: | + URLS="http://${KATANA_ADDR}:${KATANA_NO_ACCOUNT_VALIDATION_PORT}" + target/release/openrpc-testgen-runner \ + --urls "${URLS}" \ + --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ + --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ + --udc-address "${UDC_ADDRESS}" \ + --account-class-hash "${ACCOUNT_CLASS_HASH}" \ + --suite katana-no-account-validation + working-directory: katana-runner + + test: needs: ensure-docker runs-on: ubuntu-latest-32-cores From 35910794c95610e2468da87734b04de32d4873cd Mon Sep 17 00:00:00 2001 From: Uacias Date: Wed, 11 Dec 2024 22:59:05 +0100 Subject: [PATCH 54/61] on push. --- .github/workflows/ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e6b2fba837..8d22c460ce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,8 +6,14 @@ name: ci # - main # pull_request: +# on: +# workflow_dispatch: + on: - workflow_dispatch: + push: + branches: + - 'feat/**' + env: CARGO_TERM_COLOR: always From 59cccac7cdd6a0d847cd243ea74a33e6bac0f15e Mon Sep 17 00:00:00 2001 From: Uacias Date: Wed, 11 Dec 2024 23:11:24 +0100 Subject: [PATCH 55/61] RM redundant cache. --- .github/workflows/ci.yml | 23 +++++++---------------- .github/workflows/openrpc-testgen-v4.yaml | 10 +--------- 2 files changed, 8 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8d22c460ce..d2438f920a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,27 +1,18 @@ name: ci -# on: -# push: -# branches: -# - main -# pull_request: - -# on: -# workflow_dispatch: - on: push: branches: - - 'feat/**' + - main + pull_request: - env: CARGO_TERM_COLOR: always RUST_VERSION: 1.80.0 jobs: build: - runs-on: arc-runner-set + runs-on: ubuntu-latest-4-cores steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 @@ -50,13 +41,13 @@ jobs: PAYMASTER_ACCOUNT_ADDRESS: "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" UDC_ADDRESS: "0x41a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf" ACCOUNT_CLASS_HASH: "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" + SCARB_VERSION: "2.8.4" steps: - - name: Checkout main repository - uses: actions/checkout@v3 + - uses: actions/checkout@v3 - name: Install build dependencies run: | - sudo apt-get update + sudo apt-get update && \ sudo apt-get install -y build-essential libclang-dev git curl bash libssl-dev pkg-config - name: Install Rust toolchain @@ -70,7 +61,7 @@ jobs: - name: Install Scarb via script run: | export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$PATH" - curl --proto '=https' --tlsv1.2 -sSf https://docs.swmansion.com/scarb/install.sh | bash -s -- -v 2.8.4 + curl --proto '=https' --tlsv1.2 -sSf https://docs.swmansion.com/scarb/install.sh | bash -s -- -v $SCARB_VERSION echo "$HOME/.local/bin" >> $GITHUB_PATH - name: Cache target directory diff --git a/.github/workflows/openrpc-testgen-v4.yaml b/.github/workflows/openrpc-testgen-v4.yaml index 1fe3656650..69d85dc3da 100644 --- a/.github/workflows/openrpc-testgen-v4.yaml +++ b/.github/workflows/openrpc-testgen-v4.yaml @@ -3,7 +3,7 @@ name: openrpc-testgenv4 on: push: branches: - - 'uacias/**' + - 'feat/**' workflow_dispatch: env: @@ -79,14 +79,6 @@ jobs: curl --proto '=https' --tlsv1.2 -sSf https://docs.swmansion.com/scarb/install.sh | bash -s -- -v 2.8.4 echo "$HOME/.local/bin" >> $GITHUB_PATH - - name: Cache target directory - uses: actions/cache@v3 - with: - path: katana-runner/target - key: ${{ runner.os }}-cargo-${{ hashFiles('katana-runner/Cargo.lock') }} - restore-keys: | - ${{ runner.os }}-cargo- - - name: Download katana binary uses: actions/download-artifact@v4 with: From 78fe5e1bfb9ef467924dcb931cc9f78694e8123f Mon Sep 17 00:00:00 2001 From: Uacias Date: Wed, 11 Dec 2024 23:26:46 +0100 Subject: [PATCH 56/61] Better version of running, rm redundancy. --- .github/workflows/ci.yml | 20 +------ .github/workflows/openrpc-testgen-v4.yaml | 72 ++++++++--------------- 2 files changed, 26 insertions(+), 66 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d2438f920a..049d22d49d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,37 +50,23 @@ jobs: sudo apt-get update && \ sudo apt-get install -y build-essential libclang-dev git curl bash libssl-dev pkg-config - - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 + - uses: actions-rs/toolchain@v1 with: toolchain: stable - - name: Cache Rust dependencies - uses: Swatinem/rust-cache@v2 - - - name: Install Scarb via script + - name: Install Scarb run: | export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$PATH" curl --proto '=https' --tlsv1.2 -sSf https://docs.swmansion.com/scarb/install.sh | bash -s -- -v $SCARB_VERSION echo "$HOME/.local/bin" >> $GITHUB_PATH - - name: Cache target directory - uses: actions/cache@v3 - with: - path: katana-runner/target - key: ${{ runner.os }}-cargo-${{ hashFiles('katana-runner/Cargo.lock') }} - restore-keys: | - ${{ runner.os }}-cargo- - - name: Download katana binary uses: actions/download-artifact@v4 with: name: dojo-bins path: /tmp/bins - - name: Set permissions for katana - run: | - chmod +x /tmp/bins/katana + - run: chmod +x /tmp/bins/katana - name: Start katana nodes run: | diff --git a/.github/workflows/openrpc-testgen-v4.yaml b/.github/workflows/openrpc-testgen-v4.yaml index 69d85dc3da..066647e8ee 100644 --- a/.github/workflows/openrpc-testgen-v4.yaml +++ b/.github/workflows/openrpc-testgen-v4.yaml @@ -57,75 +57,49 @@ jobs: UDC_ADDRESS: "0x41a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf" ACCOUNT_CLASS_HASH: "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" steps: - - name: Checkout main repository - uses: actions/checkout@v3 + - uses: actions/checkout@v3 - name: Install build dependencies run: | sudo apt-get update sudo apt-get install -y build-essential libclang-dev git curl bash libssl-dev pkg-config - - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 + - uses: actions-rs/toolchain@v1 with: toolchain: stable - - name: Cache Rust dependencies - uses: Swatinem/rust-cache@v2 - - name: Install Scarb via script run: | export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$PATH" curl --proto '=https' --tlsv1.2 -sSf https://docs.swmansion.com/scarb/install.sh | bash -s -- -v 2.8.4 echo "$HOME/.local/bin" >> $GITHUB_PATH - - name: Download katana binary - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v4 with: name: dojo-bins path: /tmp/bins - - name: Set permissions for katana + - run: chmod +x /tmp/bins/katana + + - name: Start katana nodes run: | - chmod +x /tmp/bins/katana - - - name: Start katana nodes - run: | - /tmp/bins/katana \ - --http.port "${KATANA_PORT}" \ - --http.addr "${KATANA_ADDR}" \ - --silent \ - & - /tmp/bins/katana \ - --http.port "${KATANA_OPENRPC_PORT}" \ - --http.addr "${KATANA_ADDR}" \ - --silent \ - & - /tmp/bins/katana \ - --http.port "${KATANA_NO_MINING_PORT}" \ - --http.addr "${KATANA_ADDR}" \ - --silent \ - --no-mining \ - --dev \ - & - /tmp/bins/katana \ - --http.port "${KATANA_NO_FEE_PORT}" \ - --http.addr "${KATANA_ADDR}" \ - --silent \ - --dev \ - --dev.no-fee \ - & - /tmp/bins/katana \ - --http.port "${KATANA_NO_ACCOUNT_VALIDATION_PORT}" \ - --http.addr "${KATANA_ADDR}" \ - --silent \ - --dev \ - --dev.no-account-validation \ - & - - - - name: Checkout katana-runner repository - uses: actions/checkout@v3 + declare -A KATANA_CONFIG=( + ["${KATANA_PORT}"]="" + ["${KATANA_OPENRPC_PORT}"]="" + ["${KATANA_NO_MINING_PORT}"]="--no-mining --dev" + ["${KATANA_NO_FEE_PORT}"]="--dev --dev.no-fee" + ["${KATANA_NO_ACCOUNT_VALIDATION_PORT}"]="--dev --dev.no-account-validation" + ) + + for PORT in "${!KATANA_CONFIG[@]}"; do + /tmp/bins/katana \ + --http.port "${PORT}" \ + --http.addr "${KATANA_ADDR}" \ + --silent \ + ${KATANA_CONFIG[$PORT]} & + done + + - uses: actions/checkout@v3 with: repository: neotheprogramist/starknet-rpc-tests path: katana-runner From 3012d8b5df292821515440a09da5372216e26fbc Mon Sep 17 00:00:00 2001 From: Uacias Date: Thu, 12 Dec 2024 12:11:34 +0100 Subject: [PATCH 57/61] Hola. --- .github/workflows/ci.yml | 48 ++++++++--------------- .github/workflows/openrpc-testgen-v4.yaml | 2 +- 2 files changed, 17 insertions(+), 33 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 049d22d49d..569be0051c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,39 +68,23 @@ jobs: - run: chmod +x /tmp/bins/katana - - name: Start katana nodes + - name: Start katana nodes run: | - /tmp/bins/katana \ - --http.port "${KATANA_PORT}" \ - --http.addr "${KATANA_ADDR}" \ - --silent \ - & - /tmp/bins/katana \ - --http.port "${KATANA_OPENRPC_PORT}" \ - --http.addr "${KATANA_ADDR}" \ - --silent \ - & - /tmp/bins/katana \ - --http.port "${KATANA_NO_MINING_PORT}" \ - --http.addr "${KATANA_ADDR}" \ - --silent \ - --no-mining \ - --dev \ - & - /tmp/bins/katana \ - --http.port "${KATANA_NO_FEE_PORT}" \ - --http.addr "${KATANA_ADDR}" \ - --silent \ - --dev \ - --dev.no-fee \ - & - /tmp/bins/katana \ - --http.port "${KATANA_NO_ACCOUNT_VALIDATION_PORT}" \ - --http.addr "${KATANA_ADDR}" \ - --silent \ - --dev \ - --dev.no-account-validation \ - & + declare -A KATANA_CONFIG=( + ["${KATANA_PORT}"]="" + ["${KATANA_OPENRPC_PORT}"]="" + ["${KATANA_NO_MINING_PORT}"]="--no-mining --dev" + ["${KATANA_NO_FEE_PORT}"]="--dev --dev.no-fee" + ["${KATANA_NO_ACCOUNT_VALIDATION_PORT}"]="--dev --dev.no-account-validation" + ) + + for PORT in "${!KATANA_CONFIG[@]}"; do + /tmp/bins/katana \ + --http.port "${PORT}" \ + --http.addr "${KATANA_ADDR}" \ + --silent \ + ${KATANA_CONFIG[$PORT]} & + done - name: Checkout katana-runner repository uses: actions/checkout@v3 diff --git a/.github/workflows/openrpc-testgen-v4.yaml b/.github/workflows/openrpc-testgen-v4.yaml index 066647e8ee..f55696dbd4 100644 --- a/.github/workflows/openrpc-testgen-v4.yaml +++ b/.github/workflows/openrpc-testgen-v4.yaml @@ -1,4 +1,4 @@ -name: openrpc-testgenv4 +name: hola-amigo on: push: From 2d69bf6f30e341eb5fa06f4a548d9d73bb66a17f Mon Sep 17 00:00:00 2001 From: Uacias Date: Thu, 12 Dec 2024 12:41:05 +0100 Subject: [PATCH 58/61] Testing new bin. --- .github/workflows/openrpc-testgen-v4.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/openrpc-testgen-v4.yaml b/.github/workflows/openrpc-testgen-v4.yaml index f55696dbd4..a6d7d8853c 100644 --- a/.github/workflows/openrpc-testgen-v4.yaml +++ b/.github/workflows/openrpc-testgen-v4.yaml @@ -1,4 +1,4 @@ -name: hola-amigo +name: quando on: push: From db136b56496d8291752dc923219b1abd8b3ed90f Mon Sep 17 00:00:00 2001 From: Uacias Date: Thu, 12 Dec 2024 13:24:01 +0100 Subject: [PATCH 59/61] final check. --- .github/workflows/openrpc-testgen-v4.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/openrpc-testgen-v4.yaml b/.github/workflows/openrpc-testgen-v4.yaml index a6d7d8853c..5c7159d6e4 100644 --- a/.github/workflows/openrpc-testgen-v4.yaml +++ b/.github/workflows/openrpc-testgen-v4.yaml @@ -1,4 +1,4 @@ -name: quando +name: final-check on: push: From 071ca373a8af15acda70b274d3cf987233e58e36 Mon Sep 17 00:00:00 2001 From: Uacias Date: Thu, 12 Dec 2024 13:58:49 +0100 Subject: [PATCH 60/61] Final. --- .github/workflows/openrpc-testgen-v4.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/openrpc-testgen-v4.yaml b/.github/workflows/openrpc-testgen-v4.yaml index 5c7159d6e4..298fa5b80b 100644 --- a/.github/workflows/openrpc-testgen-v4.yaml +++ b/.github/workflows/openrpc-testgen-v4.yaml @@ -1,4 +1,4 @@ -name: final-check +name: final on: push: From 13f7f50340e6a0bfd73dc00490a84254b9e60868 Mon Sep 17 00:00:00 2001 From: Uacias Date: Thu, 12 Dec 2024 14:17:11 +0100 Subject: [PATCH 61/61] Final version in ci.yaml. --- .github/workflows/bench.yml | 8 +- .github/workflows/cargo-udeps.yml | 9 +- .github/workflows/devcontainer.yml | 27 ++-- .github/workflows/openrpc-testgen-v4.yaml | 177 ---------------------- .github/workflows/preview.yml | 3 - .github/workflows/release-dispatch.yml | 12 +- .github/workflows/release.yml | 11 +- 7 files changed, 26 insertions(+), 221 deletions(-) delete mode 100644 .github/workflows/openrpc-testgen-v4.yaml diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index a126a3aaf9..39223eed52 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -1,12 +1,8 @@ name: benchmark -# on: - # push: - # branches: [main] - on: - workflow_dispatch: - + push: + branches: [main] permissions: # deployments permission to deploy GitHub pages website diff --git a/.github/workflows/cargo-udeps.yml b/.github/workflows/cargo-udeps.yml index 4ee746c958..656b097b03 100644 --- a/.github/workflows/cargo-udeps.yml +++ b/.github/workflows/cargo-udeps.yml @@ -1,12 +1,9 @@ name: cargo-udeps -# on: -# schedule: -# # Triggers the workflow every Sunday -# - cron: "0 18 * * 0" - on: - workflow_dispatch: + schedule: + # Triggers the workflow every Sunday + - cron: "0 18 * * 0" env: CARGO_TERM_COLOR: always diff --git a/.github/workflows/devcontainer.yml b/.github/workflows/devcontainer.yml index a9319a02c0..ce4ccc1ec7 100644 --- a/.github/workflows/devcontainer.yml +++ b/.github/workflows/devcontainer.yml @@ -1,22 +1,19 @@ name: devcontainer -# on: -# workflow_dispatch: -# inputs: -# docker_tag: -# description: Descriptive name of the devcontainer for the Docker tag -# required: true -# type: string -# push: -# paths: -# - ".devcontainer/**" -# - ".github/workflows/devcontainer.yml" -# - "!.devcontainer/devcontainer.json" -# release: -# types: [published] - on: workflow_dispatch: + inputs: + docker_tag: + description: Descriptive name of the devcontainer for the Docker tag + required: true + type: string + push: + paths: + - ".devcontainer/**" + - ".github/workflows/devcontainer.yml" + - "!.devcontainer/devcontainer.json" + release: + types: [published] jobs: build-and-push: diff --git a/.github/workflows/openrpc-testgen-v4.yaml b/.github/workflows/openrpc-testgen-v4.yaml deleted file mode 100644 index 298fa5b80b..0000000000 --- a/.github/workflows/openrpc-testgen-v4.yaml +++ /dev/null @@ -1,177 +0,0 @@ -name: final - -on: - push: - branches: - - 'feat/**' - workflow_dispatch: - -env: - CARGO_TERM_COLOR: always - RUST_VERSION: 1.80.0 - -jobs: - build: - runs-on: arc-runner-set - steps: - - name: Checkout main repository - uses: actions/checkout@v3 - - - name: Install build dependencies - run: | - sudo apt-get update - sudo apt-get install -y build-essential libclang-dev - - - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - - name: Cache Rust dependencies - uses: Swatinem/rust-cache@v2 - - - name: Build katana - run: | - cargo build --release --bin katana - mkdir -p bins - cp ./target/release/katana bins/ - - - name: Upload katana binary - uses: actions/upload-artifact@v4 - with: - name: dojo-bins - path: bins - - test: - needs: build - runs-on: arc-runner-set - env: - KATANA_ADDR: "127.0.0.1" - KATANA_PORT: "5050" - KATANA_NO_MINING_PORT: "5051" - KATANA_NO_FEE_PORT: "5052" - KATANA_NO_ACCOUNT_VALIDATION_PORT: "5053" - KATANA_OPENRPC_PORT: "5054" - PAYMASTER_PRIVATE_KEY: "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912" - PAYMASTER_ACCOUNT_ADDRESS: "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec" - UDC_ADDRESS: "0x41a78e741e5af2fec34b695679bc6891742439f7afb8484ecd7766661ad02bf" - ACCOUNT_CLASS_HASH: "0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2" - steps: - - uses: actions/checkout@v3 - - - name: Install build dependencies - run: | - sudo apt-get update - sudo apt-get install -y build-essential libclang-dev git curl bash libssl-dev pkg-config - - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - - name: Install Scarb via script - run: | - export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$PATH" - curl --proto '=https' --tlsv1.2 -sSf https://docs.swmansion.com/scarb/install.sh | bash -s -- -v 2.8.4 - echo "$HOME/.local/bin" >> $GITHUB_PATH - - - uses: actions/download-artifact@v4 - with: - name: dojo-bins - path: /tmp/bins - - - run: chmod +x /tmp/bins/katana - - - name: Start katana nodes - run: | - declare -A KATANA_CONFIG=( - ["${KATANA_PORT}"]="" - ["${KATANA_OPENRPC_PORT}"]="" - ["${KATANA_NO_MINING_PORT}"]="--no-mining --dev" - ["${KATANA_NO_FEE_PORT}"]="--dev --dev.no-fee" - ["${KATANA_NO_ACCOUNT_VALIDATION_PORT}"]="--dev --dev.no-account-validation" - ) - - for PORT in "${!KATANA_CONFIG[@]}"; do - /tmp/bins/katana \ - --http.port "${PORT}" \ - --http.addr "${KATANA_ADDR}" \ - --silent \ - ${KATANA_CONFIG[$PORT]} & - done - - - uses: actions/checkout@v3 - with: - repository: neotheprogramist/starknet-rpc-tests - path: katana-runner - - - name: Scarb build - run: | - scarb build - working-directory: katana-runner - - - name: Build openrpc-testgen-runner - run: | - cargo build --release --features "openrpc katana katana_no_mining katana_no_fee katana_no_account_validation" -p openrpc-testgen -p openrpc-testgen-runner - working-directory: katana-runner - - - name: Run Katana Suite - run: | - URLS="http://${KATANA_ADDR}:${KATANA_PORT}" - target/release/openrpc-testgen-runner \ - --urls "${URLS}" \ - --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ - --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ - --udc-address "${UDC_ADDRESS}" \ - --account-class-hash "${ACCOUNT_CLASS_HASH}" \ - --suite katana - working-directory: katana-runner - - - name: Run OpenRPC Suite - run: | - URLS="http://${KATANA_ADDR}:${KATANA_OPENRPC_PORT}" - target/release/openrpc-testgen-runner \ - --urls "${URLS}" \ - --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ - --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ - --udc-address "${UDC_ADDRESS}" \ - --account-class-hash "${ACCOUNT_CLASS_HASH}" \ - --suite open-rpc - working-directory: katana-runner - - - name: Run Katana No Mining Suite - run: | - URLS="http://${KATANA_ADDR}:${KATANA_NO_MINING_PORT}" - target/release/openrpc-testgen-runner \ - --urls "${URLS}" \ - --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ - --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ - --udc-address "${UDC_ADDRESS}" \ - --account-class-hash "${ACCOUNT_CLASS_HASH}" \ - --suite katana-no-mining - working-directory: katana-runner - - - name: Run Katana No Fee Suite - run: | - URLS="http://${KATANA_ADDR}:${KATANA_NO_FEE_PORT}" - target/release/openrpc-testgen-runner \ - --urls "${URLS}" \ - --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ - --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ - --udc-address "${UDC_ADDRESS}" \ - --account-class-hash "${ACCOUNT_CLASS_HASH}" \ - --suite katana-no-fee - working-directory: katana-runner - - - name: Run Katana No Account Validation Suite - run: | - URLS="http://${KATANA_ADDR}:${KATANA_NO_ACCOUNT_VALIDATION_PORT}" - target/release/openrpc-testgen-runner \ - --urls "${URLS}" \ - --paymaster-account-address "${PAYMASTER_ACCOUNT_ADDRESS}" \ - --paymaster-private-key "${PAYMASTER_PRIVATE_KEY}" \ - --udc-address "${UDC_ADDRESS}" \ - --account-class-hash "${ACCOUNT_CLASS_HASH}" \ - --suite katana-no-account-validation - working-directory: katana-runner - - diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index a5cf99d898..9719ce4e03 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -1,8 +1,5 @@ name: preview -# on: -# workflow_dispatch: - on: workflow_dispatch: diff --git a/.github/workflows/release-dispatch.yml b/.github/workflows/release-dispatch.yml index 2283facb30..cad83f3f33 100644 --- a/.github/workflows/release-dispatch.yml +++ b/.github/workflows/release-dispatch.yml @@ -1,14 +1,12 @@ name: release-dispatch -# on: -# workflow_dispatch: -# inputs: -# version: -# description: Version to release -# required: true -# type: string on: workflow_dispatch: + inputs: + version: + description: Version to release + required: true + type: string jobs: propose-release: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 57a7157eb8..ac5ded5a7b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,14 +1,11 @@ name: release -# on: -# workflow_dispatch: -# pull_request: -# types: [closed] -# branches: -# - main - on: workflow_dispatch: + pull_request: + types: [closed] + branches: + - main env: CARGO_TERM_COLOR: always