vchain_client 1.0.31 → 1.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3848407bff9307524e2cf0c071c8766ab44c84bc
-  data.tar.gz: 6846755d6ffe38288e2e950aa5116bb5a87fe124
+  metadata.gz: 9e4b2a962bad37488c062c7c29ddab6e411e5507
+  data.tar.gz: 67a335740fcc0a6c2ec7f8916c9fb1db0bb1e376
 SHA512:
-  metadata.gz: ee3478bb3b48ebcbb4579cf3a1a64137e1992603f136d0a39cee59078dc6ae17a64338657a0f20691b37c56c0277161795ebbfe4a11a762b6e0ecc1f19e027a1
-  data.tar.gz: ca515a0c3f81dab0df028fe189bcfb45bfb4bc34ca2b4d572464727a88a782445d084c8b6795831bf35c675a23ab76ee15ca8d130877d2db8bdeb458248b921e
+  metadata.gz: 0c722e9d3ec77bfe1b028efd110256d44cf4a52a9c4c90b30dea97c8dc33a2d0e2a2ea8e34132e95c42592927e63c4a5f1fc1ad96df19714de32eb64cebafee6
+  data.tar.gz: 050f73ac82958a1b5ffc609bb2529f4ee150847162938e1621acda2e9b4a4d5f337211c59a901ddf7b3ee53508e54472bd0b0c6214de40018dc639d402587681

data/lib/vchain_client/blockstack_client.rb

@@ -2,14 +2,15 @@ module VChainClient
 
 	class BlockstackClient
 
-		MASTER_PUBLIC_KEY = "MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAEXGOuvJT5hb/bR5y/JADHxJEEaQzuJUzw
+		MASTER_ECC_PUBLIC_KEY = "MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAEXGOuvJT5hb/bR5y/JADHxJEEaQzuJUzw
 	Xet0UYuBrILjHB9HcxFc+WwuCflIRWtRDsNfaY6Ra7j/cRYLeiocYA=="
 
 		@config = nil
 		@log = nil
 
 	  	@@recs_cache = {}
-	  	@@keys_cache = {}
+	  	@@ecc_keys_cache = {}
+	  	@@rsa_keys_cache = {}
 
 	    def initialize(config)
 	    	@config = config
@@ -138,7 +139,7 @@ module VChainClient
 
 	  		if record != nil
 
-	  			if record.key?("pubkey")
+	  			if record.key?("ecc_pubkey")
 
 	  				if record.key?("vchain_role")
 	  					
@@ -203,16 +204,16 @@ module VChainClient
 
   						end
 
-  						validator_pub_key = nil
+  						validator_ecc_pub_key = nil
   						if record["vchain_role"] != 'validator'
 
   							begin
   								
-  								validator_pub_key = self.getPublicKey(validator_blockstack_id)
+  								validator_ecc_pub_key = self.getPublicKeyECC(validator_blockstack_id)
 
   							rescue => e
 						  		if @log.error?
-						  			@log.error("[Blockstack.checkBlockstackRecord] getPublicKey raised exception:")
+						  			@log.error("[Blockstack.checkBlockstackRecord] getPublicKeyECC raised exception:")
 						  			@log.error("#{e.class}, #{e.message}")
 						  			@log.error("-> blockstack_id: #{blockstack_id}")
 						  			@log.error("-> type: #{type}")
@@ -223,10 +224,10 @@ module VChainClient
   							end
 
   						else
-  							validator_pub_key = MASTER_PUBLIC_KEY;
+  							validator_ecc_pub_key = MASTER_ECC_PUBLIC_KEY;
   						end
 
-  						if validator_pub_key == nil
+  						if validator_ecc_pub_key == nil
   							if @log.error?
 					  			@log.error("[Blockstack.checkBlockstackRecord] failed to retrieve public key:")
 					  			@log.error("-> blockstack_id: #{blockstack_id}")
@@ -238,18 +239,36 @@ module VChainClient
   						end
 
 						# check client's sig
