hyperledger_cli 0.0.10 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b86d37fbdfb3d386e12382486058a3815490bee
-  data.tar.gz: b4a309fad0bbeabb9dd19867029b6cadc3705e32
+  metadata.gz: 192e7ce511fb3c24bbe2e05c656193dca94e0734
+  data.tar.gz: cd395c8633015a77a259ddd154bba12f02c8c8ca
 SHA512:
-  metadata.gz: 743db9eb864a65a5424e56e0abe06518e51b5eb24e0ac29840d28957258c06a35ee8d7d1e658f1d1ef73c8b3c79890d15022e15d7604dd7c7714f26f07dc9f5f
-  data.tar.gz: 728f0ca54f4c7f3da558a9ec9f33c73dc606bd1295f84d80b468b67c79ad21538c09f810d9849dbf1de6a8dc01252c2075230a13ad52c2c7aec2ecda25cfce29
+  metadata.gz: fbaf7e838575a3a568d74fedf8bf3ca2a3ed17f2287bd92ceed3acccee8b3704d8a149a0501b87e0434fdd757e456319ae66f70374b4de6704ab54651ad07272
+  data.tar.gz: 780ab64555d83a13c8f2390c77ffaf7b38639ee48d19dcbed6b6880a5593d47f0f9c529804cd112ac566e3f1410ce4f0a86bed65e697037bc5178ae7360017df

data/bin/hyperledger

@@ -1,124 +1,95 @@
 #!/usr/bin/env ruby
 
 require 'thor'
-require 'fileutils'
-require 'openssl'
-require 'rest_client'
-require 'base64'
-require 'json'
 require 'securerandom'
-require_relative '../lib/hyperledger_cli/error_printer'
+require_relative '../lib/hyperledger_cli'
+require_relative '../lib/hyperledger_cli/key'
 
-class Ledger < Thor
-  include HyperledgerCli::ErrorPrinter
-  
-  desc 'list', 'List all known ledgers'
+include HyperledgerCli
+
+class Asset < Thor  
+  desc 'list', 'List all known assets'
   def list
-    response = RestClient.get "#{options[:server]}/ledgers", content_type: :json, accept: :json
-    data = JSON.parse(response.body, symbolize_names: true)
-    data[:ledgers].each do |c| puts c[:name] end
+    get "#{options[:server]}/assets"
   end
   
-  desc 'register <name> <url>', 'Registers a new ledger. The name must be unique, and the URL should contain more information about the ledger.'
-  def register(name, url)
-    ledger_key = OpenSSL::PKey::RSA.new 2048
-    primary_account_key = OpenSSL::PKey::RSA.new 2048
-    ledger_data = { public_key: ledger_key.public_key.to_pem, name: name, url: url }
-    primary_account_data = { public_key: primary_account_key.public_key.to_pem }
+  desc 'register <hash>', 'Registers a new asset. The hash must be an unique hex encoded SHA265 hash.'
+  def register(hash)
+    asset_key = Key.new
+    primary_account_key = Key.new
+    data = {
+      asset: {
+        publicKey: asset_key.public_key,
+        hash: hash,
+        primaryAccountPublicKey: primary_account_key.public_key
+      }
+    }
+    
+    post("#{options[:server]}/assets", data, asset_key)
     
-    begin
-      response = RestClient.post "#{options[:server]}/ledgers", { ledger: ledger_data, primary_account: primary_account_data }, content_type: :json, accept: :json
-      ledger = JSON.parse(response.body, symbolize_names: true)[:ledger]
-      puts 'New ledger created'
-      puts "name:\t#{ledger[:name]}"
-      puts "url:\t#{ledger[:url]}"
-      puts "primary account code:\t#{ledger[:primary_account][:code]}"
-      
-      # Write key
-      FileUtils.mkdir_p "#{ENV['HOME']}/.hyperledger"
-      open "#{ENV['HOME']}/.hyperledger/#{ledger[:primary_account][:code]}.pem", 'w' do |io| io.write primary_account_key.to_pem end
-      open "#{ENV['HOME']}/.hyperledger/#{name}.pem", 'w' do |io| io.write ledger_key.to_pem end
-    rescue => e
-      print_error(e)
-    end
+    asset_key.write
+    primary_account_key.write
   end
 end
 
 class Account < Thor
