hyperledger-fabric-sdk 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61082f9951ee384979aabdca9eb446bd756be84ec5aec0dbd7420b66b0d0cfb5
-  data.tar.gz: d227227f253e076ac60d93b86a0b58e3d3ced29952a24cab323e73e44bc2fe22
+  metadata.gz: 1adb2476b322a3f58f95a51a5faef139b215c1b1ad0c87573def1ac041cf94b3
+  data.tar.gz: efe5b6c77982cadeaaa54e0c02f0ae6c68e7c0b7b699dd35af98f624db7d5cc0
 SHA512:
-  metadata.gz: b2af6d41c93b39c2bb9af417b956dc2aaa6ef1740d88b39307149bc230030f283ff49badf7df405bc1da2ee2c928330691cd0aedadde97901b3bf4769ead3fb4
-  data.tar.gz: 1b77714ef415d6a187f4ecdd74170bdfee5728541f0147ea13286b109c0af53761140c5b14fce51d6dbf8bcaf78e5a5b79c21924623e2ed63bf884735519cdf5
+  metadata.gz: a2830cee92fc0691272e115e2b61063e6e843c5f634cc82d55b2420e830263929ea76765c9d6aafc78c3baea525ce1c89ee3617860d7720ecc8d9241472a7f5c
+  data.tar.gz: e7b2e165c001a71114d58c9ffb65cabdfa5fd69b881afb8df51f579c38d698c20ba5aed45059c9beb8deb27d53d9218d899b05f193f3011c75c778577986d113

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 Bryan Padron
+Copyright (c) 2019 Alexandr Kirshin, Bryan Padron
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/fabric.rb

@@ -12,6 +12,7 @@ require_relative 'fabric/version'
 require_relative 'fabric/configuration'
 require_relative 'fabric/constants'
 require_relative 'fabric/client'
+require_relative 'fabric/client_stub'
 require_relative 'fabric/peer'
 require_relative 'fabric/orderer'
 require_relative 'fabric/enumerator_queue'
@@ -22,7 +23,6 @@ require_relative 'fabric/transaction'
 require_relative 'fabric/error'
 require_relative 'fabric/fabric_logger'
 require_relative 'fabric/chaincode_response'
-require_relative 'fabric/channel'
 require_relative 'fabric/transaction_info'
 require_relative 'fabric/helper'
 require_relative 'fabric/block_decoder'
@@ -30,42 +30,23 @@ require_relative 'fabric/event_hub'
 
 module Fabric
   extend Configuration
-  @orderers = []
-  @peers = []
 
   def self.new(config)
-    @orderers = config[:orderers]
-    @peers = config[:peers]
+    assign(config)
+
     self
   end
 
   def self.client(opts = {})
     client = Fabric::Client.new opts
 
-    @orderers.each { |url| client.register_orderer url, opts }
-    @peers.each { |url| client.register_peer url, opts }
+    orderers.each { |config| client.register_orderer config }
+    peers.each { |config| client.register_peer config }
+    event_hubs.each { |config| client.register_event_hub config }
 
     client
   end
 
-  def self.channel(opts = {})
-    channel = Fabric::Channel.new opts
-
-    @orderers.each { |url| channel.register_orderer url, opts }
-    @peers.each { |url| channel.register_peer url, opts }
-
-    channel
-  end
-
-  def self.event_hub(opts = {})
-    options = Fabric.options.merge opts
-
-    options[:crypto_suite] ||= Fabric.crypto_suite
-    options[:url] = options[:event_hub_url]
-
-    Fabric::EventHub.new options
-  end
-
   def self.crypto_suite(opts = {})
     @crypto_suite ||= Fabric::CryptoSuite.new opts
   end

data/lib/fabric/block_decoder.rb

@@ -122,7 +122,7 @@ module Fabric
     def self.decode_payload_header_extension(extension_data)
       return unless extension_data
 
-      Protos::ChaincodeHeaderExtension.decode(extension_data).to_hash
+      Protos::ChaincodeHeaderExtension.decode(extension_data)
     end
 
     def self.decode_signature_header(signature_header_data)
@@ -186,13 +186,13 @@ module Fabric
     end
 
     def self.decode_chaincode_proposal_payload_input(input_data)
