Skip to content

Commit

Permalink
Merge branch 'rooch-network:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
nlyrthiia authored Sep 22, 2024
2 parents 9c20e78 + 3ed1227 commit 06a90ae
Show file tree
Hide file tree
Showing 106 changed files with 33,578 additions and 394 deletions.
4 changes: 4 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@ rustflags = [
"-C",
"link-arg=/STACK:8000000" # Set stack to 8 MB
]

[alias]
wasm = "build --target wasm32-unknown-unknown --release"
wasm-debug = "build --target wasm32-unknown-unknown"
4 changes: 1 addition & 3 deletions .github/workflows/deploy_mainnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,4 @@ jobs:
"cd /root/rooch && git fetch origin && git checkout -B $BRANCH origin/$BRANCH || git checkout $BRANCH && bash scripts/deploy_rooch_mainnet.sh \
'${{ env.REF }}' \
'${{ secrets.BTC_MAIN_RPC_URL }}' \
'${{ secrets.BTC_MAIN_RPC_PWD }}' \
'${{ secrets.OPENDA_GCP_MAINNET_BUCKET }}' \
'${{ secrets.OPENDA_GCP_MAINNET_CREDENTIAL }}'"
'${{ secrets.BTC_MAIN_RPC_PWD }}'"
183 changes: 173 additions & 10 deletions Cargo.lock

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

6 changes: 5 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ members = [
"frameworks/moveos-stdlib",
"frameworks/rooch-framework",
"frameworks/rooch-nursery",
"examples/bitseed_generator",
]

default-members = [
Expand All @@ -67,6 +68,10 @@ default-members = [
"crates/rooch-oracle"
]

exclude = [
"generator/rust",
]

# All workspace members should inherit these keys
# for package declarations.
[workspace.package]
Expand Down Expand Up @@ -200,7 +205,6 @@ reqwest = { version = "0.12", features = ["json"] }
schemars = { version = "0.8.21", features = ["either"] }
serde = { version = "1.0.210", features = ["derive", "rc"] }
serde_bytes = "0.11.15"
#serde_json = { version = "1.0.111", features = ["preserve_order", "arbitrary_precision"] }
serde_json = { version = "1.0.127", features = ["preserve_order"] }
serde_yaml = "0.9"
serde_repr = "0.1"
Expand Down
Loading

0 comments on commit 06a90ae

Please sign in to comment.