universum 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2c8f33d68ea490e3785c31d1cca9977af498602
-  data.tar.gz: d7ac8121bc501b8339954fdc0c23111c4c5d60d8
+  metadata.gz: db4bf31c857f63ae6e203d9ddcdb718556c6f2a7
+  data.tar.gz: 3989ec1e3962f0768a8a3c108e72a76b4c4b969b
 SHA512:
-  metadata.gz: fbcfc8ea96b55f557636649078b665554464b5009f411cc6208890a4b4f558a633198321d796093b0b1e0cfa31bd58154064d2112576258ffdbf4ed97b065687
-  data.tar.gz: 03a36a8c12c2ff2e88789028b4c978c1ed3d60d909d773b1fb79592a9212b819e2712ce3e2dd82682b250d80b608c3d6cc61880ecadd589a1d14722c63f8c36d
+  metadata.gz: 276c1b77f06cf0e0dcb10a7a4ca4ef072365f1852c30e5b83279582f4d38447ad178c975c9e169e40aef5871a8d830cd8748d371c9d5846f3fd3211fe251ed07
+  data.tar.gz: 7086a5e4984497cc116ee05eb397a34afc7e766474e5aacc802421a37c16c5c4031936dae03fbdecd8b9172c5d990c52391dc3a18b14620d4ae92b26e46405e4

data/Manifest.txt

@@ -4,14 +4,30 @@ Manifest.txt
 README.md
 Rakefile
 lib/universum.rb
+lib/universum/account.rb
+lib/universum/address.rb
+lib/universum/contract.rb
 lib/universum/enum.rb
 lib/universum/event.rb
+lib/universum/function.rb
+lib/universum/receipt.rb
+lib/universum/safe_array.rb
+lib/universum/safe_hash.rb
+lib/universum/transaction.rb
+lib/universum/type.rb
+lib/universum/units_money.rb
+lib/universum/units_time.rb
 lib/universum/universum.rb
 lib/universum/version.rb
 test/contracts/greeter.rb
 test/contracts/mytoken.rb
 test/helper.rb
+test/test_array.rb
 test/test_enum.rb
 test/test_event.rb
 test/test_greeter.rb
+test/test_hash.rb
+test/test_struct.rb
+test/test_units_money.rb
+test/test_units_time.rb
 test/test_version.rb

data/README.md