-      Protos::ChaincodeInvocationSpec.decode(input_data).to_hash
+      Protos::ChaincodeInvocationSpec.decode(input_data)
     end
 
     def self.decode_chaincode_input(input_data)
       proto_chaincode_input = Protos::ChaincodeInput.decode input_data
 
-      proto_chaincode_input.to_hash
+      proto_chaincode_input
     end
 
     def self.decode_chaincode_endorsed_action(proto_action)
@@ -263,7 +263,7 @@ module Fabric
     end
 
     def self.decode_kv_rw_set(rwset_data)
-      Kvrwset::KVRWSet.decode(rwset_data).to_hash
+      Kvrwset::KVRWSet.decode(rwset_data)
     end
 
     def self.decode_collection_hashed_rw_set(proto_collection_hashed_rwset)
@@ -277,23 +277,23 @@ module Fabric
     end
 
     def self.decode_hashed_rwset(hashed_rwset_data)
-      Rwset::HashedRWSet.decode(hashed_rwset_data).to_hash
+      Rwset::HashedRWSet.decode(hashed_rwset_data)
     end
 
     def self.decode_chaincode_events(event_data)
-      Protos::ChaincodeEvent.decode(event_data).to_hash
+      Protos::ChaincodeEvent.decode(event_data)
     end
 
     def self.decode_response(proposal_response)
       return unless proposal_response
 
-      proposal_response.to_hash
+      proposal_response
     end
 
     def self.decode_chaincode_id(chaincode_id)
       return unless chaincode_id
 
-      chaincode_id.to_hash
+      chaincode_id
     end
   end
 end

data/lib/fabric/client.rb

@@ -1,35 +1,48 @@
 module Fabric
   class Client
-    attr_reader :identity, :crypto_suite,
-                :orderers, :peers, :logger
-
-    MAX_ATTEMPTS_CHECK_TRANSACTION = 20
-    DELAY_PERIOD_CHECK_TRANSACTION = 2
+    attr_reader :identity, :orderers, :peers, :event_hubs, :logger
 
     def initialize(opts = {})
       options = Fabric.options.merge opts
 
       @logger = FabricLogger.new options[:logger], options[:logger_filters]
       @identity = options[:identity]
-      @crypto_suite = options[:crypto_suite]
     end
 
-    def register_peer(url, opts = {})
+    def register_peer(options, extra_options = {})
       @peers ||= []
 
-      @peers << Peer.new(url: url, opts: opts, logger: logger)
+      options = { host: options } if options.is_a?(String)
+      extra_options.merge!(options)
+      extra_options.merge!(logger: logger)
+
+      @peers << Peer.new(extra_options[:host], extra_options[:creds], extra_options)
     end
 
-    def register_orderer(url, opts = {})
+    def register_orderer(options, extra_options = {})
       @orderers ||= []
 
-      @orderers << Orderer.new(url: url, opts: opts, logger: logger)
+      options = { host: options } if options.is_a?(String)
+      extra_options.merge!(options)
+      extra_options.merge!(logger: logger)
+
+      @orderers << Orderer.new(extra_options[:host], extra_options[:creds], extra_options)
+    end
+
+    def register_event_hub(options, extra_options = {})
+      @event_hubs ||= []
+
+      options = { host: options } if options.is_a?(String)
+      extra_options.merge!(options)
+      extra_options.merge!(logger: logger)
+
+      @event_hubs << EventHub.new(extra_options[:host], extra_options[:creds], extra_options)
     end
 
     def query(request = {})
       logging __method__, request
 
-      proposal = Proposal.new crypto_suite, identity, request
+      proposal = Proposal.new identity, request
 
       send_query(proposal) { |response| parse_chaincode_response response.response }
     end
@@ -37,16 +50,17 @@ module Fabric
     def invoke(request = {})
       logging __method__, request
 
-      proposal = Proposal.new crypto_suite, identity, request
+      proposal = Proposal.new identity, request
 
       responses = send_query(proposal) { |response| parse_peer_response response }
 
-      transaction = Transaction.new crypto_suite, identity, proposal: proposal,
-                                                            responses: responses
+      transaction = Transaction.new identity, proposal: proposal, responses: responses
 
       send_transaction(transaction) { |response| parse_orderer_response response }
 
       responses.map { |response| parse_chaincode_response response.response }
+
+      transaction
     end
 
     private
@@ -67,36 +81,6 @@ module Fabric
                                       payload: payload.to_proto
 
       orderers.each { |orderer| orderer.send_broadcast envelope, &block }
-
-      check_transaction transaction
-    end
-
-    def check_transaction(transaction)
-      MAX_ATTEMPTS_CHECK_TRANSACTION.times do
-        begin
-          validation_code = get_transaction_validation_code transaction
-
-          logging __method__, tx_id: transaction.tx_id, status: validation_code
-
-          return validation_code if validation_code == :VALID
-
-          raise Fabric::TransactionError, validation_code
-        rescue UnknownError => ex
-          sleep DELAY_PERIOD_CHECK_TRANSACTION
-
-          logger.debug ex.message
-        end
-      end
-    end
-
-    def get_transaction_validation_code(transaction)
-      channel_id = transaction.proposal.channel_id
-      responses = query channel_id: channel_id,
-                        chaincode_id: 'qscc',
-                        args: ['GetTransactionByID', channel_id, transaction.tx_id]
-      processed_transaction = Protos::ProcessedTransaction.decode responses.first
-
-      Protos::TxValidationCode.lookup processed_transaction.validationCode
     end
 
     def parse_chaincode_response(response)

data/lib/fabric/client_stub.rb

@@ -0,0 +1,25 @@
+module Fabric
+  class ClientStub
+    attr_reader :host, :creds, :options, :logger
+
+    VALID_OPTIONS_KEYS = %i[channel_override timeout propagate_mask channel_args interceptors]
+
+    def initialize(host, creds, options = {})
+      @host = host
+      @logger = options[:logger]
+
+      @creds = GRPC::Core::ChannelCredentials.new(creds) if creds.is_a?(String)
+      @creds ||= :this_channel_is_insecure
+
+      @options = options.slice(*VALID_OPTIONS_KEYS)
+    end
+
+    private
+
+    def logging(section, message)
+      logger.debug section.to_s.upcase.colorize(:yellow),
+                   host.colorize(:red),
+                   message.to_s.colorize(:blue)
+    end
+  end
+end

data/lib/fabric/configuration.rb

@@ -3,9 +3,13 @@ module Fabric
     DEFAULT_TIMEOUT = 30
 
     VALID_OPTIONS_KEYS = %i[
-      crypto_suite identity orderers
-      channel_id peers timeout logger
-      logger_filters event_hub_url
+      orderers
+      peers
+      event_hubs
+      identity
+      timeout
+      logger
+      logger_filters
     ].freeze
 
     VALID_OPTIONS_KEYS.each { |attr| attr_accessor attr }
@@ -14,7 +18,7 @@ module Fabric
       base.reset
     end
 
-    def self.configure
+    def configure
       yield self
     end
 
@@ -27,7 +31,14 @@ module Fabric
     def reset
       VALID_OPTIONS_KEYS.each { |key| send("#{key}=", nil) }
 
+      self.orderers = []
+      self.peers = []
+      self.event_hubs = []
       self.timeout = DEFAULT_TIMEOUT
     end
+
+    def assign(config)
+      VALID_OPTIONS_KEYS.each { |key| send("#{key}=", config[key]) if config.key?(key) }
+    end
   end
 end

data/lib/fabric/event_hub.rb

@@ -1,25 +1,22 @@
 module Fabric
-  class EventHub
-    attr_reader :url, :identity, :logger, :crypto_suite, :channel_id
-    attr_reader :channel, :connection, :queue
+  class EventHub < ClientStub
+    MAX_BLOCK_NUMBER = 4_611_686_018_427_387_903.freeze
 
-    MAX_BLOCK_NUMBER = 1_000_000_000
+    def client
+      @client ||= ::Protos::Deliver::Stub.new host, creds, options
+    end
 
-    def initialize(opts = {})
-      @url = opts[:url]
-      @identity = opts[:identity]
-      @crypto_suite = opts[:crypto_suite]
-      @logger = opts[:logger]
-      @channel_id = opts[:channel_id]
+    def queue
+      @queue ||= Fabric::EnumeratorQueue.new client
+    end
 
