mixin_bot 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4257bfdffc20e27ffab5ce9da23080be113a552623f5022775f3cc8a6cc6db0c
-  data.tar.gz: 7f29a034845b45715e33b3b51e28be996408fcff145538025a243fb74d42b482
+  metadata.gz: 2162191a7068afafb913aa9b898c7915c133b732c25b785c1ec8cbf672fd3edd
+  data.tar.gz: 31303c5e3c9dfb3759c943c63d74a67f7efb7a9cbdfbee9a823ba6f7dc7c6ab2
 SHA512:
-  metadata.gz: 18e9d94005f235f827ce4e7598a2b2ddf13f48b296d9af46e4d6b2550e795c30f805c40b815352c159f7f2aa7b35c0a4e93ea0787889175c373e931720b5dc17
-  data.tar.gz: 56e0c4651199912fd4ed4bef7eb96cc22de1cd30842b7d8e767811ece926e880984a0f2734db19d4f1c48464c037e3b3d9c22b61be204c8a83ffd0f926203e37
+  metadata.gz: 9cef773f5bde48f7d1697b5be99251ec6b4d2dcd5dd15c1d9b7aa60d90089a3476f8b696b5f9e7c93acbbf464d35583519b51d7fdff70cd842c9a97d7a4b2100
+  data.tar.gz: 2a16d609f841f1f2c0b85b217254e5368e042e0e2dc78817f7bee89774e90b12f674c8b3c67c4c73644ef02ff8f2a616109cd0659f63e8bed128cae50431152d

data/lib/mixin_bot/api/inscription.rb

@@ -15,6 +15,12 @@ module MixinBot
         client.get path
       end
 
+      def collection_collectibles(hash, offset: 0)
+        path = "/safe/inscriptions/collections/#{hash}/items"
+
+        client.get path, offset:
+      end
+
       def collectibles(members: [], access_token: nil)
         unspent_outputs = safe_outputs(state: :unspent, members:, access_token:)['data']
         unspent_outputs.select { |output| output['inscription_hash'].present? }

data/lib/mixin_bot/api/legacy_transfer.rb

@@ -4,7 +4,7 @@ module MixinBot
   class API
     module LegacyTransfer
       TRANSFER_ARGUMENTS = %i[asset_id opponent_id amount].freeze
-      def create_transfer(pin, **kwargs)
+      def create_legacy_transfer(pin, **kwargs)
         raise ArgumentError, "#{TRANSFER_ARGUMENTS.join(', ')} are needed for create transfer" unless TRANSFER_ARGUMENTS.all? { |param| kwargs.keys.include? param }
 
         asset_id = kwargs[:asset_id]
@@ -33,7 +33,7 @@ module MixinBot
         client.post path, **payload
       end
 
-      def transfer(trace_id, access_token: nil)
+      def legacy_transfer(trace_id, access_token: nil)
         path = format('/transfers/trace/%<trace_id>s', trace_id:)
         client.get path, access_token:
       end

data/lib/mixin_bot/api/payment.rb

@@ -11,7 +11,7 @@ module MixinBot
         memo = kwargs[:memo] || ''
         trace_id = kwargs[:trace_id] || SecureRandom.uuid
 
-        mix_address = MixinBot.utils.build_mix_address(members, threshold)
+        mix_address = MixinBot.utils.build_mix_address(members:, threshold:)
 
         "https://mixin.one/pay/#{mix_address}?amount=#{amount}&asset=#{asset_id}&memo=#{memo}&trace=#{trace_id}"
       end

data/lib/mixin_bot/api/pin.rb

@@ -30,7 +30,7 @@ module MixinBot
 
       # https://developers.mixin.one/api/alpha-mixin-network/create-pin/
       def update_pin(pin:, old_pin: nil)
-        old_pin ||= MixinBot.config.pin
+        # old_pin ||= MixinBot.config.pin
         raise ArgumentError, 'invalid old pin' if old_pin.present? && old_pin.length != 6
 
         path = '/pin/update'

data/lib/mixin_bot/api/rpc.rb

@@ -4,7 +4,7 @@ module MixinBot
   class API
     module Rpc
       def rpc_proxy(method, params = [], access_token: nil)
