Skip to content

Commit 6a7a261

Browse files
authored
Merge pull request #12 from Yakuhito/the_merge
DA MERGE (The Other Side)
2 parents 4495af3 + 9bc7455 commit 6a7a261

File tree

141 files changed

+641
-16349
lines changed

Some content is hidden

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

141 files changed

+641
-16349
lines changed

.github/workflows/rust.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ jobs:
3535
- name: Run tests
3636
run: cargo tarpaulin --release --workspace --all-features --out xml
3737

38-
- name: Log costs
39-
run: cat *.costs
40-
4138
- name: Cleanup coverage reports
4239
run: rm -f cobertura.xml
4340

Cargo.lock

Lines changed: 41 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ clvmr = "0.14.0"
1212
chia = "0.26.0"
1313
clvm-traits = "0.26.0"
1414
chia-puzzle-types = "0.26.0"
15-
hex-literal = "0.4.1"
16-
bip39 = "2.2.0"
1715
getrandom = "0.3.2"
1816
serde = { version = "1.0.219", features = ["derive"] }
1917
serde_json = "1.0.140"
@@ -32,7 +30,7 @@ futures-util = "0.3.31"
3230
axum = { version = "0.8.3", features = ["macros"]}
3331
tower-http = { version = "0.6.2", features = ["cors"] }
3432
futures = "0.3.31"
35-
chia-wallet-sdk = { git = "https://github.com/xch-dev/chia-wallet-sdk.git", rev = "2a056f03b92077fc0ce808ca2e7c01d707d04c43", features=["offer-compression"] }
33+
chia-wallet-sdk = { git = "https://github.com/xch-dev/chia-wallet-sdk.git", rev="1199e568df1d8a77a824e166d674a1e913bef211", features=["offer-compression", "action-layer"] }
3634
sage-api = { version = "0.10.3", git = "https://github.com/xch-dev/sage.git" }
3735
chia-puzzles = "0.20.1"
3836

puzzles/actions/reward_distributor/add_incentives.clsp

Lines changed: 0 additions & 60 deletions
This file was deleted.

puzzles/actions/reward_distributor/add_incentives.clsp.hex

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)