voucher 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e0e46425cb8ed9d96119d8340c8e796bef7564a
-  data.tar.gz: 9c2df3b2661c1f37b6825c136b43a9d38c0e1e43
+  metadata.gz: 2e3b42fe58da21ce169db9f3b3d858c0142f09d5
+  data.tar.gz: 6831ffac983b28322d93f7bee4e3ad120b3d4062
 SHA512:
-  metadata.gz: 34dfe41945b699d042be48f9e030d7e67a9c0d5918a77697266916bd7dd37cae7447d19a4d9518756270bf098d44ee984ce82a6f5ce3819799e6debcb88d120d
-  data.tar.gz: 1f9c198371a1ce8819b5e7367c8c9d997376e1d2cf10f2a74c55ed42b91e390bbc378ec89a514e48f23de0dc85ea70290cf565f58a26d541678bbb54e532e859
+  metadata.gz: b9227d138f53cba826806f17b8df3eb0e554a27b74df7e9edc32fc34fe29bc20bac154ec4f85f7ea002d679ed5cf85352916264402340fe9f7e2df72b1406b42
+  data.tar.gz: 8bd4a9086af7859c614089285661297e4530a5f55f945d25677405fb3b51ca37258f36a0085c50e4d2ba8dd7af29407254c8601c0bcdcf5d4e61b2a146fe36ba

data/.gitignore

@@ -6,6 +6,8 @@
 /pkg/
 /spec/reports/
 /tmp/
+.idea/
+vendor/
 
 # rspec failure tracking
 .rspec_status

data/.rubocop.yml

@@ -6,6 +6,7 @@ AllCops:
     - 'exe/*'
     - 'Gemfile'
     - 'voucher.gemspec'
+    - 'lib/voucher/metrics.rb'
     - 'Rakefile'
   TargetRubyVersion: 2.4
 

data/CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.3.0] - 2019-04-11
+### Added:
+- advertisement_id on Segment
+- update validation process
+
 ## [0.2.1] - 2018-10-05
 ### Fixed:
 - Gem version

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    voucher (0.2.1)
+    voucher (0.3.0)
       activesupport (~> 5.2)
       ethereum.rb (~> 2.2)
       hashtastic
+      mixlib-config
       murky_waters
       thor
       virtus
@@ -12,7 +13,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -25,7 +26,7 @@ GEM
     coderay (1.1.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.5)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
@@ -37,12 +38,14 @@ GEM
     hashtastic (0.1.2)
       activesupport (~> 5.0)
       digest-sha3 (~> 1.1)
-    i18n (1.1.0)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     jaro_winkler (1.5.1)
     method_source (0.9.0)
     minitest (5.11.3)
+    mixlib-config (2.2.18)
+      tomlrb
     murky_waters (0.1.4)
     parallel (1.12.1)
     parser (2.5.1.2)
@@ -75,8 +78,9 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.10.0)
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
+    tomlrb (1.2.8)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unicode-display_width (1.4.0)
@@ -90,7 +94,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.0)
   pry (~> 0.11.3)
   rake (~> 10.0)
   rspec (~> 3.0)
@@ -98,4 +102,4 @@ DEPENDENCIES
   voucher!
 
 BUNDLED WITH
-   1.16.3
+   2.0.1

data/README.md

@@ -39,7 +39,7 @@ Embedded in your application
 ```rb
 require 'voucher'
 
-Voucher.configure(host: 'http://your.node.url:8545')
+Voucher.configure(host: 'http://localhost:8545')
 Voucher::Validator.call('segments.json')
 
 => true
@@ -60,6 +60,48 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+### Testing
+
+#### Test from console
+
+In order to test ruby code in interactive console:
+
+```
+$ ./bin/console
+irb(main):002:0> Voucher.configure(host: 'http://52.208.46.161:8549')
+irb(main):002:0> Voucher::Validator.call('./spec/samples/segments.json')
+
+```
+
+Notice: by default configuration pointing to your `localhost:8545`.  
+When you want to test with ropsten, you need 
+
+#### Test CLI
+
+Just for this test change the version in `version.rb`.
+
+```
+gem uninstall voucher
+gem build voucher.gemspec 
+gem install --local voucher-[your-version].gem
+
+# check the instalation
+gem list
+
+# run CLI test locally
+voucher validate ./spec/samples/segments.json -h http://52.208.46.161:8549
+
+
+```
+
+#### Run tests
+
+```
+bundle exec rubocop
+bundle exec rspec [file: optional]
+
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/luciditytech/voucher.

