tezos_client 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a192811cdc281656ad008df4408d830283c77f7ccf66150c0282005a68505f7c
-  data.tar.gz: d1c9561af9631e8db8c54b867983efc0e0c54c0628a8f88354fc0a0d55e861dd
+  metadata.gz: ffefe0d089bcd17b9465df8a4e4b7409d618679a9578c1458390860019bf0d70
+  data.tar.gz: a42e73bfeb06305e2036eaeb64aedb8d6f91b87588b80fe250f02539d23a92e9
 SHA512:
-  metadata.gz: 334a46f80c4e6873dbd587413589d343eaba149881f6b99dcc44c658f5c904fded810ed938748aa3085bcd70db198f74564ae1e2e5a2099a6d55b40e2c425569
-  data.tar.gz: bc6a850b461d0608f82d1929745a5c34493f4c34365e4018e3bcc1ee6f3ab7e8b26613d540e05556932166a7e6af3c4fea3db60e663898bef25518ba6593810d
+  metadata.gz: ecc48bac51f93003aeaf99e7b3b18098621d0bf0163c1c8547b4284e36995b76d9955e3bd35b52c608b01c90d961a35db2c89d54cbaa880539633f7b4cd8abd9
+  data.tar.gz: 5660b04412502fd92d95fc54e411afd7c542cc002b2f5e5e817d359d8fd076ada260284037d5e5cd3e9976142ce941cabfd7d13e0385f01ab36235e3e6cba149

data/.travis.yml

@@ -1,7 +1,8 @@
 ---
 dist: trusty
 sudo: required
-language: ruby
+#language: ruby
+language: ocaml
 cache:
   bundler: true
   directories:
@@ -17,5 +18,4 @@ before_install:
   - sh travis-scripts/install-liquidity.sh
   - gem install bundler -v 1.16.3
 script:
-  - eval $(opam config env)
   - bundle exec rake

data/Gemfile.lock

@@ -11,20 +11,20 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.1)
-      actionview (= 5.2.1)
-      activesupport (= 5.2.1)
+    actionpack (5.2.2)
+      actionview (= 5.2.2)
+      activesupport (= 5.2.2)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.1)
-      activesupport (= 5.2.1)
+    actionview (5.2.2)
+      activesupport (= 5.2.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (5.2.1)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -34,42 +34,43 @@ GEM
     ast (2.4.0)
     base58 (0.2.3)
     builder (3.2.3)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.4)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.4)
     diff-lcs (1.3)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    erubi (1.7.1)
-    ffi (1.9.25)
-    hashdiff (0.3.7)
+    erubi (1.8.0)
+    ffi (1.10.0)
+    hashdiff (0.3.8)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    httparty (0.16.2)
+    httparty (0.16.3)
+      mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.1.0)
+    i18n (1.5.1)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.1)
-    loofah (2.2.2)
+    jaro_winkler (1.5.2)
+    loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    method_source (0.9.0)
+    method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
     multi_xml (0.6.0)
     netrc (0.11.0)
-    nokogiri (1.8.4)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.0)
+      mini_portile2 (~> 2.4.0)
     parallel (1.12.1)
-    parser (2.5.1.2)
+    parser (2.5.3.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     public_suffix (3.0.3)
-    rack (2.0.5)
+    rack (2.0.6)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
@@ -77,9 +78,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.1)
-      actionpack (= 5.2.1)
-      activesupport (= 5.2.1)
+    railties (5.2.2)
+      actionpack (= 5.2.2)
+      activesupport (= 5.2.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
@@ -91,42 +92,42 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    rubocop (0.58.2)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    rubocop (0.62.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-rails_config (0.2.3)
+      unicode-display_width (~> 1.4.0)
+    rubocop-rails_config (0.4.0)
       railties (>= 3.0)
-      rubocop (~> 0.56)
+      rubocop (~> 0.58)
     ruby-progressbar (1.10.0)
     safe_yaml (1.0.4)
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    unicode-display_width (1.4.0)
+    unicode-display_width (1.4.1)
     vcr (4.0.0)
-    webmock (3.4.2)
+    webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff

data/lib/tezos_client/operation.rb

@@ -51,7 +51,8 @@ class TezosClient
       run_result = run
 
       @operation_args[:gas_limit] = run_result[:consumed_gas] + 0.01
-      @operation_args[:storage_limit] = run_result[:consumed_storage]
+      #@operation_args[:storage_limit] = run_result[:consumed_storage]
+      @operation_args[:storage_limit] =  0.006
     end
 
     def to_hex
@@ -105,10 +106,21 @@ class TezosClient
     def run
       rpc_response = rpc_interface.run_operation(**operation_args, signature: base_58_signature)
 
-      operation_result = ensure_applied!(rpc_response)
+      consumed_storage = 0
+      consumed_gas = 0
 
-      consumed_storage = operation_result.fetch(:paid_storage_size_diff, "0").to_i.from_satoshi
-      consumed_gas = operation_result.fetch(:consumed_gas, "0").to_i.from_satoshi
+      operation_result = ensure_applied!(rpc_response) do |result|
+        consumed_storage = (result.dig(:operation_result, :paid_storage_size_diff) || "0").to_i.from_satoshi
+        consumed_gas = (result.dig(:operation_result, :consumed_gas) || "0").to_i.from_satoshi
+
+        unless result[:internal_operation_results].nil?
+          result[:internal_operation_results].each do |internal_operation_result|
+            consumed_gas += (internal_operation_result[:result][:consumed_gas] || "0").to_i.from_satoshi
+          end
+        end
+
+        result[:operation_result]
+      end
 
       {
         status: :applied,
@@ -138,7 +150,11 @@ class TezosClient
       operation_result = rpc_response[:metadata][:operation_result]
       status = operation_result[:status]
       raise "Operation status != 'applied': #{status}\n #{rpc_response.pretty_inspect}" if status != "applied"
-      operation_result
+      if block_given?
+        yield rpc_response[:metadata]
+      else
+        operation_result
+      end
     end
   end
 end

data/lib/tezos_client/operations/transaction_operation.rb

@@ -30,7 +30,7 @@ class TezosClient
 
     def default_args
       {
-        gas_limit: 0.04,
+        gas_limit: 0.1,
         storage_limit: 0.006,
         fee: 0.05
       }

data/lib/tezos_client/version.rb

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

data/travis-scripts/install-liquidity.sh

@@ -4,22 +4,23 @@
 # BTW, it also show some needed system packages to build liquidity
 # Travis CI is done on Ubuntu trusty
 
-[ -d liquidity ] || git clone --depth=50 https://github.com/OCamlPro/liquidity.git liquidity
+[ -d "liquidity/.git" ] || git clone --depth=50 https://github.com/OCamlPro/liquidity.git liquidity
 cd liquidity
 git pull
 git checkout next
 
 # currently, we only target OCaml 4.06.1 because we reuse the parser of OCaml
-opam switch create liquidity 4.06.1
+opam switch create liquidity 4.06.1 || opam switch set liquidity
 
-eval $(opam config env)
+eval `opam config env`
 opam update
-eval $(opam config env)
+eval `opam config env`
 
-make build-deps
 make clone-tezos
 tezos/scripts/install_build_deps.raw.sh
-# make -C tezos build-deps
+
+cd tezos && make build-deps all install && cd -
+make build-deps
 
 make
 make install

data/travis-scripts/prepare-trusty.sh

@@ -4,13 +4,13 @@
 # Travis CI is done on Ubuntu trusty
 
 sudo apt-get update -qq
-sudo apt-get install -y -qq libgmp-dev pandoc # ocaml ocaml-native-compilers
+sudo apt-get install -y -qq libgmp-dev pandoc make m4 gcc aspcud curl # ocaml ocaml-native-compilers
 
 # do this in a second step to only install libsecp256k1-dev libsecp256k1-0
 # for ubuntu, these packages are not available in trusty
-sudo add-apt-repository "deb http://cz.archive.ubuntu.com/ubuntu artful main universe"
+sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu artful main universe"
 sudo apt-get update -qq
 sudo apt-get install -y -qq \
      libsecp256k1-dev libsecp256k1-0 libsodium-dev libssl-dev \
-     bubblewrap libev-dev libhidapi-dev
+     bubblewrap libev-dev libhidapi-dev pkg-config
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tezos_client
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Pierre Michard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2019-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler