Dusty release 1.2.0 (#195)

* Bump version

* Fix BTC lock script duration sanity check

* Fix code format

* Fix version

bin/node/cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "plasm-cli"
-version = "1.1.0"
+version = "1.2.0"
 authors = ["Stake Technologies <[email protected]>"]
 description = "Plasm node implementation in Rust."
 build = "build.rs"

bin/node/cli/lockdrop-oracle/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lockdrop-oracle"
-version = "1.1.0"
+version = "1.2.0"
 authors = ["Stake Technologies <[email protected]>"]
 edition = "2018"
 

bin/node/cli/lockdrop-oracle/src/btc_utils.rs

@@ -13,17 +13,21 @@ fn bip68_encode(blocks: u32) -> u32 {
 }
 
 /// Compile BTC sequence lock script for givent public key and duration in blocks.
-pub fn lock_script(public: &ecdsa::Public, duration: u32) -> Script {
-    let public_key = PublicKey::from_slice(public.as_ref()).unwrap();
-    let blocks = bip68_encode(duration) as i64;
-    let script = bitcoin_script! {
-        <blocks>
-        OP_CSV
-        OP_DROP
-        <public_key>
-        OP_CHECKSIG
-    };
-    script.to_p2sh()
+pub fn lock_script(public: &ecdsa::Public, duration: u32) -> Result<Script, String> {
+    if duration > 0 && duration < 65535 {
+        let public_key = PublicKey::from_slice(public.as_ref()).unwrap();
+        let blocks = bip68_encode(duration) as i64;
+        let script = bitcoin_script! {
+            <blocks>
+            OP_CSV
+            OP_DROP
+            <public_key>
+            OP_CHECKSIG
+        };
+        Ok(script.to_p2sh())
+    } else {
+        return Err("Lock duration sanity check failed".to_string());
+    }
 }
 
 pub fn to_address(public: &ecdsa::Public) -> String {
@@ -42,8 +46,13 @@ mod tests {
         let public = ecdsa::Public::from_slice(
             &hex!["038ea27103fb646a2cea9eca9080737e0b23640caaaef2853416c9b286b353313e"][..],
         );
+        assert_eq!(
+            lock_script(&public, 0),
+            Err("Lock duration sanity check failed".to_string())
+        );
+
         let duration = 10;
-        let script = lock_script(&public, duration);
+        let script = lock_script(&public, duration).unwrap();
         let address = Address::from_script(&script, Network::Testnet).unwrap();
         assert_eq!(address.to_string(), "2MuJcWGWe8XkPc6h7pt6vQDyaTwDZxKJZ8p");
     }

bin/node/cli/lockdrop-oracle/src/lib.rs

@@ -81,7 +81,8 @@ pub async fn start(config: Config) {
 
             // assembly bitcoin script for given params
             let blocks = (lock.duration / 600) as u32;
-            let lock_script = btc_utils::lock_script(&lock.public_key, blocks);
+            let lock_script = btc_utils::lock_script(&lock.public_key, blocks)
+                .map_err(|e| tide::Error::from_str(tide::StatusCode::BadRequest, e))?;
             log::debug!(
                 target: "lockdrop-oracle",
                 "Lock script address for public ({}), duration({}): {}",

bin/node/primitives/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "plasm-primitives"
-version = "1.1.0"
+version = "1.2.0"
 authors = ["Stake Technologies <[email protected]>"]
 edition = "2018"
 

bin/node/rpc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "plasm-rpc"
-version = "1.1.0"
+version = "1.2.0"
 authors = ["Stake Technologies <[email protected]>"]
 edition = "2018"
 

bin/node/runtime/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "plasm-runtime"
-version = "1.1.0"
+version = "1.2.0"
 authors = ["Stake Technologies <[email protected]>"]
 edition = "2018"
 build = "build.rs"

bin/node/runtime/src/lib.rs

@@ -67,8 +67,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     // and set impl_version to equal spec_version. If only runtime
     // implementation changes and behavior does not, then leave spec_version as
     // is and increment impl_version.
-    spec_version: 2,
-    impl_version: 2,
+    spec_version: 3,
+    impl_version: 3,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 1,
 };

bin/subkey/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "subkey"
-version = "1.1.0"
+version = "1.2.0"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"