mirror of
https://github.com/mimblewimble/grin-wallet.git
synced 2025-01-20 19:11:09 +03:00
Remove grin lib re-exports from util crate (#661)
* updated util and libwallet with thiserror * update impl crate to thiserror * api crate converted to thiserror * update of controller crate to thiserror * update final bin + tests to thiserror * update unused import * remove failure derive * reset import of grin to master * update cargo lock * update from master * remove grin libs re-export from util crate :( * temp local * point code at bleeding edge grin master branch
This commit is contained in:
Yeastplume
GitHub
parent
64cab53b1b
commit
8384a3ebb0
49 changed files with 398 additions and 211 deletions
180
Cargo.lock
generated
180
Cargo.lock
generated
|
|
@ -236,7 +236,7 @@ dependencies = [
|
|||
"lazycell",
|
||||
"log",
|
||||
"peeking_take_while",
|
||||
"proc-macro2 1.0.40",
|
||||
"proc-macro2 1.0.42",
|
||||
"quote 1.0.20",
|
||||
"regex",
|
||||
"rustc-hash",
|
||||
|
|
@ -386,9 +386,9 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
|
|||
|
||||
[[package]]
|
||||
name = "bytes"
|
||||
version = "1.1.0"
|
||||
version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
|
||||
checksum = "f0b3de4a0c5e67e16066a0715723abd91edc2f9001d09c46e1dca929351e130e"
|
||||
|
||||
[[package]]
|
||||
name = "cargo-lock"
|
||||
|
|
@ -602,9 +602,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "crossbeam-channel"
|
||||
version = "0.5.5"
|
||||
version = "0.5.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c"
|
||||
checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"crossbeam-utils",
|
||||
|
|
@ -612,9 +612,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "crossbeam-deque"
|
||||
version = "0.8.1"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
|
||||
checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"crossbeam-epoch",
|
||||
|
|
@ -623,9 +623,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "crossbeam-epoch"
|
||||
version = "0.9.9"
|
||||
version = "0.9.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d"
|
||||
checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1"
|
||||
dependencies = [
|
||||
"autocfg 1.1.0",
|
||||
"cfg-if 1.0.0",
|
||||
|
|
@ -637,9 +637,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "crossbeam-utils"
|
||||
version = "0.8.10"
|
||||
version = "0.8.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7d82ee10ce34d7bc12c2122495e7593a9c41347ecdd64185af4ecf72cb1a7f83"
|
||||
checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"once_cell",
|
||||
|
|
@ -647,9 +647,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "crypto-common"
|
||||
version = "0.1.5"
|
||||
version = "0.1.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2ccfd8c0ee4cce11e45b3fd6f9d5e69e0cc62912aa6a0cb1bf4617b0eba5a12f"
|
||||
checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
|
||||
dependencies = [
|
||||
"generic-array 0.14.5",
|
||||
"typenum",
|
||||
|
|
@ -943,9 +943,9 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
|
|||
|
||||
[[package]]
|
||||
name = "fastrand"
|
||||
version = "1.7.0"
|
||||
version = "1.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
|
||||
checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
|
||||
dependencies = [
|
||||
"instant",
|
||||
]
|
||||
|
|
@ -1126,7 +1126,7 @@ version = "0.3.21"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
|
||||
dependencies = [
|
||||
"proc-macro2 1.0.40",
|
||||
"proc-macro2 1.0.42",
|
||||
"quote 1.0.20",
|
||||
"syn 1.0.98",
|
||||
]
|
||||
|
|
@ -1210,9 +1210,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gimli"
|
||||
version = "0.26.1"
|
||||
version = "0.26.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
|
||||
checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
|
||||
|
||||
[[package]]
|
||||
name = "git2"
|
||||
|
|
@ -1438,6 +1438,10 @@ dependencies = [
|
|||
"built",
|
||||
"clap",
|
||||
"easy-jsonrpc-mw",
|
||||
"grin_api",
|
||||
"grin_core",
|
||||
"grin_keychain",
|
||||
"grin_util",
|
||||
"grin_wallet_api",
|
||||
"grin_wallet_config",
|
||||
"grin_wallet_controller",
|
||||
|
|
@ -1467,6 +1471,9 @@ dependencies = [
|
|||
"chrono",
|
||||
"easy-jsonrpc-mw",
|
||||
"ed25519-dalek",
|
||||
"grin_core",
|
||||
"grin_keychain",
|
||||
"grin_util",
|
||||
"grin_wallet_config",
|
||||
"grin_wallet_impls",
|
||||
"grin_wallet_libwallet",
|
||||
|
|
@ -1486,6 +1493,8 @@ name = "grin_wallet_config"
|
|||
version = "5.2.0-alpha.1"
|
||||
dependencies = [
|
||||
"dirs 2.0.2",
|
||||
"grin_core",
|
||||
"grin_util",
|
||||
"grin_wallet_util",
|
||||
"pretty_assertions",
|
||||
"rand 0.6.5",
|
||||
|
|
@ -1502,6 +1511,11 @@ dependencies = [
|
|||
"easy-jsonrpc-mw",
|
||||
"ed25519-dalek",
|
||||
"futures 0.3.21",
|
||||
"grin_api",
|
||||
"grin_chain",
|
||||
"grin_core",
|
||||
"grin_keychain",
|
||||
"grin_util",
|
||||
"grin_wallet_api",
|
||||
"grin_wallet_config",
|
||||
"grin_wallet_impls",
|
||||
|
|
@ -1536,6 +1550,12 @@ dependencies = [
|
|||
"data-encoding",
|
||||
"ed25519-dalek",
|
||||
"futures 0.3.21",
|
||||
"grin_api",
|
||||
"grin_chain",
|
||||
"grin_core",
|
||||
"grin_keychain",
|
||||
"grin_store",
|
||||
"grin_util",
|
||||
"grin_wallet_config",
|
||||
"grin_wallet_libwallet",
|
||||
"grin_wallet_util",
|
||||
|
|
@ -1571,6 +1591,10 @@ dependencies = [
|
|||
"chrono",
|
||||
"curve25519-dalek 2.1.3",
|
||||
"ed25519-dalek",
|
||||
"grin_core",
|
||||
"grin_keychain",
|
||||
"grin_store",
|
||||
"grin_util",
|
||||
"grin_wallet_config",
|
||||
"grin_wallet_util",
|
||||
"lazy_static",
|
||||
|
|
@ -1595,11 +1619,6 @@ version = "5.2.0-alpha.1"
|
|||
dependencies = [
|
||||
"data-encoding",
|
||||
"ed25519-dalek",
|
||||
"grin_api",
|
||||
"grin_chain",
|
||||
"grin_core",
|
||||
"grin_keychain",
|
||||
"grin_store",
|
||||
"grin_util",
|
||||
"pretty_assertions",
|
||||
"rand 0.6.5",
|
||||
|
|
@ -1631,9 +1650,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.12.2"
|
||||
version = "0.12.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "607c8a29735385251a339424dd462993c0fed8fa09d378f259377df08c126022"
|
||||
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
|
||||
|
||||
[[package]]
|
||||
name = "heck"
|
||||
|
|
@ -1688,7 +1707,7 @@ version = "0.2.8"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
|
||||
dependencies = [
|
||||
"bytes 1.1.0",
|
||||
"bytes 1.2.0",
|
||||
"fnv",
|
||||
"itoa 1.0.2",
|
||||
]
|
||||
|
|
@ -1861,7 +1880,7 @@ dependencies = [
|
|||
"i18n-embed",
|
||||
"lazy_static",
|
||||
"proc-macro-error",
|
||||
"proc-macro2 1.0.40",
|
||||
"proc-macro2 1.0.42",
|
||||
"quote 1.0.20",
|
||||
"strsim 0.10.0",
|
||||
"syn 1.0.98",
|
||||
|
|
@ -1876,7 +1895,7 @@ checksum = "0db2330e035808eb064afb67e6743ddce353763af3e0f2bdfc2476e00ce76136"
|
|||
dependencies = [
|
||||
"find-crate",
|
||||
"i18n-config",
|
||||
"proc-macro2 1.0.40",
|
||||
"proc-macro2 1.0.42",
|
||||
"quote 1.0.20",
|
||||
"syn 1.0.98",
|
||||
]
|
||||
|
|
@ -1969,9 +1988,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "js-sys"
|
||||
version = "0.3.58"
|
||||
version = "0.3.59"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27"
|
||||
checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2"
|
||||
dependencies = [
|
||||
"wasm-bindgen",
|
||||
]
|
||||
|
|
@ -2545,7 +2564,7 @@ version = "0.1.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
|
||||
dependencies = [
|
||||
"proc-macro2 1.0.40",
|
||||
"proc-macro2 1.0.42",
|
||||
"quote 1.0.20",
|
||||
"syn 1.0.98",
|
||||
]
|
||||
|
|
@ -2629,7 +2648,7 @@ checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
|
|||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"libc",
|
||||
"redox_syscall 0.2.13",
|
||||
"redox_syscall 0.2.16",
|
||||
"smallvec",
|
||||
"windows-sys",
|
||||
]
|
||||
|
|
@ -2732,7 +2751,7 @@ version = "1.0.11"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "710faf75e1b33345361201d36d04e98ac1ed8909151a017ed384700836104c74"
|
||||
dependencies = [
|
||||
"proc-macro2 1.0.40",
|
||||
"proc-macro2 1.0.42",
|
||||
"quote 1.0.20",
|
||||
"syn 1.0.98",
|
||||
]
|
||||
|
|
@ -2811,7 +2830,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
|
||||
dependencies = [
|
||||
"proc-macro-error-attr",
|
||||
"proc-macro2 1.0.40",
|
||||
"proc-macro2 1.0.42",
|
||||
"quote 1.0.20",
|
||||
"syn 1.0.98",
|
||||
"version_check",
|
||||
|
|
@ -2823,7 +2842,7 @@ version = "1.0.4"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
|
||||
dependencies = [
|
||||
"proc-macro2 1.0.40",
|
||||
"proc-macro2 1.0.42",
|
||||
"quote 1.0.20",
|
||||
"version_check",
|
||||
]
|
||||
|
|
@ -2839,9 +2858,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.40"
|
||||
version = "1.0.42"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7"
|
||||
checksum = "c278e965f1d8cf32d6e0e96de3d3e79712178ae67986d9cf9151f51e95aac89b"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
|
@ -2873,7 +2892,7 @@ version = "1.0.20"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
|
||||
dependencies = [
|
||||
"proc-macro2 1.0.40",
|
||||
"proc-macro2 1.0.42",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -3117,9 +3136,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
|
|||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.2.13"
|
||||
version = "0.2.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
|
||||
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
]
|
||||
|
|
@ -3142,7 +3161,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
|
||||
dependencies = [
|
||||
"getrandom 0.2.7",
|
||||
"redox_syscall 0.2.13",
|
||||
"redox_syscall 0.2.16",
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
|
|
@ -3296,7 +3315,7 @@ version = "6.2.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "94e763e24ba2bf0c72bc6be883f967f794a019fafd1b86ba1daff9c91a7edd30"
|
||||
dependencies = [
|
||||
"proc-macro2 1.0.40",
|
||||
"proc-macro2 1.0.42",
|
||||
"quote 1.0.20",
|
||||
"rust-embed-utils",
|
||||
"syn 1.0.98",
|
||||
|
|
@ -3553,9 +3572,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
|
|||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.139"
|
||||
version = "1.0.140"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0171ebb889e45aa68b44aee0859b3eede84c6f5f5c228e6f140c0b2a0a46cad6"
|
||||
checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
|
@ -3572,11 +3591,11 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.139"
|
||||
version = "1.0.140"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dc1d3230c1de7932af58ad8ffbe1d784bd55efd5a9d84ac24f69c72d83543dfb"
|
||||
checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da"
|
||||
dependencies = [
|
||||
"proc-macro2 1.0.40",
|
||||
"proc-macro2 1.0.42",
|
||||
"quote 1.0.20",
|
||||
"syn 1.0.98",
|
||||
]
|
||||
|
|
@ -3606,9 +3625,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "serde_yaml"
|
||||
version = "0.8.25"
|
||||
version = "0.8.26"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1ec0091e1f5aa338283ce049bd9dfefd55e1f168ac233e85c1ffe0038fb48cbe"
|
||||
checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
|
||||
dependencies = [
|
||||
"indexmap",
|
||||
"ryu",
|
||||
|
|
@ -3694,9 +3713,12 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
|
|||
|
||||
[[package]]
|
||||
name = "slab"
|
||||
version = "0.4.6"
|
||||
version = "0.4.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
|
||||
checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
|
||||
dependencies = [
|
||||
"autocfg 1.1.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "smallstr"
|
||||
|
|
@ -3755,7 +3777,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2 1.0.40",
|
||||
"proc-macro2 1.0.42",
|
||||
"quote 1.0.20",
|
||||
"syn 1.0.98",
|
||||
]
|
||||
|
|
@ -3789,7 +3811,7 @@ version = "1.0.98"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
|
||||
dependencies = [
|
||||
"proc-macro2 1.0.40",
|
||||
"proc-macro2 1.0.42",
|
||||
"quote 1.0.20",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
|
@ -3800,7 +3822,7 @@ version = "0.12.6"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
|
||||
dependencies = [
|
||||
"proc-macro2 1.0.40",
|
||||
"proc-macro2 1.0.42",
|
||||
"quote 1.0.20",
|
||||
"syn 1.0.98",
|
||||
"unicode-xid 0.2.3",
|
||||
|
|
@ -3830,7 +3852,7 @@ dependencies = [
|
|||
"cfg-if 1.0.0",
|
||||
"fastrand",
|
||||
"libc",
|
||||
"redox_syscall 0.2.13",
|
||||
"redox_syscall 0.2.16",
|
||||
"remove_dir_all 0.5.3",
|
||||
"winapi 0.3.9",
|
||||
]
|
||||
|
|
@ -3902,7 +3924,7 @@ version = "1.0.31"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
|
||||
dependencies = [
|
||||
"proc-macro2 1.0.40",
|
||||
"proc-macro2 1.0.42",
|
||||
"quote 1.0.20",
|
||||
"syn 1.0.98",
|
||||
]
|
||||
|
|
@ -3999,7 +4021,7 @@ version = "0.2.6"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
|
||||
dependencies = [
|
||||
"proc-macro2 1.0.40",
|
||||
"proc-macro2 1.0.42",
|
||||
"quote 1.0.20",
|
||||
"syn 1.0.98",
|
||||
]
|
||||
|
|
@ -4183,9 +4205,9 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
|
|||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.1"
|
||||
version = "1.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
|
||||
checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-normalization"
|
||||
|
|
@ -4332,9 +4354,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen"
|
||||
version = "0.2.81"
|
||||
version = "0.2.82"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994"
|
||||
checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"serde",
|
||||
|
|
@ -4344,14 +4366,14 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-backend"
|
||||
version = "0.2.81"
|
||||
version = "0.2.82"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a"
|
||||
checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f"
|
||||
dependencies = [
|
||||
"bumpalo",
|
||||
"lazy_static",
|
||||
"log",
|
||||
"proc-macro2 1.0.40",
|
||||
"once_cell",
|
||||
"proc-macro2 1.0.42",
|
||||
"quote 1.0.20",
|
||||
"syn 1.0.98",
|
||||
"wasm-bindgen-shared",
|
||||
|
|
@ -4359,9 +4381,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-futures"
|
||||
version = "0.4.31"
|
||||
version = "0.4.32"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "de9a9cec1733468a8c657e57fa2413d2ae2c0129b95e87c5b72b8ace4d13f31f"
|
||||
checksum = "fa76fb221a1f8acddf5b54ace85912606980ad661ac7a503b4570ffd3a624dad"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"js-sys",
|
||||
|
|
@ -4371,9 +4393,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro"
|
||||
version = "0.2.81"
|
||||
version = "0.2.82"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa"
|
||||
checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602"
|
||||
dependencies = [
|
||||
"quote 1.0.20",
|
||||
"wasm-bindgen-macro-support",
|
||||
|
|
@ -4381,11 +4403,11 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro-support"
|
||||
version = "0.2.81"
|
||||
version = "0.2.82"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048"
|
||||
checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da"
|
||||
dependencies = [
|
||||
"proc-macro2 1.0.40",
|
||||
"proc-macro2 1.0.42",
|
||||
"quote 1.0.20",
|
||||
"syn 1.0.98",
|
||||
"wasm-bindgen-backend",
|
||||
|
|
@ -4394,15 +4416,15 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-shared"
|
||||
version = "0.2.81"
|
||||
version = "0.2.82"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be"
|
||||
checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a"
|
||||
|
||||
[[package]]
|
||||
name = "web-sys"
|
||||
version = "0.3.58"
|
||||
version = "0.3.59"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2fed94beee57daf8dd7d51f2b15dc2bcde92d7a72304cdf662a4371008b71b90"
|
||||
checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1"
|
||||
dependencies = [
|
||||
"js-sys",
|
||||
"wasm-bindgen",
|
||||
|
|
@ -4580,9 +4602,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "zeroize"
|
||||
version = "1.5.6"
|
||||
version = "1.5.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "20b578acffd8516a6c3f2a1bdefc1ec37e547bb4e0fb8b6b01a4cafc886b4442"
|
||||
checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f"
|
||||
dependencies = [
|
||||
"zeroize_derive",
|
||||
]
|
||||
|
|
@ -4593,7 +4615,7 @@ version = "1.3.2"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17"
|
||||
dependencies = [
|
||||
"proc-macro2 1.0.40",
|
||||
"proc-macro2 1.0.42",
|
||||
"quote 1.0.20",
|
||||
"syn 1.0.98",
|
||||
"synstructure",
|
||||
|
|
|
|||
33
Cargo.toml
33
Cargo.toml
|
|
@ -35,9 +35,38 @@ grin_wallet_impls = { path = "./impls", version = "5.2.0-alpha.1" }
|
|||
grin_wallet_libwallet = { path = "./libwallet", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_controller = { path = "./controller", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_config = { path = "./config", version = "5.2.0-alpha.1" }
|
||||
|
||||
grin_wallet_util = { path = "./util", version = "5.2.0-alpha.1" }
|
||||
|
||||
|
||||
##### Grin Imports
|
||||
|
||||
# For Release
|
||||
#grin_core = "4.0.0"
|
||||
#grin_keychain = "4.0.0"
|
||||
#grin_util = "4.0.0"
|
||||
#grin_api = "4.0.0"
|
||||
|
||||
# For beta release
|
||||
|
||||
# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2"}
|
||||
# grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
|
||||
# For bleeding edge
|
||||
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
|
||||
# For local testing
|
||||
# grin_core = { path = "../grin/core"}
|
||||
# grin_keychain = { path = "../grin/keychain"}
|
||||
# grin_util = { path = "../grin/util"}
|
||||
# grin_api = { path = "../grin/api"}
|
||||
|
||||
#####
|
||||
|
||||
[build-dependencies]
|
||||
built = { version = "0.4", features = ["git2"]}
|
||||
|
||||
|
|
@ -47,4 +76,4 @@ serde = "1"
|
|||
serde_derive = "1"
|
||||
serde_json = "1"
|
||||
remove_dir_all = "0.7"
|
||||
easy-jsonrpc-mw = "0.5.4"
|
||||
easy-jsonrpc-mw = "0.5.4"
|
||||
|
|
@ -27,6 +27,31 @@ grin_wallet_config = { path = "../config", version = "5.2.0-alpha.1" }
|
|||
grin_wallet_impls = { path = "../impls", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_util = { path = "../util", version = "5.2.0-alpha.1" }
|
||||
|
||||
##### Grin Imports
|
||||
|
||||
# For Release
|
||||
#grin_core = "4.0.0"
|
||||
#grin_keychain = "4.0.0"
|
||||
#grin_util = "4.0.0"
|
||||
|
||||
# For beta release
|
||||
|
||||
# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2"}
|
||||
# grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
|
||||
# For bleeding edge
|
||||
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
|
||||
# For local testing
|
||||
# grin_core = { path = "../../grin/core"}
|
||||
# grin_keychain = { path = "../../grin/keychain"}
|
||||
# grin_util = { path = "../../grin/util"}
|
||||
|
||||
#####
|
||||
|
||||
[dev-dependencies]
|
||||
serde_json = "1"
|
||||
tempfile = "3.1"
|
||||
|
|
|
|||
|
|
@ -105,9 +105,9 @@ where
|
|||
///
|
||||
/// # Example
|
||||
/// ```
|
||||
/// use grin_wallet_util::grin_keychain as keychain;
|
||||
/// use grin_wallet_util::grin_util as util;
|
||||
/// use grin_wallet_util::grin_core;
|
||||
/// use grin_keychain as keychain;
|
||||
/// use grin_util as util;
|
||||
/// use grin_core;
|
||||
/// use grin_wallet_api as api;
|
||||
/// use grin_wallet_config as config;
|
||||
/// use grin_wallet_impls as impls;
|
||||
|
|
@ -456,13 +456,13 @@ where
|
|||
#[macro_export]
|
||||
macro_rules! doctest_helper_setup_doc_env_foreign {
|
||||
($wallet:ident, $wallet_config:ident) => {
|
||||
use grin_core;
|
||||
use grin_keychain as keychain;
|
||||
use grin_util as util;
|
||||
use grin_wallet_api as api;
|
||||
use grin_wallet_config as config;
|
||||
use grin_wallet_impls as impls;
|
||||
use grin_wallet_libwallet as libwallet;
|
||||
use grin_wallet_util::grin_core;
|
||||
use grin_wallet_util::grin_keychain as keychain;
|
||||
use grin_wallet_util::grin_util as util;
|
||||
|
||||
use grin_core::global;
|
||||
use keychain::ExtKeychain;
|
||||
|
|
|
|||
|
|
@ -345,14 +345,14 @@ pub fn run_doctest_foreign(
|
|||
init_invoice_tx: bool,
|
||||
) -> Result<Option<serde_json::Value>, String> {
|
||||
use easy_jsonrpc_mw::Handler;
|
||||
use grin_keychain::ExtKeychain;
|
||||
use grin_wallet_impls::test_framework::{self, LocalWalletClient, WalletProxy};
|
||||
use grin_wallet_impls::{DefaultLCProvider, DefaultWalletImpl};
|
||||
use grin_wallet_libwallet::{api_impl, WalletInst};
|
||||
use grin_wallet_util::grin_keychain::ExtKeychain;
|
||||
|
||||
use crate::core::global;
|
||||
use crate::core::global::ChainTypes;
|
||||
use grin_wallet_util::grin_util as util;
|
||||
use grin_util as util;
|
||||
|
||||
use std::sync::Arc;
|
||||
use util::Mutex;
|
||||
|
|
|
|||
|
|
@ -22,10 +22,10 @@
|
|||
#![deny(unused_mut)]
|
||||
#![warn(missing_docs)]
|
||||
|
||||
use grin_core as core;
|
||||
use grin_keychain as keychain;
|
||||
use grin_util as util;
|
||||
use grin_wallet_config as config;
|
||||
use grin_wallet_util::grin_core as core;
|
||||
use grin_wallet_util::grin_keychain as keychain;
|
||||
use grin_wallet_util::grin_util as util;
|
||||
extern crate grin_wallet_impls as impls;
|
||||
extern crate grin_wallet_libwallet as libwallet;
|
||||
|
||||
|
|
|
|||
|
|
@ -109,9 +109,9 @@ where
|
|||
///
|
||||
/// # Example
|
||||
/// ```
|
||||
/// use grin_wallet_util::grin_keychain as keychain;
|
||||
/// use grin_wallet_util::grin_util as util;
|
||||
/// use grin_wallet_util::grin_core;
|
||||
/// use grin_keychain as keychain;
|
||||
/// use grin_util as util;
|
||||
/// use grin_core;
|
||||
/// use grin_wallet_api as api;
|
||||
/// use grin_wallet_config as config;
|
||||
/// use grin_wallet_impls as impls;
|
||||
|
|
@ -2507,15 +2507,13 @@ pub fn try_slatepack_sync_workflow(
|
|||
#[macro_export]
|
||||
macro_rules! doctest_helper_setup_doc_env {
|
||||
($wallet:ident, $wallet_config:ident) => {
|
||||
use grin_core::{self, global};
|
||||
use grin_keychain as keychain;
|
||||
use grin_util as util;
|
||||
use grin_wallet_api as api;
|
||||
use grin_wallet_config as config;
|
||||
use grin_wallet_impls as impls;
|
||||
use grin_wallet_libwallet as libwallet;
|
||||
use grin_wallet_util::grin_core;
|
||||
use grin_wallet_util::grin_keychain as keychain;
|
||||
use grin_wallet_util::grin_util as util;
|
||||
|
||||
use grin_core::global;
|
||||
|
||||
use keychain::ExtKeychain;
|
||||
use tempfile::tempdir;
|
||||
|
|
|
|||
|
|
@ -2275,13 +2275,13 @@ pub fn run_doctest_owner(
|
|||
payment_proof: bool,
|
||||
) -> Result<Option<serde_json::Value>, String> {
|
||||
use easy_jsonrpc_mw::Handler;
|
||||
use grin_keychain::ExtKeychain;
|
||||
use grin_wallet_impls::test_framework::{self, LocalWalletClient, WalletProxy};
|
||||
use grin_wallet_impls::{DefaultLCProvider, DefaultWalletImpl};
|
||||
use grin_wallet_libwallet::{api_impl, WalletInst};
|
||||
use grin_wallet_util::grin_keychain::ExtKeychain;
|
||||
|
||||
use crate::core::global::ChainTypes;
|
||||
use grin_wallet_util::grin_util as util;
|
||||
use grin_util as util;
|
||||
|
||||
use std::{fs, thread};
|
||||
|
||||
|
|
|
|||
|
|
@ -18,5 +18,27 @@ dirs = "2.0"
|
|||
|
||||
grin_wallet_util = { path = "../util", version = "5.2.0-alpha.1" }
|
||||
|
||||
##### Grin Imports
|
||||
|
||||
# For Release
|
||||
#grin_core = "4.0.0"
|
||||
#grin_util = "4.0.0"
|
||||
|
||||
# For beta release
|
||||
|
||||
# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2"}
|
||||
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
|
||||
# For bleeding edge
|
||||
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
|
||||
# For local testing
|
||||
# grin_core = { path = "../../grin/core"}
|
||||
# grin_util = { path = "../../grin/util"}
|
||||
|
||||
#####
|
||||
|
||||
[dev-dependencies]
|
||||
pretty_assertions = "0.6"
|
||||
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@
|
|||
#[macro_use]
|
||||
extern crate serde_derive;
|
||||
|
||||
use grin_wallet_util::grin_core as core;
|
||||
use grin_wallet_util::grin_util as util;
|
||||
use grin_core as core;
|
||||
use grin_util as util;
|
||||
|
||||
mod comments;
|
||||
pub mod config;
|
||||
|
|
|
|||
|
|
@ -31,12 +31,58 @@ thiserror = "1"
|
|||
qr_code = "1.1.0"
|
||||
|
||||
grin_wallet_util = { path = "../util", version = "5.2.0-alpha.1" }
|
||||
|
||||
grin_wallet_api = { path = "../api", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_impls = { path = "../impls", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_libwallet = { path = "../libwallet", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_config = { path = "../config", version = "5.2.0-alpha.1" }
|
||||
|
||||
##### Grin Imports
|
||||
|
||||
# For Release
|
||||
#grin_core = "4.0.0"
|
||||
#grin_keychain = "4.0.0"
|
||||
#grin_util = "4.0.0"
|
||||
#grin_api = "4.0.0"
|
||||
|
||||
# For beta release
|
||||
|
||||
# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2"}
|
||||
# grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
|
||||
# For bleeding edge
|
||||
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
|
||||
# For local testing
|
||||
# grin_core = { path = "../../grin/core"}
|
||||
# grin_keychain = { path = "../../grin/keychain"}
|
||||
# grin_util = { path = "../../grin/util"}
|
||||
# grin_api = { path = "../../grin/api"}
|
||||
|
||||
#####
|
||||
|
||||
[dev-dependencies]
|
||||
ed25519-dalek = "1.0.0-pre.4"
|
||||
remove_dir_all = "0.7"
|
||||
remove_dir_all = "0.7"
|
||||
|
||||
##### Grin Imports
|
||||
|
||||
# For Release
|
||||
# grin_chain = "4.0.0"
|
||||
|
||||
# For beta release
|
||||
|
||||
# grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
|
||||
# For bleeding edge
|
||||
grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
|
||||
# For local testing
|
||||
# grin_chain = { path = "../../grin/chain"}
|
||||
|
||||
#####
|
||||
|
||||
|
|
|
|||
|
|
@ -21,14 +21,14 @@ extern crate prettytable;
|
|||
extern crate log;
|
||||
#[macro_use]
|
||||
extern crate lazy_static;
|
||||
use grin_api as api;
|
||||
use grin_core as core;
|
||||
use grin_keychain as keychain;
|
||||
use grin_util as util;
|
||||
use grin_wallet_api as apiwallet;
|
||||
use grin_wallet_config as config;
|
||||
use grin_wallet_impls as impls;
|
||||
use grin_wallet_libwallet as libwallet;
|
||||
use grin_wallet_util::grin_api as api;
|
||||
use grin_wallet_util::grin_core as core;
|
||||
use grin_wallet_util::grin_keychain as keychain;
|
||||
use grin_wallet_util::grin_util as util;
|
||||
|
||||
pub mod command;
|
||||
pub mod controller;
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ extern crate log;
|
|||
extern crate grin_wallet_controller as wallet;
|
||||
extern crate grin_wallet_impls as impls;
|
||||
|
||||
use grin_wallet_util::grin_core as core;
|
||||
use grin_wallet_util::grin_keychain as keychain;
|
||||
use grin_core as core;
|
||||
use grin_keychain as keychain;
|
||||
|
||||
use self::core::global;
|
||||
use self::keychain::{ExtKeychain, Keychain};
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ extern crate grin_wallet_controller as wallet;
|
|||
extern crate grin_wallet_impls as impls;
|
||||
extern crate grin_wallet_libwallet as libwallet;
|
||||
|
||||
use grin_wallet_util::grin_core as core;
|
||||
use grin_core as core;
|
||||
|
||||
use self::libwallet::{InitTxArgs, Slate};
|
||||
use impls::test_framework::{self, LocalWalletClient};
|
||||
|
|
|
|||
|
|
@ -17,12 +17,12 @@ extern crate grin_wallet_controller as wallet;
|
|||
extern crate grin_wallet_impls as impls;
|
||||
extern crate grin_wallet_util;
|
||||
|
||||
use grin_wallet_libwallet as libwallet;
|
||||
use grin_wallet_util::grin_core::core::OutputFeatures;
|
||||
use grin_wallet_util::grin_keychain::{
|
||||
use grin_core::core::OutputFeatures;
|
||||
use grin_keychain::{
|
||||
mnemonic, BlindingFactor, ExtKeychain, ExtKeychainPath, Keychain, SwitchCommitmentType,
|
||||
};
|
||||
use grin_wallet_util::grin_util::{secp, ZeroingString};
|
||||
use grin_util::{secp, ZeroingString};
|
||||
use grin_wallet_libwallet as libwallet;
|
||||
use impls::test_framework::LocalWalletClient;
|
||||
use rand::{thread_rng, Rng};
|
||||
use std::sync::atomic::Ordering;
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ extern crate log;
|
|||
extern crate grin_wallet_controller as wallet;
|
||||
extern crate grin_wallet_impls as impls;
|
||||
|
||||
use grin_wallet_util::grin_core as core;
|
||||
use grin_wallet_util::grin_util as util;
|
||||
use grin_core as core;
|
||||
use grin_util as util;
|
||||
|
||||
use self::core::consensus;
|
||||
use self::core::global;
|
||||
|
|
|
|||
|
|
@ -16,9 +16,9 @@ extern crate grin_wallet_controller as wallet;
|
|||
extern crate grin_wallet_impls as impls;
|
||||
extern crate grin_wallet_libwallet as libwallet;
|
||||
|
||||
use grin_wallet_util::grin_core as core;
|
||||
use grin_wallet_util::grin_keychain as keychain;
|
||||
use grin_wallet_util::grin_util as util;
|
||||
use grin_core as core;
|
||||
use grin_keychain as keychain;
|
||||
use grin_util as util;
|
||||
|
||||
use self::core::global;
|
||||
use self::core::global::ChainTypes;
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ extern crate log;
|
|||
extern crate grin_wallet_controller as wallet;
|
||||
extern crate grin_wallet_impls as impls;
|
||||
|
||||
use grin_core as core;
|
||||
use grin_wallet_libwallet as libwallet;
|
||||
use grin_wallet_util::grin_core as core;
|
||||
|
||||
use impls::test_framework::{self, LocalWalletClient};
|
||||
use impls::{PathToSlate, SlateGetter as _, SlatePutter as _};
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ extern crate log;
|
|||
extern crate grin_wallet_controller as wallet;
|
||||
extern crate grin_wallet_impls as impls;
|
||||
|
||||
use grin_core as core;
|
||||
use grin_wallet_libwallet as libwallet;
|
||||
use grin_wallet_util::grin_core as core;
|
||||
|
||||
use impls::test_framework::{self, LocalWalletClient};
|
||||
use libwallet::{InitTxArgs, IssueInvoiceTxArgs, Slate, SlateState};
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ extern crate log;
|
|||
extern crate grin_wallet_controller as wallet;
|
||||
extern crate grin_wallet_impls as impls;
|
||||
|
||||
use grin_wallet_util::grin_core as core;
|
||||
use grin_core as core;
|
||||
|
||||
use grin_wallet_libwallet as libwallet;
|
||||
use impls::test_framework::{self, LocalWalletClient};
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ extern crate grin_wallet_controller as wallet;
|
|||
extern crate grin_wallet_impls as impls;
|
||||
extern crate grin_wallet_libwallet as libwallet;
|
||||
|
||||
use grin_wallet_util::grin_core as core;
|
||||
use grin_core as core;
|
||||
|
||||
use self::libwallet::{InitTxArgs, Slate};
|
||||
use impls::test_framework::{self, LocalWalletClient};
|
||||
|
|
|
|||
|
|
@ -16,20 +16,20 @@
|
|||
mod common;
|
||||
|
||||
use common::{clean_output_dir, create_wallet_proxy, setup};
|
||||
use grin_chain as chain;
|
||||
use grin_core as core;
|
||||
use grin_core::core::hash::Hashed;
|
||||
use grin_core::core::Transaction;
|
||||
use grin_core::global;
|
||||
use grin_keychain::ExtKeychain;
|
||||
use grin_util::secp::key::SecretKey;
|
||||
use grin_util::Mutex;
|
||||
use grin_wallet_controller::controller::owner_single_use as owner;
|
||||
use grin_wallet_impls::test_framework::*;
|
||||
use grin_wallet_impls::{DefaultLCProvider, PathToSlate, SlatePutter};
|
||||
use grin_wallet_libwallet as libwallet;
|
||||
use grin_wallet_libwallet::api_impl::types::InitTxArgs;
|
||||
use grin_wallet_libwallet::WalletInst;
|
||||
use grin_wallet_util::grin_chain as chain;
|
||||
use grin_wallet_util::grin_core as core;
|
||||
use grin_wallet_util::grin_core::core::hash::Hashed;
|
||||
use grin_wallet_util::grin_core::core::Transaction;
|
||||
use grin_wallet_util::grin_core::global;
|
||||
use grin_wallet_util::grin_keychain::ExtKeychain;
|
||||
use grin_wallet_util::grin_util::secp::key::SecretKey;
|
||||
use grin_wallet_util::grin_util::Mutex;
|
||||
use log::error;
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
use std::sync::Arc;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ extern crate log;
|
|||
extern crate grin_wallet_controller as wallet;
|
||||
extern crate grin_wallet_impls as impls;
|
||||
|
||||
use grin_wallet_util::grin_core as core;
|
||||
use grin_core as core;
|
||||
|
||||
use grin_wallet_libwallet as libwallet;
|
||||
use impls::test_framework::{self, LocalWalletClient};
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ extern crate log;
|
|||
extern crate grin_wallet_controller as wallet;
|
||||
extern crate grin_wallet_impls as impls;
|
||||
|
||||
use grin_core as core;
|
||||
use grin_wallet_libwallet as libwallet;
|
||||
use grin_wallet_util::grin_core as core;
|
||||
|
||||
use impls::test_framework::{self, LocalWalletClient};
|
||||
use impls::{PathToSlatepack, SlatePutter as _};
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ extern crate grin_wallet_controller as wallet;
|
|||
extern crate grin_wallet_impls as impls;
|
||||
extern crate grin_wallet_libwallet as libwallet;
|
||||
|
||||
use grin_wallet_util::grin_core as core;
|
||||
use grin_core as core;
|
||||
|
||||
use self::core::core::transaction;
|
||||
use self::core::global;
|
||||
|
|
|
|||
|
|
@ -40,5 +40,42 @@ grin_wallet_util = { path = "../util", version = "5.2.0-alpha.1" }
|
|||
grin_wallet_config = { path = "../config", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_libwallet = { path = "../libwallet", version = "5.2.0-alpha.1" }
|
||||
|
||||
##### Grin Imports
|
||||
|
||||
# For Release
|
||||
#grin_core = "4.0.0"
|
||||
#grin_keychain = "4.0.0"
|
||||
#grin_chain = "4.0.0"
|
||||
#grin_util = "4.0.0"
|
||||
#grin_api = "4.0.0"
|
||||
#grin_store = "4.0.0"
|
||||
|
||||
# For beta release
|
||||
|
||||
# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2"}
|
||||
# grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
|
||||
# For bleeding edge
|
||||
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_store = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
|
||||
# For local testing
|
||||
# grin_core = { path = "../../grin/core"}
|
||||
# grin_keychain = { path = "../../grin/keychain"}
|
||||
# grin_chain = { path = "../../grin/chain"}
|
||||
# grin_util = { path = "../../grin/util"}
|
||||
# grin_api = { path = "../../grin/api"}
|
||||
# grin_store = { path = "../../grin/store"}
|
||||
|
||||
#####
|
||||
|
||||
[dev-dependencies]
|
||||
"remove_dir_all" = "0.7"
|
||||
|
|
@ -101,7 +101,7 @@ mod tests {
|
|||
use super::*;
|
||||
use std::fs;
|
||||
|
||||
use grin_wallet_util::grin_core::global;
|
||||
use grin_core::global;
|
||||
|
||||
fn clean_output_dir(test_dir: &str) {
|
||||
let _ = remove_dir_all::remove_dir_all(test_dir);
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@ extern crate serde_derive;
|
|||
extern crate log;
|
||||
#[macro_use]
|
||||
extern crate serde_json;
|
||||
use grin_api as api;
|
||||
use grin_chain as chain;
|
||||
use grin_core as core;
|
||||
use grin_keychain as keychain;
|
||||
use grin_store as store;
|
||||
use grin_util as util;
|
||||
use grin_wallet_libwallet as libwallet;
|
||||
use grin_wallet_util::grin_api as api;
|
||||
use grin_wallet_util::grin_chain as chain;
|
||||
use grin_wallet_util::grin_core as core;
|
||||
use grin_wallet_util::grin_keychain as keychain;
|
||||
use grin_wallet_util::grin_store as store;
|
||||
use grin_wallet_util::grin_util as util;
|
||||
|
||||
use grin_wallet_config as config;
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ use crate::lifecycle::seed::WalletSeed;
|
|||
use crate::util::secp::key::SecretKey;
|
||||
use crate::util::ZeroingString;
|
||||
use crate::LMDBBackend;
|
||||
use grin_wallet_util::grin_util::logger::LoggingConfig;
|
||||
use grin_util::logger::LoggingConfig;
|
||||
use std::fs;
|
||||
use std::path::PathBuf;
|
||||
|
||||
|
|
|
|||
|
|
@ -38,3 +38,30 @@ byteorder = "1.3"
|
|||
grin_wallet_util = { path = "../util", version = "5.2.0-alpha.1" }
|
||||
grin_wallet_config = { path = "../config", version = "5.2.0-alpha.1" }
|
||||
|
||||
##### Grin Imports
|
||||
|
||||
# For Release
|
||||
#grin_core = "4.0.0"
|
||||
#grin_keychain = "4.0.0"
|
||||
#grin_util = "4.0.0"
|
||||
|
||||
# For beta release
|
||||
|
||||
# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2"}
|
||||
# grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_stire = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
|
||||
# For bleeding edge
|
||||
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_store = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
|
||||
# For local testing
|
||||
# grin_core = { path = "../../grin/core"}
|
||||
# grin_keychain = { path = "../../grin/keychain"}
|
||||
# grin_util = { path = "../../grin/util"}
|
||||
# grin_store = { path = "../../grin/store"}
|
||||
|
||||
#####
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
use crate::grin_util::secp::key::SecretKey;
|
||||
use crate::Error;
|
||||
use grin_wallet_util::grin_keychain::{ChildNumber, Identifier, Keychain, SwitchCommitmentType};
|
||||
use grin_keychain::{ChildNumber, Identifier, Keychain, SwitchCommitmentType};
|
||||
|
||||
use crate::blake2::blake2b::blake2b;
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,8 @@ use crate::grin_core::core::{committed, transaction};
|
|||
use crate::grin_core::libtx;
|
||||
use crate::grin_keychain;
|
||||
use crate::grin_util::secp;
|
||||
use crate::util::{self, grin_store};
|
||||
use crate::util;
|
||||
use grin_store;
|
||||
|
||||
/// Wallet errors, mostly wrappers around underlying crypto or I/O errors.
|
||||
#[derive(Clone, Eq, PartialEq, Debug, thiserror::Error, Serialize, Deserialize)]
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ use ed25519_dalek::PublicKey as DalekPublicKey;
|
|||
use ed25519_dalek::SecretKey as DalekSecretKey;
|
||||
use ed25519_dalek::Signature as DalekSignature;
|
||||
use ed25519_dalek::{Signer, Verifier};
|
||||
use grin_wallet_util::grin_core::core::FeeFields;
|
||||
use grin_core::core::FeeFields;
|
||||
|
||||
// static for incrementing test UUIDs
|
||||
lazy_static! {
|
||||
|
|
|
|||
|
|
@ -23,9 +23,10 @@
|
|||
#![warn(missing_docs)]
|
||||
|
||||
use grin_wallet_config as config;
|
||||
use grin_wallet_util::grin_core;
|
||||
use grin_wallet_util::grin_keychain;
|
||||
use grin_wallet_util::grin_util;
|
||||
|
||||
use grin_core;
|
||||
use grin_keychain;
|
||||
use grin_util;
|
||||
|
||||
use grin_wallet_util as util;
|
||||
|
||||
|
|
|
|||
|
|
@ -493,8 +493,8 @@ fn slate_v4_serialize_deserialize() {
|
|||
use crate::grin_util::from_hex;
|
||||
use crate::grin_util::secp::key::PublicKey;
|
||||
use crate::Slate;
|
||||
use grin_wallet_util::grin_core::global::{set_local_chain_type, ChainTypes};
|
||||
use grin_wallet_util::grin_keychain::{ExtKeychain, Keychain, SwitchCommitmentType};
|
||||
use grin_core::global::{set_local_chain_type, ChainTypes};
|
||||
use grin_keychain::{ExtKeychain, Keychain, SwitchCommitmentType};
|
||||
set_local_chain_type(ChainTypes::Mainnet);
|
||||
let slate = Slate::blank(1, false);
|
||||
let mut v4 = SlateV4::from(slate);
|
||||
|
|
|
|||
|
|
@ -21,7 +21,8 @@
|
|||
// Finally add armor framing and space/newline formatting as desired
|
||||
|
||||
use crate::Error;
|
||||
use grin_wallet_util::{byte_ser, grin_core::global::max_tx_weight};
|
||||
use grin_core::global::max_tx_weight;
|
||||
use grin_wallet_util::byte_ser;
|
||||
use regex::Regex;
|
||||
use sha2::{Digest, Sha256};
|
||||
use std::str;
|
||||
|
|
|
|||
|
|
@ -12,15 +12,15 @@
|
|||
// limitations under the License.
|
||||
|
||||
//! core::libtx specific tests
|
||||
use grin_wallet_libwallet::Context;
|
||||
use grin_wallet_util::grin_core::core::transaction;
|
||||
use grin_wallet_util::grin_core::core::FeeFields;
|
||||
use grin_wallet_util::grin_core::libtx::{aggsig, proof};
|
||||
use grin_wallet_util::grin_keychain::{
|
||||
use grin_core::core::transaction;
|
||||
use grin_core::core::FeeFields;
|
||||
use grin_core::libtx::{aggsig, proof};
|
||||
use grin_keychain::{
|
||||
BlindSum, BlindingFactor, ExtKeychain, ExtKeychainPath, Keychain, SwitchCommitmentType,
|
||||
};
|
||||
use grin_wallet_util::grin_util::secp;
|
||||
use grin_wallet_util::grin_util::secp::key::{PublicKey, SecretKey};
|
||||
use grin_util::secp;
|
||||
use grin_util::secp::key::{PublicKey, SecretKey};
|
||||
use grin_wallet_libwallet::Context;
|
||||
use rand::thread_rng;
|
||||
|
||||
fn kernel_sig_msg() -> secp::Message {
|
||||
|
|
|
|||
|
|
@ -22,10 +22,10 @@ use crate::config::ConfigError;
|
|||
use crate::core::global;
|
||||
use crate::util::init_logger;
|
||||
use clap::App;
|
||||
use grin_core as core;
|
||||
use grin_util as util;
|
||||
use grin_wallet_config as config;
|
||||
use grin_wallet_impls::HTTPNodeClient;
|
||||
use grin_wallet_util::grin_core as core;
|
||||
use grin_wallet_util::grin_util as util;
|
||||
use std::env;
|
||||
use std::path::PathBuf;
|
||||
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@ use crate::util::secp::key::SecretKey;
|
|||
use crate::util::Mutex;
|
||||
use clap::App;
|
||||
//use colored::Colorize;
|
||||
use grin_keychain as keychain;
|
||||
use grin_wallet_api::Owner;
|
||||
use grin_wallet_config::{TorConfig, WalletConfig};
|
||||
use grin_wallet_controller::command::GlobalArgs;
|
||||
use grin_wallet_controller::Error;
|
||||
use grin_wallet_impls::DefaultWalletImpl;
|
||||
use grin_wallet_libwallet::{NodeClient, StatusMessage, WalletInst, WalletLCProvider};
|
||||
use grin_wallet_util::grin_keychain as keychain;
|
||||
use rustyline::completion::{Completer, FilenameCompleter, Pair};
|
||||
use rustyline::error::ReadlineError;
|
||||
use rustyline::highlight::{Highlighter, MatchingBracketHighlighter};
|
||||
|
|
|
|||
|
|
@ -20,15 +20,15 @@ use crate::util::secp::key::SecretKey;
|
|||
use crate::util::{Mutex, ZeroingString};
|
||||
/// Argument parsing and error handling for wallet commands
|
||||
use clap::ArgMatches;
|
||||
use grin_core as core;
|
||||
use grin_core::core::amount_to_hr_string;
|
||||
use grin_keychain as keychain;
|
||||
use grin_wallet_api::Owner;
|
||||
use grin_wallet_config::{config_file_exists, TorConfig, WalletConfig};
|
||||
use grin_wallet_controller::{command, Error};
|
||||
use grin_wallet_impls::{DefaultLCProvider, DefaultWalletImpl};
|
||||
use grin_wallet_libwallet::{self, Slate, SlatepackAddress, SlatepackArmor};
|
||||
use grin_wallet_libwallet::{IssueInvoiceTxArgs, NodeClient, WalletInst, WalletLCProvider};
|
||||
use grin_wallet_util::grin_core as core;
|
||||
use grin_wallet_util::grin_core::core::amount_to_hr_string;
|
||||
use grin_wallet_util::grin_keychain as keychain;
|
||||
use linefeed::terminal::Signal;
|
||||
use linefeed::{Interface, ReadResult};
|
||||
use rpassword;
|
||||
|
|
|
|||
|
|
@ -16,9 +16,9 @@ extern crate lazy_static;
|
|||
#[macro_use]
|
||||
extern crate clap;
|
||||
|
||||
use grin_api as api;
|
||||
use grin_util as util;
|
||||
use grin_wallet_config as config;
|
||||
use grin_wallet_util::grin_api as api;
|
||||
use grin_wallet_util::grin_util as util;
|
||||
|
||||
mod cli;
|
||||
pub mod cmd;
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@ use clap::App;
|
|||
use std::thread;
|
||||
use std::time::Duration;
|
||||
|
||||
use grin_keychain::ExtKeychain;
|
||||
use grin_wallet_impls::DefaultLCProvider;
|
||||
use grin_wallet_util::grin_keychain::ExtKeychain;
|
||||
|
||||
mod common;
|
||||
use common::{clean_output_dir, execute_command, initial_setup_wallet, instantiate_wallet, setup};
|
||||
|
|
|
|||
|
|
@ -14,9 +14,9 @@
|
|||
//! Common functions for wallet integration tests
|
||||
extern crate grin_wallet;
|
||||
|
||||
use grin_util as util;
|
||||
use grin_wallet_config as config;
|
||||
use grin_wallet_impls::test_framework::LocalWalletClient;
|
||||
use grin_wallet_util::grin_util as util;
|
||||
|
||||
use clap::{App, ArgMatches};
|
||||
use std::path::PathBuf;
|
||||
|
|
@ -24,17 +24,17 @@ use std::sync::Arc;
|
|||
use std::{env, fs};
|
||||
use util::{Mutex, ZeroingString};
|
||||
|
||||
use grin_core::global::{self, ChainTypes};
|
||||
use grin_keychain::ExtKeychain;
|
||||
use grin_util::{from_hex, static_secp_instance};
|
||||
use grin_wallet_api::{EncryptedRequest, EncryptedResponse, JsonId};
|
||||
use grin_wallet_config::{GlobalWalletConfig, WalletConfig, GRIN_WALLET_DIR};
|
||||
use grin_wallet_impls::{DefaultLCProvider, DefaultWalletImpl};
|
||||
use grin_wallet_libwallet::{NodeClient, WalletInfo, WalletInst};
|
||||
use grin_wallet_util::grin_core::global::{self, ChainTypes};
|
||||
use grin_wallet_util::grin_keychain::ExtKeychain;
|
||||
use grin_wallet_util::grin_util::{from_hex, static_secp_instance};
|
||||
use util::secp::key::{PublicKey, SecretKey};
|
||||
|
||||
use grin_api as api;
|
||||
use grin_wallet::cmd::wallet_args;
|
||||
use grin_wallet_util::grin_api as api;
|
||||
|
||||
use serde::de::DeserializeOwned;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
|
|
|||
|
|
@ -26,10 +26,10 @@ use clap::App;
|
|||
use std::thread;
|
||||
use std::time::Duration;
|
||||
|
||||
use grin_keychain::ExtKeychain;
|
||||
use grin_util::secp::key::SecretKey;
|
||||
use grin_util::{from_hex, static_secp_instance};
|
||||
use grin_wallet_impls::DefaultLCProvider;
|
||||
use grin_wallet_util::grin_keychain::ExtKeychain;
|
||||
use grin_wallet_util::grin_util::secp::key::SecretKey;
|
||||
use grin_wallet_util::grin_util::{from_hex, static_secp_instance};
|
||||
use serde_json;
|
||||
|
||||
#[macro_use]
|
||||
|
|
|
|||
|
|
@ -26,12 +26,12 @@ use clap::App;
|
|||
use std::thread;
|
||||
use std::time::Duration;
|
||||
|
||||
use grin_keychain::ExtKeychain;
|
||||
use grin_wallet_impls::DefaultLCProvider;
|
||||
use grin_wallet_libwallet::{InitTxArgs, Slate, SlateVersion, VersionedSlate};
|
||||
use grin_wallet_util::grin_keychain::ExtKeychain;
|
||||
use serde_json;
|
||||
|
||||
use grin_wallet_util::grin_util::Mutex;
|
||||
use grin_util::Mutex;
|
||||
use std::path::PathBuf;
|
||||
use std::sync::Arc;
|
||||
|
||||
|
|
|
|||
|
|
@ -25,10 +25,10 @@ use clap::App;
|
|||
use std::thread;
|
||||
use std::time::Duration;
|
||||
|
||||
use grin_keychain::ExtKeychain;
|
||||
use grin_wallet_impls::DefaultLCProvider;
|
||||
use grin_wallet_util::grin_keychain::ExtKeychain;
|
||||
|
||||
use grin_wallet_util::grin_util as util;
|
||||
use grin_util as util;
|
||||
|
||||
#[macro_use]
|
||||
mod common;
|
||||
|
|
|
|||
|
|
@ -18,38 +18,23 @@ data-encoding = "2"
|
|||
sha3 = "0.8"
|
||||
thiserror = "1"
|
||||
|
||||
##### Grin Imports
|
||||
|
||||
# For Release
|
||||
#grin_core = "4.0.0"
|
||||
#grin_keychain = "4.0.0"
|
||||
#grin_chain = "4.0.0"
|
||||
#grin_util = "4.0.0"
|
||||
#grin_api = "4.0.0"
|
||||
#grin_store = "4.0.0"
|
||||
|
||||
# For beta release
|
||||
|
||||
# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2"}
|
||||
# grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
# grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
|
||||
|
||||
# For bleeding edge
|
||||
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_store = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
|
||||
|
||||
# For local testing
|
||||
# grin_core = { path = "../../grin/core"}
|
||||
# grin_keychain = { path = "../../grin/keychain"}
|
||||
# grin_chain = { path = "../../grin/chain"}
|
||||
|
||||
# grin_util = { path = "../../grin/util"}
|
||||
# grin_api = { path = "../../grin/api"}
|
||||
# grin_store = { path = "../../grin/store"}
|
||||
|
||||
#####
|
||||
|
||||
[dev-dependencies]
|
||||
pretty_assertions = "0.6"
|
||||
|
|
|
|||
|
|
@ -29,10 +29,3 @@ pub use ov3::OnionV3Error as OnionV3AddressError;
|
|||
|
||||
#[allow(missing_docs)]
|
||||
pub mod byte_ser;
|
||||
|
||||
pub use grin_api;
|
||||
pub use grin_chain;
|
||||
pub use grin_core;
|
||||
pub use grin_keychain;
|
||||
pub use grin_store;
|
||||
pub use grin_util;
|
||||
|
|
|
|||
|
|
@ -12,10 +12,10 @@
|
|||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
use crate::grin_util::from_hex;
|
||||
use data_encoding::BASE32;
|
||||
use ed25519_dalek::PublicKey as DalekPublicKey;
|
||||
use ed25519_dalek::SecretKey as DalekSecretKey;
|
||||
use grin_util::from_hex;
|
||||
use sha3::{Digest, Sha3_256};
|
||||
use std::convert::TryFrom;
|
||||
use std::fmt;
|
||||
|
|
|
|||
Loading…
Reference in a new issue