data/lib/voucher.rb

@@ -9,10 +9,11 @@ require 'pry'
 
 require 'voucher/version'
 require 'voucher/config'
+require 'voucher/metrics'
 require 'voucher/errors'
 require 'voucher/model/election'
 require 'voucher/model/segment'
-require 'voucher/election_contract'
+require 'voucher/chain_contract'
 require 'voucher/segments_reader'
 require 'voucher/segments_builder'
 require 'voucher/segments_parser'
@@ -24,11 +25,11 @@ module Voucher
   end
 
   def self.config
-    @config ||= Config.new
+    @config ||= Config
   end
 
   def self.reset
-    @config = Config.new
+    @config = Config
   end
 
   def self.configure(options = {})

data/lib/voucher/chain_contract.rb

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

data/lib/voucher/cli.rb

@@ -14,7 +14,7 @@ module Voucher
     method_option :host, type: :string, aliases: '-h'
     def validate(segments_file)
       configure
-      Voucher::Validator.call(segments_file)
+      puts 'Validation SUCCESSFUL!' if Voucher::Validator.call(segments_file)
     end
 
     private

data/lib/voucher/config.rb

@@ -1,14 +1,22 @@
 # frozen_string_literal: true
 
-module Voucher
-  class Config
-    ABI_FILE_NAME = File.join(File.dirname(__FILE__), 'config', 'json', 'election.json')
+require 'mixlib/config'
 
-    attr_accessor :ethereum_url, :election_abi
+module Config
+  extend Mixlib::Config
+  config_strict_mode true
 
-    def initialize
-      @ethereum_url = ENV['ETHEREUM_URL'] || 'http://172.31.80.135:8545'
-      @election_abi = File.read(ABI_FILE_NAME)
-    end
-  end
+  ABI_FILE_NAME = File.join(File.dirname(__FILE__), 'config', 'json', 'chain.json')
+
+  default :ethereum_url, ENV['ETHEREUM_URL'] || 'http://52.208.46.161:8549'
+  default :default_account, ENV['DEFAULT_ACCOUNT'] || '0x1B380DC721280DdBD4E0Cbf342Bf2c23A5FEC96A'
+  default :chain_abi, File.read(ABI_FILE_NAME)
+
+  default :metrics, []
+  default :aggregated_metric_types, []
+  default :non_aggregated_metric_types, []
+  default :cost_metrics, []
+  default :compound_metrics, {}
+  default :compound_metric_types, []
+  default :metric_types, []
 end

data/lib/voucher/config/json/chain.json

