forked from mimblewimble/grin-wallet
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge 2.0.0 branch into master (mimblewimble#164)
* create 2.0.0 branch * V0/V1 Slate Removal + Grin Header Version Bump (mimblewimble#140) * Remove V0 and V1 Slates from Wallet * rustfmt * V1 API + V2 wallet to wallet impl (mimblewimble#144) * remove v1 API * rustfmt * convert http adapter to use V2 api * rustfmt * V2 API conversion Pt2 - Check version (mimblewimble#146) * call check_version on wallet before http send * rustfmt * Support new Bulletproof rewind scheme (mimblewimble#122) * Restore with LegacyProofBuilder * Switch to ProofBuilder at HF block * Switch proof builder for coinbase outputs at hard fork * Use valid_header_version to switch proof builder * Fix compilation errors * Use legacy proof builder for AutomatedTesting chain type * Add macro to avoid duplicate code * Read version info from server, react accordingly (mimblewimble#154) * read and parse version, bump hf * rustfmt * add foreign api middleware check * rustfmt * add middleware checks * rustfmt * add check for incoming pre-hf slates * api tests * Add double rewind period (mimblewimble#155) * Add double rewind period * Simplify restore * Fix comment * bump imported version for beta release * version bump for next (potential) release * Provide more specific error when other wallet is outdated (mimblewimble#162) * add appropriate error message when other wallet is out of date * rustfmt * missing cargo.lock
- Loading branch information
1 parent
d70b977
commit 5134780
Showing
37 changed files
with
927 additions
and
4,053 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
[package] | ||
name = "grin_wallet" | ||
version = "1.1.1-beta.1" | ||
version = "2.0.0-beta.2" | ||
authors = ["Grin Developers <[email protected]>"] | ||
description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." | ||
license = "Apache-2.0" | ||
|
@@ -28,14 +28,15 @@ failure_derive = "0.1" | |
prettytable-rs = "0.7" | ||
log = "0.4" | ||
linefeed = "0.5" | ||
semver = "0.9" | ||
|
||
grin_wallet_api = { path = "./api", version = "1.1.1-beta.1" } | ||
grin_wallet_impls = { path = "./impls", version = "1.1.1-beta.1" } | ||
grin_wallet_libwallet = { path = "./libwallet", version = "1.1.1-beta.1" } | ||
grin_wallet_controller = { path = "./controller", version = "1.1.1-beta.1" } | ||
grin_wallet_config = { path = "./config", version = "1.1.1-beta.1" } | ||
grin_wallet_api = { path = "./api", version = "2.0.0-beta.2" } | ||
grin_wallet_impls = { path = "./impls", version = "2.0.0-beta.2" } | ||
grin_wallet_libwallet = { path = "./libwallet", version = "2.0.0-beta.2" } | ||
grin_wallet_controller = { path = "./controller", version = "2.0.0-beta.2" } | ||
grin_wallet_config = { path = "./config", version = "2.0.0-beta.2" } | ||
|
||
grin_wallet_util = { path = "./util", version = "1.1.1-beta.1" } | ||
grin_wallet_util = { path = "./util", version = "2.0.0-beta.2" } | ||
|
||
[build-dependencies] | ||
built = "0.3" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
[package] | ||
name = "grin_wallet_api" | ||
version = "1.1.1-beta.1" | ||
version = "2.0.0-beta.2" | ||
authors = ["Grin Developers <[email protected]>"] | ||
description = "Grin Wallet API" | ||
license = "Apache-2.0" | ||
|
@@ -18,11 +18,10 @@ serde_json = "1" | |
easy-jsonrpc = "0.5.1" | ||
chrono = { version = "0.4.4", features = ["serde"] } | ||
|
||
grin_wallet_libwallet = { path = "../libwallet", version = "1.1.1-beta.1" } | ||
grin_wallet_config = { path = "../config", version = "1.1.1-beta.1" } | ||
grin_wallet_impls = { path = "../impls", version = "1.1.1-beta.1" } | ||
|
||
grin_wallet_util = { path = "../util", version = "1.1.1-beta.1" } | ||
grin_wallet_libwallet = { path = "../libwallet", version = "2.0.0-beta.2" } | ||
grin_wallet_config = { path = "../config", version = "2.0.0-beta.2" } | ||
grin_wallet_impls = { path = "../impls", version = "2.0.0-beta.2" } | ||
grin_wallet_util = { path = "../util", version = "2.0.0-beta.2" } | ||
|
||
[dev-dependencies] | ||
serde_json = "1" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.