-						client_sig_to_check = record["vchain_id"] + record["vchain_role"] + blockstack_id + record["pubkey"] + record["sig_version"];
+						client_sig_to_check = record["vchain_id"] + record["vchain_role"] + blockstack_id + record["ecc_pubkey"] + record["sig_version"];
+
+						validator_sig_to_check = record["vchain_id"] + record["vchain_role"] + blockstack_id + record["ecc_pubkey"] + record["sig_version"] + record["validator_vchain_id"] + validator_blockstack_id
+
+						if record["sig_version"] != "1"
+
+							# need to retrieve RSA key
+							if !record.key?("rsa_pubkey")
+					  			if @log.error?
+					  				@log.error("[Blockstack.checkBlockstackRecord] record doesn't have 'rsa_pubkey' field")
+						  			@log.error("-> blockstack_id: #{blockstack_id}")
+						  			@log.error("-> type: #{type}")
+					  			end
+
+								return false
+							end
+
+							client_sig_to_check = record["vchain_id"] + record["vchain_role"] + blockstack_id + record["ecc_pubkey"] + record["rsa_pubkey"] + record["sig_version"];
+
+							validator_sig_to_check = record["vchain_id"] + record["vchain_role"] + blockstack_id + record["ecc_pubkey"] + record["rsa_pubkey"] + record["sig_version"] + record["validator_vchain_id"] + validator_blockstack_id
+						end
 
 						begin
 
-							if signaturesHelper.verifySignature(client_sig_to_check, record["client_sig"], record["pubkey"])
+							if signaturesHelper.verifySignature(client_sig_to_check, record["client_sig"], record["ecc_pubkey"])
 								
 								# check validator's sig
-								validator_sig_to_check = record["vchain_id"] + record["vchain_role"] + blockstack_id + record["pubkey"] + record["sig_version"] + record["validator_vchain_id"] + validator_blockstack_id
-								
 								begin
 
-									if signaturesHelper.verifySignature(validator_sig_to_check, record["validator_sig"], validator_pub_key)
+									if signaturesHelper.verifySignature(validator_sig_to_check, record["validator_sig"], validator_ecc_pub_key)
 										
 										return true;
 
@@ -260,7 +279,7 @@ module VChainClient
 								  			@log.error("-> type: #{type}")
 							  				@log.error("--> validator_sig_to_check: #{validator_sig_to_check}")
 							  				@log.error("--> validator_sig: "+ Base64.encode64(record["validator_sig"]))
-							  				@log.error("--> validator_pub_key: "+ record["validator_pub_key"])
+							  				@log.error("--> validator_ecc_pub_key: #{validator_ecc_pub_key}")
 										end
 
 										return false
@@ -274,7 +293,7 @@ module VChainClient
 							  			@log.error("-> type: #{type}")
 							  			@log.error("--> validator_sig_to_check: #{validator_sig_to_check}")
 							  			@log.error("--> validator_sig: "+ Base64.encode64(record["validator_sig"]))
-							  			@log.error("--> validator_pub_key: "+ record["validator_pub_key"])
+							  			@log.error("--> validator_ecc_pub_key: #{validator_ecc_pub_key}")
 									end
 
 									raise e
@@ -287,7 +306,7 @@ module VChainClient
 						  			@log.error("-> type: #{type}")
 					  				@log.error("--> client_sig_to_check: #{client_sig_to_check}")
 					  				@log.error("--> client_sig: "+ Base64.encode64(record["client_sig"]))
-					  				@log.error("--> pubkey: "+ record["pubkey"])
+					  				@log.error("--> ecc_pubkey: "+ record["ecc_pubkey"])
 						  		end
 
 								return false
@@ -301,7 +320,7 @@ module VChainClient
 					  			@log.error("-> type: #{type}")
 					  			@log.error("--> client_sig_to_check: #{client_sig_to_check}")
 					  			@log.error("--> client_sig: "+ Base64.encode64(record["client_sig"]))
-					  			@log.error("--> pubkey: "+ record["pubkey"])
+					  			@log.error("--> ecc_pubkey: "+ record["ecc_pubkey"])
 							end
 
 							raise e
@@ -317,7 +336,7 @@ module VChainClient
 
 	  			else
 		  			if @log.error?
-		  				@log.error("[Blockstack.checkBlockstackRecord] record doesn't have 'pubkey' field")
+		  				@log.error("[Blockstack.checkBlockstackRecord] record doesn't have 'ecc_pubkey' field")
 			  			@log.error("-> blockstack_id: #{blockstack_id}")
 			  			@log.error("-> type: #{type}")
 		  			end
@@ -334,41 +353,107 @@ module VChainClient
 	  		return false
 	  	end
 
-	  	def getPublicKey(blockstack_id)
+	  	def getPublicKeyECC(blockstack_id, force_refresh=false)
 
 	  		if @log.debug?
-	  			@log.debug("[Blockstack.getPublicKey] input:")
+	  			@log.debug("[Blockstack.getPublicKeyECC] input:")
 	  			@log.debug("-> blockstack_id: #{blockstack_id}")
 	  		end
 
-	  		if @@keys_cache.key?(blockstack_id)
+	  		if !force_refresh
+		  		if @@ecc_keys_cache.key?(blockstack_id)
 
-		  		if @log.debug?
-		  			@log.debug("[Blockstack.getPublicKey] '#{blockstack_id}' is in a cache")
+			  		if @log.debug?
+			  			@log.debug("[Blockstack.getPublicKeyECC] '#{blockstack_id}' is in a cache")
+			  		end
+
+		  			return @@ecc_keys_cache[blockstack_id]
+		  		end
+	  		end
+
+	  		if @log.debug?
+	  			@log.debug("[Blockstack.getPublicKeyECC] '#{blockstack_id}' is not in a cache yet")
+	  		end
+
+	  		begin
+
+		  		record = self.getBlockstackRecord(blockstack_id, force_refresh);
+
+		  		if record != nil
+		  			
+		  			if record.key?("ecc_pubkey")
+
+		  				@@ecc_keys_cache[blockstack_id] = record["ecc_pubkey"]
+
+		  				return record["ecc_pubkey"]
+
+		  			else 
+				  		if @log.error?
+				  			@log.error("[Blockstack.getPublicKeyECC] record '#{blockstack_id}' doesn't have 'ecc_pubkey' field")
+				  			@log.error("-> blockstack_id: #{blockstack_id}")
+				  			@log.error("--> blockstack_id: #{blockstack_id}")
+				  		end
+		  			end
+
+		  		else
+			  		if @log.error?
+			  			@log.error("[Blockstack.getPublicKeyECC] failed to retrieve '#{blockstack_id}' record")
+			  			@log.error("-> blockstack_id: #{blockstack_id}")
+			  			@log.error("--> blockstack_id: #{blockstack_id}")
+			  		end
 		  		end
 
-	  			return @@keys_cache[blockstack_id]
+		  	rescue => e
+		  		if @log.error?
+		  			@log.error("[Blockstack.getPublicKeyECC] getBlockstackRecord raised exception:")
+		  			@log.error("#{e.class}, #{e.message}")
+		  			@log.error("-> blockstack_id: #{blockstack_id}")
+		  			@log.error("--> blockstack_id: #{blockstack_id}")
+		  		end
+
+		  		raise e
+		  	end
+
+	  		return nil
+	  	end
+
+	  	def getPublicKeyRSA(blockstack_id, force_refresh=false)
+
+	  		if @log.debug?
+	  			@log.debug("[Blockstack.getPublicKeyRSA] input:")
+	  			@log.debug("-> blockstack_id: #{blockstack_id}")
+	  		end
+
+	  		if !force_refresh
+		  		if @@rsa_keys_cache.key?(blockstack_id)
+
+			  		if @log.debug?
+			  			@log.debug("[Blockstack.getPublicKeyRSA] '#{blockstack_id}' is in a cache")
+			  		end
+
+		  			return @@rsa_keys_cache[blockstack_id]
+		  		end
 	  		end
 
 	  		if @log.debug?
-	  			@log.debug("[Blockstack.getPublicKey] '#{blockstack_id}' is not in a cache yet")
+	  			@log.debug("[Blockstack.getPublicKeyRSA] '#{blockstack_id}' is not in a cache yet")
 	  		end
 
 	  		begin
 
-		  		record = self.getBlockstackRecord(blockstack_id);
+		  		record = self.getBlockstackRecord(blockstack_id, force_refresh);
 
 		  		if record != nil
 		  			
-		  			if record.key?("pubkey")
+		  			if record.key?("rsa_pubkey")
 
-		  				@@keys_cache[blockstack_id] = record["pubkey"]
+		  				@@rsa_keys_cache[blockstack_id] = record["rsa_pubkey"]
 
-		  				return record["pubkey"]
+		  				return record["rsa_pubkey"]
 
 		  			else 
 				  		if @log.error?
