universum 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70d14cee1fae619bb93bdf56c7a81b79987f16bb
-  data.tar.gz: 8ed7b6fde7aabaeb6430ebbc61c1863e50241064
+  metadata.gz: 2a83f038e0a43351f492fc32ea68042559a82782
+  data.tar.gz: 604e2ed189008bc319d88b2cbb0d1cafbe8bffc1
 SHA512:
-  metadata.gz: 6a06807b4ff6cd4a8b4d84dc688e8a9af995a08135aaca0fcf8b1f1d0c249cf0530560ca901ebcf9c189e4b11131037cd1862369e956a5117ac5a5ef9216287c
-  data.tar.gz: e3e45a313da7ee2c0e0094f61c5fc082e015b8a5d0dfcc3e291decbd430d48746fa10f0ad4db4f6fca171413fd6cb8a3af3aff5949e328ffddafe879fa731995
+  metadata.gz: 7e27c2c0b46fd2e82bbfa1994656cdc174499efcb23b4f0cbb8304ef497c421ca4c32ab1b778003f0e24470de430ab9126e01dbf0d95c8b9d265b9208a2c4ad1
+  data.tar.gz: c0c4e8c82b5c4cf32a9d6414b7246a66f0bd675820cdb9c27b6376bfcaba37c028086d43955e61b468f865db0c563eee93cac86f87e7b70f691936be983cc9f1

data/Manifest.txt

@@ -18,9 +18,11 @@ lib/universum/units_money.rb
 lib/universum/units_time.rb
 lib/universum/universum.rb
 lib/universum/version.rb
+test/contracts/ballot.rb
 test/contracts/greeter.rb
 test/contracts/mytoken.rb
 test/helper.rb
+test/test_ballot.rb
 test/test_enum.rb
 test/test_event.rb
 test/test_greeter.rb

data/README.md