-      @channel = ::Protos::Deliver::Stub.new url, :this_channel_is_insecure
-      @queue = Fabric::EnumeratorQueue.new channel
-      @connection = channel.deliver(queue.each).each
+    def connection
+      @connection ||= client.deliver(queue.each).each
     end
 
-    def observe(start_block = :newest, stop_block = MAX_BLOCK_NUMBER)
-      tx_info = Fabric::TransactionInfo.new crypto_suite, identity
-      seek_header = build_seek_header tx_info
+    def observe(channel_id, identity, start_block = :newest, stop_block = MAX_BLOCK_NUMBER)
+      tx_info = Fabric::TransactionInfo.new identity
+      seek_header = build_seek_header channel_id, tx_info
       seek_info = build_seek_info start_block, stop_block
       envelope = build_envelope tx_info, seek_header, seek_info
 
@@ -46,7 +43,7 @@ module Fabric
                              payload: seek_payload.to_proto
     end
 
-    def build_seek_header(tx_info)
+    def build_seek_header(channel_id, tx_info)
       seek_info_header = Fabric::Helper.build_channel_header(
         type: ::Common::HeaderType::DELIVER_SEEK_INFO,
         channel_id: channel_id,

data/lib/fabric/fabric_logger.rb

@@ -7,25 +7,25 @@ module Fabric
 
     def initialize(logger, filters = [])
       @logger = logger
-      @filters = [filters]
+      @filters = [filters].compact
     end
 
     def error(*args)
       return unless logger
 
-      logger.tagged(LOGGER_TAG) { |logger| logger.error filter_message(args.join('|')) }
+      logger.error filter_message(args.join('|'))
     end
 
     def info(*args)
       return unless logger
 
-      logger.tagged(LOGGER_TAG) { |logger| logger.info filter_message(args.join('|')) }
+      logger.info filter_message(args.join('|'))
     end
 
     def debug(*args)
       return unless logger
 
-      logger.tagged(LOGGER_TAG) { |logger| logger.debug filter_message(args.join('|')) }
+      logger.debug filter_message(args.join('|'))
     end
 
     private

data/lib/fabric/helper.rb

@@ -19,7 +19,7 @@ module Fabric
     end
 
     def self.build_timestamp
-      now = Time.current
+      now = Time.now
 
       Google::Protobuf::Timestamp.new seconds: now.to_i, nanos: now.nsec
     end

data/lib/fabric/identity.rb

@@ -4,7 +4,8 @@ module Fabric
   class Identity
     attr_reader :private_key,
                 :public_key,
-                :address
+                :address,
+                :crypto_suite
 
     attr_accessor :certificate, :mspid
 

data/lib/fabric/orderer.rb

@@ -1,15 +1,9 @@
 require 'orderer/ab_services_pb.rb'
 
 module Fabric
-  class Orderer
-    attr_reader :url, :opts, :client, :logger
-
-    def initialize(args)
-      @url = args[:url]
-      @opts = args[:opts]
-      @logger = args[:logger]
-
-      @client = ::Orderer::AtomicBroadcast::Stub.new url, :this_channel_is_insecure
+  class Orderer < ClientStub
+    def client
+      @client ||= ::Orderer::AtomicBroadcast::Stub.new host, creds, options
     end
 
     def send_broadcast(envelope)
@@ -23,13 +17,5 @@ module Fabric
         yield response if block_given?
       end
     end
-
-    private
-
-    def logging(section, message)
-      logger.debug section.to_s.upcase,
-                   url,
-                   message.to_s
-    end
   end
 end

data/lib/fabric/peer.rb

@@ -1,15 +1,9 @@
 require 'peer/peer_services_pb'
 
 module Fabric
-  class Peer
-    attr_reader :url, :opts, :client, :logger
-
-    def initialize(args)
-      @url = args[:url]
-      @opts = args[:opts]
-      @logger = args[:logger]
-
-      @client = Protos::Endorser::Stub.new url, :this_channel_is_insecure
+  class Peer < ClientStub
+    def client
+      @client ||= Protos::Endorser::Stub.new(host, creds, options)
     end
 
     def send_process_proposal(proposal)
@@ -21,17 +15,5 @@ module Fabric
 
       response
     end
-
-    def create_event_hub
-      EventHub.new url: url, opts: opts, logger: logger
-    end
-
-    private
-
-    def logging(section, message)
-      logger.debug section.to_s.upcase,
-                   url,
-                   message.to_s
-    end
   end
 end

data/lib/fabric/proposal.rb

@@ -1,15 +1,18 @@
 module Fabric
   class Proposal
-    attr_reader :crypto_suite, :identity, :request
+    attr_reader :identity, :request
 
-    def initialize(crypto_suite, identity, request = {})
-      @crypto_suite = crypto_suite
+    def initialize(identity, request = {})
       @identity = identity
       @request = request
 
       assign_tx request[:transaction_info] if request[:transaction_info]
     end
 
+    def crypto_suite
+      identity.crypto_suite
+    end
+
     def nonce
       @nonce ||= crypto_suite.generate_nonce
     end
@@ -70,7 +73,7 @@ module Fabric
     end
 
     def tx_timestamp
-      now = Time.current
+      now = Time.now
 
       @tx_timestamp ||= Google::Protobuf::Timestamp.new seconds: now.to_i, nanos: now.nsec
     end

data/lib/fabric/transaction.rb

@@ -2,10 +2,9 @@ require 'peer/transaction_pb'
 
 module Fabric
   class Transaction
-    attr_reader :crypto_suite, :identity, :request
+    attr_reader :identity, :request
 
-    def initialize(crypto_suite, identity, request = {})
-      @crypto_suite = crypto_suite
+    def initialize(identity, request = {})
       @identity = identity
       @request = request
     end

data/lib/fabric/transaction_info.rb

@@ -1,16 +1,15 @@
 module Fabric
   class TransactionInfo
-    attr_reader :tx_id, :nonce, :crypto_suite, :identity
+    attr_reader :tx_id, :nonce, :identity
 
-    def initialize(crypto_suite, identity)
+    def initialize(identity)
       @identity = identity
-      @nonce = crypto_suite.generate_nonce
-      @tx_id = crypto_suite.hexdigest(nonce + identity.serialize)
-      @crypto_suite = crypto_suite
+      @nonce = identity.crypto_suite.generate_nonce
+      @tx_id = identity.crypto_suite.hexdigest(nonce + identity.serialize)
     end
 
     def nonce_hex
-      crypto_suite.encode_hex nonce
+      identity.crypto_suite.encode_hex nonce
     end
 
     def signature_header

data/lib/fabric/version.rb

@@ -1,3 +1,3 @@
 module Fabric
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/fabric_ca.rb

@@ -11,6 +11,12 @@ module FabricCA
   extend Configuration
 
   def self.new(options = {})
+    assign(options)
+
+    self
+  end
+
+  def self.client(options)
     FabricCA::Client.new(options)
   end
 end

data/lib/fabric_ca/configuration.rb

@@ -23,5 +23,9 @@ module FabricCA
     def reset
       VALID_OPTIONS_KEYS.each { |key| send("#{key}=", nil) }
     end
+
+    def assign(config)
+      VALID_OPTIONS_KEYS.each { |key| send("#{key}=", config[key]) if config.key?(key) }
+    end
   end
 end

data/lib/fabric_ca/faraday_middleware/raise_http_exception.rb

@@ -3,9 +3,6 @@ require 'faraday'
 module FabricCA
   module FaradayMiddleware
     class RaiseHttpException < Faraday::Middleware
-      ## Variables
-      LOGGER_TAG = 'FABRIC CA'.freeze
-
       ## Attributes
       attr_reader :app, :logger
 
@@ -40,7 +37,7 @@ module FabricCA
       def logging(message)
         return unless logger
 
-        logger.tagged(LOGGER_TAG) { |logger| logger.error message }
+        logger.error message
       end
     end
   end

data/lib/fabric_ca/version.rb

@@ -1,3 +1,3 @@
 module FabricCA
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyperledger-fabric-sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Alexandr Kirshin(kirshin)
@@ -139,6 +139,7 @@ files:
 - lib/fabric/chaincode_response.rb
 - lib/fabric/channel.rb
 - lib/fabric/client.rb
+- lib/fabric/client_stub.rb
 - lib/fabric/configuration.rb
 - lib/fabric/constants.rb
 - lib/fabric/crypto_suite.rb