tezos_client 0.3.9 → 0.4.0

data/lib/tezos_client/rpc_interface/operations.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+class TezosClient
+  class RpcInterface
+    module Operations
+      using CurrencyUtils
+
+      def preapply_operations(operations:, **options)
+        content = {
+          protocol: options.fetch(:protocol),
+          branch: options.fetch(:branch),
+          contents: operations,
+          signature: options.fetch(:signature)
+        }
+
+        res = post("chains/main/blocks/head/helpers/preapply/operations",
+                   [content])
+        res[0]["contents"]
+      end
+
+      def run_operations(operations:, **options)
+        content = {
+          branch: options.fetch(:branch),
+          contents: operations,
+          signature: options.fetch(:signature)
+        }
+        res = post("chains/main/blocks/head/helpers/scripts/run_operation", content)
+        res["contents"]
+      end
+
+      def forge_operations(operations:, **options)
+        content = {
+          branch: options.fetch(:branch),
+          contents: operations
+        }
+        post("chains/main/blocks/head/helpers/forge/operations", content)
+      end
+
+      def broadcast_operation(data)
+        post("injection/operation?chain=main", data)
+      end
+    end
+  end
+end

data/lib/tezos_client/rpc_interface/request_manager.rb

@@ -11,10 +11,10 @@ class TezosClient
 
         log("-------")
         log(">>> GET #{response.request.uri.to_s} \n")
-        log("<<< code: #{response.code} \n #{formatted_response.pretty_inspect}")
+        log("<<< code: #{response.code} \n #{tezos_contents_log(formatted_response)}")
         log("-------")
         unless response.success?
-          raise "#{url} failed with code #{response.code}: #{formatted_response.pretty_inspect}"
+          failed!(url: url, code: response.code, responses: formatted_response)
         end
 
         formatted_response
@@ -29,12 +29,12 @@ class TezosClient
         formatted_response = format_response(response.parsed_response)
 
         log("-------")
-        log(">>> POST #{url} \n #{content.pretty_inspect}")
-        log("<<< code: #{response.code} \n #{formatted_response.pretty_inspect}")
+        log(">>> POST #{url} \n #{tezos_contents_log(content)}")
+        log("<<< code: #{response.code} \n #{tezos_contents_log(formatted_response)}")
         log("-------")
 
         unless response.success?
-          raise "#{url} failed with code #{response.code}:\n #{formatted_response.pretty_inspect}"
+          failed!(url: url, code: response.code, responses: formatted_response)
         end
 
         formatted_response
@@ -63,6 +63,24 @@ class TezosClient
 
       private
 
+      def exception_klass(error)
+        case error[:id]
+        when "proto.003-PsddFKi3.operation.invalid_activation"
+          TezosClient::InvalidActivation
+        else
+          TezosClient::RpcRequestFailure
+        end
+      end
+
+      def failed!(url:, code:, responses:)
+        error = responses[0]
+        raise exception_klass(error).new(
+          error: error,
+          url: url,
+          status_code: code
+        )
+      end
+
       def monitor_event_reader(uuid, event_handler)
         proc do |event_response|
           event_response.read_body do |event_json|

data/lib/tezos_client/version.rb

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

data/travis-scripts/install-liquidity.sh

@@ -3,24 +3,16 @@
 # This script is used in .travis.yml for continuous integration on travis.
 # BTW, it also show some needed system packages to build liquidity
 # Travis CI is done on Ubuntu trusty
+export OPAMYES=1
 
 [ -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 set liquidity
-
-eval `opam config env`
-opam update
 eval `opam config env`
 
-make clone-tezos
-tezos/scripts/install_build_deps.raw.sh
-
-cd tezos && make build-deps all install && cd -
 make build-deps
-
+make clone-tezos
 make
 make install

data/travis-scripts/install-opam.sh

@@ -1,4 +1,12 @@
-#!/bin/sh
-set -ex
+# This script is used in .travis.yml for continuous integration on travis.
+# Travis CI is done on Ubuntu trusty
+
+export OPAMYES=1
 wget https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh
-yes "" | sh install.sh
+yes "" | sh install.sh
+
+opam switch create liquidity 4.06.1  || opam switch set liquidity
+
+eval $(opam config env)
+
+opam update

data/travis-scripts/prepare-ubuntu.sh

@@ -0,0 +1,14 @@
+# This script is used in .travis.yml for continuous integration on travis.
+# This also show some needed system packages to build liquidity.
+# Travis CI is done on Ubuntu Xenial
+
+sudo apt-get update -qq
+sudo apt-get install -y -qq libgmp-dev
+
+# do this in a second step
+# for ubuntu, these packages are too old or not available in xenial
+sudo add-apt-repository "deb http://fr.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tezos_client
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - Pierre Michard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-29 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -223,11 +223,14 @@ files:
 - lib/tezos_client/crypto.rb
 - lib/tezos_client/currency_utils.rb
 - lib/tezos_client/encode_utils.rb
+- lib/tezos_client/exceptions.rb
 - lib/tezos_client/liquidity_inteface/liquidity_wrapper.rb
 - lib/tezos_client/liquidity_interface.rb
 - lib/tezos_client/logger.rb
-- lib/tezos_client/operation.rb
+- lib/tezos_client/operation_mgr.rb
 - lib/tezos_client/operations/activate_account_operation.rb
+- lib/tezos_client/operations/operation.rb
+- lib/tezos_client/operations/operation_array.rb
 - lib/tezos_client/operations/origination_operation.rb
 - lib/tezos_client/operations/reveal_operation.rb
 - lib/tezos_client/operations/transaction_operation.rb
@@ -238,13 +241,14 @@ files:
 - lib/tezos_client/rpc_interface/contracts.rb
 - lib/tezos_client/rpc_interface/helper.rb
 - lib/tezos_client/rpc_interface/monitor.rb
+- lib/tezos_client/rpc_interface/operations.rb
 - lib/tezos_client/rpc_interface/request_manager.rb
 - lib/tezos_client/string_utils.rb
 - lib/tezos_client/version.rb
 - tezos_client.gemspec
 - travis-scripts/install-liquidity.sh
 - travis-scripts/install-opam.sh
-- travis-scripts/prepare-trusty.sh
+- travis-scripts/prepare-ubuntu.sh
 homepage: http://moneytrack.io
 licenses:
 - MIT

data/lib/tezos_client/operation.rb

@@ -1,159 +0,0 @@
-
-class TezosClient
-
-  class Operation
-    include Crypto
-    using CurrencyUtils
-
-    attr_accessor :liquidity_interface,
-                  :rpc_interface,
-                  :from,
-                  :operation_args,
-                  :rpc_args
-
-    def initialize(liquidity_interface:, rpc_interface:, **args)
-      @liquidity_interface = liquidity_interface
-      @rpc_interface = rpc_interface
-      @from = args.fetch(:from) { raise ArgumentError, "Argument :from missing" }
-      @secret_key = args.fetch(:secret_key)
-      @init_args = args
-      @operation_args = {}
-      initialize_operation_args
-      @signed_operation_args_h = nil
-      @rpc_args = rpc_interface.operation(@operation_args)
-    end
-
-    def initialize_operation_args
-      raise NotImplementedError.new("#{self.class.name}##{__method__} is an abstract method.")
-    end
-
-    def operation_kind
-      raise NotImplementedError.new("#{self.class.name}##{__method__} is an abstract method.")
-    end
-
-    def branch
-      rpc_interface.head_hash
-    end
-
-    def remote_counter
-      @remote_counter ||= rpc_interface.contract_counter(from) + 1
-    end
-
-    def counter
-      @counter ||= @init_args.fetch(:counter) { remote_counter }
-    end
-
-    def protocol
-      rpc_interface.protocol
-    end
-
-    def simulate_and_update_limits
-      run_result = run
-
-      @operation_args[:gas_limit] = run_result[:consumed_gas] + 0.01
-      #@operation_args[:storage_limit] = run_result[:consumed_storage]
-    end
-
-    def to_hex
-      rpc_interface.forge_operation(operation_args)
-    end
-
-    def sign
-      sign_operation(
-        secret_key: @secret_key,
-        operation_hex: to_hex
-      ) do |base_58_signature, signed_hex, _op_id|
-        @signed_operation_args_h = operation_args.hash
-        @base_58_signature = base_58_signature
-        @signed_hex = signed_hex
-      end
-    end
-
-    def signed?
-      @signed_operation_args_h == operation_args.hash
-    end
-
-    def base_58_signature
-      sign unless signed?
-      @base_58_signature
-    end
-
-    def signed_hex
-      sign unless signed?
-      @signed_hex
-    end
-
-    def test_and_broadcast
-      # https://gitlab.com/tezos/tezos/issues/376
-      operation_args.merge!(counter: remote_counter)
-
-      # simulate operations and adjust gas limits
-      simulate_and_update_limits
-      operation_result = preapply
-
-      # https://gitlab.com/tezos/tezos/issues/376
-      operation_args.merge!(counter: counter)
-
-      op_id = broadcast
-      {
-        operation_id: op_id,
-        operation_result: operation_result,
-        counter: counter
-      }
-    end
-
-    def run
-      rpc_response = rpc_interface.run_operation(**operation_args, signature: base_58_signature)
-
-      consumed_storage = 0
-      consumed_gas = 0
-
-      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,
-        consumed_gas: consumed_gas,
-        consumed_storage: consumed_storage,
-        operation_result: operation_result
-      }
-    end
-
-    def preapply
-      res = rpc_interface.preapply_operation(
-        **operation_args,
-        signature: base_58_signature,
-        protocol: protocol)
-
-      ensure_applied!(res)
-    end
-
-    def broadcast
-      rpc_interface.broadcast_operation(signed_hex)
-    end
-
-
-    private
-
-    def ensure_applied!(rpc_response)
-      operation_result = rpc_response[:metadata][:operation_result]
-      status = operation_result[:status]
-      raise "Operation status != 'applied': #{status}\n #{rpc_response.pretty_inspect}" if status != "applied"
-      if block_given?
-        yield rpc_response[:metadata]
-      else
-        operation_result
-      end
-    end
-  end
-end

data/travis-scripts/prepare-trusty.sh

@@ -1,16 +0,0 @@
-#!/bin/sh
-# This script is used in .travis.yml for continuous integration on travis.
-# BTW, it also show some needed system packages to build liquidity.
-# Travis CI is done on Ubuntu trusty
-
-sudo apt-get update -qq
-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://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 pkg-config
-