secp256k1zkp 0.9.0 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 951b1330ba2ce304878210145ac200583994dad6
-  data.tar.gz: ac91e14b4c07918be085d3d32f0df83cafae6f7e
+  metadata.gz: 303aa7af695c95b2547b94d982a7cf0c03475a2f
+  data.tar.gz: 7d23be044ed0ace606f30d8381884b40b004b299
 SHA512:
-  metadata.gz: b150ff39fd63b32f55f324fc99abf20d336e961a7a2348dc5cf26527726a52a18dc7cb006eead9fae9533eb94c9d2f302532e2bc6e474a64424814e04010cff5
-  data.tar.gz: 5b58160792d93e8b46b998e25e0de1773e73ee90c137f742c4ef76cf88ba7bc629e38e1aa0d6fbb6926b900477d02c439fb2dd279be96f8923768ae3afd51857
+  metadata.gz: e8a9763f9cfd0b3fa9fc878a7ba5420f8d78661f0affe1c084641e8fa2db01fd9469d5c03204473a3efd6c73b8b06e3537f63e51aba530e8b2c4e4ddefe8644c
+  data.tar.gz: 4a3e66737896497638c2fb98398171092bb12cf772d0287aaaab295a4b04fe7cf0bddfa4a724970cac1d4cc768c6de650b1908a4d79c4dbceb3fe177ddd06c31

data/ext/secp256k1zkp/secp256k1zkp.c

@@ -265,7 +265,7 @@ static int is_canonical(const rb_struct_compact_signature *sign)
 }
 
 /**
- * Secp256k1Zkp::Context#sign_compact(message_digest, private_key)
+ * Secp256k1Zkp::Context#sign_compact(message_digest, private_key[, require_canonical = true])
  *
  * 生成紧凑格式的 ECDSA 签名（recId + 64字节）。
  *
@@ -273,8 +273,9 @@ static int is_canonical(const rb_struct_compact_signature *sign)
  * @param private_key [Secp256k1Zkp::PrivateKey] 私钥。
  * @return [String] 
  */
