universum 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a83f038e0a43351f492fc32ea68042559a82782
-  data.tar.gz: 604e2ed189008bc319d88b2cbb0d1cafbe8bffc1
+  metadata.gz: 4ed79bd806a5db0f1d5a92a0dfd2e7f3f3b3db56
+  data.tar.gz: 89afee15e5c5800220c13f8f7b58dffb190a4177
 SHA512:
-  metadata.gz: 7e27c2c0b46fd2e82bbfa1994656cdc174499efcb23b4f0cbb8304ef497c421ca4c32ab1b778003f0e24470de430ab9126e01dbf0d95c8b9d265b9208a2c4ad1
-  data.tar.gz: c0c4e8c82b5c4cf32a9d6414b7246a66f0bd675820cdb9c27b6376bfcaba37c028086d43955e61b468f865db0c563eee93cac86f87e7b70f691936be983cc9f1
+  metadata.gz: ed45e6ab943f70fcd6a9c43c4faa98ab6f6e606f5808e188276b16efc1464603d393ccb4763484c4f33e8f0386a0644a83a6c0856b6197054240f67f486884bf
+  data.tar.gz: f9f0fe016eb2113b1705ec86aed96530690b250e8b83dbff0751b43b7d901ef404dd3bb769ef5e7ae66d75e9ec26cedca6e219fc6561c42e99355e17320be980

data/Manifest.txt

@@ -12,6 +12,7 @@ lib/universum/enum.rb
 lib/universum/event.rb
 lib/universum/function.rb
 lib/universum/receipt.rb
+lib/universum/storage.rb
 lib/universum/transaction.rb
 lib/universum/type.rb
 lib/universum/units_money.rb
@@ -26,6 +27,8 @@ test/test_ballot.rb
 test/test_enum.rb
 test/test_event.rb
 test/test_greeter.rb
+test/test_mytoken.rb
+test/test_storage.rb
 test/test_units_money.rb
 test/test_units_time.rb
 test/test_version.rb

data/README.md

@@ -59,7 +59,7 @@ and
 ##################
 # Greeter Contract
 
-def initialize( greeting )
+def setup( greeting )
   @owner    = msg.sender
   @greeting = greeting
 end
@@ -141,7 +141,7 @@ and
 ############################
 ## My Token Contract
 
-def initialize( initial_supply )
+def setup( initial_supply )
   @balance_of = Mapping.of( Address => Money )
   @balance_of[ msg.sender] = initial_supply
 end

data/lib/universum.rb

@@ -29,6 +29,7 @@ require 'universum/function'
 require 'universum/address'
 require 'universum/type'
 require 'universum/account'
+require 'universum/storage'
 require 'universum/contract'
 require 'universum/transaction'
 require 'universum/receipt'

data/lib/universum/account.rb

@@ -27,25 +27,26 @@ class Account
   def self.all()  @@directory.values;  end
 
 
+
   ####
   #  account (builtin) services / transaction methods
-  include Address    ## includes address + send/transfer/balance
 
+  def address() @address; end
+  def address_hex() @address.hex; end   ## add convenience shortcut address_hex - why? why not?
+
+  def balance() @address.balance; end   ## note: add convenience shortcut - why? why not?
   ## note: for now allow write access too!!!
   def balance=( value )
-    @balance = value
+    @address.send( '@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
+    @address = Address.new( address, balance: balance )    # type address - (hex) string starts with 0x
     @tx      = tx         # transaction (tx) count (used for nonce and replay attack protection)
   end
 

data/lib/universum/address.rb

@@ -1,64 +1,61 @@
 # encoding: utf-8
 
 
-#############
-# FIX/FIX/FIX!!!!  - turn Address into a class!!!!
+class Address
+  def self.zero() '0x0000'; end
 
+  def initialize( address, balance: 0 )
+    @address = address
+    @balance = balance
+  end
+
+  def hex()     @address; end   ## return address as a hex string (e.g. '0x1111' etc.)
+  def balance() @balance; end
 
-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
+    ## todo/fix: use assert( send( value )
     send( value )   # returns true/false
   end
 
   def send( value )  ## @payable @public
+    ## note: auto-adds "global" from address (using Universum.this)
+    _send( Universum.this, value )
+  end
+
+
+  #############################
+  ### private (internal use only) methods - PLEASE do NOT use (use transfer/send)
+  def _send( from, value )
     ## 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)
+    from._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 )
+      ## fix/fix/fix:  use Address[self] lookup!!!!
+      ##   do NOT use Account any longer
+      Account[self].address.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
@@ -67,7 +64,9 @@ class String
   def send( value )
     ## check if self is an address
     if self.start_with?( '0x' )
-      Account[self].send( value )
+      ## fix/fix/fix:  use Address[self] lookup!!!!
+      ##   do NOT use Account any longer
+      Account[self].address.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

data/lib/universum/contract.rb

@@ -17,6 +17,25 @@ class Contract
     end
 
     code = File.open( path, 'r:bom|utf-8' ) { |f| f.read }
