tezos_client 0.3.9 → 0.4.0

data/lib/tezos_client/operations/activate_account_operation.rb

@@ -1,35 +1,17 @@
 class TezosClient
   class ActivateAccountOperation < Operation
 
-    def initialize_operation_args
-      @operation_args = default_args.merge(
-        **@init_args,
-        operation_kind: operation_kind,
-        branch: branch)
+    def rpc_operation_args
+      @rpc_operation_args ||= rpc_interface.activate_account_operation(
+        operation_args
+      )
     end
 
-    def operation_kind
-      :activate_account
+    def operation_args
+      {
+        pkh: @args.fetch(:pkh),
+        secret: @args.fetch(:secret)
+      }
     end
-
-    def ensure_applied!(rpc_response)
-      balance_updates = rpc_response[:metadata][:balance_updates]
-      raise "Operation failed\n #{rpc_response.pretty_inspect}" if balance_updates.nil?
-      if block_given?
-        yield rpc_response[:metadata]
-      else
-        rpc_response[:metadata]
-      end
-    end
-
-    private
-
-      def default_args
-        {
-          gas_limit: 0.1,
-          storage_limit: 0.006,
-          fee: 0.05
-        }
-      end
   end
 end

data/lib/tezos_client/operations/operation.rb

@@ -0,0 +1,33 @@
+class TezosClient
+  class Operation
+    delegate :run, :preapply, :test_and_broadcast, :signed_hex, to: :operation_mgr
+
+    def initialize(rpc_interface:, **args)
+      @rpc_interface = rpc_interface
+      @args = args.clone
+      post_initialize(**args)
+    end
+
+    protected
+
+    attr_reader :rpc_interface, :liquidity_interface
+
+    def rpc_operation_args
+      raise NotImplementedError, "#{__method__} is a virtual method"
+    end
+
+    def post_initialize(*_args)
+    end
+
+    def operation_mgr
+      @operation_mgr ||= OperationMgr.new(
+        rpc_interface: rpc_interface,
+        rpc_operation_args: rpc_operation_args,
+        **operation_options)
+    end
+
+    def operation_options
+      @args.slice(:secret_key, :protocol, :branch)
+    end
+  end
+end

data/lib/tezos_client/operations/operation_array.rb

@@ -0,0 +1,35 @@
+class TezosClient
+  class OperationArray < Operation
+
+    def post_initialize(operations:, **args)
+      @operations = operations.clone
+    end
+
+    def rpc_operation_args
+      @rpc_operation_args ||= begin
+        initial_counter = rpc_interface.contract_counter(@args.fetch(:from)) + 1
+
+        operations.map.with_index do |operation, index|
+          counter = (initial_counter + index)
+          operation_kind = operation.delete(:kind)
+
+          operation_klass(operation_kind).new(
+            operation
+              .merge(@args.slice(:from))
+              .merge(
+                rpc_interface: rpc_interface,
+                counter: counter
+            )
+          ).rpc_operation_args
+        end
+      end
+    end
+
+    private
+    attr_reader :operations
+
+    def operation_klass(operation_name)
+      "tezos_client/#{operation_name}_operation".camelize.constantize
+    end
+  end
+end

data/lib/tezos_client/operations/origination_operation.rb

@@ -1,50 +1,19 @@
 class TezosClient
   class OriginationOperation < Operation