-  include HyperledgerCli::ErrorPrinter
-  
   desc 'list', 'List all known accounts'
   def list
-    response = RestClient.get "#{options[:server]}/accounts", content_type: :json, accept: :json
-    data = JSON.parse(response.body, symbolize_names: true)
-    data[:accounts].each do |a|
-      a.each do |k, v|
-        puts "#{k}:\t#{v}"
-      end
-      puts "\n"
-    end
+    get "#{options[:server]}/accounts"
   end
   
-  desc 'register <ledger>', 'Registers a new account in <ledger>.'
-  def register(ledger)
-    key = OpenSSL::PKey::RSA.new 2048
-    data = { public_key: key.public_key.to_pem, ledger: ledger }
+  desc 'register <asset>', 'Registers a new account to hold <asset>.'
+  def register(asset)
+    account_key = Key.new
+    data = {
+      account: {
+        assetHash: asset,
+        publicKey: account_key.public_key
+      }
+    }
+    
+    post("#{options[:server]}/accounts", data, account_key)
     
-    begin
-      resp = RestClient.post "#{options.server}/accounts", { account: data }, content_type: :json, accept: :json
-      account = JSON.parse(resp.body, symbolize_names: true)[:account]
-      puts 'New account created'
-      puts "code:\t\t#{account[:code]}"
-      puts "balance:\t#{account[:balance]}"
-      
-      # Write key
-      FileUtils.mkdir_p "#{ENV['HOME']}/.hyperledger"
-      open "#{ENV['HOME']}/.hyperledger/#{account[:code]}.pem", 'w' do |io| io.write key.to_pem end
-    rescue => e
-      print_error(e)
-    end
+    account_key.write
   end
 end
 
 class Hyperledger < Thor
-  include HyperledgerCli::ErrorPrinter
+  class_option :server, type: :string, required: true
   
-  class_option :server, type: :string, default: 'http://hyperledger-staging-1.herokuapp.com'
-  
-  desc 'ledger SUBCOMMAND', 'Subcommands relating to ledgers.'
-  subcommand 'ledger', Ledger
+  desc 'asset SUBCOMMAND', 'Subcommands relating to ledgers.'
+  subcommand 'asset', Asset
   
   desc 'account SUBCOMMAND', 'Subcommands relating to accounts.'
   subcommand 'account', Account
   
-  desc 'issue <amount> <ledger>', 'Issue <amount> new units to <ledger>.'
-  def issue(amount, ledger)
-    data = { ledger: ledger, amount: amount.to_i, uuid: SecureRandom.uuid }
-    
-    key = OpenSSL::PKey::RSA.new File.read("#{ENV['HOME']}/.hyperledger/#{ledger.downcase}.pem")
-    sign = Base64.encode64 key.sign(OpenSSL::Digest::SHA256.new, data.to_json)
+  desc 'issue <amount> <asset> <public key>', 'Issue <amount> new units of <asset> authorised by <public key>.'
+  def issue(amount, asset, public_key)
+    asset_key = Key.new(public_key)
+    data = {
+      issue: {
+        uuid: SecureRandom.uuid,
+        assetHash: asset,
+        amount: amount.to_i
+      }
+    }
     
-    begin
-      resp = RestClient.post "#{options[:server]}/issues", { issue: data.merge({resource_signature: sign}) }.to_json, content_type: :json, accept: :json
-      puts "#{amount} new units issued to #{ledger}"
-    rescue => e
-      print_error(e)
-    end
+    post("#{options.server}/assets/#{asset}/issues", data, asset_key)
   end
   
   desc 'transfer <amount> <source> <destination>', 'Transfer <amount> of units from <source> to <destination>'
   def transfer(amount, source, destination)