+
+    ## auto-patch!!!!
+    ##   change all ivars to use storage
+    ##   e.g.  @greeting                  => storage.greeting
+    ##         @balance_of[ msg.sender ]  => storage.balance_of[ msg.sender ]
+    ##         ...
+    ##
+    ##  todo/fix: check for possible class variables!! (e.g. @@logger or something)
+    ##               make regex "smarter"
+    code = code.gsub( /(@{1,})([a-z][a-zA-Z0-9_]*)/ ) do |_|
+      if $1.size == 1
+         puts "auto-patching contract code >#{$1}#{$2}< to >storage[ :#{$2} ]<"
+         "storage[ :#{$2} ]"
+      else
+         ## assume class variable - skip - keep as is
+         "#{$1}#{$2}"
+      end
+    end
+
     klass = Class.new( Contract )
     klass.class_eval( code )   ## note: use class_eval (NOT instance_eval)
     klass
@@ -40,7 +59,35 @@ class Contract
 
   ####
   #  account (builtin) services / transaction methods
-  include Address    ## includes address + send/transfer/balance
+  def self.create( *args )
+    klass = new( nil, *args )
+    klass.setup( *args )
+    klass
+  end
+
+  def initialize( address=nil, *args )
+    ##  fix/todo:  use/lookup proper addr from contract
+    ## construct address for now from object_id
+    address = "0x#{(object_id << 1).to_s(16)}"  if address.nil?
+    @address = Address.new( address )
+    @storage = Storage.new
+
+    ###########
+    # note: does NOT auto-call setup - why? why not?
+    #   use create !!!!!!
+
+    ## todo: make initialize private - why? why not?
+  end
+
+
+  def setup
+    # default (built-in) setup; do nothing
+  end
+
+  def address() @address; end
+  def this()    @address; end  ## returns "embedded" address of current contract (that is, us!)
+
+  def storage() @storage; end
 
   ## function sig(nature) macro for types (dummy for now)
   # e.g. use like
@@ -54,9 +101,9 @@ class Contract
 
   ####
   #  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
-
+  #    no - do NOT add, BUT add payable config for receive
+  # def receive    ## @payable default fallback - use different name - why? why not? (e.g. handle/process/etc.)
+  # end
 
   def assert( condition )
     if condition == true
@@ -67,7 +114,6 @@ class Contract
   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

data/lib/universum/receipt.rb

@@ -36,7 +36,7 @@ class Receipt   ## transaction receipt
 
       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})"
+        @contract_address = "#{contract.address.hex} (#{contract.class.name})"
       else
         @contract_address = nil
       end

data/lib/universum/storage.rb

@@ -0,0 +1,48 @@
+# encoding: utf-8
+
+#######
+# keep track of contract state
+
+class Storage
+
+  def initialize
+    @data = {}
+  end
+
+  def [](key)
+    puts "  SLOAD( #{key.inspect} )"
+    @data[key]
+  end
+
+  def []=(key,value)
+    puts "  SSTORE( #{key.inspect}, #{value.inspect} )"
+    @data[key] = value
+  end
+
+
+
+  ###############################
+  # todo/future: in the future auto-add getter/setter methods on setup
+  #   do NOT use method_missing!!!
+  def method_missing( m, *args, &block )
+    puts "Storage#method_missing( #{m.inspect}), #{args.inspect} )"
+
+    ## todo: add support ? for bool
+    ##    elsif m.end_with?('?') && args.empty?
+    ##      @storage[m]
+
+    if m =~/\A[a-z][a-zA-Z0-9_]*=\z/ && args.size == 1
+      key   = m[0...-1].to_sym    ## note: cut-off trailing equal sign (=), use EXCLUSIVE (...) range and NOT INCLUSIVE (..)
+      value = args[0]
+      puts "  SSTORE( #{key.inspect}, #{value.inspect} )"
+      @data[key] = value
+    elsif m =~/\A[a-z][a-zA-Z0-9_]*\z/ && args.empty?   ## todo/fix: check for valid identifier
+      key = m
+      puts "  SLOAD( #{key.inspect} )"
+      @data[key]
+    else
+      super
+    end
+  end
+
+end ## class Storage

data/lib/universum/transaction.rb

@@ -18,12 +18,12 @@ class Transaction
       account = Account.at( from )   ## lookup account by address
     end
 
-    @from = account.address
+    @from = account.address.hex
 
     if to.is_a?( Contract )
-      @to = "#{to.address} (#{to.class.name})"
+      @to = "#{to.address.hex} (#{to.class.name})"
     elsif to.is_a?( Account )     ## note: to allows Contracts AND Accounts
-      @to = to.address
+      @to = to.address.hex
     else
       @to = to    # might be a contract or account (pass through for now)
     end

data/lib/universum/universum.rb

@@ -31,6 +31,9 @@ class Universum   ## Uni short for Universum
     counter = @@counter ||= 0    ## total tx counter for debugging (start with 0)
     @@counter += 1
 
+    ## todo/fix:
+    ##   allow/add auto-create account for convenience (and easy testing)!!!
+
     ## note: always lookup (use) account for now
     if from.is_a?( Account )
       account = from
@@ -39,7 +42,7 @@ class Universum   ## Uni short for Universum
     end
 
     ## setup contract msg context
-    self.msg = { sender: account.address, value: value }
+    self.msg = { sender: account.address.hex, value: value }
 
 
     ## allow shortcut for Class (without ctor arguments) - no need to wrap in array
@@ -54,7 +57,7 @@ class Universum   ## Uni short for Universum
       args  = data[1..-1]   ## arguments
 
       puts "** tx ##{counter} (block ##{block.number}): #{tx.log_str}"
-      contract = klass.new( *args )   ## note: balance and this (and msg.send/transfer) NOT available/possible !!!!
+      contract = klass.create( *args )   ## note: balance and this (and msg.send/transfer) NOT available/possible !!!!
 
       if value > 0
         ## move value to msg (todo/fix: restore if exception)
@@ -62,9 +65,9 @@ class Universum   ## Uni short for Universum
         contract._add( value )        # add / credit to the recipient
       end
 
-      puts " new #{contract.class.name} contract adddress: #{contract.address.inspect}"
+      puts " new #{contract.class.name} contract adddress: #{contract.address.hex.inspect}"
       ## add new contract to (lookup) directory
-      Contract.store( contract.address, contract )
+      Contract.store( contract.address.hex, contract )
 
       ## issue (mined) transaction receipt
       receipt = Receipt.new( tx: tx,

data/lib/universum/version.rb

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

data/test/contracts/ballot.rb

@@ -9,7 +9,7 @@ Voter    = Struct.new( weight:   0,
 Proposal = Struct.new( vote_count: 0 )
 
 ## Create a new ballot with $(num_proposals) different proposals.
-def initialize( num_proposals )
+def setup( num_proposals )
   @chairperson = msg.sender
   @voters      = Mapping.of( Address => Voter )
   @proposals   = Array.of( Proposal, num_proposals )

data/test/contracts/greeter.rb

@@ -3,7 +3,7 @@
 ######################
 # Greeter Contract
 
-def initialize( greeting )
+def setup( greeting )
   @owner    = msg.sender
   @greeting = greeting
 end

data/test/contracts/mytoken.rb

@@ -3,9 +3,9 @@
 #########################
 # My Token Contract
 
-def initialize( initial_supply )
+def setup( initial_supply )
   @balance_of = Mapping.of( Address => Money )
-  @balance_of[ msg.sender] = initial_supply
+  @balance_of[ msg.sender ] = initial_supply
 end
 
 def transfer( to, value )

data/test/test_mytoken.rb

@@ -0,0 +1,33 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_mytoken.rb
+
+
+require 'helper'
+
+
+
+class TestMyToken < MiniTest::Test
+
+MyToken = Contract.load( "#{Universum.root}/test/contracts/mytoken" )
+
+def test_uni
+   Account['0x1111']
+   Account['0xaaaa']
+   Account['0xbbbb']
+
+   tx = Uni.send_transaction( from: '0x1111', data: [MyToken, 100_000_000] )
+   pp tx
+   pp tx.receipt
+
+   token = tx.receipt.contract
+
+   Uni.send_transaction( from: '0x1111', to: token, data: [:transfer, '0xaaaa', 100] )
+   Uni.send_transaction( from: '0x1111', to: token, data: [:transfer, '0xbbbb', 200] )
+   Uni.send_transaction( from: '0xbbbb', to: token, data: [:transfer, '0xaaaa', 10] )
+   pp token
+end
+
+end # class TestMyToken

data/test/test_storage.rb

@@ -0,0 +1,36 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_storage.rb
+
+
+require 'helper'
+
+
+
+
+class TestStorage < MiniTest::Test
+
+def test_storage
+
+  s = Storage.new
+  s[:balance]
+  s[:balance] = {}
+  s[:balance]['0xaaaa'] = 100
+  s[:balance]['0xbbbb'] = 200
+  pp s
+
+  balance_exp = { '0xaaaa'=>100, '0xbbbb'=>200 }
+  assert_equal balance_exp, s.balance
+  assert_equal 100, s.balance['0xaaaa']
+  assert_equal 200, s.balance['0xbbbb']
+
+  s.balance['0xcccc'] = 300
+  assert_equal 300, s.balance['0xcccc']
+
+  s.owner     = '0x1111'
+  assert_equal '0x1111', s.owner
+end
+
+end # class TestStorage

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: universum
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-16 00:00:00.000000000 Z
+date: 2019-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safestruct
@@ -79,6 +79,7 @@ files:
 - lib/universum/event.rb
 - lib/universum/function.rb
 - lib/universum/receipt.rb
+- lib/universum/storage.rb
 - lib/universum/transaction.rb
 - lib/universum/type.rb
 - lib/universum/units_money.rb
@@ -93,6 +94,8 @@ files:
 - test/test_enum.rb
 - test/test_event.rb
 - test/test_greeter.rb
+- test/test_mytoken.rb
+- test/test_storage.rb
 - test/test_units_money.rb
 - test/test_units_time.rb
 - test/test_version.rb