hyperledger-fabric-sdk 0.1.0 → 0.1.1

data/lib/fabric.rb

@@ -0,0 +1,74 @@
+lib_dir = File.join(__dir__, 'fabric/protos')
+
+$LOAD_PATH.push(lib_dir) unless $LOAD_PATH.include?(lib_dir)
+
+require 'colorize'
+
+require 'common/common_pb'
+require 'common/configtx_pb'
+require 'peer/events_services_pb'
+require 'ledger/rwset/rwset_pb'
+require 'ledger/rwset/kvrwset/kv_rwset_pb'
+
+require_relative 'fabric/version'
+require_relative 'fabric/configuration'
+require_relative 'fabric/constants'
+require_relative 'fabric/client'
+require_relative 'fabric/peer'
+require_relative 'fabric/orderer'
+require_relative 'fabric/enumerator_queue'
+require_relative 'fabric/crypto_suite'
+require_relative 'fabric/identity'
+require_relative 'fabric/proposal'
+require_relative 'fabric/transaction'
+require_relative 'fabric/error'
+require_relative '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'
+require_relative 'fabric/event_hub'
+
+module Fabric
+  extend Configuration
+  @orderers = []
+  @peers = []
+
+  def self.new(config)
+    @orderers = config[:orderers]
+    @peers = config[:peers]
+    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 }
+
+    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
+end

data/lib/fabric_ca/attribute.rb

@@ -0,0 +1,7 @@
+module FabricCA
+  class Attribute
+    REGISTRAR_ROLES = 'hf.Registrar.Roles'.freeze
+    REGISTRAR_DELEGATE_ROLES = 'hf.Registrar.DelegateRoles'.freeze
+    REGISTRAR_ATTRIBUTES = 'hf.Registrar.Attributes'.freeze
+  end
+end

data/lib/fabric_ca/client.rb

@@ -1,12 +1,9 @@
-require File.expand_path('../connection', __FILE__)
-require File.expand_path('../request', __FILE__)
-
 module FabricCA
   class Client
     include Connection
     include Request
 
-    attr_accessor *Configuration::VALID_OPTIONS_KEYS
+    Configuration::VALID_OPTIONS_KEYS.each { |attr| attr_accessor attr }
 
     def initialize(options = {})
       options = FabricCA.options.merge(options)
@@ -25,27 +22,22 @@ module FabricCA
       conf
     end
 
-    def enroll(identity_context, msp_id)
-      crypto_suite = identity_context.crypto_suite
-      private_key = crypto_suite.generate_private_key
-      certificate_request = crypto_suite.generate_csr private_key,
-                                                      [['CN', identity_context.username]]
-
-      response = post 'enroll', certificate_request: certificate_request.to_s
-
-      identity_context.enroll private_key: private_key,
-                              certificate: Base64.decode64(response.result['Cert']),
-                              msp_id: msp_id
-
-      identity_context
+    def enroll(certificate_request, attrs = nil)
+      post 'enroll', certificate_request: certificate_request.to_s,
+                     caName: ca_name,
+                     attr_reqs: attrs
     end
 
     def register(params = {})
       post 'register', params
     end
 
-    def tcert(params = {})
-      post 'tcert', params
+    def list_identities(opts = {})
+      get 'identities', opts
+    end
+
+    def list_affiliations(opts = {})
+      get 'affiliations', opts
     end
   end
 end

data/lib/fabric_ca/configuration.rb

@@ -1,8 +1,10 @@
 module FabricCA
   module Configuration
-    VALID_OPTIONS_KEYS = [:endpoint, :identity_context, :username, :password, :logger]
+    VALID_OPTIONS_KEYS = %i[endpoint ca_name identity
+                            username password logger
+                            connection_opts].freeze
 
-    attr_accessor *VALID_OPTIONS_KEYS
+    VALID_OPTIONS_KEYS.each { |attr| attr_accessor attr }
 
     def self.extended(base)
       base.reset

data/lib/fabric_ca/connection.rb

@@ -1,32 +1,34 @@
 require 'faraday_middleware'
 
-Dir[File.expand_path('../faraday_middleware/*.rb', __FILE__)].each { |f| require_relative f }
+Dir[File.expand_path('faraday_middleware/*.rb', __dir__)].each { |f| require_relative f }
 
 module FabricCA
   module Connection
     private
 