@@ -0,0 +1,753 @@
+[
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "singleStorage",
+    "outputs": [
+      {
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [],
+    "name": "register",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "isRegistered",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "_newInstance",
+        "type": "address"
+      }
+    ],
+    "name": "unregister",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "getAllStorages",
+    "outputs": [
+      {
+        "name": "",
+        "type": "address[]"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [],
+    "name": "renounceOwnership",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "owner",
+    "outputs": [
+      {
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "isOwner",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "contractRegistry",
+    "outputs": [
+      {
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "newOwner",
+        "type": "address"
+      }
+    ],
+    "name": "transferOwnership",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "name": "_contractRegistry",
+        "type": "address"
+      },
+      {
+        "name": "_chainStorage",
+        "type": "address"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "name": "previousOwner",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "name": "newOwner",
+        "type": "address"
+      }
+    ],
+    "name": "OwnershipTransferred",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "name": "executor",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "name": "newStorageOwner",
+        "type": "address"
+      }
+    ],
+    "name": "LogDetachFromStorage",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "name": "storageAddress",
+        "type": "address"
+      }
+    ],
+    "name": "LogNewStorage",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "name": "executor",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "name": "registered",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "name": "isRegistered",
+        "type": "bool"
+      }
+    ],
+    "name": "LogRegister",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "name": "balance",
+        "type": "uint256"
+      },
+      {
+        "indexed": true,
+        "name": "balanceReceiver",
+        "type": "address"
+      }
+    ],
+    "name": "LogSuicide",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "name": "sender",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "name": "blockHeight",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "name": "blindedProposal",
+        "type": "bytes32"
+      },
+      {
+        "indexed": false,
+        "name": "shard",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "name": "balance",
+        "type": "uint256"
+      }
+    ],
+    "name": "LogPropose",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "name": "sender",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "name": "blockHeight",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "name": "proposal",
+        "type": "bytes32"
+      }
+    ],
+    "name": "LogReveal",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "name": "sender",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "name": "blockHeight",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "name": "shard",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "name": "proposal",
+        "type": "bytes32"
+      },
+      {
+        "indexed": false,
+        "name": "counts",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "name": "balance",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "name": "newWinner",
+        "type": "bool"
+      },
+      {
+        "indexed": false,
+        "name": "totalTokenBalanceForShard",
+        "type": "uint256"
+      }
+    ],
+    "name": "LogUpdateCounters",
+    "type": "event"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "contractName",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bytes32"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "_blindedProposal",
+        "type": "bytes32"
+      },
+      {
+        "name": "_blockHeight",
+        "type": "uint256"
+      }
+    ],
+    "name": "propose",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "_proposal",
+        "type": "bytes32"
+      },
+      {
+        "name": "_secret",
+        "type": "bytes32"
+      }
+    ],
+    "name": "reveal",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "getBlockHeight",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "name": "_proposal",
+        "type": "bytes32"
+      },
+      {
+        "name": "_secret",
+        "type": "bytes32"
+      }
+    ],
+    "name": "createProof",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bytes32"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "name": "_blockHeight",
+        "type": "uint256"
+      },
+      {
+        "name": "_shard",
+        "type": "uint256"
+      }
+    ],
+    "name": "getBlockRoot",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bytes32"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "name": "_blockHeight",
+        "type": "uint256"
+      },
+      {
+        "name": "_voter",
+        "type": "address"
+      }
+    ],
+    "name": "getBlockVoter",
+    "outputs": [
+      {
+        "name": "blindedProposal",
+        "type": "bytes32"
+      },
+      {
+        "name": "shard",
+        "type": "uint256"
+      },
+      {
+        "name": "proposal",
+        "type": "bytes32"
+      },
+      {
+        "name": "balance",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "name": "_blockHeight",
+        "type": "uint256"
+      },
+      {
+        "name": "_shard",
+        "type": "uint256"
+      }
+    ],
+    "name": "getBlockMaxVotes",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "name": "_blockHeight",
+        "type": "uint256"
+      },
+      {
+        "name": "_shard",
+        "type": "uint256"
+      },
+      {
+        "name": "_proposal",
+        "type": "bytes32"
+      }
+    ],
+    "name": "getBlockCount",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "name": "_blockHeight",
+        "type": "uint256"
+      },
+      {
+        "name": "_i",
+        "type": "uint256"
+      }
+    ],
+    "name": "getBlockAddress",
+    "outputs": [
+      {
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "name": "_blockHeight",
+        "type": "uint256"
+      }
+    ],
+    "name": "getBlockAddressCount",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "name": "_blockHeight",
+        "type": "uint256"
+      },
+      {
+        "name": "_shard",
+        "type": "uint256"
+      }
+    ],
+    "name": "getStakeTokenBalanceFor",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "name": "_blockHeight",
+        "type": "uint256"
+      },
+      {
+        "name": "_shard",
+        "type": "uint256"
+      }
+    ],
+    "name": "isElectionValid",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "_minimumStakingTokenPercentage",
+        "type": "uint8"
+      }
+    ],
+    "name": "updateMinimumStakingTokenPercentage",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "updateMinimumStakingTokenPercentageEnabled",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "minimumStakingTokenPercentage",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint8"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "blocksPerPhase",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint8"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "getCurrentElectionCycleBlock",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "getFirstCycleBlock",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "isProposePhase",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "name": "_shard",
+        "type": "uint256"
+      }
+    ],
+    "name": "initialBlockHeights",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  }
+]