vchain_client 1.0.22 → 1.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65340391974700636c2d48e309226cae1e472797
-  data.tar.gz: 132f978b2d7e25377f9efdbc108e4f744a0d74a3
+  metadata.gz: 92c2df9b16d843b7be9c12ce8cc83f10b643e725
+  data.tar.gz: c07b86f7d21307c62cc54ccca8975b62c11b0ae0
 SHA512:
-  metadata.gz: 110cf09f708a3b23d8de059a9cbb9d14fbfbc48f7dbd4ef7a1f1a3097cb42345fc2b6ed62116fecd60553ad1f2e9a9779914991f0a9bc6602469a6205a4683f1
-  data.tar.gz: 959022c40a2975fb038ac62599bcdb320d4101d318fbe82565e3d470770171e8905fd9603356cd6836879b2bd8b717dc09ed90735d1d382967c9bff696bba78c
+  metadata.gz: 9119d354ff15ad2a38ac4392b5d9a11238a204213c71a854b126b7c9bf7f04dfccab41655d03c8e26bfdbfcf026882f8003215f6f03976d8af0f039dcb99b83f
+  data.tar.gz: 76e341ee3ca61841b8f270af8abdd331e15c42ce35cd0ba19f85db301c7677d7033bda848cc3c082a0b7269762f8794941743ece67ce886eb14888d8502137ad

data/lib/vchain_client/bitcoind_blockchain_adapter.rb

@@ -4,6 +4,8 @@ module VChainClient
 
     @log = nil
 
+    @config = nil
+
     @server = nil
     @port = nil
     @rpc_username = nil
@@ -11,12 +13,14 @@ module VChainClient
 
     @@tx_cache = {}
 
-    def initialize(server, port, rpc_username, rpc_password)
+    def initialize(server, port, rpc_username, rpc_password, config)
       @server = server
       @port = port
       @rpc_username = rpc_username
       @rpc_password = rpc_password
 
+      @config = config
+
       @log = Log4r::Logger["vchain_client"]
     end 
 
@@ -60,11 +64,16 @@ module VChainClient
         raise e
       end
 
+      confirmations_threshold = 5
+      if @config.key?("blockchain_confirmations")
+        confirmations_threshold = @config["blockchain_confirmations"]
+      end
+
       if raw_tx != nil
 
         if raw_tx.key?("confirmations")
 
-          if raw_tx["confirmations"] > 5
+          if raw_tx["confirmations"] > confirmations_threshold
 
             if raw_tx.key?("blockhash")
 

data/lib/vchain_client/blockchain_adapter_factory.rb

@@ -4,10 +4,10 @@ module VChainClient
 
   	def self.getAdapter(type, config)
   		if type == "bitcoind"
-  			return VChainClient::BitcoindBlockchainAdapter.new(config["server"], config["port"], config["rpc_username"], config["rpc_password"])
+  			return VChainClient::BitcoindBlockchainAdapter.new(config["server"], config["port"], config["rpc_username"], config["rpc_password"], config)
 
   		elsif type == "blockcypher"
-  			return VChainClient::BlockcypherBlockchainAdapter.new(config["api_token"])
+  			return VChainClient::BlockcypherBlockchainAdapter.new(config["api_token"], config)
   		end
 
       raise "No such adapter '#{type}'"

data/lib/vchain_client/blockcypher_blockchain_adapter.rb

@@ -4,11 +4,15 @@ module VChainClient
 
     @log = nil
 
+    @config = nil
+
     @api_token = nil
 
-    def initialize(api_token)
+    def initialize(api_token, config)
     	@api_token = api_token
 
+      @config = config
+
       @log = Log4r::Logger["vchain_client"]
     end 
 
@@ -73,11 +77,16 @@ module VChainClient
 
       res = JSON.parse req.body
 
+      confirmations_threshold = 5
+      if @config.key?("blockchain_confirmations")
+        confirmations_threshold = @config["blockchain_confirmations"]
+      end
+
       if res != nil
 
         if res.key?("confirmations")
 
-        	if res["confirmations"] > 5
+        	if res["confirmations"] > confirmations_threshold
 
         		if res.key?("block_hash")
 
@@ -133,7 +142,7 @@ module VChainClient
         					prefix = op_return[0..2]
 
         					if prefix == "VCH"
-        						op_return = op_return[3..op_return.length]
+        						op_return = op_return[5..op_return.length]
 
         						return {
   										"size"            => res["size"],

data/lib/vchain_client.rb

@@ -549,9 +549,8 @@ module VChainClient
           }
 
           return {
-            "status"       => "success",
-            "validated"    => result,
-            "hashed_input" => sent_document
+            "status" => "success",
+            "result" => "NO_DATA"
           }
 
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vchain_client
 version: !ruby/object:Gem::Version
-  version: 1.0.22
+  version: 1.0.23
 platform: ruby
 authors:
 - Aleksandr Gorelik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r