voucher 0.2.1 → 0.3.0

data/lib/voucher/validator.rb

@@ -22,7 +22,7 @@ module Voucher
 
     def verify(segment)
       Murky.verify(
-        contract.winning_hash(segment.shard),
+        contract.winning_hash(election.attributes[:block_number], segment.shard),
         segment.siblings,
         segment.hash,
         digest: Hashtastic::EthereumSHA3
@@ -30,10 +30,10 @@ module Voucher
     end
 
     def contract
-      @contract ||= ElectionContract.new(
+      @contract ||= ChainContract.new(
         address: election.address,
-        ethereum_url: Voucher.config.ethereum_url,
-        abi: Voucher.config.election_abi
+        ethereum_url: Config.ethereum_url,
+        abi: Config.chain_abi
       )
     end
 

data/lib/voucher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Voucher
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/voucher.gemspec

@@ -27,8 +27,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'ethereum.rb', '~> 2.2'
   spec.add_dependency 'hashtastic'
   spec.add_dependency 'murky_waters'
+  spec.add_dependency 'mixlib-config'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'pry', '~> 0.11.3'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: voucher
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - lucidity
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-05 00:00:00.000000000 Z
+date: 2019-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -94,20 +94,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mixlib-config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -189,11 +203,12 @@ files:
 - bin/setup
 - exe/voucher
 - lib/voucher.rb
+- lib/voucher/chain_contract.rb
 - lib/voucher/cli.rb
 - lib/voucher/config.rb
-- lib/voucher/config/json/election.json
-- lib/voucher/election_contract.rb
+- lib/voucher/config/json/chain.json
 - lib/voucher/errors.rb
+- lib/voucher/metrics.rb
 - lib/voucher/model/election.rb
 - lib/voucher/model/segment.rb
 - lib/voucher/segments_builder.rb

data/lib/voucher/config/json/election.json

@@ -1,210 +0,0 @@
-[
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "endsAt",
-    "outputs": [{"name": "", "type": "uint256"}],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "chairperson",
-    "outputs": [{"name": "", "type": "address"}],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "revealed",
-    "outputs": [{"name": "", "type": "bool"}],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "blockNumber",
-    "outputs": [{"name": "", "type": "uint256"}],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [{"name": "", "type": "bytes32"}],
-    "name": "blindedProposals",
-    "outputs": [{"name": "", "type": "bool"}],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "chainAddress",
-    "outputs": [{"name": "", "type": "address"}],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "votingEnd",
-    "outputs": [{"name": "", "type": "uint256"}],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "previousRoot",
-    "outputs": [{"name": "", "type": "bytes32"}],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [{"name": "", "type": "address"}],
-    "name": "voters",
-    "outputs": [
-      {"name": "voted", "type": "bool"},
-      {"name": "blindedProposal", "type": "bytes32"},
-      {"name": "shard", "type": "uint256"},
-      {"name": "proposal", "type": "bytes32"},
-      {"name": "revealed", "type": "bool"}
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "revealEnd",
-    "outputs": [{"name": "", "type": "uint256"}],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "startsAt",
-    "outputs": [{"name": "", "type": "uint256"}],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [{"name": "", "type": "uint256"}],
-    "name": "roots",
-    "outputs": [{"name": "", "type": "bytes32"}],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "registryAddress",
-    "outputs": [{"name": "", "type": "address"}],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [{"name": "", "type": "uint256"}],
-    "name": "addresses",
-    "outputs": [{"name": "", "type": "address"}],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "counted",
-    "outputs": [{"name": "", "type": "bool"}],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {"name": "", "type": "uint256"},
-      {"name": "", "type": "bytes32"}
-    ],
-    "name": "counts",
-    "outputs": [{"name": "", "type": "uint256"}],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {"name": "_registryAddress", "type": "address"},
-      {"name": "_chainAddress", "type": "address"},
-      {"name": "_chairperson", "type": "address"},
-      {"name": "_blockNumber", "type": "uint256"},
-      {"name": "_previousRoot", "type": "bytes32"},
-      {"name": "_startsAt", "type": "uint256"},
-      {"name": "_endsAt", "type": "uint256"},
-      {"name": "_votingTime", "type": "uint256"},
-      {"name": "_revealTime", "type": "uint256"}
-    ],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "getNumberOfVerifiers",
-    "outputs": [{"name": "", "type": "uint256"}],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [{"name": "_blindedProposal", "type": "bytes32"}],
-    "name": "vote",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {"name": "_proposal", "type": "bytes32"},
-      {"name": "_secret", "type": "bytes32"}
-    ],
-    "name": "reveal",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [],
-    "name": "count",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]

data/lib/voucher/election_contract.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-module Voucher
-  class ElectionContract
-    attr_reader :contract, :ethereum
-
-    def initialize(options = {})
-      @ethereum = Ethereum::HttpClient.new(options[:ethereum_url])
-
-      @contract = Ethereum::Contract.create(
-        name: options[:name] || 'ElectionContractClient',
-        address: options[:address],
-        abi: options[:abi],
-        client: ethereum
-      )
-
-      @roots = {}
-      @formatter = Ethereum::Formatter.new
-    end
-
-    def winning_hash(shard)
-      @roots[shard] ||= find_root(shard)
-    end
-
-    private
-
-    def find_root(shard)
-      root = contract.call.roots(shard)
-
-      raise RootHashNotFound, shard if root.blank?
-
-      eth_format(root)
-    end
-
-    def eth_format(value)
-      hex = @formatter.from_ascii(value)
-
-      "0x#{hex}"
-    end
-  end
-end