Skip to content

Commit

Permalink
Merge milestone/2.1.0 into master (mimblewimble#199)
Browse files Browse the repository at this point in the history
* version bump for next potential release

* Merge master into milestone/2.1.0 (mimblewimble#182)

* Derive --version output dynamically from cargo package version (mimblewimble#174)

* add --txid to the `wallet txs` command (mimblewimble#176)

* add --txid to the `wallet txs` command

* add test for `wallet txs` command with `--txid` parameter

* Refactor - Split WalletCommAdapter into multiple traits (mimblewimble#180)

* Derive --version output dynamically from cargo package version (mimblewimble#174)

* add server auth argument to http client

* Revert "add server auth argument to http client"

This reverts commit f52a8d2.

* modify WalletCommAdapter, moving dest argument into fields on implementors,
visiting havok on automated tests, at least one of which is now out of date and failing

* Split WalletCommAdapter into four traits, one for each of its intended behaviors.

* Remove two vestigals
1. args, a stringly typed argument to put_tx
2. NullAdapter, which is no longer used

* Remove unused "params" argument from listen method.

* Re-add previously existing TODO comment

* Fix non-test build

* completely Fix non-test build

* Full Lifecycle API Support (mimblewimble#184)

* refactoring wallet lib traits

* rustfmt

* rustfmt

* add new files

* explicit lifetime specifiers on all wallet traits

* rustfmt

* modify apis to use new walletinst

* rustfmt

* converting controller crate

* rustfmt

* controller crate compiling

* rustfmt

* compilation

* rustfmt

* Remove config from wallet, implement open_wallet, close_wallet in lifecycle provider, remove password + open_with_credentials from WalletBackend + impl

* rustfmt

* full compilation, changing recovery + init to new model

* rustfmt

* wallet initialisation working, init command output and flow identical to v2.0.0 wallet

* rustfmt

* fix listener and owner api startup

* rustfmt

* rustfmt

* move encryption test

* rustfmt

* fix api doctests

* rustfmt

* fix for most tests in controller crate

* rustfmt

* fix for check tests in controller crate

* fix main wallet tests

* rustfmt

* add explicit functions to handle mnemonic recovery, fix CLI recovery workflow

* rustfmt

* update keybase adapter to use new wallet format

* rustfmt

* test fix

* remove debug output
  • Loading branch information
yeastplume authored Jul 29, 2019
1 parent 7b6d597 commit c40e8a9
Show file tree
Hide file tree
Showing 54 changed files with 2,402 additions and 1,939 deletions.
57 changes: 29 additions & 28 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet"
version = "2.0.1-beta.1"
version = "2.1.0-beta.1"
authors = ["Grin Developers <[email protected]>"]
description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand Down Expand Up @@ -30,13 +30,13 @@ log = "0.4"
linefeed = "0.5"
semver = "0.9"

grin_wallet_api = { path = "./api", version = "2.0.1-beta.1" }
grin_wallet_impls = { path = "./impls", version = "2.0.1-beta.1" }
grin_wallet_libwallet = { path = "./libwallet", version = "2.0.1-beta.1" }
grin_wallet_controller = { path = "./controller", version = "2.0.1-beta.1" }
grin_wallet_config = { path = "./config", version = "2.0.1-beta.1" }
grin_wallet_api = { path = "./api", version = "2.1.0-beta.1" }
grin_wallet_impls = { path = "./impls", version = "2.1.0-beta.1" }
grin_wallet_libwallet = { path = "./libwallet", version = "2.1.0-beta.1" }
grin_wallet_controller = { path = "./controller", version = "2.1.0-beta.1" }
grin_wallet_config = { path = "./config", version = "2.1.0-beta.1" }

grin_wallet_util = { path = "./util", version = "2.0.1-beta.1" }
grin_wallet_util = { path = "./util", version = "2.1.0-beta.1" }

[build-dependencies]
built = "0.3"
10 changes: 5 additions & 5 deletions api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_api"
version = "2.0.1-beta.1"
version = "2.1.0-beta.1"
authors = ["Grin Developers <[email protected]>"]
description = "Grin Wallet API"
license = "Apache-2.0"
Expand All @@ -18,10 +18,10 @@ serde_json = "1"
easy-jsonrpc = "0.5.1"
chrono = { version = "0.4.4", features = ["serde"] }

grin_wallet_libwallet = { path = "../libwallet", version = "2.0.1-beta.1" }
grin_wallet_config = { path = "../config", version = "2.0.1-beta.1" }
grin_wallet_impls = { path = "../impls", version = "2.0.1-beta.1" }
grin_wallet_util = { path = "../util", version = "2.0.1-beta.1" }
grin_wallet_libwallet = { path = "../libwallet", version = "2.1.0-beta.1" }
grin_wallet_config = { path = "../config", version = "2.1.0-beta.1" }
grin_wallet_impls = { path = "../impls", version = "2.1.0-beta.1" }
grin_wallet_util = { path = "../util", version = "2.1.0-beta.1" }

[dev-dependencies]
serde_json = "1"
Expand Down
Loading

0 comments on commit c40e8a9

Please sign in to comment.