[5.3.x BRANCH] 5.3.x branch pre-release update (#723)

* update and versioning for v5.3.1 (#709)

* Revert "update and versioning for v5.3.1 (#709)" (#710)

This reverts commit 3d6f4b8437.

* Update working version on master (#713)

* Update working version on master

* update cargo lock

* [CONTRACTS] Contracts branch update for 1.80 (#718)

* Simple contracts restructured v3 (#675)

* Add prototype contract implementation

Lacks:
- Payment proofs (add early payment proofs)
- Tests
- Better structure

* Separate contract utilities

* Simplify the main setup/sign code flow

* Remove commented initial_sec_key assignment

* Simplify sign::compute function

* Add logic for "removal" of secret keys from the context

* Further simplify a bit sign and setup

* No need for mutable context when adding outputs

* Refactor the commented code (lol)

* Refactor a bit

* tmp

---------

Co-authored-by: oryhp <gtrphyro@gmail.com>

* contract test fixes (#676)

* [Contracts] Experimental Slate v5 (#677)

* beginning to add and modify slate version 5

* completion of conversions from V5 to V4 Slate

* timestamp and memo fields

* upgrade/downgrade serialization of v5 slates

* add v5 binary slate versions + start of tests

* add bin slate ser/deser to tests

* ensure serialization of timestamp always excludes milliseconds

* start to update v5 tests, update v5 documentation

* add fn to generate populated internal slate for conversion testing

* add basic tests to convert all slate versions

* update

* commit cargo.lock

* [WIP] [Contracts] Early payment proofs (#681)

* add types and beginnings of signature utils

* add proof serialization

* serialisation of proof data + signature operation

* add serialization type for invoice proof + separate bin wrapper version

* add witness data + serializion to invoice payment proof, insert verfication functions in place in order to begin verification testing

* tests and infrastructure in place for validation

* verification of promise sig

* added verification of promise signature, infrastructure up to the point where a signature must be subtracted

* attempting to figure out differences between recipient nonce that's getting stored and calculated recipient nonce

* implementation of witness verification function, retrieve relevant values and re-validate derived recipient partial signature

* move stored portion of invoice proof into core types for storage, need to rename invoice proof

* define/refine the stored portion of payment proofs type 2?

* Folding all proof data into tx log entry storage

* back to importing master

* remove cargo files from diffs

* remove a lot of extra debug output

* return proof witness as part of proof retrieval, define json serialization of invoice proof + witness fields

* finish adding verification steps to foreign API

* remove redundant promise sig field

* move lcation of sign/verify calls

* Replace Azure Pipelines with Github Actions (#688)

* Update CI Badge on README.MD (#690)

* Trigger CI on push and pull request (#693)

* Update versioning to 5.2.0-beta.1 against grin 5.2.0-beta.3 (#691)

* update versioning to 5.2.0-beta.1 against grin 5.2.0-beta.3

* tweak for CI trigger

---------

Co-authored-by: Quentin Le Sceller <q.lesceller@gmail.com>

---------

Co-authored-by: Quentin Le Sceller <q.lesceller@gmail.com>

* fix Cargo.lock

* Contracts - Test fixes + warning cleanups (#694)

* clean up warnings in libwallet crate

* clean up warnings in controller crate

* update all contract tests with awareness of new proof structure

* added explicit payment proof tests for both rsr and srs (#695)

* Basic mwmixnet send (#696)

* integrating onion library

* updates and changes to support newly included mwmixnet types

* add (incorrect) owner api function

* turn off test for now

* switch working grin branch to master

* fix doctests for build

* update cargo lock in attempt to fix croaring build on CI server

* update cargo lock with upstream thiserror crate

* update test dependency for croaring

* [Contracts] Add self spend transaction state (#697)

* Add self spend transaction state

* subtle errors with output states and tx lookups - fixes

* [Contracts] Slatepack v5 Deserialization fix (#698)

* add V5 deserialization test + fixes

* clarify comment

* upwrap fix during v4 deserialization

* further unwrap removal

* update cargo lock, use latest grin packages

* addition of self-spend cancel + tests (#699)

* add tests + legacy self send cancel (#702)

* [Contracts] Cancel self-spend TX Pt. 2 (#703)

* add tests + legacy self send cancel

* add missing file

* Update grin to latest master, change versioning label to include contracts (#712)

* Add owner_api_listen_interface as hidden configuration field (#714)

* updates for rust 1.80

* updates for rust 1.80

---------

Co-authored-by: oryhp <gtrphyro@gmail.com>
Co-authored-by: Quentin Le Sceller <q.lesceller@gmail.com>

* Revert "[CONTRACTS] Contracts branch update for 1.80 (#718)"

This reverts commit cdd63fb565.

* [MASTER] Updates for Rust 1.80+ (#722)

* warning fixes

* warning cleanup

* Merge 1.80 fixes from master 2

* Merge 1.80 fixes from master 3 - Cargo.lock

* version update for 5.3.3 release

---------

Co-authored-by: oryhp <gtrphyro@gmail.com>
Co-authored-by: Quentin Le Sceller <q.lesceller@gmail.com>

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "grin_wallet"
-version = "5.3.1"
+version = "5.3.3"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
 license = "Apache-2.0"
@@ -30,21 +30,21 @@ semver = "0.10"
 rustyline = "6"
 lazy_static = "1"
 
-grin_wallet_api = { path = "./api", version = "5.3.1" }
+grin_wallet_api = { path = "./api", version = "5.3.3" }
-grin_wallet_impls = { path = "./impls", version = "5.3.1" }
+grin_wallet_impls = { path = "./impls", version = "5.3.3" }
-grin_wallet_libwallet = { path = "./libwallet", version = "5.3.1" }
+grin_wallet_libwallet = { path = "./libwallet", version = "5.3.3" }
-grin_wallet_controller = { path = "./controller", version = "5.3.1" }
+grin_wallet_controller = { path = "./controller", version = "5.3.3" }
-grin_wallet_config = { path = "./config", version = "5.3.1" }
+grin_wallet_config = { path = "./config", version = "5.3.3" }
-grin_wallet_util = { path = "./util", version = "5.3.1" }
+grin_wallet_util = { path = "./util", version = "5.3.3" }
 
 
 ##### Grin Imports
 
 # For Release
-grin_core = "5.3.1"
+grin_core = "5.3.3"
-grin_keychain = "5.3.1"
+grin_keychain = "5.3.3"
-grin_util = "5.3.1"
+grin_util = "5.3.3"
-grin_api = "5.3.1"
+grin_api = "5.3.3"
 
 # For beta release
 
@@ -68,7 +68,7 @@ grin_api = "5.3.1"
 ###### 
 
 [build-dependencies]
-built = { version = "0.4", features = ["git2"]}
+built = { version = "0.7", features = ["git2"]}
 
 [dev-dependencies]
 url = "2.1"

api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "grin_wallet_api"
-version = "5.3.1"
+version = "5.3.3"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Grin Wallet API"
 license = "Apache-2.0"
@@ -22,17 +22,17 @@ ring = "0.16"
 base64 = "0.12"
 ed25519-dalek = "1.0.0-pre.4"
 
-grin_wallet_libwallet = { path = "../libwallet", version = "5.3.1" }
+grin_wallet_libwallet = { path = "../libwallet", version = "5.3.3" }
-grin_wallet_config = { path = "../config", version = "5.3.1" }
+grin_wallet_config = { path = "../config", version = "5.3.3" }
-grin_wallet_impls = { path = "../impls", version = "5.3.1" }
+grin_wallet_impls = { path = "../impls", version = "5.3.3" }
-grin_wallet_util = { path = "../util", version = "5.3.1" }
+grin_wallet_util = { path = "../util", version = "5.3.3" }
 
 ##### Grin Imports
 
 # For Release
-grin_core = "5.3.1"
+grin_core = "5.3.3"
-grin_keychain = "5.3.1"
+grin_keychain = "5.3.3"
-grin_util = "5.3.1"
+grin_util = "5.3.3"
 
 # For beta release
 

config/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "grin_wallet_config"
-version = "5.3.1"
+version = "5.3.3"
 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"
@@ -16,13 +16,13 @@ serde_derive = "1"
 toml = "0.5"
 dirs = "2.0"
 
-grin_wallet_util = { path = "../util", version = "5.3.1" }
+grin_wallet_util = { path = "../util", version = "5.3.3" }
 
 ##### Grin Imports
 
 # For Release
-grin_core = "5.3.1"
+grin_core = "5.3.3"
-grin_util = "5.3.1"
+grin_util = "5.3.3"
 
 # For beta release
 

controller/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "grin_wallet_controller"
-version = "5.3.1"
+version = "5.3.3"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Controllers for grin wallet instantiation"
 license = "Apache-2.0"
@@ -30,19 +30,19 @@ lazy_static = "1"
 thiserror = "1"
 qr_code = "1.1.0"
 
-grin_wallet_util = { path = "../util", version = "5.3.1" }
+grin_wallet_util = { path = "../util", version = "5.3.3" }
-grin_wallet_api = { path = "../api", version = "5.3.1" }
+grin_wallet_api = { path = "../api", version = "5.3.3" }
-grin_wallet_impls = { path = "../impls", version = "5.3.1" }
+grin_wallet_impls = { path = "../impls", version = "5.3.3" }
-grin_wallet_libwallet = { path = "../libwallet", version = "5.3.1" }
+grin_wallet_libwallet = { path = "../libwallet", version = "5.3.3" }
-grin_wallet_config = { path = "../config", version = "5.3.1" }
+grin_wallet_config = { path = "../config", version = "5.3.3" }
 
 ##### Grin Imports
 
 # For Release
-grin_core = "5.3.1"
+grin_core = "5.3.3"
-grin_keychain = "5.3.1"
+grin_keychain = "5.3.3"
-grin_util = "5.3.1"
+grin_util = "5.3.3"
-grin_api = "5.3.1"
+grin_api = "5.3.3"
 
 # For beta release
 
@@ -72,7 +72,7 @@ remove_dir_all = "0.7"
 ##### Grin Imports
 
 # For Release
-grin_chain = "5.3.1"
+grin_chain = "5.3.3"
 
 # For beta release
 

impls/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "grin_wallet_impls"
-version = "5.3.1"
+version = "5.3.3"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Concrete types derived from libwallet traits"
 license = "Apache-2.0"
@@ -36,19 +36,19 @@ sysinfo = "0.29"
 base64 = "0.12.0"
 url = "2.1"
 
-grin_wallet_util = { path = "../util", version = "5.3.1" }
+grin_wallet_util = { path = "../util", version = "5.3.3" }
-grin_wallet_config = { path = "../config", version = "5.3.1" }
+grin_wallet_config = { path = "../config", version = "5.3.3" }
-grin_wallet_libwallet = { path = "../libwallet", version = "5.3.1" }
+grin_wallet_libwallet = { path = "../libwallet", version = "5.3.3" }
 
 ##### Grin Imports
 
 # For Release
-grin_core = "5.3.1"
+grin_core = "5.3.3"
-grin_keychain = "5.3.1"
+grin_keychain = "5.3.3"
-grin_chain = "5.3.1"
+grin_chain = "5.3.3"
-grin_util = "5.3.1"
+grin_util = "5.3.3"
-grin_api = "5.3.1"
+grin_api = "5.3.3"
-grin_store = "5.3.1"
+grin_store = "5.3.3"
 
 # For beta release
 

impls/src/adapters/mod.rs

@@ -17,7 +17,7 @@ pub mod http;
 mod slatepack;
 
 pub use self::file::PathToSlate;
-pub use self::http::{HttpSlateSender, SchemeNotHttp};
+pub use self::http::HttpSlateSender;
 pub use self::slatepack::PathToSlatepack;
 
 use crate::config::WalletConfig;

impls/src/node_clients/resp_types.rs

@@ -15,6 +15,7 @@
 
 //! JSON RPC Types for V2 node client
 
+#[allow(dead_code)]
 #[derive(Debug, Deserialize)]
 pub struct GetTipResp {
 	pub height: u64,

libwallet/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "grin_wallet_libwallet"
-version = "5.3.1"
+version = "5.3.3"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
 license = "Apache-2.0"
@@ -36,16 +36,16 @@ bech32 = "0.7"
 byteorder = "1.3"
 num-bigint = "0.2"
 
-grin_wallet_util = { path = "../util", version = "5.3.1" }
+grin_wallet_util = { path = "../util", version = "5.3.3" }
-grin_wallet_config = { path = "../config", version = "5.3.1" }
+grin_wallet_config = { path = "../config", version = "5.3.3" }
 
 ##### Grin Imports
 
 # For Release
-grin_core = "5.3.1"
+grin_core = "5.3.3"
-grin_keychain = "5.3.1"
+grin_keychain = "5.3.3"
-grin_util = "5.3.1"
+grin_util = "5.3.3"
-grin_store = "5.3.1"
+grin_store = "5.3.3"
 
 # For beta release
 

src/build/build.rs

@@ -39,13 +39,10 @@ fn main() {
 	}
 
 	// build and versioning information
-	let mut opts = built::Options::default();
-	opts.set_dependencies(true);
 	let out_dir_path = format!("{}{}", env::var("OUT_DIR").unwrap(), "/built.rs");
 	// don't fail the build if something's missing, may just be cargo release
 	let _ = built::write_built_file_with_opts(
-		&opts,
+		Some(Path::new(env!("CARGO_MANIFEST_DIR"))),
-		Path::new(env!("CARGO_MANIFEST_DIR")),
 		Path::new(&out_dir_path),
 	);
 }

util/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "grin_wallet_util"
-version = "5.3.1"
+version = "5.3.3"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Util, for generic utilities and to re-export grin crates"
 license = "Apache-2.0"
@@ -21,7 +21,7 @@ thiserror = "1"
 ##### Grin Imports
 
 # For Release
-grin_util = "5.3.1"
+grin_util = "5.3.3"
 
 # For beta release