tezos_client 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ea0bb8309ad037eaa79cd877cd344fa3a2dea0f12b3fe3efe1ded6e6089929e
-  data.tar.gz: 6fccb50a5c5c5938d61eebd5d4c5556faceccb402f02b0c6688afb3a3f8ee337
+  metadata.gz: a21029dab6eb8b945102361e51011ad6a580d80cee4bffe390b3280ccc901976
+  data.tar.gz: 8c1fa53542e21120978dc47629709b32f0ecbfc944ced46a7b85e434d2051260
 SHA512:
-  metadata.gz: 2df80a4c2f4a966d2e4bf885e2e024be442a343a0f92fd08e56fb81f4d75f70c27e25f03f8fd4e308fa3df28367cf4066d22cc733697b7f43e87a5d2c57b0578
-  data.tar.gz: 0c3324c44fd398a91460b85cf1a1bebaed9764dc78445eb32c2c12a5e53fd319f6428291b047dc4fe427f383639e8cc378354f022294af224a39d8d2075a51db
+  metadata.gz: 7a0bbbdaca9dd25288db693b6543b4c6c7be52927f8a423704e85633cd51028b14c5d502ea75798365891a9ed5f89e6cce7a4e6076c1df86963bb29423cdd5a3
+  data.tar.gz: a9e05d491808f5ddb3649bcaf50cba40c9142814966c85deaa35d6a1892d6bc55f419bf02c145c5b50984a0f23d1f7eca957cf210485c000d860b2f2f8756cc5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tezos_client (0.4.6)
+    tezos_client (0.4.7)
       activesupport (~> 5.2.3)
       base58 (~> 0.2.3)
       bip_mnemonic (~> 0.0.2)

data/lib/tezos_client/exceptions.rb

@@ -52,6 +52,8 @@ class TezosClient
   end
 
   class TezBalanceTooLow < OperationFailure
+    FIRST_ERROR_REGEXP = /proto\.[^.]*\.contract\.balance_too_low/
+
     attr_reader :contract
     attr_reader :balance
     attr_reader :amount
@@ -69,21 +71,22 @@ class TezosClient
   end
 
   class ScriptRuntimeError < OperationFailure
+    FIRST_ERROR_REGEXP = /proto.\d*-\w*\.(scriptRejectedRuntimeError|michelson_v\d\.runtime_error)/
+    ERROR_REGEXP = /proto.\d*-\w*\.(scriptRejectedRuntimeError|michelson_v\d\.script_rejected)/
+
     attr_reader :location
     attr_reader :with
     attr_reader :contract
 
     def initialize(metadata:, errors:, status:)
-      error = errors[0]
-      rejection_error = errors.detect { |error| error[:id] == "proto.003-PsddFKi3.scriptRejectedRuntimeError" }
+      first_error = errors[0]
+      rejection_error = errors.detect { |error| error[:id].match? ERROR_REGEXP }
 
       @location = rejection_error[:location]
-      @contract =  error[:contractHandle]
+      @contract =  first_error[:contractHandle]
       @with = rejection_error[:with]
       @message = "Script runtime Error when executing #{contract}: #{with} (location: #{location})"
       super
     end
   end
-
-
-end
+end

data/lib/tezos_client/operation_mgr.rb

@@ -164,9 +164,9 @@ class TezosClient
     def exception_klass(errors)
       error = errors[0]
       case error[:id]
-      when /proto\.[^.]*\.contract\.balance_too_low/
+      when TezBalanceTooLow::FIRST_ERROR_REGEXP
         TezBalanceTooLow
-      when /proto\.[^.]*\.scriptRuntimeError/
+      when ScriptRuntimeError::FIRST_ERROR_REGEXP
         ScriptRuntimeError
       else
         OperationFailure

data/lib/tezos_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tezos_client
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Pierre Michard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-11 00:00:00.000000000 Z
+date: 2019-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler