tezos_client 0.4.16 → 0.4.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79c72fa7b67051d75e1fce3b9c5cc24a8078bbf8e027f344d0d47cff2455c715
-  data.tar.gz: f98b436a87cbe436ee48f2ea92b4dfaa0be42481677773805b250d1404398f0f
+  metadata.gz: 77e64070f9d16862fe3ea855743decfd8177b364643e52166efd959cac713997
+  data.tar.gz: f6393e2ee64d200169e1ffa47c2b9bb65cf5cd1b5c3507d7bf9d812f6aa1daac
 SHA512:
-  metadata.gz: cbb290b67bbd4bc9077949ec9527c815e65db2917863408f74aa3b1a7db5ddd265c396f668c0cb3afa00f654b81546e590e9751bbcb8b652326b8f59d223221f
-  data.tar.gz: d30036573558a14950b79c5a64c450324d4c65381aadb8237fce67ae954907ddbf4a9c1e2944d52e2839a2d7d37da9e397eb045524bdc8dd94920e53c8922564
+  metadata.gz: 37f86d63ec3aab4310e6328ef7e5f4a9e935e693e98eef92ccdd640a562667692ed7850230a7014386f5030ee962cc8e74f1d3c6171c0b595f9b26000ddd41d7
+  data.tar.gz: ca437a9e9a68bef967f10b5621582f10b28a3ee6ae5e23033509b950bd686a1b1a617188088a2eb0463fdfacd2fb9ad82bb4396b1726eb042f255b6854d75f61

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tezos_client (0.4.16)
+    tezos_client (0.4.17)
       activesupport (~> 6.0.0)
       base58 (~> 0.2.3)
       bip_mnemonic (~> 0.0.2)
@@ -47,11 +47,11 @@ GEM
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     erubi (1.9.0)
-    ffi (1.11.3)
+    ffi (1.12.2)
     hashdiff (1.0.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    httparty (0.17.1)
+    httparty (0.17.3)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     i18n (1.7.0)
@@ -61,7 +61,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (0.9.2)
-    mime-types (3.3)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.1009)
     mini_portile2 (2.4.0)
@@ -79,7 +79,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (4.0.1)
-    rack (2.0.7)
+    rack (2.0.8)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)

data/lib/tezos_client/exceptions.rb

@@ -101,4 +101,6 @@ class TezosClient
       super
     end
   end
+
+  class UnknownTransactionError < Exception; end
 end

data/lib/tezos_client/operation_mgr.rb

@@ -168,18 +168,39 @@ class TezosClient
 
     def ensure_applied!(rpc_responses)
       metadatas = rpc_responses.map { |response| response[:metadata] }
-      operation_results = metadatas.map { |metadata| metadata[:operation_result] }
+      operation_full_results = metadatas.map do |metadata|
+        { op_result: metadata[:operation_result], internal_operation_results: metadata[:internal_operation_results]}
+      end
 
-      failed = operation_results.detect do |operation_result|
+      failed = operation_full_results.map{|op_res| op_res[:op_result]}.detect do |operation_result|
         operation_result != nil && operation_result[:status] != "applied"
       end
 
       return metadatas if failed.nil?
 
-      failed_operation_result = operation_results.detect do |operation_result|
-        operation_result[:status] == "failed"
+      process_transaction_errors!(operation_full_results)
+    end
+
+    def process_transaction_errors!(operations_full_results)
+      detect_operation = ->(op_full_results, status: "failed") do
+        op_full_results.detect do |operation_result|
+          operation_result[:op_result][:status] == status
+        end
+      end
+
+      failed_operation_result = detect_operation.call(operations_full_results)
+
+      if failed_operation_result.nil?
+        backtracked_operation_result = detect_operation.call(operations_full_results, status: "backtracked")
+        raise UnknownTransactionError if backtracked_operation_result.nil?
+
+        internal_operations_results = backtracked_operation_result[:internal_operation_results].map{|op| op[:result]}
+        failed_operation_result = internal_operations_results.detect { |op_result| op_result[:status] == "failed" }
+      else
+        failed_operation_result = failed_operation_result[:op_result]
       end
 
+      operation_results = operations_full_results.map { |full_result| full_result[:op_result] }
       failed!("failed", failed_operation_result[:errors], operation_results)
     end
 

data/lib/tezos_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class TezosClient
-  VERSION = "0.4.16"
+  VERSION = "0.4.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tezos_client
 version: !ruby/object:Gem::Version
-  version: 0.4.16
+  version: 0.4.17
 platform: ruby
 authors:
 - Pierre Michard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-05 00:00:00.000000000 Z
+date: 2020-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler