mixin_bot 0.8.1 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69eee8eeeacfd16b933260c77c2bad6ba50281ce66282562b473b0e921c2636d
-  data.tar.gz: 83fddd1ea7601f5d2fdb8c71401f4338a55655c296775a90da1ba1425fef9a61
+  metadata.gz: 70628f46673124183dc96c2e61646297010a5be0173448ed0c8a9024af371f64
+  data.tar.gz: 2e3d3c6c6f164cb4303f6baa148e667927c771b53172dc91edeaddb6f425ab76
 SHA512:
-  metadata.gz: e01978f001f19da84cddbd378d9daa5046c873effd292af59d143dec0fbadc7358c0178198b2b600fce3c67d7be42351ae47ad8e164288ed6b5e9ae6b493817f
-  data.tar.gz: f730a99bfb87abd4043325f87dee4b51bc604ed00d8e7ae10fd03999148a910fcd65544e982dd7bb128017126b28984524f3d52eefcc1cd9c6a76922e0e451e9
+  metadata.gz: abe3adfe9531303aa8d2528e1fdd9d1d409511ce0fed9f728a75fa804f53acf421c7f93b5f822536fa91ae3c60f36312abff67b06711e3d5bccb9ed5278d3045
+  data.tar.gz: f8380ed54ed31a20e294e3a3bc9fff1ac73361021c9502f34aa4219db64396097ffdf2811b25f18673cf2338d243dfdc3daa0969450d56741dc72ebc1a6427ef

data/lib/mixin_bot/api/auth.rb

@@ -17,10 +17,11 @@ module MixinBot
           sig: sig,
           scp: scp
         }
-        if pin_token.size == 32
+        case key_type
+        when :ed25519
           jwk = JOSE::JWK.from_okp [:Ed25519, private_key]
           jws = JOSE::JWS.from({ 'alg' => 'EdDSA' })
-        else
+        when :rsa
           jwk = JOSE::JWK.from_pem private_key
           jws = JOSE::JWS.from({ 'alg' => 'RS512' })
         end

data/lib/mixin_bot/api.rb

@@ -22,7 +22,7 @@ require_relative './api/withdraw'
 
 module MixinBot
   class API
-    attr_reader :client_id, :client_secret, :session_id, :pin_token, :private_key, :client, :blaze_host, :schmoozer
+    attr_reader :client_id, :client_secret, :session_id, :pin_token, :private_key, :client, :blaze_host, :key_type
 
     def initialize(options = {})
       @client_id = options[:client_id] || MixinBot.client_id
@@ -37,12 +37,13 @@ module MixinBot
           ''
         end
       _private_key = options[:private_key] || MixinBot.private_key
-      @private_key =
-        if /^-----BEGIN RSA PRIVATE KEY-----/.match? _private_key
-          _private_key.gsub('\\r\\n', "\n").gsub("\r\n", "\n")
-        else
-          Base64.urlsafe_decode64 _private_key
-        end
+      if /^-----BEGIN RSA PRIVATE KEY-----/.match? _private_key
+        @private_key = _private_key.gsub('\\r\\n', "\n").gsub("\r\n", "\n")
+        @key_type = :rsa
+      else
+        @private_key = Base64.urlsafe_decode64 _private_key
+        @key_type = :ed25519
+      end
     end
 
     def sign_raw_transaction(tx)

data/lib/mixin_bot/utils/nfo.rb

@@ -16,10 +16,10 @@ module MixinBot
         @prefix = NFT_MEMO_PREFIX
         @version = NFT_MEMO_VERSION
         @mask = kwargs[:mask] || 0
-        @chain = kwargs[:chain]
-        @nm_class = kwargs[:nm_class]
-        @collection = kwargs[:collection]
-        @token = kwargs[:token]
+        @chain = kwargs[:chain] || NFT_MEMO_DEFAULT_CHAIN
+        @nm_class = kwargs[:nm_class] || NFT_MEMO_DEFAULT_CLASS
+        @collection = kwargs[:collection] || NULL_UUID
+        @token = kwargs[:token].presence&.to_i
         @extra = kwargs[:extra]
         @memo = kwargs[:memo]
         @hex = kwargs[:hex]
@@ -38,6 +38,25 @@ module MixinBot
         memo
       end
 
+      def unique_token_id
+        bytes = []
+        bytes += MixinBot::Utils::UUID.new(hex: chain).packed.bytes
+        bytes += [nm_class].pack('H*').bytes
+        bytes += MixinBot::Utils::UUID.new(hex: collection).packed.bytes
+        bytes += MixinBot::Utils.bytes_of token
+
+        md5 = Digest::MD5.new
+        md5.update bytes.pack('c*')
+        digest = [md5.hexdigest].pack('H*').bytes
+
+        digest[6] = (digest[6] & 0x0f) | 0x30
+        digest[8] = (digest[8] & 0x3f) | 0x80
+
+        hex = digest.pack('c*').unpack1('H*')
+
+        MixinBot::Utils::UUID.new(hex: hex).unpacked
+      end
+
       def mark(*indexes)
         indexes.map do |index|
           if index >= 64 || index < 0

data/lib/mixin_bot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MixinBot
-  VERSION = '0.8.1'
+  VERSION = '0.8.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixin_bot
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.4
 platform: ruby
 authors:
 - an-lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport