From f648eab20839232e51e9b7ae981cf1dcbd1fc4db Mon Sep 17 00:00:00 2001
From: Dr Maxim Orlovsky <orlovsky@pandoracore.com>
Date: Fri, 9 Oct 2020 03:49:57 +0200
Subject: [PATCH] Upgrading to amplify v1.2

---
 Cargo.lock        | 24 +++++++++++++++---------
 Cargo.toml        | 13 +++++--------
 derive/Cargo.toml |  2 +-
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ab0ee974..b66e52f7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -17,8 +17,9 @@ dependencies = [
 
 [[package]]
 name = "amplify"
-version = "1.1.1"
-source = "git+https://github.com/LNP-BP/rust-amplify?branch=develop#0a8178b684e409aee72eb7a388004922466ddbcb"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f0ebe1cc10cc8b2665dd077e7f076b644e94f33577289ee61c7669d75286753"
 dependencies = [
  "async-trait",
  "ed25519-dalek",
@@ -29,9 +30,9 @@ dependencies = [
 
 [[package]]
 name = "amplify_derive"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6e85a39efb3a9220c0e6e23ad97868b2b8e056a26ee6cef2d752468c98cc6c6"
+checksum = "57f080656cc1eb3d55c2446813e6197293f5d43b4cf52ffb1f6cb5ca18e0ac0b"
 dependencies = [
  "amplify",
  "quote 1.0.7",
@@ -688,6 +689,15 @@ dependencies = [
  "openssl-sys",
 ]
 
+[[package]]
+name = "openssl-src"
+version = "111.11.0+1.1.1h"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "380fe324132bea01f45239fadfec9343adb044615f29930d039bec1ae7b9fa5b"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "openssl-sys"
 version = "0.9.58"
@@ -697,6 +707,7 @@ dependencies = [
  "autocfg 1.0.1",
  "cc",
  "libc",
+ "openssl-src",
  "pkg-config",
  "vcpkg",
 ]
@@ -1413,8 +1424,3 @@ dependencies = [
  "libc",
  "metadeps",
 ]
-
-[[patch.unused]]
-name = "torut"
-version = "0.1.5"
-source = "git+https://github.com/LNP-BP/torut?branch=develop#91d918c1175ff32bf656461c949ccadd0de767a0"
diff --git a/Cargo.toml b/Cargo.toml
index 00336c13..c720878c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,8 +33,8 @@ crate-type = ["dylib", "rlib", "staticlib"]
 [dependencies]
 # Dependencies on other LNP/BP repositories
 # -----------------------------------------
-amplify = "~1.1.0" # This project does not have any non-optional dependencies
-amplify_derive = "~1.1.1"
+amplify = "~1.2.0" # This project does not have any non-optional dependencies
+amplify_derive = "~1.2.0"
 lnpbp_derive = { path = "derive" }
 # Dependencies on core rust-bitcoin ecosystem projects
 # ----------------------------------------------------
@@ -86,7 +86,7 @@ async-trait = { version = "~0.1.30", optional = true }
 [dev-dependencies]
 miniscript = { version = "~2.0.0", features = ["compiler"] }
 bitcoin = { version = "~0.25.0", branch = "develop", features = ["rand"] }
-torut = { version = "~0.1.5", features = ["v2", "v3"] }
+torut = { version = "~0.1.6", features = ["v2", "v3"] }
 
 # Forked dependencies
 # -------------------
@@ -107,10 +107,6 @@ bitcoin_hashes = { git = "https://github.com/LNP-BP/bitcoin_hashes", tag = "lnpb
 lightning = { git = "https://github.com/LNP-BP/rust-lightning", branch = "develop", optional = true }
 # No changes here, just need to import forked `bitcoin` library
 miniscript = { git = "https://github.com/LNP-BP/rust-miniscript", branch = "develop" }
-# We can remove these two after <https://github.com/LNP-BP/rust-amplify/pull/21>
-# TODO: (new) remove them before 1.0 release
-amplify = { git = "https://github.com/LNP-BP/rust-amplify", branch = "develop" }
-torut = { git = "https://github.com/LNP-BP/torut", branch = "develop" }
 
 # Features
 # ========
@@ -127,7 +123,7 @@ all = [
        # Cryptographic optionals
        "keygen", "elgamal",
        # Networking
-       "tor", "url", "websockets"]
+       "tor", "url", "websockets", "vendored_openssl"]
 # High-level library components
 # -----------------------------
 lnp = ["lightning", "async", "zmq"]
@@ -146,6 +142,7 @@ elgamal = [] # Provides ElGamal encryption module from this library
 # ----------
 websockets = [] # Used only by LNP
 tor = ["amplify/tor"] # Exposes dependency feature
+vendored_openssl = ["torut/vendored_openssl"]
 
 [workspace]
 members = ["derive", "."]
diff --git a/derive/Cargo.toml b/derive/Cargo.toml
index 4ae9b8f0..b2556fc0 100644
--- a/derive/Cargo.toml
+++ b/derive/Cargo.toml
@@ -16,7 +16,7 @@ proc-macro = true
 [dependencies]
 quote = "~1.0.7"
 syn = "~1.0.31"
-amplify = "~1.1.0"
+amplify = "~1.2.0"
 
 [dev-dependencies]
 lnpbp = { path = ".." }