Upgrading to amplify v1.2

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", "."]

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 = ".." }