-      def connection(opts = {})
-        Faraday::Connection.new(opts.merge(options)) do |connection|
-          connection.use ::FaradayMiddleware::EncodeJson
-          connection.use FabricCA::FaradayMiddleware::BasicAuth, username, password
-          connection.use FabricCA::FaradayMiddleware::TokenAuth, identity_context
-          connection.use ::Faraday::Request::UrlEncoded
-          connection.use ::FaradayMiddleware::Mashify
-          connection.use ::Faraday::Response::ParseJson
-          connection.use FabricCA::FaradayMiddleware::RaiseHttpException, logger
-          connection.adapter(adapter)
-        end
+    def connection(opts = {})
+      Faraday::Connection.new(opts.merge(options)) do |connection|
+        connection.use ::FaradayMiddleware::EncodeJson
+        connection.use FabricCA::FaradayMiddleware::BasicAuth, username, password
+        connection.use FabricCA::FaradayMiddleware::TokenAuth, identity
+        connection.use ::Faraday::Request::UrlEncoded
+        connection.use ::FaradayMiddleware::Mashify
+        connection.use ::Faraday::Response::ParseJson
+        connection.use FabricCA::FaradayMiddleware::RaiseHttpException, logger
+        connection.adapter(adapter)
       end
+    end
 
-      def options
-        {
-          url: endpoint
-        }
-      end
+    def options
+      opts = connection_opts || {}
 
-      def adapter
-        Faraday.default_adapter
-      end
+      opts[:url] = endpoint
+
+      opts
+    end
+
+    def adapter
+      Faraday.default_adapter
+    end
   end
 end

data/lib/fabric_ca/error.rb

@@ -1,11 +1,12 @@
 module FabricCA
   class Error < StandardError
-    attr_reader :response
+    attr_reader :response, :full_message
 
     def initialize(message, response)
       super message
 
-      @response = response
+      @response = Hashie::Mash.new JSON.parse(response.body)
+      @full_message = @response.errors.map(&:message).join(', ')
     end
   end
 end

data/lib/fabric_ca/faraday_middleware/basic_auth.rb

@@ -25,9 +25,9 @@ module FabricCA
 
       private
 
-        def generate_auth_header
-          Base64.encode64 "#{username}:#{password}"
-        end
+      def generate_auth_header
+        Base64.strict_encode64 "#{username}:#{password}"
+      end
     end
   end
 end

data/lib/fabric_ca/faraday_middleware/raise_http_exception.rb

@@ -4,7 +4,7 @@ module FabricCA
   module FaradayMiddleware
     class RaiseHttpException < Faraday::Middleware
       ## Variables
-      LOGGER_TAG = 'FABRIC CA'
+      LOGGER_TAG = 'FABRIC CA'.freeze
 
       ## Attributes
       attr_reader :app, :logger
@@ -28,20 +28,20 @@ module FabricCA
 
       private
 
-        def build_error_message(response)
-          [
-            response[:method].to_s.upcase,
-            response[:url],
-            response[:status],
-            response[:body]
-          ].join(', ')
-        end
+      def build_error_message(response)
+        [
+          response[:method].to_s.upcase,
+          response[:url],
+          response[:status],
+          response[:body]
+        ].join(', ')
+      end
 
-        def logging(message)
-          return unless logger
+      def logging(message)
+        return unless logger
 
-          logger.tagged(LOGGER_TAG) { |logger| logger.error message }
-        end
+        logger.tagged(LOGGER_TAG) { |logger| logger.error message }
+      end
     end
   end
 end

data/lib/fabric_ca/faraday_middleware/token_auth.rb

@@ -4,10 +4,10 @@ require 'base64'
 module FabricCA
   module FaradayMiddleware
     class TokenAuth < Faraday::Middleware
-      attr_reader :app, :identity_context
+      attr_reader :app, :identity
 
       def call(env)
-        if identity_context&.enrolled?
+        if identity
           env[:request_headers] =
             env[:request_headers].merge(
               'Authorization' => generate_auth_header(env)
@@ -17,22 +17,20 @@ module FabricCA
         app.call env
       end
 
-      def initialize(app, identity_context)
+      def initialize(app, identity)
         @app = app
-        @identity_context = identity_context
+        @identity = identity
       end
 
       private
 
-        def generate_auth_header(env)
-          body = Base64.strict_encode64(env.body.to_s)
-          identity = identity_context.identity
-          cert = Base64.strict_encode64 identity.certificate
-          body_and_cert = body + '.' + cert
-          sign = Base64.strict_encode64 identity.sign(body_and_cert)
+      def generate_auth_header(env)
+        body = Base64.strict_encode64(env.body.to_s)
+        body_and_cert = body + '.' + identity.certificate
 
-          cert + '.' + sign
-        end
+        identity.certificate + '.' +
+          Base64.strict_encode64(identity.sign(body_and_cert))
+      end
     end
   end
 end

data/lib/fabric_ca/request.rb

@@ -18,33 +18,22 @@ module FabricCA
 
     private
 
-      def request(method, path, params, options)
-        response = send_request method, path, params, options
+    def request(method, path, params, options)
+      response = send_request method, path, params, options
 
-        Response.create response.body
-      end
+      Response.create response.body
+    end
 
-      def send_request(method, path, params, options)
-        connection(options).send(method) do |request|
-          case method
-          when :get, :delete
-            request.url(URI.encode(path), params)
-          when :post, :put
-            p path
-            p params.to_json
-            p method
-            p options
-            request.path = URI.encode path
-            request.body = params unless params.empty?
-            request.options.params_encoder = Encoder.new
-          end
+    def send_request(method, path, params, options)
+      connection(options).send(method) do |request|
+        case method
+        when :get, :delete
+          request.url(URI.encode(path), params)
+        when :post, :put
+          request.path = URI.encode path
+          request.body = params unless params.empty?
         end
       end
-  end
-end
-
-class Encoder
-  def encode(param)
-    param.to_json
+    end
   end
 end

data/lib/fabric_ca/version.rb

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

data/lib/fabric_ca.rb

@@ -0,0 +1,16 @@
+require_relative 'fabric_ca/version'
+require_relative 'fabric_ca/configuration'
+require_relative 'fabric_ca/error'
+require_relative 'fabric_ca/connection'
+require_relative 'fabric_ca/request'
+require_relative 'fabric_ca/response'
+require_relative 'fabric_ca/client'
+require_relative 'fabric_ca/attribute'
+
+module FabricCA
+  extend Configuration
+
+  def self.new(options = {})
+    FabricCA::Client.new(options)
+  end
+end

data/lib/hyperledger-fabric-sdk.rb

@@ -1,47 +1,2 @@
-lib_dir = File.join(File.expand_path(File.dirname(__FILE__)), 'protos')
-$LOAD_PATH.unshift(lib_dir) unless $LOAD_PATH.include?(lib_dir)
-
-require_relative 'fabric/version'
-require_relative 'fabric/configuration'
-require_relative 'fabric/constants'
-require_relative 'fabric/client'
-require_relative 'fabric/peer_endorser'
-require_relative 'fabric/transaction_id'
-require_relative 'fabric/channel'
-require_relative 'fabric/peer'
-require_relative 'fabric/orderer'
-require_relative 'fabric/user'
-require_relative 'fabric/identity'
-
-require_relative 'fabric_ca/error'
-require_relative 'fabric_ca/configuration'
-require_relative 'fabric_ca/client'
-require_relative 'fabric_ca/response'
-require_relative 'fabric_ca/version'
-require_relative 'fabric_ca/tools'
-
-require_relative 'crypto_suite/ecdsa_aes'
-
-require 'common/common_pb'
-require 'common/configtx_pb'
-
-module Fabric
-  extend Configuration
-
-  def self.new(config)
-    client = Fabric::Client.new config[:options]
-
-    config[:orderer_urls].each { |url| client.new_orderer url }
-    config[:peer_urls].each { |url| client.new_peer url }
-
-    client
-  end
-end
-
-module FabricCA
-  extend Configuration
-
-  def self.new(options = {})
-    FabricCA::Client.new(options)
-  end
-end
+require_relative 'fabric'
+require_relative 'fabric_ca'