mixin_bot 0.8.0 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a76c8b7d2c5d8cebc963a56d350e3fd5e4bbc1e18ad3e037b65cfb6e1d77b0d1
-  data.tar.gz: 8c9813a57cb33f256c695a88e42f53feffb33a45979f5fbf788916f332a52d26
+  metadata.gz: 668a2577b6ceb0f2e78d47002062ff1f451006027a31b1bac2081864494cf9fe
+  data.tar.gz: 3c291ef3a6b7ed2c9ef9b6a56726c563639b575e05378e1ce15466cc00c23b15
 SHA512:
-  metadata.gz: 999325d7c1b73c54b80a6a7a2e432e83aaff341997db01211fb43cddffa32448451aaf5c1d92852dfcda872d92b4724d938bacde83621650c20594aaa034ff32
-  data.tar.gz: 7b49bda1bb1026823ca51301a7f61380db7714f9d9441c466ff0a0c2bb50be52e199900e13b0d7c5e8e6782f938c57f38562e9d56439346c62b7abb364d928e5
+  metadata.gz: c8b2d87ca9ff0293aa0e63ce3d82986b30df7fcfe6197eb415b0eee16da6ac00104899e1431bd0975cb11e08a8f5f2e7fac431c02204b73bb0b5b0278525afa5
+  data.tar.gz: 7a50ecdb7d683ef493fb5a60fa042ba7b3bb904eaa3fec589b3e7fa10a33968936bc2495aef5325c3636dce30ac69c85dcf486fe0764c6d522c54766b012be19

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,9 +16,9 @@ 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]
+        @chain = kwargs[:chain] || NFT_MEMO_DEFAULT_CHAIN
+        @nm_class = kwargs[:nm_class] || NFT_MEMO_DEFAULT_CLASS
+        @collection = kwargs[:collection] || NULL_UUID
         @token = kwargs[:token]
         @extra = kwargs[:extra]
         @memo = kwargs[:memo]
@@ -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
@@ -70,6 +89,8 @@ module MixinBot
           token_bytes = MixinBot::Utils.bytes_of token
           bytes += MixinBot::Utils.bytes_of token_bytes.size
           bytes += token_bytes
+        else
+          bytes += [0]
         end
 
         extra_bytes = [extra].pack('H*').bytes
@@ -127,6 +148,8 @@ module MixinBot
 
         extra_length = bytes.shift
         @extra = bytes.shift(extra_length).pack('C*').unpack1('H*')
+
+        self
       end
 
       def to_h

data/lib/mixin_bot/version.rb

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

metadata

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