iost_sdk 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47f23025639c7a13c134e39e88e3e91696a5a04459528fc515b31289f5fdde6b
-  data.tar.gz: 34ae6bafab7ac64c5329d5c80e83f257e446e61c7ca05e03ab263a8096c212d0
+  metadata.gz: 6ad731fd51e432cb3e208830e9bac05b6791929a5b10b3160292e2c9dabbf32d
+  data.tar.gz: 2acb03fbf50d62203bbe8727c66ee17a038b0c909355b643ce2ba5e1092485b0
 SHA512:
-  metadata.gz: cff87f7f815c940755e552bf99534c79ad93d7ebad82cab690d122339319661147309b7623b151006044dd9675bb9c6b6dd96fb48bc79ad7259e2d532c2b4a37
-  data.tar.gz: ea48f173fe2d6d9c30acdd37c085ed609350bdacef3a9e01f75821aca69b4bd2e6068e3dd6bc105c9f8c20d815ce3f8cfc0331028a40f2bcbd9f261c9f0af3fd
+  metadata.gz: 3282a86197eb10e5f0aeedbfea442200e0504ff619f031e66f4d6f99dcbdf56b873a41b64406c5064157226be9483b12990958a56846ed642d95f64f0f49daf1
+  data.tar.gz: a5ae133dc8048a86c2cf0ff0a52fec861c1ad876eb9a5a7469f0ad4167f08f7ec7e731684514fd7a0572ac4c1846f09df4754cb06175b64b024dbfb55d13a37e

data/lib/iost_sdk/errors.rb

@@ -6,5 +6,11 @@ module IOSTSdk
         super(@message)
       end
     end
+
+    class InvalidTransactionError < StandardError
+      def initialize(message)
+        super(message)
+      end
+    end
   end
 end

data/lib/iost_sdk/models/query/transaction.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'json'
+require 'iost_sdk/errors'
 require 'iost_sdk/models'
 require 'iost_sdk/models/amount_limit'
 require 'iost_sdk/models/action'
@@ -12,6 +13,10 @@ module IOSTSdk
       class Transaction
         include Models
 
+        GAS_LIMIT_RANGE = [6000, 4_000_000].freeze
+        GAS_RATIO_RANGE = [1, 100].freeze
+        NUMERIC_REGEX = /^\d+(\.\d+)?$/.freeze
+
         attr_accessor :chain_id
 
         def self.attr_names
@@ -62,6 +67,9 @@ module IOSTSdk
         # @param token [String] name of the token
         # @param amount [Integer|String] amount of the token or 'unlimited'
         def add_approve(token:, amount:)
+          raise IOSTSdk::Errors::InvalidTransactionError.new('approve token should not be *') if token == '*'
+          raise IOSTSdk::Errors::InvalidTransactionError.new('approve amount should be numeric') unless amount.is_a?(Numeric)
+
           @amount_limit << IOSTSdk::Models::AmountLimit.new.populate(
             model_data: {
               'token' => token.to_s,
@@ -69,6 +77,18 @@ module IOSTSdk
             }
           )
         end
+
+        # Verify if the transaction object is valid
+        def is_valid?
+          [
+            # check gas limit
+            gas_limit.is_a?(Numeric) && gas_limit.between?(GAS_LIMIT_RANGE.first, GAS_LIMIT_RANGE.last),
+            # check gas ratio
+            gas_ratio.is_a?(Numeric) && gas_ratio.between?(GAS_RATIO_RANGE.first, GAS_RATIO_RANGE.last),
+            # check approve token and amount
+            amount_limit.all? { |al| al.token != '*' || /^\d+(\.\d+)?$/ =~ al.value }
+          ].all?
+        end
       end
     end
   end

data/lib/iost_sdk/version.rb

@@ -1,3 +1,3 @@
 module IOSTSdk
-  VERSION = ENV['IOST_SDK_VERSION'] || '0.1.0'
+  VERSION = ENV['IOST_SDK_VERSION'] || '0.1.4'
 end

data/lib/iost_sdk.rb

@@ -46,7 +46,7 @@ module IOSTSdk
     def_delegators :@client, *IOSTSdk::Http::Client.read_apis.keys
 
     def sign_and_send(account_name:, key_pair:)
-      if @transaction
+      if @transaction && @transaction.is_valid?
         resp = @client.send_tx(
           transaction: @transaction,
           account_name: account_name,
@@ -91,7 +91,6 @@ module IOSTSdk
     def call_abi(contract_id:, abi_name:, abi_args:)
       transaction = init_transaction
       transaction.add_action(contract_id: contract_id, action_name: abi_name, action_data: abi_args)
-      transaction.add_approve(token: '*', amount: :unlimited)
       transaction.set_time_params(expiration: expiration, delay: delay)
 
       @transaction = transaction
@@ -110,7 +109,7 @@ module IOSTSdk
       call_abi(
         contract_id: 'token.iost',
         abi_name: :transfer,
-        abi_args: [token, from, to, amount, memo]
+        abi_args: [token, from, to, amount.to_s, memo]
       )
       @transaction.add_approve(token: :iost, amount: amount)
       @transaction.set_time_params(expiration: expiration, delay: delay)
@@ -151,8 +150,6 @@ module IOSTSdk
       end
 
       transaction.set_time_params(expiration: expiration, delay: delay)
-      transaction.add_approve(token: '*', amount: approval_limit_amount)
-
       @transaction = transaction
       self
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iost_sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Han Wang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2019-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler