diff --git a/Cargo.toml b/Cargo.toml index 4607875..b89c2a3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,11 +26,11 @@ resolver = "2" strata-bridge-agent = { path = "crates/agent" } strata-bridge-btcio = { path = "crates/btcio" } strata-bridge-db = { path = "crates/db" } +strata-bridge-guest-builder = { path = "bridge-proofs" } strata-bridge-primitives = { path = "crates/primitives" } strata-bridge-tx-graph = { path = "crates/tx-graph" } strata-proofimpl-bitvm-bridge = { path = "crates/proof-impl/bitvm-bridge" } strata-test-utils = { path = "crates/test-utils" } -strata-bridge-guest-builder = { path = "bridge-proofs" } # deps from original strata repo shrex = { git = "/~https://github.com/alpenlabs/strata.git", branch = "fix/add-getters-for-withdrawal-info-fields", features = [ diff --git a/bin/bridge-demo/Cargo.toml b/bin/bridge-demo/Cargo.toml index a5cb358..228c502 100644 --- a/bin/bridge-demo/Cargo.toml +++ b/bin/bridge-demo/Cargo.toml @@ -4,20 +4,20 @@ version = "0.1.0" edition = "2021" [dependencies] -rand = { workspace = true } -strata-bridge-tx-graph = { workspace = true } -bitvm = { workspace = true } -bitcoin = { workspace = true } -ark-std = { workspace = true } ark-bn254 = { workspace = true } -ark-groth16 = { workspace = true } -ark-relations = { workspace = true } -ark-ff = { workspace = true } -ark-ec = { workspace = true } ark-crypto-primitives = { workspace = true } +ark-ec = { workspace = true } +ark-ff = { workspace = true } +ark-groth16 = { workspace = true } ark-r1cs-std = { workspace = true } +ark-relations = { workspace = true } +ark-std = { workspace = true } +bitcoin = { workspace = true } bitcoin-script = { workspace = true } bitcoin-scriptexec = { workspace = true } +bitvm = { workspace = true } +rand = { workspace = true } +strata-bridge-tx-graph = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } diff --git a/bin/bridge-demo/src/signer/mod.rs b/bin/bridge-demo/src/signer/mod.rs index e69de29..8b13789 100644 --- a/bin/bridge-demo/src/signer/mod.rs +++ b/bin/bridge-demo/src/signer/mod.rs @@ -0,0 +1 @@ + diff --git a/bridge-proofs/guest-bridge/Cargo.lock b/bridge-proofs/guest-bridge/Cargo.lock index 87e28b9..cc2e0e0 100644 --- a/bridge-proofs/guest-bridge/Cargo.lock +++ b/bridge-proofs/guest-bridge/Cargo.lock @@ -3199,7 +3199,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strata-bridge-tx-builder" version = "0.1.0" -source = "git+/~https://github.com/alpenlabs/strata.git?branch=releases/0.1.0#b7078bd625a178b4ab93491e5c8cbfbaaa8a3ba8" +source = "git+/~https://github.com/alpenlabs/strata.git?branch=fix/add-getters-for-withdrawal-info-fields#96369d954c1529a9daa4c07aa4cedf8163132674" dependencies = [ "bitcoin", "lazy_static", @@ -3212,7 +3212,7 @@ dependencies = [ [[package]] name = "strata-crypto" version = "0.1.0" -source = "git+/~https://github.com/alpenlabs/strata.git?branch=releases/0.1.0#b7078bd625a178b4ab93491e5c8cbfbaaa8a3ba8" +source = "git+/~https://github.com/alpenlabs/strata.git?branch=fix/add-getters-for-withdrawal-info-fields#96369d954c1529a9daa4c07aa4cedf8163132674" dependencies = [ "borsh", "secp256k1", @@ -3223,7 +3223,7 @@ dependencies = [ [[package]] name = "strata-primitives" version = "0.1.0" -source = "git+/~https://github.com/alpenlabs/strata.git?branch=releases/0.1.0#b7078bd625a178b4ab93491e5c8cbfbaaa8a3ba8" +source = "git+/~https://github.com/alpenlabs/strata.git?branch=fix/add-getters-for-withdrawal-info-fields#96369d954c1529a9daa4c07aa4cedf8163132674" dependencies = [ "anyhow", "arbitrary", @@ -3261,7 +3261,7 @@ dependencies = [ [[package]] name = "strata-state" version = "0.1.0" -source = "git+/~https://github.com/alpenlabs/strata.git?branch=releases/0.1.0#b7078bd625a178b4ab93491e5c8cbfbaaa8a3ba8" +source = "git+/~https://github.com/alpenlabs/strata.git?branch=fix/add-getters-for-withdrawal-info-fields#96369d954c1529a9daa4c07aa4cedf8163132674" dependencies = [ "arbitrary", "bitcoin", @@ -3282,7 +3282,7 @@ dependencies = [ [[package]] name = "strata-zkvm" version = "0.1.0" -source = "git+/~https://github.com/alpenlabs/strata.git?branch=releases/0.1.0#b7078bd625a178b4ab93491e5c8cbfbaaa8a3ba8" +source = "git+/~https://github.com/alpenlabs/strata.git?branch=fix/add-getters-for-withdrawal-info-fields#96369d954c1529a9daa4c07aa4cedf8163132674" dependencies = [ "anyhow", "arbitrary", diff --git a/crates/primitives/src/scripts/parse_witness.rs b/crates/primitives/src/scripts/parse_witness.rs index 14549ed..e0b4d74 100644 --- a/crates/primitives/src/scripts/parse_witness.rs +++ b/crates/primitives/src/scripts/parse_witness.rs @@ -1,5 +1,4 @@ use bitvm::{ - groth16::g16, signatures::wots::{wots160, wots256}, treepp::*, };