vchain_client 1.0.15 → 1.0.16

data/lib/vchain_client/bitcoind_blockchain_adapter.rb

@@ -9,6 +9,8 @@ module VChainClient
     @rpc_username = nil
     @rpc_password = nil
 
+    @@tx_cache = {}
+
     def initialize(server, port, rpc_username, rpc_password)
       @server = server
       @port = port
@@ -24,6 +26,14 @@ module VChainClient
 
     def getTx(txid)
 
+      if @@tx_cache.key?(txid)
+        if @log.debug?
+          @log.debug("[Bitcoind.getTx] '#{txid}' is in a cache")
+        end
+
+        return @@tx_cache[txid]
+      end
+
       if @log.debug?
         @log.debug("[Bitcoind.getTx] input:")
         @log.debug("-> txid: #{txid}")
@@ -84,14 +94,18 @@ module VChainClient
 
                   if prefix == "VCH"
 
-                    op_return = op_return[3..op_return.length]
+                    op_return = op_return[5..op_return.length]
 
-                    return {
+                    out = {
                       "size"            => raw_tx["size"],
                       "block_hash"      => raw_tx["blockhash"],
                       "block_timestamp" => raw_tx["blocktime"],
                       "op_return"       => op_return
                     }
+
+                    @@tx_cache[txid] = out
+
+                    return out
                   
                   else
                     if @log.error?

data/lib/vchain_client/blockstack_client.rb

@@ -413,6 +413,8 @@ module VChainClient
 
 	  		blockstack_path = @config["blockstack"]["path"]
 
+	  		cmd_init = blockstack_path +" set_advanced_mode on"
+
 	  		cmd = blockstack_path +" get_name_zonefile "+ blockstack_id
 
 	  		if @log.debug?
@@ -424,6 +426,8 @@ module VChainClient
 
 	  		begin 
 
+	  			`#{cmd_init}`
+
 	  			ret = `#{cmd}`
 
 	  		rescue => e

data/lib/vchain_client/signatures.rb

@@ -11,13 +11,15 @@ module VChainClient
 	    	@log = Log4r::Logger["vchain_client"]
 	    end 
 
-		def signRequest(document, timestamp)
+		def signRequest(document, point_type, weight, timestamp)
 			OpenSSL::PKey::EC.send(:alias_method, :private?, :private_key?)
 
 			priv_key_path = @config["private_key_location"]
 
 			if @log.debug?
 				@log.debug("[Signatures.signRequest] input:")
+				@log.debug("-> point_type: "+ point_type)
+				@log.debug("-> weight: "+ weight.to_s)
 				@log.debug("-> timestamp: "+ timestamp.to_s)
 				@log.debug("-> key path: #{priv_key_path}")
 				@log.debug("-> input:")
@@ -34,6 +36,8 @@ module VChainClient
 				if @log.error?
 					@log.error("[Signatures.signRequest] File.read raised exception:")
 					@log.error("#{e.class}, #{e.message}")
+					@log.error("-> point_type: "+ point_type)
+					@log.error("-> weight: "+ weight.to_s)
 					@log.error("-> timestamp: "+ timestamp.to_s)
 					@log.error("-> input:")
 					@log.error(document)
@@ -46,6 +50,8 @@ module VChainClient
 			if priv_key == nil
 				if @log.error?
 					@log.error("[Signatures.signRequest] failed to load private key")
+					@log.error("-> point_type: "+ point_type)
+					@log.error("-> weight: "+ weight.to_s)
 					@log.error("-> timestamp: "+ timestamp.to_s)
 					@log.error("-> input:")
 					@log.error(document)
@@ -69,6 +75,8 @@ module VChainClient
 				if @log.error?
 					@log.error("[Signatures.signRequest] OpenSSL::PKey::EC.new raised exception:")
 					@log.error("#{e.class}, #{e.message}")
+					@log.error("-> point_type: "+ point_type)
+					@log.error("-> weight: "+ weight.to_s)
 					@log.error("-> timestamp: "+ timestamp.to_s)
 					@log.error("-> input:")
 					@log.error(document)
@@ -81,6 +89,8 @@ module VChainClient
 			if ec == nil
 				if @log.error?
 					@log.error("[Signatures.signRequest] failed init EC key")
+					@log.error("-> point_type: "+ point_type)
+					@log.error("-> weight: "+ weight.to_s)
 					@log.error("-> timestamp: "+ timestamp.to_s)
 					@log.error("-> input:")
 					@log.error(document)
@@ -96,7 +106,7 @@ module VChainClient
 
 			digest = OpenSSL::Digest::SHA256.new
 
-			whole_sign = document.to_json + timestamp.to_s
+			whole_sign = document.to_json + point_type + weight.to_s + timestamp.to_s
 
 			if @log.debug?
 				@log.debug("[Signatures.signRequest] whole_to_sign: "+ whole_sign)
@@ -112,6 +122,8 @@ module VChainClient
 				if @log.error?
 					@log.error("[Signatures.signRequest] ec.sign raised exception:")
 					@log.error("#{e.class}, #{e.message}")
+					@log.error("-> point_type: "+ point_type)
+					@log.error("-> weight: "+ weight.to_s)
 					@log.error("-> timestamp: "+ timestamp.to_s)
 					@log.error("-> input:")
 					@log.error(document)
@@ -125,6 +137,8 @@ module VChainClient
 			if whole_signature == nil
 				if @log.error?
 					@log.error("[Signatures.signRequest] failed to sign")
+					@log.error("-> point_type: "+ point_type)
+					@log.error("-> weight: "+ weight.to_s)
 					@log.error("-> timestamp: "+ timestamp.to_s)
 					@log.error("-> input:")
 					@log.error(document)
@@ -147,13 +161,6 @@ module VChainClient
 	  		pub_key += public_key
 			pub_key += "\n-----END PUBLIC KEY-----"
 
-			if @log.debug?
-				@log.debug("[Signatures.verifySignature] input:")
-				@log.debug("-> what_to_check: #{what_to_check}")
-				@log.debug("-> signature: "+ Base64.encode64(signature))
-				@log.debug("-> public_key: "+ pub_key)
-			end
-
 			ec = nil
 
 			begin
@@ -164,9 +171,9 @@ module VChainClient
 				if @log.error?
 					@log.error("[Signatures.verifySignature] OpenSSL::PKey::EC.new raised exception:")
 					@log.error("#{e.class}, #{e.message}")
-					@log.debug("-> what_to_check: #{what_to_check}")
-					@log.debug("-> signature: "+ Base64.encode64(signature))
-					@log.debug("-> public_key: "+ pub_key)
+					@log.error("-> what_to_check: #{what_to_check}")
+					@log.error("-> signature: "+ Base64.encode64(signature))
+					@log.error("-> public_key: "+ pub_key)
 					@log.error(document)
 					@log.error("--> pub_key: #{pub_key}")
 				end
@@ -177,19 +184,15 @@ module VChainClient
 			if ec == nil
 				if @log.error?
 					@log.error("[Signatures.verifySignature] failed init EC key")
-					@log.debug("-> what_to_check: #{what_to_check}")
-					@log.debug("-> signature: "+ Base64.encode64(signature))
-					@log.debug("-> public_key: "+ pub_key)
+					@log.error("-> what_to_check: #{what_to_check}")
+					@log.error("-> signature: "+ Base64.encode64(signature))
+					@log.error("-> public_key: "+ pub_key)
 					@log.error("--> pub_key: #{pub_key}")
 				end
 
 				return false
 			end
 
-			if @log.debug?
-				@log.debug("[Signatures.verifySignature] key created")
-			end
-
 			digest = OpenSSL::Digest::SHA256.new
 
 			begin
@@ -200,9 +203,9 @@ module VChainClient
 				if @log.error?
 					@log.error("[Signatures.verifySignature] ec.verify raised exception:")
 					@log.error("#{e.class}, #{e.message}")
-					@log.debug("-> what_to_check: #{what_to_check}")
-					@log.debug("-> signature: "+ Base64.encode64(signature))
-					@log.debug("-> public_key: "+ pub_key)
+					@log.error("-> what_to_check: #{what_to_check}")
+					@log.error("-> signature: "+ Base64.encode64(signature))
+					@log.error("-> public_key: "+ pub_key)
 					@log.error(document)
 					@log.error("--> signature: "+ Base64.encode64(signature))
 					@log.error("--> what_to_check: #{what_to_check}")
@@ -212,7 +215,7 @@ module VChainClient
 			end
 	  	end
 
-	  	def signVerification(verification_type, data, timestamp)
+	  	def signDataPoint(point_type, data, doc_hash, weight, timestamp)
 
 	  		OpenSSL::PKey::EC.send(:alias_method, :private?, :private_key?)
 
@@ -220,10 +223,12 @@ module VChainClient
 	  		priv_key_path = @config["private_key_location"]
 
 			if @log.debug?
-				@log.debug("[Signatures.signVerification] input:")
+				@log.debug("[Signatures.signDataPoint] input:")
 				@log.debug("-> this_client_id: #{this_client_id}")
+				@log.debug("-> doc_hash: #{doc_hash}")
+				@log.debug("-> weight: "+ weight.to_s)
 				@log.debug("-> timestamp: "+ timestamp.to_s)
-				@log.debug("-> verification_type: #{verification_type}")
+				@log.debug("-> point_type: #{point_type}")
 				@log.debug("-> key path: #{priv_key_path}")
 				@log.debug("-> data:")
 				@log.debug(data)
@@ -237,11 +242,13 @@ module VChainClient
 
 			rescue => e
 				if @log.error?
-					@log.error("[Signatures.signVerification] File.read raised exception:")
+					@log.error("[Signatures.signDataPoint] File.read raised exception:")
 					@log.error("#{e.class}, #{e.message}")
 					@log.error("-> this_client_id: #{this_client_id}")
+					@log.error("-> doc_hash: #{doc_hash}")
+					@log.error("-> weight: "+ weight.to_s)
 					@log.error("-> timestamp: "+ timestamp.to_s)
-					@log.error("-> verification_type: #{verification_type}")
+					@log.error("-> point_type: #{point_type}")
 					@log.error("-> key path: #{priv_key_path}")
 					@log.error("-> data:")
 					@log.error(data)
@@ -253,10 +260,12 @@ module VChainClient
 
 			if priv_key == nil
 				if @log.error?
-					@log.error("[Signatures.signVerification] failed to load private key")
+					@log.error("[Signatures.signDataPoint] failed to load private key")
 					@log.error("-> this_client_id: #{this_client_id}")
+					@log.error("-> doc_hash: #{doc_hash}")
+					@log.error("-> weight: "+ weight.to_s)
 					@log.error("-> timestamp: "+ timestamp.to_s)
-					@log.error("-> verification_type: #{verification_type}")
+					@log.error("-> point_type: #{point_type}")
 					@log.error("-> key path: #{priv_key_path}")
 					@log.error("-> data:")
 					@log.error(data)
@@ -267,7 +276,7 @@ module VChainClient
 			end
 
 			if @log.debug?
-				@log.debug("[Signatures.signVerification] priv key loaded")
+				@log.debug("[Signatures.signDataPoint] priv key loaded")
 			end
 
 	  		output = {}
@@ -277,10 +286,10 @@ module VChainClient
 	  			value = rec[1]
 
 	  			if @log.debug?
-	  				@log.debug("[Signatures.signVerification] field: #{field}, value: #{value}")
+	  				@log.debug("[Signatures.signDataPoint] field: #{field}, value: #{value}")
 	  			end
 
-	  			if field != 'type' && field != 'client_id'
+	  			if field != 'client_id'
 
 	  				field_hash = Digest::SHA512.hexdigest(field)
 
@@ -288,13 +297,15 @@ module VChainClient
 
 	  				what_to_sign = field_hash
 	  				what_to_sign += value_hash
-	  				what_to_sign += verification_type
+	  				what_to_sign += Digest::SHA512.hexdigest(doc_hash)
+	  				what_to_sign += point_type
+	  				what_to_sign += weight.to_s
 	  				what_to_sign += timestamp.to_s
 	  				what_to_sign += this_client_id
 
 		  			if @log.debug?
-		  				@log.debug("[Signatures.signVerification] field_hash: #{field_hash}")
-		  				@log.debug("[Signatures.signVerification] value_hash: #{value_hash}")
+		  				@log.debug("[Signatures.signDataPoint] field_hash: #{field_hash}")
+		  				@log.debug("[Signatures.signDataPoint] value_hash: #{value_hash}")
 		  			end
 
 					ec = nil
@@ -305,11 +316,13 @@ module VChainClient
 
 					rescue => e
 						if @log.error?
-							@log.error("[Signatures.signVerification] OpenSSL::PKey::EC.new raised exception:")
+							@log.error("[Signatures.signDataPoint] OpenSSL::PKey::EC.new raised exception:")
 							@log.error("#{e.class}, #{e.message}")
 							@log.error("-> this_client_id: #{this_client_id}")
+							@log.error("-> doc_hash: #{doc_hash}")
+							@log.error("-> weight: "+ weight.to_s)
 							@log.error("-> timestamp: "+ timestamp.to_s)
-							@log.error("-> verification_type: #{verification_type}")
+							@log.error("-> point_type: #{point_type}")
 							@log.error("-> key path: #{priv_key_path}")
 							@log.error("-> data:")
 							@log.error(data)
@@ -321,10 +334,12 @@ module VChainClient
 
 					if ec == nil
 						if @log.error?
-							@log.error("[Signatures.signVerification] failed init EC key")
+							@log.error("[Signatures.signDataPoint] failed init EC key")
 							@log.error("-> this_client_id: #{this_client_id}")
+							@log.error("-> doc_hash: #{doc_hash}")
+							@log.error("-> weight: "+ weight.to_s)
 							@log.error("-> timestamp: "+ timestamp.to_s)
-							@log.error("-> verification_type: #{verification_type}")
+							@log.error("-> point_type: #{point_type}")
 							@log.error("-> key path: #{priv_key_path}")
 							@log.error("-> data:")
 							@log.error(data)
@@ -335,7 +350,7 @@ module VChainClient
 					end
 
 					if @log.debug?
-						@log.debug("[Signatures.signVerification] key created")
+						@log.debug("[Signatures.signDataPoint] key created")
 					end
 
 	  				digest = OpenSSL::Digest::SHA256.new
@@ -348,11 +363,13 @@ module VChainClient
 
 					rescue => e
 						if @log.error?
-							@log.error("[Signatures.signVerification] ec.sign raised exception:")
+							@log.error("[Signatures.signDataPoint] ec.sign raised exception:")
 							@log.error("#{e.class}, #{e.message}")
 							@log.error("-> this_client_id: #{this_client_id}")
+							@log.error("-> doc_hash: #{doc_hash}")
+							@log.error("-> weight: "+ weight.to_s)
 							@log.error("-> timestamp: "+ timestamp.to_s)
-							@log.error("-> verification_type: #{verification_type}")
+							@log.error("-> point_type: #{point_type}")
 							@log.error("-> key path: #{priv_key_path}")
 							@log.error("-> data:")
 							@log.error(data)
@@ -365,10 +382,12 @@ module VChainClient
 
 					if signature == nil
 						if @log.error?
-							@log.error("[Signatures.signVerification] failed to sign")
+							@log.error("[Signatures.signDataPoint] failed to sign")
 							@log.error("-> this_client_id: #{this_client_id}")
+							@log.error("-> doc_hash: #{doc_hash}")
+							@log.error("-> weight: "+ weight.to_s)
 							@log.error("-> timestamp: "+ timestamp.to_s)
-							@log.error("-> verification_type: #{verification_type}")
+							@log.error("-> point_type: #{point_type}")
 							@log.error("-> key path: #{priv_key_path}")
 							@log.error("-> data:")
 							@log.error(data)
@@ -380,7 +399,7 @@ module VChainClient
 					end
 
 					if @log.debug?
-						@log.debug("[Signatures.signVerification] signature raw: "+ Base64.encode64(signature))
+						@log.debug("[Signatures.signDataPoint] signature raw: "+ Base64.encode64(signature))
 					end
 
 	  				output[field] = Base64.encode64(signature).gsub(/\n/, "")
@@ -389,7 +408,7 @@ module VChainClient
 	  		}
 
 			if @log.debug?
