Skip to content

Commit

Permalink
Merge branch 'deoxys/l1' into deoxys/prod
Browse files Browse the repository at this point in the history
  • Loading branch information
antiyro committed Dec 1, 2023
2 parents 2ed5853 + c790170 commit 909425e
Show file tree
Hide file tree
Showing 330 changed files with 2,851 additions and 580,432 deletions.
4 changes: 2 additions & 2 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"projectName": "madara",
"projectOwner": "keep-starknet-strange",
"projectName": "deoxys",
"projectOwner": "kasarlabs",
"repoType": "github",
"repoHost": "https://github.com",
"files": ["README.md"],
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/starknet-js-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ jobs:
./target/release/madara setup --chain=dev --from-local=configs
- name: Run starknet-js test
run: |-
./target/release/madara --dev --execution native &
NATIVE_RUN_PID=$!
./target/release/madara --dev &
MADARA_RUN_PID=$!
while ! echo exit | nc localhost 9944; do sleep 1; done
git clone https://github.com/keep-starknet-strange/sequencer-js-compatibility-tests.git
cd sequencer-js-compatibility-tests
npm install
npm test
kill $NATIVE_RUN_PID
kill $MADARA_RUN_PID
16 changes: 4 additions & 12 deletions .github/workflows/starknet-rpc-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,11 @@ jobs:
- name: Setup dev chain
run: |
./target/release/madara setup --chain=dev --from-local=configs
- name: Run rpc native test
- name: Run rpc test
run: |-
./target/release/madara --dev --sealing=manual --execution=Native &
NATIVE_RUN_PID=$!
./target/release/madara --dev --sealing=manual &
MADARA_RUN_PID=$!
while ! echo exit | nc localhost 9944; do sleep 1; done
cd starknet-rpc-test
cargo test
kill $NATIVE_RUN_PID
- name: Run rpc wasm test
run: |-
./target/release/madara --dev --sealing=manual --execution=Wasm &
WASM_RUN_PID=$!
while ! echo exit | nc localhost 9944; do sleep 1; done
cd starknet-rpc-test
cargo test
kill $WASM_RUN_PID
kill $MADARA_RUN_PID
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,10 @@
"editor.formatOnSave": false,
"[rust]": {
"editor.formatOnSave": false
},
"workbench.colorCustomizations": {
"activityBar.background": "#093338",
"titleBar.activeBackground": "#0D474E",
"titleBar.activeForeground": "#F2FCFD"
}
}
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

## Next release

- build: update blockifier, fix divergent substrat block hash
- chore: remove tests that run in wasm and native, only wasm from now
- chore: split StarknetRpcApi trait in two, like in openRPC specs
- refacto: move starknet runtime api in it's own crate
- chore: update README.md and getting-started.md
- chore: remove crates that have been copy-pasted from plkdtSDK
- feat(rpc): return deployed contract address and actual fee in transaction
receipt
Expand Down
Loading

0 comments on commit 909425e

Please sign in to comment.