Skip to content

Commit b20f4a2

Browse files
authored
Merge pull request #15 from movementlabsxyz/monza
Monza
2 parents 8320c5b + 4f06ec7 commit b20f4a2

File tree

121 files changed

+18096
-125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+18096
-125
lines changed

.cargo/config.toml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
[alias]
2+
xclippy = [
3+
"clippy",
4+
"--workspace",
5+
"--all-targets",
6+
"--",
7+
"-Dwarnings",
8+
"-Wclippy::all",
9+
"-Aclippy::upper_case_acronyms",
10+
"-Aclippy::enum-variant-names",
11+
"-Aclippy::result-large-err",
12+
"-Aclippy::mutable-key-type",
13+
"-Aclippy::map_identity", # We temporarily ignore this due to: https://github.com/rust-lang/rust-clippy/issues/11764
14+
]
15+
x = "run --package aptos-cargo-cli --bin aptos-cargo-cli --"
16+
17+
[build]
18+
rustflags = ["--cfg", "tokio_unstable", "-C", "force-frame-pointers=yes", "-C", "force-unwind-tables=yes"]
19+
20+
# TODO(grao): Figure out whether we should enable other cpu features, and whether we should use a different way to configure them rather than list every single one here.
21+
[target.x86_64-unknown-linux-gnu]
22+
rustflags = ["--cfg", "tokio_unstable", "-C", "link-arg=-fuse-ld=lld", "-C", "force-frame-pointers=yes", "-C", "force-unwind-tables=yes", "-C", "target-feature=+sse4.2"]
23+
24+
# 64 bit MSVC
25+
[target.x86_64-pc-windows-msvc]
26+
rustflags = [
27+
"--cfg",
28+
"tokio_unstable",
29+
"-C",
30+
"force-frame-pointers=yes",
31+
"-C",
32+
"force-unwind-tables=yes",
33+
"-C",
34+
"link-arg=/STACK:8000000" # Set stack to 8 MB
35+
]
+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: M1 DA Light Node
2+
3+
on:
4+
push:
5+
pull_request:
6+
7+
jobs:
8+
build:
9+
runs-on: movement-runner
10+
11+
steps:
12+
- name: Checkout repository
13+
uses: actions/checkout@v3
14+
15+
- name: Install Nix
16+
uses: DeterminateSystems/nix-installer-action@main
17+
18+
- name: Run test in nix environment
19+
run: nix develop --command bash -c "just m1-da-light-node test.local"

.github/workflows/m2-ci.yml

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
name: M2 CI
2+
3+
on:
4+
push:
5+
pull_request:
6+
7+
env:
8+
CARGO_TERM_COLOR: always
9+
10+
jobs:
11+
build:
12+
runs-on: movement-runner
13+
14+
steps:
15+
- name: Checkout code
16+
uses: actions/checkout@v2
17+
18+
- name: Install build essentials
19+
run: |
20+
sudo apt-get update
21+
sudo apt-get install -y build-essential lld libpq-dev unzip
22+
sudo apt install -y pkg-config libusb-1.0-0-dev libftdi1-dev
23+
sudo apt-get install libudev-dev libdw1 libdw-dev
24+
sudo apt-get install -y protobuf-compiler
25+
26+
- name: Setup SSH
27+
run: |
28+
mkdir -p ~/.ssh
29+
echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
30+
chmod 600 ~/.ssh/id_rsa
31+
ssh-keyscan github.com >> ~/.ssh/known_hosts
32+
33+
- name: Install Rust
34+
uses: actions-rs/toolchain@v1
35+
with:
36+
toolchain: 1.75.0
37+
components: rustfmt, clippy
38+
override: true
39+
40+
- name: Cache Rust dependencies
41+
uses: actions/cache@v2
42+
with:
43+
path: ~/.cargo/registry
44+
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
45+
restore-keys: |
46+
${{ runner.os }}-cargo-
47+
48+
- name: Install risc0
49+
shell: bash
50+
run: |
51+
cargo install cargo-binstall
52+
echo -e "yes\n" | cargo binstall --github-token ${{ secrets.GITHUB_TOKEN }} cargo-risczero
53+
cargo risczero install
54+
55+
- name: cargo check
56+
run: |
57+
eval "$(ssh-agent -s)"
58+
ssh-add ~/.ssh/id_rsa
59+
export RUSTUP_HOME=$HOME/.rustup
60+
export CARGO_HOME=$HOME/.cargo
61+
export PATH=$CARGO_HOME/bin:$PATH
62+
cargo check --verbose
63+
64+
- name: cargo test
65+
run: cargo test --verbose

.github/workflows/rust.yml

-33
This file was deleted.

.gitignore

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
.DS_Store
2-
.idea/
3-
Cargo.lock
42
methods/guest/Cargo.lock
3+
.idea/
54
target/
5+
ledger_db/
6+
state_merkle_db/
7+
.etc

.gitmodules

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[submodule "protocol-units/dispute/lib/forge-std"]
2+
path = protocol-units/dispute/lib/forge-std
3+
url = https://github.com/foundry-rs/forge-std
4+
[submodule "protocol-units/eth-settlement/contracts/lib/openzeppelin-contracts"]
5+
path = protocol-units/dispute/contracts/lib/openzeppelin-contracts
6+
url = https://github.com/OpenZeppelin/openzeppelin-contracts
7+
[submodule "protocol-units/eth-settlement/lib/openzeppelin-contracts"]
8+
path = protocol-units/eth-settlement/lib/openzeppelin-contracts
9+
url = https://github.com/OpenZeppelin/openzeppelin-contracts

0 commit comments

Comments
 (0)