Skip to content

Commit

Permalink
tx log entries backwards compat fix (#242)
Browse files Browse the repository at this point in the history
  • Loading branch information
@yeastplume
yeastplume authored Oct 17, 2019
1 parent dabdea9 commit 28739e6
Show file tree
Hide file tree
Showing 9 changed files with 58 additions and 56 deletions.
56 changes: 28 additions & 28 deletions Cargo.lock
View file

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
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet"
version = "2.1.0-beta.4"
version = "2.1.0-beta.5"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
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.1.0-beta.4" }
grin_wallet_impls = { path = "./impls", version = "2.1.0-beta.4" }
grin_wallet_libwallet = { path = "./libwallet", version = "2.1.0-beta.4" }
grin_wallet_controller = { path = "./controller", version = "2.1.0-beta.4" }
grin_wallet_config = { path = "./config", version = "2.1.0-beta.4" }
grin_wallet_api = { path = "./api", version = "2.1.0-beta.5" }
grin_wallet_impls = { path = "./impls", version = "2.1.0-beta.5" }
grin_wallet_libwallet = { path = "./libwallet", version = "2.1.0-beta.5" }
grin_wallet_controller = { path = "./controller", version = "2.1.0-beta.5" }
grin_wallet_config = { path = "./config", version = "2.1.0-beta.5" }

grin_wallet_util = { path = "./util", version = "2.1.0-beta.4" }
grin_wallet_util = { path = "./util", version = "2.1.0-beta.5" }

[build-dependencies]
built = "0.3"
Expand Down
10 changes: 5 additions & 5 deletions api/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_api"
version = "2.1.0-beta.4"
version = "2.1.0-beta.5"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Grin Wallet API"
license = "Apache-2.0"
Expand All @@ -23,10 +23,10 @@ chrono = { version = "0.4.4", features = ["serde"] }
ring = "0.13"
base64 = "0.9"

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

[dev-dependencies]
serde_json = "1"
Expand Down
4 changes: 2 additions & 2 deletions config/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_config"
version = "2.1.0-beta.4"
version = "2.1.0-beta.5"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Configuration for grin wallet , a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand All @@ -16,7 +16,7 @@ serde_derive = "1"
toml = "0.4"
dirs = "1.0.3"

grin_wallet_util = { path = "../util", version = "2.1.0-beta.4" }
grin_wallet_util = { path = "../util", version = "2.1.0-beta.5" }

[dev-dependencies]
pretty_assertions = "0.5.1"
12 changes: 6 additions & 6 deletions controller/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_controller"
version = "2.1.0-beta.4"
version = "2.1.0-beta.5"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Controllers for grin wallet instantiation"
license = "Apache-2.0"
Expand Down Expand Up @@ -32,9 +32,9 @@ chrono = { version = "0.4.4", features = ["serde"] }
easy-jsonrpc-mw = "0.5.3"
lazy_static = "1"

grin_wallet_util = { path = "../util", version = "2.1.0-beta.4" }
grin_wallet_util = { path = "../util", version = "2.1.0-beta.5" }

grin_wallet_api = { path = "../api", version = "2.1.0-beta.4" }
grin_wallet_impls = { path = "../impls", version = "2.1.0-beta.4" }
grin_wallet_libwallet = { path = "../libwallet", version = "2.1.0-beta.4" }
grin_wallet_config = { path = "../config", version = "2.1.0-beta.4" }
grin_wallet_api = { path = "../api", version = "2.1.0-beta.5" }
grin_wallet_impls = { path = "../impls", version = "2.1.0-beta.5" }
grin_wallet_libwallet = { path = "../libwallet", version = "2.1.0-beta.5" }
grin_wallet_config = { path = "../config", version = "2.1.0-beta.5" }
8 changes: 4 additions & 4 deletions impls/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_impls"
version = "2.1.0-beta.4"
version = "2.1.0-beta.5"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Concrete types derived from libwallet traits"
license = "Apache-2.0"
Expand All @@ -27,6 +27,6 @@ tokio-retry = "0.1"
uuid = { version = "0.7", features = ["serde", "v4"] }
chrono = { version = "0.4.4", features = ["serde"] }

grin_wallet_util = { path = "../util", version = "2.1.0-beta.4" }
grin_wallet_config = { path = "../config", version = "2.1.0-beta.4" }
grin_wallet_libwallet = { path = "../libwallet", version = "2.1.0-beta.4" }
grin_wallet_util = { path = "../util", version = "2.1.0-beta.5" }
grin_wallet_config = { path = "../config", version = "2.1.0-beta.5" }
grin_wallet_libwallet = { path = "../libwallet", version = "2.1.0-beta.5" }
6 changes: 3 additions & 3 deletions libwallet/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_libwallet"
version = "2.1.0-beta.4"
version = "2.1.0-beta.5"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand All @@ -25,5 +25,5 @@ lazy_static = "1"
strum = "0.15"
strum_macros = "0.15"

grin_wallet_util = { path = "../util", version = "2.1.0-beta.4" }
grin_wallet_config = { path = "../config", version = "2.1.0-beta.4" }
grin_wallet_util = { path = "../util", version = "2.1.0-beta.5" }
grin_wallet_config = { path = "../config", version = "2.1.0-beta.5" }
2 changes: 2 additions & 0 deletions libwallet/src/types.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -759,9 +759,11 @@ pub struct TxLogEntry {
pub stored_tx: Option<String>,
/// Associated kernel excess, for later lookup if necessary
#[serde(with = "secp_ser::option_commitment_serde")]
#[serde(default)]
pub kernel_excess: Option<pedersen::Commitment>,
/// Height reported when transaction was created, if lookup
/// of kernel is necessary
#[serde(default)]
pub kernel_lookup_min_height: Option<u64>,
}

Expand Down
2 changes: 1 addition & 1 deletion util/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_util"
version = "2.1.0-beta.4"
version = "2.1.0-beta.5"
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
description = "Util, for generic utilities and to re-export grin crates"
license = "Apache-2.0"
Expand Down

0 comments on commit 28739e6

Please sign in to comment.