-static VALUE dm_context_sign_compact(VALUE self, VALUE message_digest, VALUE private_key)
+static VALUE dm_context_sign_compact(int argc, VALUE *argv, VALUE self)
 {
+  VALUE message_digest, private_key, v_require_canonical;
   rb_struct_context *context;
   rb_struct_private_key *sp_private_key;
   const unsigned char *digest32;
@@ -285,6 +286,11 @@ static VALUE dm_context_sign_compact(VALUE self, VALUE message_digest, VALUE pri
       0,
   };
 
+  if (2 == rb_scan_args(argc, argv, "21", &message_digest, &private_key, &v_require_canonical))
+  {
+    v_require_canonical = Qtrue;
+  }
+
   SafeStringValue(message_digest);
   if (RSTRING_LEN(message_digest) != kByteSizeSha256)
   {
@@ -304,9 +310,9 @@ static VALUE dm_context_sign_compact(VALUE self, VALUE message_digest, VALUE pri
 
   //  初始化部分参数
   digest32 = (const unsigned char *)RSTRING_PTR(message_digest);
-  require_canonical = 0; //  0 or 1
+  require_canonical = RTEST(v_require_canonical) ? 1 : 0;
   counter = 0;
-
+  
   //  循环计算签名，直到找到合适的 canonical 签名。
   do
   {
@@ -379,6 +385,7 @@ static VALUE dm_context_pedersen_blind_sum(VALUE self, VALUE blinds_in, VALUE no
 {
   rb_struct_context *context;
   long blinds_in_size;
+  long i;
   rb_struct_blind_factor_type result = {
       0,
   };
@@ -393,7 +400,7 @@ static VALUE dm_context_pedersen_blind_sum(VALUE self, VALUE blinds_in, VALUE no
     return Qnil;
   }
   const unsigned char *blinds[blinds_in_size];
-  for (long i = 0; i < blinds_in_size; ++i)
+  for (i = 0; i < blinds_in_size; ++i)
   {
     VALUE blind_factor = rb_ary_entry(blinds_in, i);
     SafeStringValue(blind_factor);
@@ -707,7 +714,7 @@ void Init_secp256k1zkp()
   rb_define_method(rb_cSecp256k1Context, "is_valid_private_keydata?", dm_context_verify_private_keydata, 1);
   rb_define_method(rb_cSecp256k1Context, "clone", dm_context_clone, 0);
   rb_define_method(rb_cSecp256k1Context, "dup", dm_context_clone, 0);
-  rb_define_method(rb_cSecp256k1Context, "sign_compact", dm_context_sign_compact, 2);
+  rb_define_method(rb_cSecp256k1Context, "sign_compact", dm_context_sign_compact, -1);
   rb_define_method(rb_cSecp256k1Context, "pedersen_commit", dm_context_pedersen_commit, 2);
   rb_define_method(rb_cSecp256k1Context, "pedersen_blind_sum", dm_context_pedersen_blind_sum, 2);
   rb_define_method(rb_cSecp256k1Context, "range_proof_sign", dm_context_range_proof_sign, 7);

data/lib/secp256k1zkp.rb

@@ -5,7 +5,7 @@ end
 
 require 'secp256k1zkp/secp256k1zkp'
 require 'secp256k1zkp/version'
-require 'secp256k1zkp/utils'
+require 'secp256k1zkp/utility'
 require 'secp256k1zkp/context'
 require 'secp256k1zkp/public_key'
 require 'secp256k1zkp/private_key'

data/lib/secp256k1zkp/private_key.rb

@@ -2,29 +2,57 @@
 
 require 'securerandom'
 
-module Secp256k1Zkp
+class Secp256k1Zkp::PrivateKey
 
-  class PrivateKey
+  include Secp256k1Zkp::Utility
 
-    def self.random
-      # # => REMARK：私钥有效范围。[1, secp256k1 curve order)。REMARK：大部分 lib 范围是 [1, secp256k1 curve order] 的闭区间，c库范围为开区间。
-      # sec = SecureRandom.random_number(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141 - 1) + 1
-      # new(hex_decode("%064x" % sec))
-      new(SecureRandom.random_bytes(32))
+  class << self
+
+    include Secp256k1Zkp::Utility
+    
+    SECP256K1_CURVE_ORDER = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141
+
+    def nonce
+      # => 私钥有效范围。[1, SECP256K1_CURVE_ORDER)。 REMARK：大部分 lib 范围是 [1, SECP256K1_CURVE_ORDER] 的闭区间，该C库范围为开区间。
+      SecureRandom.random_number(SECP256K1_CURVE_ORDER - 1) + 1
+    end
+
+    def random
+       new(hex_decode("%064x" % self.nonce))
     end
 
-    def shared_secret(public_key)
-      return public_key * self.bytes
+    # => role - owner / active
+    def from_account_and_password(account, password, role = 'active')
+      return from_seed(format("%s%s%s", account, role, password))
     end
 
-    def hex_encode(data)
-      return data.unpack("H*").first.downcase
+    def from_seed(seed)
+      return new(sha256(seed))
     end
 
-    def hex_decode(data)
-      return [data].pack("H*")
+    def from_wif(wif_private_key_string)
+      raw = base58_decode(wif_private_key_string)
+      version = raw[0].unpack("C").first
+      raise 'invalid private key.' if version != 0x80
+      # => raw = [1B]0x80 + [32B]privatekey + [4B]checksum
+      checksum_size = 4
+      checksum4 = raw[-checksum_size..-1]
+      private_key_with_prefix = raw[0...-checksum_size]
+      digest = sha256(sha256(private_key_with_prefix))
+      raise 'invalid private key.' if checksum4 != digest[0, checksum_size]
+      return new(raw[1, 32])
     end
 
   end
+  
+  def to_wif
+    private_key_with_prefix = 0x80.chr + self.bytes
+    checksum = sha256(sha256(private_key_with_prefix))[0, 4]
+    return base58_encode(private_key_with_prefix + checksum)
+  end
+
+  def shared_secret(public_key)
+    return public_key * self.bytes
+  end
 
 end

data/lib/secp256k1zkp/public_key.rb

@@ -1,13 +1,41 @@
 #encoding:utf-8
 
-module Secp256k1Zkp
+class Secp256k1Zkp::PublicKey
 
-  class PublicKey
+  include Secp256k1Zkp::Utility
 
-    def shared_secret(private_key)
-      return self * private_key.bytes
+  class << self
+
+    include Secp256k1Zkp::Utility
+    
+    def from_wif(wif_public_key, public_key_prefix = 'BTS')
+      prefix_size = public_key_prefix.bytesize
+      prefix = wif_public_key[0, prefix_size]
+      raise 'invalid public key prefix.' if prefix != public_key_prefix
+
+      raw = base58_decode(wif_public_key[prefix_size..-1])
+      checksum_size = 4
+      compression_public_key = raw[0, raw.bytesize - checksum_size]
+      checksum4 = raw[-checksum_size..-1]
+      raise 'invalid public key.' if checksum4 != rmd160(compression_public_key)[0, checksum_size]
+      return new(compression_public_key)
     end
 
   end
 
+  def to_wif(public_key_prefix = 'BTS')
+    checksum = rmd160(self.bytes)
+    addr = self.bytes + checksum[0, 4]
+    return public_key_prefix + base58_encode(addr)
+  end
+
+  # => (public) 生成bts地址（序列化时公钥排序会用到。）
+  def to_blockchain_address
+    return rmd160(sha512(self.bytes))
+  end
+
+  def shared_secret(private_key)
+    return self * private_key.bytes
+  end
+
 end

data/lib/secp256k1zkp/utility.rb

@@ -0,0 +1,60 @@
+#encoding:utf-8
+
+require 'digest'
+require 'base58'
+
+module Secp256k1Zkp
+
+  module Utility
+  
+    def md5(data, raw = true)
+      if raw
+        return Digest::MD5.digest(data)
+      else
+        return Digest::MD5.hexdigest(data)
+      end
+    end
+
+    def sha256(data, raw = true)
+      if raw
+        return Digest::SHA256.digest(data)
+      else
+        return Digest::SHA256.hexdigest(data)
+      end
+    end
+
+    def sha512(data, raw = true)
+      if raw
+        return Digest::SHA512.digest(data)
+      else
+        return Digest::SHA512.hexdigest(data)
+      end
+    end
+
+    def rmd160(data, raw = true)
+      if raw
+        return Digest::RMD160.digest(data)
+      else
+        return Digest::RMD160.hexdigest(data)
+      end
+    end
+
+    def hex_encode(data)
+      return data.unpack("H*").first.downcase
+    end
+
+    def hex_decode(data)
+      return [data].pack("H*")
+    end
+
+    def base58_encode(str, alphabet = :bitcoin)
+      Base58.binary_to_base58(str.force_encoding('BINARY'), alphabet)
+    end
+
+    def base58_decode(base58_str, alphabet = :bitcoin)
+      Base58.base58_to_binary(base58_str, alphabet)
+    end
+
+  end
+  
+end

data/lib/secp256k1zkp/version.rb

@@ -2,6 +2,6 @@
 
 module Secp256k1Zkp
 
-  VERSION = '0.9.0'.freeze
+  VERSION = '0.9.6'.freeze
 
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: secp256k1zkp
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.6
 platform: ruby
 authors:
 - jokenshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2020-10-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base58
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: mini_portile2
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +67,7 @@ files:
 - lib/secp256k1zkp/context.rb
 - lib/secp256k1zkp/private_key.rb
 - lib/secp256k1zkp/public_key.rb
-- lib/secp256k1zkp/utils.rb
+- lib/secp256k1zkp/utility.rb
 - lib/secp256k1zkp/version.rb
 homepage: https://github.com/jokenshi/ruby-secp256zkp.git
 licenses:
@@ -68,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/secp256k1zkp/utils.rb

@@ -1,20 +0,0 @@
-#encoding:utf-8
-
-require 'digest'
-
-module Secp256k1Zkp
-
-  module Utils
-  
-    module_function
-    
-    #------------------------------------------------------------------------
-    # ● 计算sha1
-    #------------------------------------------------------------------------
-    def sha1(str)
-      return Digest::SHA1.hexdigest(str)
-    end
-
-  end
-  
-end