-
-    def initialize_operation_args
-      operation_args = default_args.merge(
-        **@init_args,
-        manager: manager,
-        operation_kind: operation_kind,
-        branch: branch,
-        counter: counter)
-
-      if has_script?
-        operation_args[:script] = json_script
-      end
-      @operation_args = operation_args
-    end
-
-    def has_script?
-      @init_args.key? :script
-    end
-
-    def json_script
-      liquidity_interface.origination_script(
-        @init_args.slice(:from, :script, :init_params)
+    def rpc_operation_args
+      @rpc_operation_args ||= rpc_interface.origination_operation(
+        @args.slice(
+          :delegatable,
+          :spendable,
+          :amount,
+          :from,
+          :gas_limit,
+          :storage_limit,
+          :fee,
+          :counter,
+          :script
+        )
       )
     end
-
-    def manager
-      @init_args.fetch(:manager) { @init_args.fetch(:from) }
-    end
-
-
-    def operation_kind
-      :origination
-    end
-
-    private
-
-    def default_args
-      {
-        amount: 0,
-        spendable: false,
-        delegatable: false,
-        gas_limit: 0.1,
-        storage_limit: 0.06,
-        fee: 0.05
-      }
-    end
   end
 end

data/lib/tezos_client/operations/reveal_operation.rb

@@ -1,28 +1,9 @@
 class TezosClient
   class RevealOperation < Operation
-
-    def initialize_operation_args
-      @operation_args = default_args.merge(
-        **@init_args,
-        operation_kind: operation_kind,
-        branch: branch,
-        counter: counter
+    def rpc_operation_args
+      @rpc_operation_args ||= rpc_interface.reveal_operation(
+        @args.slice(:from, :fee, :gas_limit, :storage_limit, :counter, :public_key)
       )
     end
-
-
-    def operation_kind
-      :reveal
-    end
-
-    private
-
-    def default_args
-      {
-        gas_limit: 0.1,
-        storage_limit: 0,
-        fee: 0.05
-      }
-    end
   end
 end

data/lib/tezos_client/operations/transaction_operation.rb

@@ -2,38 +2,35 @@ class TezosClient
   class TransactionOperation < Operation
     include EncodeUtils
 
-    def initialize_operation_args
-      @operation_args = default_args.merge(
-        **@init_args,
-        operation_kind: operation_kind,
-        branch: branch,
-        counter: counter
+    def rpc_operation_args
+      rpc_interface.transaction_operation(
+        operation_args
       )
-      if has_parameters?
-        @operation_args[:parameters] = parameters
-      end
     end
 
-    def has_parameters?
-      @init_args.key? :parameters
-    end
+    private
 
-    def parameters
-      (@init_args[:parameters].is_a? String) ? encode_args(@init_args[:parameters]) : @init_args[:parameters]
-    end
+    def operation_args
+      operation_args = @args.slice(
+        :amount,
+        :from,
+        :to,
+        :gas_limit,
+        :storage_limit,
+        :fee,
+        :counter
+      )
+      operation_args[:parameters] = parameters if has_parameters?
 
-    def operation_kind
-      :transaction
+      operation_args
     end
 
-    private
+    def has_parameters?
+      @args.key? :parameters
+    end
 
-    def default_args
-      {
-        gas_limit: 0.1,
-        storage_limit: 0.006,
-        fee: 0.05
-      }
+    def parameters
+      (@args[:parameters].is_a? String) ? encode_args(@args[:parameters]) : @args[:parameters]
     end
   end
 end

data/lib/tezos_client/operations/transactions_operation.rb

@@ -1,29 +1,31 @@
 class TezosClient
   class TransactionsOperation < Operation
-    include EncodeUtils
-
-    def initialize_operation_args
-      @operation_args = default_args.merge(
-        **@init_args,
-        operation_kind: operation_kind,
-        branch: branch,
-        counter: counter
-      )
+    def rpc_operation_args
+      @rpc_operation_args ||= begin
+        OperationArray.new(
+          operations: operations,
+          secret_key: @args.fetch(:secret_key),
+          from: @args.fetch(:from),
+          rpc_interface: rpc_interface,
+          liquidity_interface: liquidity_interface
+        ).rpc_operation_args
+      end
     end
 
-
-    def operation_kind
-      :transactions
-    end
-
-    private
-
-    def default_args
-      {
-        gas_limit: 0.1,
-        storage_limit: 0.006,
-        fee: 0.05
-      }
+    def operations
+      @args[:amounts].map do |destination, amount|
+        {
+          kind: :transaction,
+          amount: amount,
+          to: destination
+        }.merge(
+          @args.slice(
+            :gas_limit,
+            :storage_limit,
+            :fee
+          )
+        )
+      end
     end
   end
 end

data/lib/tezos_client/rpc_interface.rb

@@ -7,6 +7,7 @@ require_relative "rpc_interface/monitor"
 require_relative "rpc_interface/contracts"
 require_relative "rpc_interface/context"
 require_relative "rpc_interface/helper"
+require_relative "rpc_interface/operations"
 require_relative "rpc_interface/request_manager"
 require_relative "rpc_interface/blocks"
 
@@ -17,6 +18,7 @@ class TezosClient
     include Contracts
     include Context
     include Helper
+    include Operations
     include RequestManager
     include Blocks
 

data/lib/tezos_client/rpc_interface/helper.rb

@@ -11,42 +11,29 @@ class TezosClient
           amount: args.fetch(:amount).to_satoshi.to_s,
           source: args.fetch(:from),
           destination: args.fetch(:to),
-          gas_limit: args.fetch(:gas_limit).to_satoshi.to_s,
-          storage_limit: args.fetch(:storage_limit).to_satoshi.to_s,
-          counter: args.fetch(:counter).to_s,
-          fee: args.fetch(:fee).to_satoshi.to_s
+          gas_limit: args.fetch(:gas_limit, 0.1).to_satoshi.to_s,
+          storage_limit: args.fetch(:storage_limit, 0.006).to_satoshi.to_s,
+          counter: counter(args).to_s,
+          fee: args.fetch(:fee, 0.05).to_satoshi.to_s
         }
         operation[:parameters] = args[:parameters] if args[:parameters]
         operation
       end
 
-      def transactions_operation(args)
-        args[:amounts].map.with_index do |(destination, amount), index|
-          {
-            kind: "transaction",
-            amount: amount.to_satoshi.to_s,
-            source: args.fetch(:from),
-            destination: destination,
-            gas_limit: args.fetch(:gas_limit).to_satoshi.to_s,
-            storage_limit: args.fetch(:storage_limit).to_satoshi.to_s,
-            counter: (args.fetch(:counter) + index).to_s,
-            fee: args.fetch(:fee).to_satoshi.to_s
-          }
-        end
-      end
-
       def origination_operation(args)
+        manager = (args.fetch(:manager) { args.fetch(:from) })
+
         operation = {
           kind: "origination",
-          delegatable: args.fetch(:delegatable),
-          spendable: args.fetch(:spendable),
-          balance: args.fetch(:amount).to_satoshi.to_s,
+          delegatable: args.fetch(:delegatable, false),
+          spendable: args.fetch(:spendable, false),
+          balance: args.fetch(:amount,0).to_satoshi.to_s,
           source: args.fetch(:from),
-          gas_limit: args.fetch(:gas_limit).to_satoshi.to_s,
-          storage_limit: args.fetch(:storage_limit).to_satoshi.to_s,
-          counter: args.fetch(:counter).to_s,
-          fee: args.fetch(:fee).to_satoshi.to_s,
-          managerPubkey: args.fetch(:manager)
+          gas_limit: args.fetch(:gas_limit, 0.1).to_satoshi.to_s,
+          storage_limit: args.fetch(:storage_limit, 0.06).to_satoshi.to_s,
+          counter: counter(args).to_s,
+          fee: args.fetch(:fee, 0.05).to_satoshi.to_s,
+          managerPubkey: manager
         }
 
         operation[:script] = args[:script] if args[:script]
@@ -66,75 +53,32 @@ class TezosClient
         {
           kind: "reveal",
           source: args.fetch(:from),
-          fee: args.fetch(:fee).to_satoshi.to_s,
-          counter: args.fetch(:counter).to_s,
-          gas_limit: args.fetch(:gas_limit).to_satoshi.to_s,
-          storage_limit: args.fetch(:storage_limit).to_satoshi.to_s,
+          fee: args.fetch(:fee, 0.05).to_satoshi.to_s,
+          counter: counter(args).to_s,
+          gas_limit: args.fetch(:gas_limit, 0.1).to_satoshi.to_s,
+          storage_limit: args.fetch(:storage_limit, 0).to_satoshi.to_s,
           public_key: args.fetch(:public_key)
         }
       end
 
-      def operation(args)
-        operation_kind = args.fetch(:operation_kind) { raise ArgumentError, ":operation_kind argument missing" }
-        send("#{operation_kind}_operation", args)
-      end
-
-      %w(origination transaction).each do |operation_kind|
-        # preapply_transaction, preapply_origination ...
-        define_method "preapply_#{operation_kind}" do |args|
-          preapply_operation(operation_kind: operation_kind, **args)
-        end
-
-        # run_transaction, run_origination ...
-        define_method "run_#{operation_kind}" do |args|
-          run_operation(operation_kind: operation_kind, **args)
-        end
-
-        # forge_transaction, forge_origination ...
-        define_method "forge_#{operation_kind}" do |args|
-          forge_operation(operation_kind: operation_kind, **args)
+      def counter(args)
+        args.fetch(:counter) do
+          contract_counter(args.fetch(:from)) + 1
         end
       end
 
-
-      def preapply_operation(args)
-        content = {
-          protocol: args.fetch(:protocol),
-          branch: args.fetch(:branch),
-          contents: contents(args),
-          signature: args.fetch(:signature)
-        }
-
-        res = post("chains/main/blocks/head/helpers/preapply/operations",
-                   [content])
-        res[0]["contents"][0]
-      end
-
-      def run_operation(args)
-        content = {
-          branch: args.fetch(:branch),
-          contents: contents(args),
-          signature: args.fetch(:signature)
-        }
-        res = post("chains/main/blocks/head/helpers/scripts/run_operation", content)
-        res["contents"][0]
-      end
-
-      def forge_operation(args)
-        content = {
-          branch: args.fetch(:branch),
-          contents: contents(args)
-        }
-        post("chains/main/blocks/head/helpers/forge/operations", content)
+      def preapply_operation(operation:, **options)
+        res = preapply_operations(operations: [operation], **options)
+        res[0]
       end
 
-      def broadcast_operation(data)
-        post("injection/operation?chain=main", data)
+      def run_operation(operation:, **options)
+        res = run_operations(operations: [operation], **options)
+        res[0]
       end
 
-      def contents(args)
-        operation = operation(args)
-        (operation.is_a?(Array)) ? operation : [operation]
+      def forge_operation(operation:, **options)
+        forge_operations(operations: [operation], **options)
       end
     end
   end