shilling 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94551689d1b4b2198bf0fcf75211ca6b3b9a5f1b
-  data.tar.gz: 9f703f85dbc1c8de0b15bc23ed1af4e1a9931c64
+  metadata.gz: 3ec576692c34de7444a874bab09bc0e738f75fd6
+  data.tar.gz: 1885f770b43715813f7062820c217b5f76ef7e10
 SHA512:
-  metadata.gz: f2b04c71d59561d3b14933028c56b54cd4eae4a3f56b3bc17582135bccef6e1b0f08e8f777f5bcb16663c6a8dcd2a8c8be27ac91eef0b54020d9be7df7bde4e1
-  data.tar.gz: 7bf21a8f145a255dcf85a8f75f1016c60ecedae4910123455c9ddb62847436c8557ea2b9324f527bf5743ccf6a139f3dc782e43ff17ff7593dde851664fed0e2
+  metadata.gz: fb9d7fbba7d30f7d179b0e57cd6ca74987bb99a48e6fdc4397e508a1eb1d4b71d62aa991a41eded7faa96de1ed78538ce33f9d04e817e8ffc4eeb84a4ee7ce35
+  data.tar.gz: 4d957daa158c18849f024f43abee289234c46b0bacbae50a8984725f3a6e560b16ea47374aea074b17e852559c86c57b73276392dc09529d9083e98cfc4be92f

data/Manifest.txt

@@ -9,7 +9,6 @@ lib/shilling/bank.rb
 lib/shilling/block.rb
 lib/shilling/blockchain.rb
 lib/shilling/cache.rb
-lib/shilling/ledger.rb
 lib/shilling/node.rb
 lib/shilling/pool.rb
 lib/shilling/service.rb

data/README.md

@@ -6,12 +6,13 @@ w/ public distributed (hyper) ledger book on the blockchain peer-to-peer over HT
 
 
 
-* home  :: [github.com/blockchainaustria/shilling.tools](https://github.com/blockchainaustria/shilling.tools)
-* bugs  :: [github.com/blockchainaustria/shilling.tools/issues](https://github.com/blockchainaustria/shilling.tools/issues)
+* home  :: [github.com/bitshilling/bitshilling.tools](https://github.com/bitshilling/bitshilling.tools)
+* bugs  :: [github.com/bitshilling/bitshilling.tools/issues](https://github.com/bitshilling/bitshilling.tools/issues)
 * gem   :: [rubygems.org/gems/shilling](https://rubygems.org/gems/shilling)
 * rdoc  :: [rubydoc.info/gems/shilling](http://rubydoc.info/gems/shilling)
 
 
+
 ## Command Line
 
 Use the `shilling` command line tool. Try:
@@ -77,6 +78,7 @@ source "https://rubygems.org"
 gem 'sinatra'
 gem 'sass'
 gem 'blockchain-lite'
+gem 'ledger-lite'
 ```
 
 run

data/Rakefile

@@ -8,7 +8,7 @@ Hoe.spec 'shilling' do
   self.summary = 'shilling (or schilling) on the blockchain! rock-solid alpine dollar from austria; print (mine) your own shillings; run your own federated shilling central bank nodes w/ public distributed (hyper) ledger book on the blockchain peer-to-peer over HTTP; revolutionize the world one block at a time with cryptos'
   self.description = summary
 
-  self.urls    = ['https://github.com/blockchainaustria/shilling.tools']
+  self.urls    = ['https://github.com/bitshilling/bitshilling.tools']
 
   self.author  = 'Gerald Bauer'
   self.email   = 'ruby-talk@ruby-lang.org'
@@ -20,9 +20,11 @@ Hoe.spec 'shilling' do
   self.extra_deps = [
     ['sinatra', '>=2.0'],
     ['sass'],   ## used for css style preprocessing (scss)
-    ['blockchain-lite', '>=1.3.1'],
+    ['blockchain-lite', '>=1.4.0'],
+    ['ledger-lite', '>=1.1.1' ]
   ]
 
+
   self.licenses = ['Public Domain']
 
   self.spec_extras = {

data/lib/shilling.rb

@@ -12,8 +12,21 @@ require 'optparse'    ## note: used for command line tool (see Tool in tool.rb)
 ### 3rd party gems
 require 'sinatra/base'                         # note: use "modular" sinatra app / service
 
-require 'merkletree'
-require 'blockchain-lite/proof_of_work/block'  # note: use proof-of-work block only (for now)
+
+require 'blockchain-lite/base'
+
+###
+#  add convenience top-level shortcut / alias
+#    "standard" default block for now block with proof of work
+Block   = BlockchainLite::ProofOfWork::Block
+
+
+require 'ledger-lite/base'
+
+###
+# add convenience top-level shortcut / alias
+Ledger = LedgerLite::Ledger
+
 
 
 ### our own code
@@ -24,7 +37,6 @@ require 'shilling/transaction'
 require 'shilling/blockchain'
 require 'shilling/pool'
 require 'shilling/bank'
-require 'shilling/ledger'
 require 'shilling/wallet'
 
 require 'shilling/node'
@@ -50,11 +62,15 @@ module Shilling
      attr_accessor :mining_reward
 
      ## note: add a (†) coinbase  marker
+     ##  fix: "sync" with ledger-lite config!!!!
+     COINBASE = ['Coinbase†']
+=begin
      COINBASE = ['Großglockner†', 'Wildspitze†', 'Großvenediger†',
                  'Hochfeiler†', 'Zuckerhütl†', 'Hochalmspitze†',
                  'Gr. Muntanitz†', 'Hoher Riffler†',
                  'Parseierspitze†', 'Hoher Dachstein†'
                 ]
+=end
 
 
      def initialize

data/lib/shilling/bank.rb

@@ -50,7 +50,7 @@ class Bank
     ## (convenience) delegate for ledger
     ##  todo/check: use address instead of wallet - why? why not?
     ##   for now single address wallet (that is, wallet==address)
-    @ledger.sufficient_funds?( wallet, amount )
+    @ledger.sufficient?( wallet, amount )
   end
 
 

data/lib/shilling/block.rb

@@ -1,14 +1,9 @@
 
-
-Block = BlockchainLite::ProofOfWork::Block
-
-## see https://github.com/openblockchains/blockchain.lite.rb/blob/master/lib/blockchain-lite/proof_of_work/block.rb
-
 ######
 ## add more methods
 
-class Block
 
+class Block
 
 def to_h
   { index:             @index,

data/lib/shilling/version.rb

@@ -2,7 +2,7 @@
 
 module Shilling
 
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 
   def self.root
     "#{File.expand_path( File.dirname(File.dirname(File.dirname(__FILE__))) )}"

data/lib/shilling/views/_ledger.erb

@@ -5,7 +5,7 @@
       <th>Address</th>
       <th>Balance</th>
     </tr>
-    <% @node.bank.ledger.wallets.each do |address, amount| %>
+    <% @node.bank.ledger.each do |address, amount| %>
       <tr>
         <td><%= address[0..15] %></td>
         <td>$<%= amount %></td>

data/lib/shilling/views/_wallet.erb

@@ -4,7 +4,7 @@
     <h2>Address</h2>
     <div><%= @node.wallet.address %></div>
     <h2>Balance</h2>
-    <div class="balance">$<%= @node.bank.ledger.wallets[@node.wallet.address] || 0 %></div>
+    <div class="balance">$<%= @node.bank.ledger[@node.wallet.address] || 0 %></div>
   </div>
   <form action="/send" method="post" class="transaction-form">
     <label for="to">To</label>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shilling
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-26 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -44,14 +44,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: ledger-lite
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -105,7 +119,6 @@ files:
 - lib/shilling/block.rb
 - lib/shilling/blockchain.rb
 - lib/shilling/cache.rb
-- lib/shilling/ledger.rb
 - lib/shilling/node.rb
 - lib/shilling/pool.rb
 - lib/shilling/service.rb
@@ -120,7 +133,7 @@ files:
 - lib/shilling/views/index.erb
 - lib/shilling/views/style.scss
 - lib/shilling/wallet.rb
-homepage: https://github.com/blockchainaustria/shilling.tools
+homepage: https://github.com/bitshilling/bitshilling.tools
 licenses:
 - Public Domain
 metadata: {}

data/lib/shilling/ledger.rb

@@ -1,30 +0,0 @@
-
-class Ledger
-  attr_reader :wallets     ## use addresses - why? why not? for now single address wallet (wallet==address)
-
-  def initialize( chain=[] )
-    @wallets = {}
-    chain.each do |block|
-      apply_transactions( block.transactions )
-    end
-  end
-
-  def sufficient_funds?( wallet, amount )
-    return true   if Shilling.config.coinbase?( wallet )
-    @wallets.has_key?( wallet ) && @wallets[wallet] - amount >= 0
-  end
-
-
-private
-
-  def apply_transactions( transactions )
-    transactions.each do |tx|
-      if sufficient_funds?(tx.from, tx.amount)
-        @wallets[tx.from] -= tx.amount   unless Shilling.config.coinbase?( tx.from )
-        @wallets[tx.to] ||= 0
-        @wallets[tx.to] += tx.amount
-      end
-    end
-  end
-
-end   ## class Ledger