mixin_bot 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d714edf6aef84c707774d04abf1b8016041d09160f82864966e2b09bf6845870
-  data.tar.gz: 7816eaf72dd92c841ed78e9bc315a562feb12b34d50f7c87c35a3c34d7fe1176
+  metadata.gz: cd8f989ccf2f759f7a9498fbacb7ce8b2f1652c254b08d9c021de11ff2814ecc
+  data.tar.gz: e3da8ada69570970fd7277058f0f55b5b05696dde767be56190eef4a7bab8a21
 SHA512:
-  metadata.gz: 846f28a71824b964b68664538e2960f991dabf3ebbcf3f162cacc2ef4fd88713351d2949f639108d125cfd65dc33aebb9f6c4bfdc07d2fcf07f72d01a96c10b2
-  data.tar.gz: fc2939f80ba895921d45d5d29866d50696dab737b19f5234d1223d6f3cd5867879606ec3978ee502ae7532275cbd6172a6a780771c3d68965fa82f5e2ae446f7
+  metadata.gz: c8fc866de489a28d5566ae5711a42c6635ab62a11c8789b744728d7eac2e428af451114d80f8383d2ddb1d9997e92a84ca9bffe24f9eee3e3f1feadcf768b002
+  data.tar.gz: 7aeea158f3c1f142b82e9ffbc26647aa30d8c8dfe0712eede9417cc7875786d95cef4cdbe617f6f5f6e6f90092a1fb9934a64fe9cfbdef89261b008b180262d4

data/lib/mixin_bot.rb

@@ -11,6 +11,7 @@ require 'msgpack'
 require 'open3'
 require 'openssl'
 require 'rbnacl'
+require 'sha3'
 
 require_relative './mixin_bot/api'
 require_relative './mixin_bot/cli'

data/lib/mixin_bot/api/multisig.rb

@@ -28,26 +28,28 @@ module MixinBot
       #     "signed_tx":""
       #   }
       # ]}
-      def multisigs(limit: 100, offset: nil, access_token: nil)
-        path = format('/multisigs?limit=%<limit>s&offset=%<offset>s', limit: limit, offset: offset)
+      def outputs(**kwargs)
+        limit = kwargs[:limit] || 100
+        offset = kwargs[:offset]
+        state = kwargs[:state]
+        members = kwargs[:members]
+        threshold = kwargs[:threshold]
+        access_token = kwargs[:access_token]
+        members = SHA3::Digest::SHA256.hexdigest(members&.sort&.join)
+
+        path = format(
+          '/multisigs/outputs?limit=%<limit>s&offset=%<offset>s&state=%<state>s&members=%<members>s&threshold=%<threshold>s',
+          limit: limit,
+          offset: offset,
+          state: state,
+          members: members,
+          threshold: threshold
+        )
         access_token ||= access_token('GET', path, '')
         authorization = format('Bearer %<access_token>s', access_token: access_token)
         client.get(path, headers: { 'Authorization': authorization })
       end
-
-      def all_multisigs(utxos: [], offset: nil, access_token: nil)
-        res = multisigs(limit: 100, offset: offset, access_token: access_token)
-
-        return [] if res['data'].nil?
-
-        utxos += res['data']
-
-        if res['data'].length < 100
-          utxos
-        else
-          all_multisigs(utxos: utxos, offset: utxos[-1]['created_at'], access_token: access_token)
-        end
-      end
+      alias multisigs outputs
 
       def create_output(receivers:, index:, access_token: nil)
         path = '/outputs'
@@ -64,7 +66,7 @@ module MixinBot
       # create a request for multi sign
       # for now, raw(RAW-TRANSACTION-HEX) can only be generated by Mixin SDK of Golang or Javascript
       def create_sign_multisig_request(raw, access_token: nil)