-				  			@log.error("[Blockstack.getPublicKey] record '#{blockstack_id}' doesn't have 'pubkey' field")
+				  			@log.error("[Blockstack.getPublicKeyRSA] record '#{blockstack_id}' doesn't have 'rsa_pubkey' field")
 				  			@log.error("-> blockstack_id: #{blockstack_id}")
 				  			@log.error("--> blockstack_id: #{blockstack_id}")
 				  		end
@@ -376,7 +461,7 @@ module VChainClient
 
 		  		else
 			  		if @log.error?
-			  			@log.error("[Blockstack.getPublicKey] failed to retrieve '#{blockstack_id}' record")
+			  			@log.error("[Blockstack.getPublicKeyRSA] failed to retrieve '#{blockstack_id}' record")
 			  			@log.error("-> blockstack_id: #{blockstack_id}")
 			  			@log.error("--> blockstack_id: #{blockstack_id}")
 			  		end
@@ -384,7 +469,7 @@ module VChainClient
 
 		  	rescue => e
 		  		if @log.error?
-		  			@log.error("[Blockstack.getPublicKey] getBlockstackRecord raised exception:")
+		  			@log.error("[Blockstack.getPublicKeyRSA] getBlockstackRecord raised exception:")
 		  			@log.error("#{e.class}, #{e.message}")
 		  			@log.error("-> blockstack_id: #{blockstack_id}")
 		  			@log.error("--> blockstack_id: #{blockstack_id}")
@@ -396,19 +481,21 @@ module VChainClient
 	  		return nil
 	  	end
 
-	  	def getBlockstackRecord(blockstack_id)
+	  	def getBlockstackRecord(blockstack_id, force_refresh=false)
 
 	  		if @log.debug?
 	  			@log.debug("[Blockstack.getBlockstackRecord] input:")
 	  			@log.debug("-> blockstack_id: #{blockstack_id}")
 	  		end
 
-	  		if @@recs_cache.key?(blockstack_id)
-		  		if @log.debug?
-		  			@log.debug("[Blockstack.getBlockstackRecord] '#{blockstack_id}' is in a cache")
-		  		end
+	  		if !force_refresh
+		  		if @@recs_cache.key?(blockstack_id)
+			  		if @log.debug?
+			  			@log.debug("[Blockstack.getBlockstackRecord] '#{blockstack_id}' is in a cache")
+			  		end
 
-	  			return @@recs_cache[blockstack_id]
+		  			return @@recs_cache[blockstack_id]
+		  		end
 	  		end
 
 	  		blockstack_path = @config["blockstack"]["path"]
@@ -469,7 +556,7 @@ module VChainClient
 				recs = line.split(" ")
 
 				if recs.size == 3
-					if recs[0] == "A1" || recs[0] == "A2" || recs[0] == "A3" || recs[0] == "A4" || recs[0] == "A5" || recs[0] == "A6" || recs[0] == "A7" || recs[0] == "A8"
+					if recs[0] == "A1" || recs[0] == "A2" || recs[0] == "A3" || recs[0] == "A4" || recs[0] == "A5" || recs[0] == "A6" || recs[0] == "A7" || recs[0] == "A8" || recs[0] == "A9"
 						fz[recs[0]] = recs[2][1..-2]
 					end
 				end
@@ -480,13 +567,45 @@ module VChainClient
 	  			@log.debug(fz)
 	  		end
 
-	  		if fz.key?("A1") && fz.key?("A2") && fz.key?("A3") && fz.key?("A4") && fz.key?("A5") && fz.key?("A6") && fz.key?("A7") && fz.key?("A8")
+	  		if fz.key?("A1") && 
+	  		   fz.key?("A2") && 
+	  		   fz.key?("A3") && 
+	  		   fz.key?("A4") && 
+	  		   fz.key?("A5") && 
+	  		   fz.key?("A6") && 
+	  		   fz.key?("A7") && 
+	  		   fz.key?("A8")
+
+	  			ecc_pubkey_aligned = fz["A1"]
+	  			ecc_pubkey = ecc_pubkey_aligned[0..63] + "\n" +
+	  						 ecc_pubkey_aligned[64..ecc_pubkey_aligned.length]
 
-	  			pubkey_aligned = fz["A1"]
-	  			pubkey = pubkey_aligned[0..63] +"\n"+ pubkey_aligned[64..pubkey_aligned.length]
+	  			rsa_pubkey = nil
+	  			if fz["A7"] != "1"
+
+	  				if !fz.key?("A9")
+			  			if @log.error?
+		  					@log.error("[Blockstack.getBlockstackRecord] no 'A9' field, sig ver is >1")
+		  					@log.error("-> blockstack_id: #{blockstack_id}")
+		  					@log.error("--> blockstack_id: #{blockstack_id}")
+		  				end
+
+		  				return nil
+	  				end
+
+		  			rsa_pubkey_aligned = fz["A9"]
+		  			rsa_pubkey = rsa_pubkey_aligned[0..63] + "\n" +
+		  						 rsa_pubkey_aligned[64..127] + "\n" +
+		  						 rsa_pubkey_aligned[128..191] + "\n" +
+		  						 rsa_pubkey_aligned[192..255] + "\n" +
+		  						 rsa_pubkey_aligned[256..319] + "\n" +
+		  						 rsa_pubkey_aligned[320..383] + "\n" +
+		  						 rsa_pubkey_aligned[384..rsa_pubkey_aligned.length]
+	  			end
 
 	  			output = {
-					"pubkey"                  => pubkey,
+					"ecc_pubkey"              => ecc_pubkey,
+					"rsa_pubkey"              => rsa_pubkey,
 					"vchain_id"               => fz["A2"],
 					"validator_sig"           => Base64.decode64(fz["A3"]),
 					"validator_vchain_id"     => fz["A4"],
@@ -502,7 +621,8 @@ module VChainClient
 		  		end
 
 	  			@@recs_cache[blockstack_id] = output
-	  			@@keys_cache[blockstack_id] = pubkey
+	  			@@ecc_keys_cache[blockstack_id] = ecc_pubkey
+	  			@@rsa_keys_cache[blockstack_id] = rsa_pubkey
 
 	  			return output
 

data/lib/vchain_client/signatures.rb

@@ -17,7 +17,7 @@ module VChainClient
 	    def signBatchRequest(batch, timestamp)
 			OpenSSL::PKey::EC.send(:alias_method, :private?, :private_key?)
 
-			priv_key_path = @config["private_key_location"]
+			priv_key_path = @config["ecc_private_key_location"]
 
 			if @log.debug?
 				@log.debug("[Signatures.signBatchRequest] input:")
@@ -160,7 +160,7 @@ module VChainClient
 			
 			OpenSSL::PKey::EC.send(:alias_method, :private?, :private_key?)
 
-			priv_key_path = @config["private_key_location"]
+			priv_key_path = @config["ecc_private_key_location"]
 
 			if @log.debug?
 				@log.debug("[Signatures.signRequest] input:")
@@ -370,7 +370,7 @@ module VChainClient
 	  		OpenSSL::PKey::EC.send(:alias_method, :private?, :private_key?)
 
 	  		this_client_id = @config["blockstack"]["client_id"]
-	  		priv_key_path = @config["private_key_location"]
+	  		priv_key_path = @config["ecc_private_key_location"]
 
 			if @log.debug?
 				@log.debug("[Signatures.signDataPoint] input:")

data/lib/vchain_client.rb

@@ -5,7 +5,6 @@ module VChainClient
   	require 'rest-client'
   	require 'base64'
   	require 'openssl'
-    require 'openssl-pkey-ec-ies'
     require 'log4r'
     require 'json'
 
@@ -27,7 +26,7 @@ module VChainClient
 
     DATA_POINT_VERSION = "1"
 
-    CLIENT_LIB_VERSION = "1.0.31"
+    CLIENT_LIB_VERSION = "1.0.32"
 
     @config = nil
     @log = nil
@@ -430,7 +429,7 @@ module VChainClient
       }
 
       client_id = @config["client_id"]
-      api_url = @config["api"]["url"] + "v0.2/batchAddDataPoint/"
+      api_url = @config["api"]["url"] + "v0.3/batchAddDataPoint/"
 
       whole_signature = nil
 
@@ -534,7 +533,7 @@ module VChainClient
   	def add_data_point(point_type, input, weight = 1)
 
     	client_id = @config["client_id"]
-    	api_url = @config["api"]["url"] + "v0.2/addDataPoint/"
+    	api_url = @config["api"]["url"] + "v0.3/addDataPoint/"
 
 	  	time = Time.now.getutc
 	  	timestamp = time.to_i
@@ -809,7 +808,7 @@ module VChainClient
 
       client_id = @config["client_id"]
 