-				@log.debug("[Signatures.signVerification] output:")
+				@log.debug("[Signatures.signDataPoint] output:")
 				@log.debug(output)
 			end
 
@@ -442,13 +461,15 @@ module VChainClient
 		    end
 	    end
 
-	    def checkVerificationSignature(field_hash, data_hash, verification_type, timestamp, blockstack_client_id, pubkey, signature)
+	    def checkVerificationSignature(field_hash, data_hash, doc_hash, verification_type, weight, timestamp, blockstack_client_id, pubkey, signature)
 
 			if @log.debug?
 				@log.debug("[Signatures.checkVerificationSignature] input:")
 	    		@log.debug("-> field_hash: #{field_hash}")
 	    		@log.debug("-> data_hash: #{data_hash}")
-	    		@log.debug("-> verification_type: #{verification_type}")
+	    		@log.debug("-> doc_hash: #{doc_hash}")
+	    		@log.debug("-> type: #{verification_type}")
+	    		@log.debug("-> weight: "+ weight.to_s)
 	    		@log.debug("-> timestamp: "+ timestamp.to_s)
 	    		@log.debug("-> blockstack_client_id: #{blockstack_client_id}")
 	    		@log.debug("-> signature: "+ Base64.encode64(signature))
@@ -457,7 +478,9 @@ module VChainClient
 
 			what_to_check = field_hash
 			what_to_check += data_hash
+			what_to_check += doc_hash
 			what_to_check += verification_type
+			what_to_check += weight.to_s
 			what_to_check += timestamp.to_s
 			what_to_check += blockstack_client_id
 
@@ -471,14 +494,13 @@ module VChainClient
 		    		@log.error("#{e.class}, #{e.message}")
 		    		@log.error("-> field_hash: #{field_hash}")
 		    		@log.error("-> data_hash: #{data_hash}")
+		    		@log.error("-> doc_hash: #{doc_hash}")
 		    		@log.error("-> verification_type: #{verification_type}")
 		    		@log.error("-> timestamp: "+ timestamp.to_s)
+		    		@log.error("-> weight: "+ weight.to_s)
 		    		@log.error("-> blockstack_client_id: #{blockstack_client_id}")
 		    		@log.error("-> signature: "+ Base64.encode64(signature))
 		    		@log.error("-> pubkey: #{pubkey}")
-		    		@log.error("--> what_to_check: #{what_to_check}")
-		    		@log.error("--> signature: "+ Base64.encode64(signature))
-		    		@log.error("--> pubkey: #{pubkey}")
 		    	end
 
 		    	raise e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vchain_client
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16
 platform: ruby
 authors:
 - Aleksandr Gorelik