@@ -82,8 +82,6 @@ And let's run the greeter with Universum (Uni):
 ``` ruby
 require 'universum'
 
-Account['0x1111']    ## setup a test account
-
 ## create contract (english version)
 tx = Uni.send_transaction( from: '0x1111', data: ['./greeter', 'Hello World!'] )
 greeter = tx.receipt.contract
@@ -149,7 +147,7 @@ def initialize( initial_supply )
 end
 
 def transfer( to, value )
-  assert @balance_of[ msg.sender ] >= value 
+  assert @balance_of[ msg.sender ] >= value
   assert @balance_of[ to ] + value >= @balance_of[ to ]
 
   @balance_of[ msg.sender ] -= value
@@ -171,7 +169,10 @@ See the [`/universum-contracts`](https://github.com/s6ruby/universum-contracts)
 
 ## More Documentation / Articles / Contracts
 
-[Programming Crypto Blockchain Contracts Step-by-Step Book / Guide](https://github.com/s6ruby/programming-cryptocontracts) - Let's Start with Ponzi & Pyramid Schemes. Run Your Own Lotteries, Gambling Casinos and more on the Blockchain World Computer...
+[Programming Crypto Blockchain Contracts Step-by-Step Book / Guide](https://github.com/s6ruby/programming-cryptocontracts) - Let's start with ponzi & pyramid schemes. Run your own lotteries, gambling casinos and more on the blockchain world computer...
+
+[Safe Data Structures (Array, Hash, Struct)](https://github.com/s6ruby/safestruct) - Say goodbye to null / nil (and maybe) and the Billion-Dollar mistake. Say hello to zero and the Billon-Dollar fix.
+
 
 
 
@@ -186,6 +187,8 @@ $ gem install universum
 
 ## License
 
+![](https://publicdomainworks.github.io/buttons/zero88x31.png)
+
 The `universum` scripts are dedicated to the public domain.
 Use it as you please with no restrictions whatsoever.
 

data/Rakefile

@@ -18,7 +18,7 @@ Hoe.spec 'universum' do
   self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
-    ['safestruct'],
+    ['safestruct', '>=1.0.0'],
   ]
 
   self.licenses = ['Public Domain']

data/lib/universum.rb

@@ -12,6 +12,8 @@ require 'uri'
 ## 3rd party gems
 require 'safestruct'    # SafeArray, SafeHash, SafeStruct, etc.
 
+## note: make Mapping an alias for Hash (lets you use Mapping.of() for Hash.of)
+Mapping = Hash
 
 
 ## our own code

data/lib/universum/contract.rb

@@ -3,6 +3,7 @@
 
 class Contract
 
+  include Safe    # adds support for SafeStruct (Struct), SafeArray (Array), SafeHash (Mapping)
   #########
   # load "class-less" contract
   #   e.g.   SathoshiDice = Contract.load( './sathoshi_dice' )

data/lib/universum/enum.rb

@@ -52,6 +52,15 @@ class Enum
   ###################
   ##  meta-programming "macro" - build class (on the fly)
   def self.build_class( *keys )
+
+    ## check if all keys are symbols and follow the ruby id(entifier) naming rules
+    keys.each do |key|
+      if key.is_a?( Symbol ) && key =~ /\A[a-z][a-zA-Z0-9_]*\z/
+      else
+        raise ArgumentError.new( "[Enum] arguments to Enum.new must be all symbols following the ruby id naming rules; >#{key}< failed" )
+      end
+    end
+       
     klass = Class.new( Enum )
 
     ## add self.new too - note: call/forward to "old" orginal self.new of Event (base) class

data/lib/universum/units_money.rb

@@ -24,7 +24,7 @@ class Integer
   #
   #  wei                     1 wei | 1
   #  kwei (babbage)        1e3 wei | 1_000
-  #  mwei (lovelace | ada) 1e6 wei | 1_000_000
+  #  mwei (lovelace)       1e6 wei | 1_000_000
   #  gwei (shannon)        1e9 wei | 1_000_000_000
   #  microether (szabo)   1e12 wei | 1_000_000_000_000
   #  milliether (finney)  1e15 wei | 1_000_000_000_000_000
@@ -32,7 +32,7 @@ class Integer
   #
   #  Names in Honor:
   #   wei            => Wei Dai
-  #   lovelace | ada => Ada Lovelace (1815-1852)
+  #   lovelace       => Ada Lovelace (1815-1852)
   #   babbage	       => Charles Babbage (1791-1871)
   #   shannon	       => Claude Shannon (1916-2001)
   #   szabo          => Nick Szabo
@@ -50,7 +50,6 @@ class Integer
   ## alias - use alias or alias_method - why? why not?
   def babbage()   kwei; end
   def lovelace()  mwei; end
-  def ada()       mwei; end    ## todo/check: in use, really? keep just lovelave- why? why not?
   def shannon()   gwei; end
   def szabo()     microether; end
   def finney()    milliether; end

data/lib/universum/version.rb

@@ -8,7 +8,7 @@ class Universum
 
   MAJOR = 0
   MINOR = 3
-  PATCH = 0
+  PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/contracts/ballot.rb

@@ -0,0 +1,66 @@
+#########################
+# Ballot Contract
+
+Voter    = Struct.new( weight:   0,
+                       voted:    false,
+                       vote:     0,
+                       delegate: Address(0))
+
+Proposal = Struct.new( vote_count: 0 )
+
+## Create a new ballot with $(num_proposals) different proposals.
+def initialize( num_proposals )
+  @chairperson = msg.sender
+  @voters      = Mapping.of( Address => Voter )
+  @proposals   = Array.of( Proposal, num_proposals )
+
+  @voters[@chairperson].weight = 1
+end
+
+## Give $(to_voter) the right to vote on this ballot.
+## May only be called by $(chairperson).
+def give_right_to_vote( to_voter )
+   assert msg.sender == @chairperson && @voters[to_voter].voted? == false
+   @voters[to_voter].weight = 1
+end
+
+## Delegate your vote to the voter $(to).
+def delegate( to )
+  sender = @voters[msg.sender]  # assigns reference
+  assert sender.voted? == false
+
+  while @voters[to].delegate != Address(0) && @voters[to].delegate != msg.sender do
+    to = @voters[to].delegate
+  end
+  assert to != msg.sender
+
+  sender.voted    = true
+  sender.delegate = to
+  delegate_to = @voters[to]
+  if delegate_to.voted
+    @proposals[delegate_to.vote].vote_count += sender.weight
+  else
+    delegate_to.weight += sender.weight
+  end
+end
+
+## Give a single vote to proposal $(to_proposal).
+def vote( to_proposal )
+  sender = @voters[msg.sender]
+  assert sender.voted? == false && to_proposal < @proposals.length
+  sender.voted = true
+  sender.vote  = to_proposal
+  @proposals[to_proposal].vote_count += sender.weight
+end
+
+def winning_proposal
+  winning_vote_count = 0
+  winning_proposal   = 0
+  @proposals.each_with_index do |proposal,i|
+    if proposal.vote_count > winning_vote_count
+      winning_vote_count = proposal.vote_count
+      winning_proposal   = i
+    end
+  end
+  winning_proposal
+end

data/test/test_ballot.rb

@@ -0,0 +1,46 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_ballot.rb
+
+
+require 'helper'
+
+
+
+class TestBallot < MiniTest::Test
+
+Ballot = Contract.load( "#{Universum.root}/test/contracts/ballot" )
+
+def test_uni
+   Account['0x1111']    ### todo/fix: auto-add account in from: if not present or missing!!!!
+   Account['0xaaaa']
+   Account['0xbbbb']
+   Account['0xcccc']
+   Account['0xdddd']
+
+   tx = Uni.send_transaction( from: '0x1111', data: [Ballot, 2] )
+   pp tx
+   pp tx.receipt
+
+   ballot = tx.receipt.contract
+   pp ballot
+
+   Uni.send_transaction( from: '0x1111', to: ballot, data: [:give_right_to_vote, '0xaaaa'] )
+   Uni.send_transaction( from: '0x1111', to: ballot, data: [:give_right_to_vote, '0xbbbb'] )
+   Uni.send_transaction( from: '0x1111', to: ballot, data: [:give_right_to_vote, '0xcccc'] )
+   Uni.send_transaction( from: '0x1111', to: ballot, data: [:give_right_to_vote, '0xdddd'] )
+   pp ballot
+
+   Uni.send_transaction( from: '0xaaaa', to: ballot, data: [:vote, 1] )
+   Uni.send_transaction( from: '0xbbbb', to: ballot, data: [:delegate, '0xaaaa'] )
+   Uni.send_transaction( from: '0xcccc', to: ballot, data: [:vote, 0] )
+   Uni.send_transaction( from: '0xdddd', to: ballot, data: [:delegate, '0xbbbb'] )
+   pp ballot
+
+   ## todo/fix: get return value from sent_transaction
+   assert_equal 1, ballot.winning_proposal
+end
+
+end # class TestBallot

data/test/test_units_money.rb

@@ -47,7 +47,6 @@ def test_money
 
   assert_equal 1_000_000,       1.mwei
   assert_equal 1_000_000,       1.lovelace
-  assert_equal 1_000_000,       1.ada
   assert_equal 1_000_000*2,     1.mwei*2
   assert_equal value+1_000_000, value+1.mwei
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: universum
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-14 00:00:00.000000000 Z
+date: 2019-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safestruct
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -85,9 +85,11 @@ files:
 - lib/universum/units_time.rb
 - lib/universum/universum.rb
 - lib/universum/version.rb
+- test/contracts/ballot.rb
 - test/contracts/greeter.rb
 - test/contracts/mytoken.rb
 - test/helper.rb
+- test/test_ballot.rb
 - test/test_enum.rb
 - test/test_event.rb
 - test/test_greeter.rb