@@ -1,4 +1,4 @@
-New to Universum? See the [Universum (World Computer) White Paper](https://github.com/openblockchains/universum/blob/master/WHITEPAPER.md)!
+New to Universum? See the [Universum (World Computer) White Paper](https://github.com/s6ruby/universum/blob/master/WHITEPAPER.md)!
 
 
 
@@ -7,8 +7,8 @@ New to Universum? See the [Universum (World Computer) White Paper](https://githu
 next generation ethereum 2.0 world computer runtime - run contract scripts / transactions in plain vanilla / standard ruby on the blockchain - update the (contract-protected / isolated) world states with plain vanilla / standard SQL
 
 
-* home  :: [github.com/openblockchains/universum](https://github.com/openblockchains/universum)
-* bugs  :: [github.com/openblockchains/universum/issues](https://github.com/openblockchains/universum/issues)
+* home  :: [github.com/s6ruby/universum](https://github.com/s6ruby/universum)
+* bugs  :: [github.com/s6ruby/universum/issues](https://github.com/s6ruby/universum/issues)
 * gem   :: [rubygems.org/gems/universum](https://rubygems.org/gems/universum)
 * rdoc  :: [rubydoc.info/gems/universum](http://rubydoc.info/gems/universum)
 
@@ -56,21 +56,21 @@ contract Greeter is Mortal {
 and
 
 ``` ruby
-class Greeter < Contract
+##################
+# Greeter Contract
 
-  def initialize( greeting )
-    @owner    = msg.sender
-    @greeting = greeting
-  end
+def initialize( greeting )
+  @owner    = msg.sender
+  @greeting = greeting
+end
 
-  def greet
-    @greeting
-  end
+def greet
+  @greeting
+end
 
-  def kill
-    selfdestruct( msg.sender )  if msg.sender == @owner
-  end
-end  # class Greeter
+def kill
+  selfdestruct( msg.sender )  if msg.sender == @owner
+end
 ```
 
 (Source: [`contracts/greeter.rb`](test/contracts/greeter.rb))
@@ -82,18 +82,17 @@ And let's run the greeter with Universum (Uni):
 ``` ruby
 require 'universum'
 
-require_relative 'greeter'
-
-
 Account['0x1111']    ## setup a test account
 
-tx = Tx.send( from: '0x1111', data: [Greeter, 'Hello World!'] )
+## create contract (english version)
+tx = Uni.send_transaction( from: '0x1111', data: ['./greeter', 'Hello World!'] )
 greeter = tx.receipt.contract
 
 puts greeter.greet
 #=> Hello World!
 
-tx = Tx.send( from: '0x1111', data: [Greeter, '¡Hola, mundo!'] )
+## create contract (spanish version)
+tx = Uni.send_transaction( from: '0x1111', data: ['./greeter', '¡Hola, mundo!'] )
 greeter_es = Receipt[ tx ].contract
 
 puts greeter_es.greet
@@ -141,23 +140,23 @@ contract MyToken {
 and
 
 ``` ruby
-class MyToken < Contract
+############################
+## My Token Contract
 
-  def initialize( initial_supply )
-    @balance_of = Mapping.of( Address => Money )
-    @balance_of[ msg.sender] = initial_supply
-  end
+def initialize( initial_supply )
+  @balance_of = Mapping.of( Address => Money )
+  @balance_of[ msg.sender] = initial_supply
+end
 
-  def transfer( to, value )
-    assert( @balance_of[ msg.sender ] >= value )
-    assert( @balance_of[ to ] + value >= @balance_of[ to ] )
+def transfer( to, value )
+  assert @balance_of[ msg.sender ] >= value 
+  assert @balance_of[ to ] + value >= @balance_of[ to ]
 
-    @balance_of[ msg.sender ] -= value
-    @balance_of[ to ]         += value
+  @balance_of[ msg.sender ] -= value
+  @balance_of[ to ]         += value
 
-    true
-  end
-end   # class MyToken
+  true
+end
 ```
 
 (Source: [`contracts/mytoken.rb`](test/contracts/mytoken.rb))
@@ -167,12 +166,12 @@ end   # class MyToken
 
 ## More Contract Samples
 
-See the [`/universum-contracts`](https://github.com/openblockchains/universum-contracts) collection.
+See the [`/universum-contracts`](https://github.com/s6ruby/universum-contracts) collection.
 
 
 ## More Documentation / Articles / Contracts
 
-[Programming Crypto Blockchain Contracts Step-by-Step Book / Guide](https://github.com/openblockchains/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...
 
 
 

data/Rakefile

@@ -8,7 +8,7 @@ Hoe.spec 'universum' do
   self.summary = "universum - next generation ethereum 2.0 world computer runtime; run contract scripts / transactions in plain vanilla / standard ruby on the blockchain; update the (contract-protected / isolated) world states with plain vanilla / standard SQL"
   self.description = summary
 
-  self.urls    = ['https://github.com/openblockchains/universum']
+  self.urls    = ['https://github.com/s6ruby/universum']
 
   self.author  = 'Gerald Bauer'
   self.email   = 'wwwmake@googlegroups.com'

data/lib/universum.rb

@@ -4,14 +4,33 @@
 ## stdlibs
 require 'pp'         ## pretty print (pp)
 require 'digest'
+require 'date'
+require 'time'
+require 'uri'
+
 
 
 ## our own code
 require 'universum/version'    # note: let version always go first
 
+require 'universum/units_time'
+require 'universum/units_money'
+
+require 'universum/safe_array'
+require 'universum/safe_hash'
+
 require 'universum/enum'
 require 'universum/event'
 
+require 'universum/function'
+require 'universum/address'
+require 'universum/type'
+require 'universum/account'
+require 'universum/contract'
+require 'universum/transaction'
+require 'universum/receipt'
+
+
 require 'universum/universum'
 
 

data/lib/universum/account.rb

@@ -0,0 +1,52 @@
+# encoding: utf-8
+
+
+class Account
+
+  @@directory = {}
+  def self.find_by_address( key )
+     ## clean key (allow "embedded" name e.g 0x1111 (Alice))
+     key = key.gsub(/\(.+\)/, '' ).strip
+     @@directory[ key ]
+  end
+  def self.find( key ) find_by_address( key ); end   # make find_by_address the default finder
+  def self.at( key) find_by_address( key ); end   # another "classic" alias for find_by_address
+
+  def self.[]( key )
+    o = find_by_address( key )
+    if o
+      o
+    else
+      o = new( key )
+      ## note: auto-register (new) address in (yellow page) directory
+      @@directory[ key ] = o
+      o
+    end
+  end
+
+  def self.all()  @@directory.values;  end
+
+
+  ####
+  #  account (builtin) services / transaction methods
+  include Address    ## includes address + send/transfer/balance
+
+  ## note: for now allow write access too!!!
+  def balance=( value )
+    @balance = value
+  end
+
+  attr_reader :tx
+  def _auto_inc_tx() @tx += 1; end   ## "internal" method - (auto) increment transaction (tx) counter
+
+  ## note: needed by transfer/send
+  def this()       Universum.this;         end   ## returns current contract
+
+private
+  def initialize( address, balance: 0, tx: 0 )
+    @address = address    # type address - (hex) string starts with 0x
+    @balance = balance    # uint
+    @tx      = tx         # transaction (tx) count (used for nonce and replay attack protection)
+  end
+
+end # class Account

data/lib/universum/address.rb

@@ -0,0 +1,75 @@
+# encoding: utf-8
+
+
+#############
+# FIX/FIX/FIX!!!!  - turn Address into a class!!!!
+
+
+module Address
+  def self.zero() '0x0000'; end
+
+  def address
+    if @address
+      @address
+    else
+      if is_a? Contract
+         ##  fix/todo:  use/lookup proper addr from contract
+         ## construct address for now from object_id
+         "0x#{(object_id << 1).to_s(16)}"
+      else  ## assume Account
+         '0x0000'
+      end
+    end
+  end # method address
+
+  def transfer( value )  ## @payable @public
+    ## todo/fix: throw exception if insufficient funds
+    send( value )   # returns true/false
+  end
+
+  def send( value )  ## @payable @public
+    ## todo/fix: assert value > 0
+    ## todo/fix: add missing  -= part in transfer!!!!
+
+    ## use this (current contract) for debit (-) ammount
+    this._sub( value )    # sub(tract) / debit from the sender (current contract)
+    _add( value )         # add / credit to the recipient
+  end
+
+  def balance
+    @balance ||= 0   ## return 0 if undefined
+  end
+
+  ### private (internal use only) methods - PLEASE do NOT use (use transfer/send)
+  def _sub( value )
+    @balance ||= 0   ## return 0 if undefined
+    @balance -= value
+  end
+
+  def _add( value )
+    @balance ||= 0   ## return 0 if undefined
+    @balance += value
+  end
+end  # module Address
+
+
+
+class String
+  def transfer( value )
+    ## check if self is an address
+    if self.start_with?( '0x' )
+      Account[self].transfer( value )
+    else
+      raise "(Auto-)Type Conversion from Address (Hex) String to Account Failed; Expected String Starting with 0x got #{self}; Contract Halted (Stopped)"
+    end
+  end
+
+  def send( value )
+    ## check if self is an address
+    if self.start_with?( '0x' )
+      Account[self].send( value )
+    else
+      raise "(Auto-)Type Conversion from Address (Hex) String to Account Failed; Expected String Starting with 0x got #{self}; Contract Halted (Stopped)"
+    end
+  end
+end

data/lib/universum/contract.rb

@@ -0,0 +1,87 @@
+# encoding: utf-8
+
+
+class Contract
+
+  #########
+  # load "class-less" contract
+  #   e.g.   SathoshiDice = Contract.load( './sathoshi_dice' )
+  def self.load( path )
+    extname = File.extname( path )   #=> ".rb"
+    if extname == '.rb'
+      ## do nothing
+    else
+      ## "convenience" helper - (auto-)add .rb extension
+      path = "#{path}.rb"
+    end
+
+    code = File.open( path, 'r:bom|utf-8' ) { |f| f.read }
+    klass = Class.new( Contract )
+    klass.class_eval( code )   ## note: use class_eval (NOT instance_eval)
+    klass
+  end
+
+
+  @@directory = {}
+  def self.find_by_address( key )
+     ## clean key (allow "embedded" class name e.g 0x4de2ee8 (SatoshiDice))
+     key = key.gsub(/\(.+\)/, '' ).strip
+     @@directory[ key ];
+  end
+  def self.find( key ) find_by_address( key ); end   # make find_by_address the default finder
+  def self.at( key) find_by_address( key ); end     # another "classic" alias for find_by_address
+  def self.[]( key ) find_by_address( key ); end
+
+  def self.store( key, o ) @@directory.store( key, o ); end  ## store (add) new contract object (o) to hash / directory
+  def self.all() @@directory.values; end
+
+
+
+  ####
+  #  account (builtin) services / transaction methods
+  include Address    ## includes address + send/transfer/balance
+
+  ## function sig(nature) macro for types (dummy for now)
+  # e.g. use like
+  #   payable :process
+  #   payable :initialize
+  #   payable :bet, Integer
+  #   payable :lend_money, Address => Bool   ## returns Bool
+  def self.payable( *args ); end
+
+  payable :receive
+
+  ####
+  #  todo/double check: auto-add payable default fallback - why? why not?
+  def receive    ## @payable default fallback - use different name - why? why not? (e.g. handle/process/etc.)
+  end
+
+
+  def assert( condition )
+    if condition == true
+      ## do nothing
+    else
+      raise 'Contract Assertion Failed; Contract Halted (Stopped)'
+    end
+  end
+
+
+  def this()       Universum.this;         end   ## returns current contract
+  def log( event ) Universum.log( event ); end
+  def msg()        Universum.msg;          end
+  def block()      Universum.block;        end
+  def blockhash( number )
+    ## todo/fix: only allow going back 255 blocks; check if number is in range!!!
+    Universum.blockhash( number )
+  end
+
+private
+  def selfdestruct( owner )   ## todo/check: use a different name e.g. destruct/ delete - why? why not?
+    ## selfdestruct function (for clean-up on blockchain)
+    owner.send( @balance )    ## send back all funds owned/hold by contract
+
+     ## fix: does nothing for now - add some code (e.g. cleanup)
+     ##  mark as destruct - why? why not?
+  end
+
+end  # class Contract

data/lib/universum/function.rb

@@ -0,0 +1,10 @@
+# encoding: utf-8
+
+########################################
+# builtin "global" functions
+
+def sha256( *args )
+  ## note: allow multiple args (string)
+  ##   all args will get auto-joined (with no padding)
+  Digest::SHA256.hexdigest( args.join )
+end

data/lib/universum/receipt.rb

@@ -0,0 +1,52 @@
+# encoding: utf-8
+
+
+class Receipt   ## transaction receipt
+
+  @@directory = {}
+  def self.find( tx )
+     key = "#{tx.from}/#{tx.nonce}"
+     @@directory[ key ];
+  end
+  def self.[]( tx ) find( tx ); end
+
+  def self.store( o )
+     key = "#{o.from}/#{o.nonce}"
+     @@directory.store( key, o ); end  ## store (add) new receipt object (o) to hash / directory
+  def self.all() @@directory.values; end
+
+
+   ## required attributes / fields
+   attr_reader :nonce, :from, :to, :value,
+               :block_number
+   ## optional
+   attr_reader :contract_address
+
+   def initialize( tx:,
+                   block:,
+                   contract: nil )
+      @nonce = tx.nonce
+      @from  = tx.from
+      @to    = tx.to
+      @value = tx.value
+      ## todo/fix: add data too!!!
+
+      @block_number    = block.number
+      ## todo/fix: add block_hash
+
+      if contract
+        ## note: for easier debugging add class name in () to address (needs to get stripped away in lookup)
+        @contract_address = "#{contract.address} (#{contract.class.name})"
+      else
+        @contract_address = nil
+      end
+   end
+
+   def contract   # convenience helper (quick contract lookup)
+     if @contract_address
+       Contract.find( @contract_address )
+     else
+       nil
+     end
+   end
+end