github-jwinterm/grin-wallet
1
0
Fork 0
mirror of https://github.com/jwinterm/grin-wallet.git synced 2026-10-17 07:11:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge 2.0.0 branch into master (#164)

Browse Source 
* create 2.0.0 branch

* V0/V1 Slate Removal + Grin Header Version Bump (#140)

* Remove V0 and V1 Slates from Wallet

* rustfmt

* V1 API + V2 wallet to wallet impl (#144)

* remove v1 API

* rustfmt

* convert http adapter to use V2 api

* rustfmt

* V2 API conversion Pt2 - Check version (#146)

* call check_version on wallet before http send

* rustfmt

* Support new Bulletproof rewind scheme (#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 (#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 (#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 (#162)

* add appropriate error message when other wallet is out of date

* rustfmt

* missing cargo.lock
This commit is contained in:
Yeastplume
2019-06-27 10:41:05 +01:00
committed by GitHub
parent c7a00478aa
commit 64e8c48c35
37 changed files with 935 additions and 4061 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controller/Cargo.toml
+6 -6
View File
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_controller"
version = "1.1.1-beta.1"
version = "2.0.0-beta.2"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Controllers for grin wallet instantiation"
license = "Apache-2.0"
@@ -32,9 +32,9 @@ chrono = { version = "0.4.4", features = ["serde"] }
easy-jsonrpc = "0.5.1"
lazy_static = "1"
grin_wallet_util = { path = "../util", version = "1.1.1-beta.1" }
grin_wallet_util = { path = "../util", version = "2.0.0-beta.2" }
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_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_config = { path = "../config", version = "2.0.0-beta.2" }