iost_sdk 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ad731fd51e432cb3e208830e9bac05b6791929a5b10b3160292e2c9dabbf32d
-  data.tar.gz: 2acb03fbf50d62203bbe8727c66ee17a038b0c909355b643ce2ba5e1092485b0
+  metadata.gz: 3c7627fde4fe416cfe76cdcb120424fb3b13ec46e2faa5d473be118aaa143486
+  data.tar.gz: 6901a1b985095abf199ab7156acb3b5337ac7a037f579b1a2973ffdb1cc89044
 SHA512:
-  metadata.gz: 3282a86197eb10e5f0aeedbfea442200e0504ff619f031e66f4d6f99dcbdf56b873a41b64406c5064157226be9483b12990958a56846ed642d95f64f0f49daf1
-  data.tar.gz: a5ae133dc8048a86c2cf0ff0a52fec861c1ad876eb9a5a7469f0ad4167f08f7ec7e731684514fd7a0572ac4c1846f09df4754cb06175b64b024dbfb55d13a37e
+  metadata.gz: b63944945a76f2971f9286b0189a46dde39e89933cdadf2ddada0d8261edbde950809cbbb7b38c83f4379a3594c5fa21218b1b90e12cd4078f9c58d93f8c15e8
+  data.tar.gz: 42d605532bd9445e9d2fab3643230dcf74893390b9d1f6f84394033e1b8d52d13ba7afca68a9d8b189b27e233049e5b0450edfa0bb141311677b64d3810c04d7

data/lib/iost_sdk.rb

@@ -32,6 +32,8 @@ module IOSTSdk
       failed: 'failed'
     }.freeze
 
+    SERVER_TIME_DIFF_THRESHOLD = (30 * 1_000_000_000).freeze
+
     #
     # @param endpoint [String] a URL of the JSON RPC endpoint of IOST
     def initialize(endpoint:)
@@ -53,10 +55,11 @@ module IOSTSdk
           key_pair: key_pair
         )
 
-        if resp['pre_tx_receipt']['status_code'] != TXN_STATUS[:success].upcase
+        if !resp['pre_tx_receipt'] || (resp['pre_tx_receipt'] && resp['pre_tx_receipt']['status_code'] != TXN_STATUS[:success].upcase)
           {
             status: TXN_STATUS[:failed],
-            txn_hash: resp['hash']
+            txn_hash: resp['hash'],
+            message: resp['pre_tx_receipt'] ? resp['pre_tx_receipt']['error'] : ''
           }
         else
           txn_hash = resp['hash']
@@ -76,7 +79,8 @@ module IOSTSdk
 
           {
             status: txn_status,
-            txn_hash: txn_receipt.tx_hash
+            txn_hash: txn_receipt.tx_hash,
+            message: ''
           }
         end
       end
@@ -91,8 +95,11 @@ 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.set_time_params(expiration: expiration, delay: delay)
-
+      transaction.set_time_params(
+        expiration: expiration,
+        delay: delay,
+        server_time_diff: server_time_diff
+      )
       @transaction = transaction
       self
     end
@@ -112,7 +119,6 @@ module IOSTSdk
         abi_args: [token, from, to, amount.to_s, memo]
       )
       @transaction.add_approve(token: :iost, amount: amount)
-      @transaction.set_time_params(expiration: expiration, delay: delay)
 
       self
     end
@@ -148,9 +154,14 @@ module IOSTSdk
           action_data: [creator, name, initial_gas_pledge.to_s]
         )
       end
+      transaction.set_time_params(
+        expiration: expiration,
+        delay: delay,
+        server_time_diff: server_time_diff
+      )
 
-      transaction.set_time_params(expiration: expiration, delay: delay)
       @transaction = transaction
+
       self
     end
 
@@ -174,5 +185,17 @@ module IOSTSdk
       )
       transaction
     end
+
+    def server_time_diff
+      request_start_time = Time.now.utc.to_i * 1_000_000_000
+      node_server_time = @client.get_node_info.server_time.to_i
+      request_end_time = Time.now.utc.to_i * 1_000_000_000
+
+      if request_end_time - request_start_time < SERVER_TIME_DIFF_THRESHOLD
+        node_server_time - request_end_time
+      else
+        0
+      end
+    end
   end
 end

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

@@ -39,10 +39,11 @@ module IOSTSdk
         #
         # @param expiration [Integer] number of seconds, since creation, the transaction will expire in
         # @param delay [Integer] the delay
-        def set_time_params(expiration:, delay:)
+        # @param server_time_diff [Integer] diff between client time and IOST node server time
+        def set_time_params(expiration:, delay:, server_time_diff:)
           time_now = (Time.now.utc.to_f * 1000).to_i * 1_000_000
 
-          @time = time_now
+          @time = time_now + (server_time_diff || 0)
           @expiration = @time + expiration * 1_000_000_000
           @delay = delay
         end
@@ -67,7 +68,6 @@ 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(

data/lib/iost_sdk/version.rb

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

metadata

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