-      api_url = @config["api"]["url"] + "v0.2/check/";
+      api_url = @config["api"]["url"] + "v0.3/check/";
 
       document = input
 
@@ -841,37 +840,64 @@ module VChainClient
 
       sent_document = document.clone
 
-      document["client_id"] = client_id
+      vchain_public_key_body = nil
 
-      if @log.debug?
-        @log.debug("[check] will call "+ api_url +" using vchain_client_id "+ client_id)
-        @log.debug("-> is_already_hashed: #{is_already_hashed}")
-        @log.debug("-> hashed input:")
-        @log.debug(document)
-      end
+      begin
+        
+        vchain_public_key_body = blockstackClient.getPublicKeyRSA("vchain_core_01.id")
 
-      ## let's encode message using vchain public key
-      vchain_pubkey_body = blockstackClient.getPublicKey("vchain_core_01.id")
+      rescue => e
+        if @log.error?
+          @log.error("[check] failed to retrieve vchain public RSA key from Blockstack")
+          @log.error("#{e.class}, #{e.message}")
+        end
 
-      if vchain_pubkey_body == nil
+        raise e
+      end
+
+      if vchain_public_key_body == nil
         if @log.error?
-          @log.error("[check] failed to get vchain public key")
+          @log.error("[check] failed to retrieve vchain public RSA key from Blockstack")
         end
 
         return false
       end
 
-      vchain_pubkey_str = "-----BEGIN PUBLIC KEY-----\n"
-      vchain_pubkey_str += vchain_pubkey_body
-      vchain_pubkey_str += "\n-----END PUBLIC KEY-----"
+      vchain_public_key_str = "-----BEGIN PUBLIC KEY-----\n"
+      vchain_public_key_str += vchain_public_key_body
+      vchain_public_key_str += "\n-----END PUBLIC KEY-----"
 
-      vchain_pubkey = OpenSSL::PKey::EC::IES.new(vchain_pubkey_str)
-      
-      encrypted_doc = Base64.encode64(vchain_pubkey.public_encrypt(document.to_json))
+      vchain_public_key = OpenSSL::PKey::RSA.new(vchain_public_key_str)
 
-      puts encrypted_doc
+      cif = OpenSSL::Cipher.new('AES-256-CBC')
 
-      exit 0
+      cif.encrypt
+
+      cif.key = key = cif.random_key
+      cif.iv  = iv  = cif.random_iv
+
+      encoded_doc = cif.update(document.to_json) +
+                    cif.final
+
+      encoded_key = vchain_public_key.public_encrypt(key, OpenSSL::PKey::RSA::PKCS1_OAEP_PADDING)
+
+      encoded_iv = vchain_public_key.public_encrypt(iv, OpenSSL::PKey::RSA::PKCS1_OAEP_PADDING)
+
+      doc_to_send = {
+        "key"       => Base64.encode64(encoded_key),
+        "iv"        => Base64.encode64(encoded_iv),
+        "payload"   => Base64.encode64(encoded_doc),
+        "client_id" => client_id
+      }
+
+      if @log.debug?
+        @log.debug("[check] will call "+ api_url +" using vchain_client_id "+ client_id)
+        @log.debug("-> is_already_hashed: #{is_already_hashed}")
+        @log.debug("-> hashed input:")
+        @log.debug(document)
+        @log.debug("-> sending:")
+        @log.debug(doc_to_send)
+      end
 
       req = nil
 
@@ -885,7 +911,7 @@ module VChainClient
           res = RestClient::Resource.new api_url
         end
 
-        req = res.post encrypted_doc, :content_type => 'application/json'
+        req = res.post doc_to_send.to_json, :content_type => 'application/json'
         
         if req.code != 200
           
@@ -1526,46 +1552,54 @@ module VChainClient
       return output
     end
 
-    def self.generateBlockstackCommand(config)
+    def self.generateBlockstackCommand(config, role, validator_sig = nil)
 
       OpenSSL::PKey::EC.send(:alias_method, :private?, :private_key?)
 
       blockstack_id = config["blockstack"]["client_id"]
 
-      #A1 pubkey
-      public_key_location = config["public_key_location"]
-      pub_key = File.read(public_key_location)
-      pub_key.slice! "-----BEGIN PUBLIC KEY-----\n"
-      pub_key.slice! "\n-----END PUBLIC KEY-----\n"
-      pub_key_aligned = pub_key.gsub(/\n/, "")
+      #A1 ECC pubkey
+      ecc_public_key_location = config["ecc_public_key_location"]
+      ecc_pub_key = File.read(ecc_public_key_location)
+      ecc_pub_key.slice! "-----BEGIN PUBLIC KEY-----\n"
+      ecc_pub_key.slice! "\n-----END PUBLIC KEY-----\n"
+      ecc_pub_key_aligned = ecc_pub_key.gsub(/\n/, "")
 
       #A2 vchain_client_id
       vchain_client_id = config["client_id"]
 
-      #A3 validator_sig
-      validator_sig = nil
-      if config.key?("validator_sig")
-        validator_sig = config["validator_sig"]
-      end
-
       #A4 validator_vchain_id
       validator_vchain_id = "da93b5f7-2295-4435-a67a-4fc226eca3ac"
+      #validator_vchain_id = "35645858-630d-4873-9a2d-1ea7ec3b6d10"
 
       #A5 validator_blockstack_id
       validator_blockstack_id = "vchain_core_01.id"
+      #validator_blockstack_id = "master"
 
       #A6 vchain_role
-      vchain_role = "verificator"
+      vchain_role = role
 
       #A7 sig_version
-      sig_version = "1"
+      sig_version = "2"
 
       #A8 client_sig
       client_sig = nil
-      priv_key_path = config["private_key_location"]
+      priv_key_path = config["ecc_private_key_location"]
       priv_key = File.read(priv_key_path)
 
-      whole_sign = vchain_client_id + vchain_role + blockstack_id + pub_key + sig_version
+      #A9 RSA pubkey
+      rsa_public_key_location = config["rsa_public_key_location"]
+      rsa_pub_key = File.read(rsa_public_key_location)
+      rsa_pub_key.slice! "-----BEGIN PUBLIC KEY-----\n"
+      rsa_pub_key.slice! "\n-----END PUBLIC KEY-----\n"
+      rsa_pub_key_aligned = rsa_pub_key.gsub(/\n/, "")
+      
+      whole_sign = vchain_client_id + 
+                   vchain_role + 
+                   blockstack_id + 
+                   ecc_pub_key + 
+                   rsa_pub_key + 
+                   sig_version
       
       ec = OpenSSL::PKey::EC.new(priv_key)
       digest = OpenSSL::Digest::SHA256.new
@@ -1578,7 +1612,8 @@ module VChainClient
 
         puts "blockstack_id = " + blockstack_id
         puts "vchain_client_id = " + vchain_client_id
-        puts "pub_key = "+ pub_key_aligned
+        puts "ecc_pub_key = "+ ecc_pub_key_aligned
+        puts "rsa_pub_key = "+ rsa_pub_key_aligned
         puts "validator_vchain_id = "+ validator_vchain_id
         puts "vchain_role = " + vchain_role
         puts "client_sig = " + client_sig
@@ -1586,7 +1621,7 @@ module VChainClient
       else
         puts "BLOCKSTACK_DEBUG=1 blockstack update "+ blockstack_id +" '$ORIGIN "+ blockstack_id +"
 $TTL 3600
-A1 TXT \""+ pub_key_aligned +"\"
+A1 TXT \""+ ecc_pub_key_aligned +"\"
 A2 TXT \""+ vchain_client_id +"\"
 A3 TXT \""+ validator_sig +"\"
 A4 TXT \""+ validator_vchain_id +"\"
@@ -1594,6 +1629,7 @@ A5 TXT \""+ validator_blockstack_id +"\"
 A6 TXT \""+ vchain_role +"\"
 A7 TXT \""+ sig_version +"\"
 A8 TXT \""+ client_sig +"\"
+A9 TXT \""+ rsa_pub_key_aligned +"\"
 _tcp._http URI 10 1 \"http://example.com\"
 '"
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vchain_client
 version: !ruby/object:Gem::Version
-  version: 1.0.31
+  version: 1.0.32
 platform: ruby
 authors:
 - Aleksandr Gorelik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-05 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -70,26 +70,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: openssl-pkey-ec-ies
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.1
 description: Fully functional client for VChain Platform written on Ruby. For more
   info visit https://bitbucket.org/vchain_dev/ruby-client
 email: alexander@vchain.tech
@@ -127,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: VChain Platform client written on Ruby