tezos_client 0.4.13 → 0.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '059692d083f91c9eddefdf15b5cb7485e7ba27070638a8c0fee2e9a38c008094'
-  data.tar.gz: f93408c394fa95a1c07dfcad1aae6f483b0725018c0f09d508ca6c27ffb840b5
+  metadata.gz: 462e81ddcbebfb1cecb9c99b577810e47aa7b657b5cc3f88b3e2ffd8e23fc326
+  data.tar.gz: 1c87b82243cac80fcde31551471f25d98623c0bfa323f4eccd238ee3f776f93e
 SHA512:
-  metadata.gz: 3523af808e1b148f1c9ff0d57bcf02aacf3ee6338b831e493454de4e00632544d81aca70bd4db2fe9716889e2e3f721bb75fff798e04c3a427116f22e74d7955
-  data.tar.gz: 3d0225e61842678a78f1c38dacc0b236dd7bcb0634252384b0f4bba76fa8ed32cef8a19f9531e63eb91b517b835728dacd21ed2f2b7f22e5b650de0073043073
+  metadata.gz: 8ab7ba2e5e37024370536a0f31d0e6da53c31a74227d6f903b79d83e9ad700f3be4c710aac1135237ad287e99c1fbb93860ff37d8f0f4cc8dffe89a43ed81cc2
+  data.tar.gz: e1e0c5752ed8d64fe2b83b24779262d52d0c9b7136c7df6ca8cddc0d278aada1476df47efa7254188872f3684b7295834fbd979191b7788c22be2e0f79862a2f

data/lib/tezos_client/crypto.rb

@@ -112,7 +112,10 @@ class TezosClient
     def generate_key(mnemonic: nil, password: nil, wallet_seed: nil, path: nil)
       signing_key = generate_signing_key(mnemonic: mnemonic, password: password, wallet_seed: wallet_seed, path: path).to_bytes.to_hex
 
-      secret_key = encode_tz(:edsk2, signing_key)
+      verify_key = RbNaCl::SigningKey.new(signing_key.to_bin)
+      hex_pubkey = verify_key.to_s.to_hex
+
+      secret_key = encode_tz(:edsk, signing_key + hex_pubkey)
       public_key = secret_key_to_public_key(secret_key)
       address = public_key_to_address(public_key)
 
@@ -124,16 +127,22 @@ class TezosClient
       }
     end
 
+    def edsk2_to_edsk(edsk2key)
+      signing_key = signing_key(edsk2key)
+      keypair_hex = signing_key.keypair_bytes.to_hex
+      encode_tz(:edsk, keypair_hex)
+    end
+
     def generate_mnemonic
       BipMnemonic.to_mnemonic(nil)
     end
 
     def signing_key(secret_key)
       secret_key = decode_tz(secret_key) do |type, _key|
-        raise "invalid secret key: #{secret_key} " unless type == :edsk2
+        raise "invalid secret key: #{secret_key} " unless [:edsk, :edsk2].include? type
       end
 
-      RbNaCl::SigningKey.new(secret_key.to_bin)
+      RbNaCl::SigningKey.new(secret_key.to_bin[0..31])
     end
 
     def sign_bytes(secret_key:, data:, watermark: nil)

data/lib/tezos_client/liquidity_interface.rb

@@ -16,6 +16,8 @@ class TezosClient
     end
 
     def format_params(params)
+      return "" if params.nil?
+
       params = [params] if params.is_a? String
       params.map { |s| "'#{s}'" }.join(" ")
     end

data/lib/tezos_client/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
-class TezosClient VERSION = "0.4.13"
+class TezosClient
+  VERSION = "0.4.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tezos_client
 version: !ruby/object:Gem::Version
-  version: 0.4.13
+  version: 0.4.14
 platform: ruby
 authors:
 - Pierre Michard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2019-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -285,8 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Wrapper to the tezos client.