-    key = OpenSSL::PKey::RSA.new File.read("#{ENV['HOME']}/.hyperledger/#{source}.pem")
-    
-    data = { source: source, destination: destination, amount: amount.to_i, uuid: SecureRandom.uuid }
-    sign = Base64.encode64 key.sign(OpenSSL::Digest::SHA256.new, data.to_json)
-    
-    begin
-      resp = RestClient.post "#{options.server}/transfers", { transfer: data.merge({resource_signature: sign}) }.to_json, content_type: :json, accept: :json
-      puts 'Transfer completed!'
-    rescue => e
-      print_error(e)
-    end
+    source_key = Key.new(source)
+    data = {
+      transfer: {
+        uuid: SecureRandom.uuid,
+        sourcePublicKey: source,
+        destinationPublicKey: destination,
+        amount: amount.to_i
+      }
+    }
+        
+    post("#{options.server}/transfers", data, source_key)
   end
 end
 

data/hyperledger_cli.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.3"
-  spec.add_runtime_dependency "rest_client", "~> 1.7"
+  spec.add_runtime_dependency "rest-client", "~> 1.7"
   spec.add_runtime_dependency "thor", "~> 0.19"
 end

data/lib/hyperledger_cli.rb

@@ -1,4 +1,39 @@
-require "hyperledger_cli/version"
+require 'pp'
+require 'json'
+require 'restclient'
+require 'hyperledger_cli/version'
+require_relative 'hyperledger_cli/error_printer'
 
-module HyperledgerCli
+include HyperledgerCli::ErrorPrinter
+
+module HyperledgerCli  
+  def post(url, data, key = nil)
+    json_data = data.to_json
+    headers = {
+      content_type: :json,
+      accept: 'application/vnd.uber-amundsen+json'
+    }
+    if key
+      sig = key.sign(json_data)
+      headers.merge!({
+        authorization: "Hyper Key=#{key.public_key}, Signature=#{sig}"
+      })
+    end
+    
+    begin
+      response = RestClient.post(url, json_data, headers)
+      pp JSON.parse(response)["uber"]["data"]
+    rescue => e
+      print_error(e)
+    end
+  end
+  
+  def get(url)
+    begin
+      response = RestClient.get(url, accept: 'application/vnd.uber-amundsen+json')
+      pp JSON.parse(response)["uber"]["data"]
+    rescue => e
+      print_error(e)
+    end
+  end
 end

data/lib/hyperledger_cli/error_printer.rb

@@ -1,11 +1,10 @@
+require 'pp'
+
 module HyperledgerCli
   module ErrorPrinter
     def print_error(err)
       puts "Error: #{err}"
-      errors = JSON.parse(err.response, symbolize_names: true)[:errors]
-      if errors
-        errors.each do |k, v| puts "#{k}:\t#{v.join(', ')}" end
-      end
+      pp err.response
     end
   end
 end

data/lib/hyperledger_cli/key.rb

@@ -0,0 +1,40 @@
+require 'openssl'
+include OpenSSL
+
+module HyperledgerCli
+  class Key
+    def initialize(public_key = nil)
+      @key = if public_key
+          PKey::EC.new(File.open(path(public_key)).read)
+        else
+          PKey::EC.new("secp256k1").generate_key
+        end
+    end
+    
+    def path(public_key = nil)
+      root = "#{ENV['HOME']}/.hyperledger"
+      if public_key
+        "#{root}/#{public_key}.pem"
+      else
+        root
+      end
+    end
+    
+    def write
+      FileUtils.mkdir_p path
+      open path(public_key), 'w' do |io|
+        io.write @key.to_pem
+      end
+    end
+    
+    def public_key
+      @key.public_key.to_bn.to_s(16)
+    end
+    
+    def sign(message)
+      digest = Digest::SHA256.digest(message)
+      signature = @key.dsa_sign_asn1(digest)
+      signature.unpack("H*").first.upcase
+    end
+  end
+end

data/lib/hyperledger_cli/version.rb

@@ -1,3 +1,3 @@
 module HyperledgerCli
-  VERSION = "0.0.10"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyperledger_cli
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors:
 - Daniel Feichtinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2015-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.3'
 - !ruby/object:Gem::Dependency
-  name: rest_client
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -83,6 +83,7 @@ files:
 - hyperledger_cli.gemspec
 - lib/hyperledger_cli.rb
 - lib/hyperledger_cli/error_printer.rb
+- lib/hyperledger_cli/key.rb
 - lib/hyperledger_cli/version.rb
 homepage: 
 licenses:
@@ -104,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A sample CLI for the Hyperledger protocol.