diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index ea6fd99..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "libs/ur-rs"] - path = libs/ur-rs - url = git@github.com:KeystoneHQ/ur-rs.git diff --git a/Cargo.lock b/Cargo.lock index 0665bb8..f4e87f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -44,12 +44,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "checked_int_cast" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919" - [[package]] name = "cpufeatures" version = "0.2.2" @@ -123,15 +117,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -[[package]] -name = "qrcode" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d2f1455f3630c6e5107b4f2b94e74d76dea80736de0981fd27644216cff57f" -dependencies = [ - "checked_int_cast", -] - [[package]] name = "rand_core" version = "0.6.3" @@ -203,13 +188,13 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "ur" version = "0.2.0" +source = "git+https://github.com/KeystoneHQ/ur-rs.git?rev=5f673a1#5f673a15d5f63e71b9707a0c46df60f158684b49" dependencies = [ "anyhow", "bitcoin_hashes", "crc", "hex", "once_cell", - "qrcode", "rand_xoshiro", "serde", "serde_cbor", diff --git a/Cargo.toml b/Cargo.toml index eaa67ae..27b5c72 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,9 @@ [workspace] members = [ "libs/*" -] \ No newline at end of file +] + +[workspace.dependencies.ur] +git = "https://github.com/KeystoneHQ/ur-rs.git" +rev = "5f673a1" +version = "0.2.0" diff --git a/libs/ur-registry-ffi/Cargo.toml b/libs/ur-registry-ffi/Cargo.toml index 20b69dd..91ffad7 100644 --- a/libs/ur-registry-ffi/Cargo.toml +++ b/libs/ur-registry-ffi/Cargo.toml @@ -8,9 +8,9 @@ edition = "2021" [dependencies] hex = "0.4.3" secp256k1 = "0.24.0" -ur = { path = "../ur-rs" } ur-registry = { path = "../ur-registry" } +ur = { workspace = true } [lib] name = "ur_registry_ffi" -crate-type = ["cdylib", "staticlib"] \ No newline at end of file +crate-type = ["cdylib", "staticlib"] diff --git a/libs/ur-registry/Cargo.toml b/libs/ur-registry/Cargo.toml index e02d6e9..64385e7 100644 --- a/libs/ur-registry/Cargo.toml +++ b/libs/ur-registry/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ur = {path = "../ur-rs"} serde_cbor = "0.11.2" hex = "0.4.3" -bs58 = {version = "0.4.0", features=['check']} \ No newline at end of file +bs58 = { version = "0.4.0", features=['check'] } +ur = { workspace = true } diff --git a/libs/ur-rs b/libs/ur-rs deleted file mode 160000 index 5f673a1..0000000 --- a/libs/ur-rs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5f673a15d5f63e71b9707a0c46df60f158684b49