-        path = '/external/proxy'
+        path = '/external/kernel'
         payload = {
           method:,
           params:

data/lib/mixin_bot/api/transaction.rb

@@ -269,7 +269,7 @@ module MixinBot
 
         receivers = kwargs[:receivers].presence || [config.app_id]
         receivers_threshold = kwargs[:receivers_threshold] || receivers.length
-        recipient = MixinBot.utils.build_mix_address(receivers, receivers_threshold)
+        recipient = MixinBot.utils.build_mix_address(members: receivers, threshold: receivers_threshold)
 
         content = kwargs[:content]
         collection_hash = kwargs[:collection_hash]

data/lib/mixin_bot/api/transfer.rb

@@ -15,8 +15,17 @@ module MixinBot
       #  spend_key: string / nil,
       # }
       def create_safe_transfer(**kwargs)
-        asset_id = kwargs[:asset_id]
-        raise ArgumentError, 'asset_id required' if asset_id.blank?
+        utxos = kwargs[:utxos]
+        raise ArgumentError, 'utxos must be array' if utxos.present? && !utxos.is_a?(Array)
+
+        asset_id =
+          if utxos.present?
+            utxos.first['asset_id']
+          else
+            kwargs[:asset_id]
+          end
+
+        raise ArgumentError, 'utxos or asset_id required' if utxos.blank? && asset_id.blank?
 
         amount = kwargs[:amount]&.to_d
         raise ArgumentError, 'amount required' if amount.blank?
@@ -29,7 +38,7 @@ module MixinBot
         memo = kwargs[:memo] || ''
 
         # step 1: select inputs
-        utxos = build_utxos(asset_id:, amount:)
+        utxos ||= build_utxos(asset_id:, amount:)
 
         # step 2: build transaction
         tx = build_safe_transaction(
@@ -61,6 +70,7 @@ module MixinBot
           signed_raw
         )
       end
+      alias create_transfer create_safe_transfer
 
       def build_utxos(asset_id:, amount:)
         outputs = safe_outputs(state: 'unspent', asset: asset_id, limit: 500)['data'].sort_by { |o| o['amount'].to_d }

data/lib/mixin_bot/api/user.rb

@@ -49,9 +49,9 @@ module MixinBot
         keystore = {
           app_id: user['data']['user_id'],
           session_id: user['data']['session_id'],
-          private_key:,
-          pin_token: user['data']['pin_token_base64'],
-          spend_key: spend_keypair[1].unpack1('H*')
+          session_private_key: private_key,
+          server_public_key: user['data']['pin_token_base64'],
+          spend_key:
         }
         user_api = MixinBot::API.new(**keystore)
 
@@ -60,7 +60,7 @@ module MixinBot
         # wait for tip pin update in server
         sleep 1
 
-        user_api.safe_register spend_key
+        user_api.safe_register keystore[:spend_key]
 
         keystore
       end

data/lib/mixin_bot/utils/address.rb

@@ -31,7 +31,7 @@ module MixinBot
         payload
       end
 
-      def build_mix_address(members, threshold)
+      def build_mix_address(members:, threshold:)
         raise ArgumentError, 'members should be an array' unless members.is_a? Array
         raise ArgumentError, 'members should not be empty' if members.empty?
         raise ArgumentError, 'members length should less than 256' if members.length > 255
@@ -61,24 +61,24 @@ module MixinBot
 
         data = address[MIX_ADDRESS_PREFIX.length..]
         data = Base58.base58_to_binary data, :bitcoin
-        raise ArgumentError, 'invalid address' if data.length < 3 + 16 + 4
+        raise ArgumentError, 'invalid address, length invalid' if data.length < 3 + 16 + 4
 
         msg = data[...-4]
         checksum = SHA3::Digest::SHA256.digest((MIX_ADDRESS_PREFIX + msg))[0...4]
 
-        raise ArgumentError, 'invalid address' unless checksum[0...4] == data[-4..]
+        raise ArgumentError, 'invalid address, checksum invalid' unless checksum[0...4] == data[-4..]
 
         version = data[0].ord
-        raise ArgumentError, 'invalid address' unless version == MIX_ADDRESS_VERSION
+        raise ArgumentError, 'invalid address, version invalid' unless version == MIX_ADDRESS_VERSION
 
         threshold = data[1].ord
         members_count = data[2].ord
 
-        if data[3..].length == members_count * 16
-          members = data[3..].scan(/.{16}/)
+        if data[3...-4].length == members_count * 16
+          members = data[3...-4].chars.each_slice(16).map(&:join)
           members = members.map(&->(member) { MixinBot::UUID.new(raw: member).unpacked })
         else
-          members = data[3..].scan(/.{64}/)
+          members = data[3...-4].chars.each_slice(64).map(&:join)
           members = members.map(&->(member) { build_main_address(member) })
         end
 
@@ -100,7 +100,7 @@ module MixinBot
           members:,
           threshold:,
           amount:,
-          mix_address: build_mix_address(members, threshold)
+          mix_address: build_mix_address(members:, threshold:)
         }
       end
 

data/lib/mixin_bot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixin_bot
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - an-lee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-23 00:00:00.000000000 Z
+date: 2024-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -321,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: A Ruby SDK for Mixin Nexwork