Skip to content

Commit

Permalink
Merge branch 'main' into notlesh/merge-in-orchestrator-repo
Browse files Browse the repository at this point in the history
  • Loading branch information
notlesh committed Jan 22, 2025
2 parents 0d7df60 + 88ed67c commit bd1b71b
Show file tree
Hide file tree
Showing 73 changed files with 5,686 additions and 1,534 deletions.
4 changes: 3 additions & 1 deletion .db-versions.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
current_version: 0
current_version: 1
versions:
- version: 1
pr: 450
- version: 0
pr: 372
4 changes: 2 additions & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
with:
toolchain: 1.81

- uses: Swatinem/rust-cache@v2 # use a different cache key as coverae uses custom rustc args
- uses: Swatinem/rust-cache@v2 # use a different cache key as coverage uses custom rustc args
with:
cache-provider: buildjet
key: "coverage"
Expand All @@ -49,7 +49,7 @@ jobs:
cargo build --bin madara --profile dev
export COVERAGE_BIN=$(realpath target/debug/madara)
rm -f target/madara-* lcov.info
cargo test --profile dev --workspace -- --test-threads=1
cargo test --profile dev --workspace
- name: Generate coverage info
run: |
Expand Down
15 changes: 12 additions & 3 deletions .github/workflows/db-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,23 @@ on:
workflow_call:

jobs:
db-check:
runs-on: ubuntu-latest
steps:
- run: echo "Checking DB Version"

update-db-version:
runs-on: ubuntu-latest
if: contains(github.event.pull_request.labels.*.name, 'db-migration')
permissions:
contents: write
steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.head_ref || github.ref_name }}

- name: Install yq
run: sudo apt-get install -y yq
uses: mikefarah/yq@master

- name: Check if PR already bumped
id: check_bump
Expand All @@ -40,7 +49,7 @@ jobs:
if: steps.check_bump.outputs.already_bumped == 'false'
run: |
if [[ -n "$(git status --porcelain)" ]]; then
git add .db-versions.toml
git add .db-versions.yml
git commit -m "chore: bump db version"
git push origin HEAD
git push origin ${{ github.head_ref || github.ref_name }}
fi
8 changes: 7 additions & 1 deletion .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,13 @@ jobs:
toml-lint:
runs-on: ubuntu-latest
steps:
- name: Download taplo
run: |
curl -L https://github.com/tamasfe/taplo/releases/download/0.9.3/taplo-linux-x86_64.gz -o taplo.gz
gunzip taplo.gz
chmod +x taplo
mv taplo /usr/local/bin/taplo
- name: Checkout toml files
uses: actions/checkout@v4
- name: Run toml check
run: npx @taplo/[email protected] fmt --config ./taplo/taplo.toml --check
run: taplo fmt --config ./taplo/taplo.toml --check
5 changes: 1 addition & 4 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ concurrency:
cancel-in-progress: true

permissions:
contents: write
pull-requests: write

jobs:
Expand All @@ -22,7 +23,6 @@ jobs:
linters:
name: Run linters
needs: update_db_version
if: ${{ always() }}
uses: ./.github/workflows/linters.yml

rust_check:
Expand All @@ -38,18 +38,15 @@ jobs:
coverage:
name: Run Coverage
needs: update_db_version
if: ${{ always() }}
secrets: inherit
uses: ./.github/workflows/coverage.yml

build:
name: Build Madara
needs: update_db_version
if: ${{ always() }}
uses: ./.github/workflows/build.yml

js_test:
name: Run JS Tests
needs: build
if: ${{ always() }}
uses: ./.github/workflows/starknet-js-test.yml
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ madara.log
starknet-e2e-test/contracts/cache
starknet-e2e-test/contracts/build

# proptest report
**/proptest-regressions/

# vscode settings
.vscode/settings.json

Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Next release

- fix(primitives): limit legacy class sizes
- fix(block_production): dynamic block closing now adds special address with prev block hash
- fix(rpc): call, simulate, estimate rpcs executed on top of the block, not at the start of it
- fix(compilation): crate-level compilation
Expand Down
61 changes: 19 additions & 42 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -239,11 +239,11 @@ bincode = "1.3"
fdlimit = "0.3.0"
proptest = "1.5.0"
proptest-derive = "0.5.0"
proptest-state-machine = "0.3.1"
dotenv = "0.15.0"
httpmock = "0.7.0"
tempfile = "3.10.1"
mockall = "0.13.0"
serial_test = "3.1.1"
itertools = "0.13.0"
regex = "1.10.5"
bytes = "1.6.0"
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ WORKDIR /usr/src/madara/
# Copy the source code into the container
COPY Cargo.toml Cargo.lock ./
COPY crates crates
COPY .db-versions.yml .db-versions.yml ./
COPY cairo-artifacts cairo-artifacts

# Install runtime dependencies
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ Here is a list of all the supported methods with their current status:
| ------ | ------------------------------------------------ |
|| `starknet_unsubscribe` (v0.8.0) |
|| `starknet_subscribeNewHeads` (v0.8.0) |
| | `starknet_subscribeEvents` (v0.8.0) |
| | `starknet_subscribeEvents` (v0.8.0) |
|| `starknet_subscribeTransactionStatus` (v0.8.0) |
|| `starknet_subscribePendingTransactions` (v0.8.0) |
|| `starknet_subscriptionReorg` (v0.8.0) |
Expand Down
Loading

0 comments on commit bd1b71b

Please sign in to comment.