-        path = '/multisigs'
+        path = '/multisigs/requests'
         payload = {
           action: 'sign',
           raw: raw
@@ -77,7 +79,7 @@ module MixinBot
       # transfer from the multisig address
       # create a request for unlock a multi-sign
       def create_unlock_multisig_request(raw, access_token: nil)
-        path = '/multisigs'
+        path = '/multisigs/requests'
         payload = {
           action: 'unlock',
           raw: raw
@@ -88,7 +90,7 @@ module MixinBot
       end
 
       def sign_multisig_request(request_id, pin)
-        path = format('/multisigs/%<request_id>s/sign', request_id: request_id)
+        path = format('/multisigs/requests/%<request_id>s/sign', request_id: request_id)
         payload = {
           pin: encrypt_pin(pin)
         }
@@ -98,7 +100,7 @@ module MixinBot
       end
 
       def unlock_multisig_request(request_id, pin)
-        path = format('/multisigs/%<request_id>s/unlock', request_id: request_id)
+        path = format('/multisigs/requests/%<request_id>s/unlock', request_id: request_id)
         payload = {
           pin: encrypt_pin(pin)
         }
@@ -108,7 +110,7 @@ module MixinBot
       end
 
       def cancel_multisig_request(request_id, pin)
-        path = format('/multisigs/%<request_id>s/cancel', request_id: request_id)
+        path = format('/multisigs/requests/%<request_id>s/cancel', request_id: request_id)
         payload = {
           pin: encrypt_pin(pin)
         }
@@ -165,76 +167,42 @@ module MixinBot
         "fffe#{s}"
       end
 
-      # filter utxo by members, asset_id and threshold
-      def filter_utxos(**kwargs)
-        utxos = all_multisigs(access_token: kwargs[:access_token])
-
-        unless kwargs[:members].nil?
-          utxos = utxos.filter(
-            &lambda { |utxo|
-              utxo['members'].sort == kwargs[:members].sort
-            }
-          )
-        end
-
-        unless kwargs[:asset_id].nil?
-          utxos = utxos.filter(
-            &lambda { |utxo|
-              utxo['asset_id'] == kwargs[:asset_id]
-            }
-          )
-        end
-
-        unless kwargs[:threshold].nil?
-          utxos = utxos.filter(
-            &lambda { |utxo|
-              utxo['threshold'] == kwargs[:threshold]
-            }
-          )
-        end
-
-        unless kwargs[:state].nil?
-          utxos = utxos.filter(
-            &lambda { |utxo|
-              utxo['state'] == kwargs[:state]
-            }
-          )
-        end
-
-        utxos
-      end
-
       # kwargs:
       # {
       #   senders: [ uuid ],
       #   receivers: [ uuid ],
       #   threshold: integer,
       #   asset_id: uuid,
-      #   asset_mixin_id: string,
       #   amount: string / float,
       #   memo: string,
       # }
-      def build_raw_transaction(kwargs)
+      RAW_TRANSACTION_ARGUMENTS = %i[senders receivers amount threshold asset_id].freeze
+      def build_raw_transaction(**kwargs)
+        raise ArgumentError, "#{RAW_TRANSACTION_ARGUMENTS.join(', ')} are needed for build raw transaction" unless RAW_TRANSACTION_ARGUMENTS.all? { |param| kwargs.keys.include? param }
+
         senders        = kwargs[:senders]
         receivers      = kwargs[:receivers]
-        asset_id       = kwargs[:asset_id]
-        asset_mixin_id = kwargs[:asset_mixin_id]
         amount         = kwargs[:amount]
-        memo           = kwargs[:memo]
         threshold      = kwargs[:threshold]
-        access_token   = kwargs[:access_token]
+        asset_id       = kwargs[:asset_id]
         utxos          = kwargs[:utxos]
+        memo           = kwargs[:memo]
+        access_token   = kwargs[:access_token]
 
         raise 'access_token required!' if access_token.nil? && !senders.include?(client_id)
 
-        # default to use all unspent utxo
-        utxos ||= filter_utxos(
+        # default to use all(first 100) unspent utxo
+        utxos ||= multisigs(
           members: senders,
-          asset_id: asset_id,
           threshold: threshold,
           state: 'unspent',
           access_token: access_token
+        ).filter(
+          &lambda { |utxo|
+            utxo['asset_id'] == kwargs[:asset_id]
+          }
         )
+
         amount = amount.to_f.round(8)
         input_amount = utxos.map(
           &lambda { |utxo|
@@ -281,7 +249,7 @@ module MixinBot
         extra = Digest.hexencode memo.to_s.slice(0, 140)
         tx = {
           version: 1,
-          asset: asset_mixin_id,
+          asset: SHA3::Digest::SHA256.hexdigest(asset_id),
           inputs: inputs,
           outputs: outputs,
           extra: extra

data/lib/mixin_bot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixin_bot
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - an-lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2021-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.1'
+- !ruby/object:Gem::Dependency
+  name: sha3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement