ruby-ethereum 0.9.4 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5dea8f0df777458359a58003ad2c36d5bab5c97
-  data.tar.gz: 3ad437895256c6a02baf5a65502e87f6fc2d3b3d
+  metadata.gz: b148ff5fc474e2b43055a78679a76e13911534ed
+  data.tar.gz: 8d19a27b24c3e44c6826418c6062d5d5feccc5c4
 SHA512:
-  metadata.gz: f85feb3ff2fadd5822eb1927d714f3afa6c9bdab8fa4a475e1e34cbdad8b3e901a907395ad69fbe3f284ee23bc0b7f01c17729b684c379f2b7f57aeb26ae9814
-  data.tar.gz: 63eeecac33f4f8a60cc1274097d8871cc708debff8e6e304279485e34a22b1fd8bce2bb64f4db4023e59d4e56d91440c66a7a9faa6f49e5911f138e9c4ad4430
+  metadata.gz: 1bc3e0f52812048175c9e939ae8250f7a8086365970df3779ff0edfdd6a4faf88015c53365b8e72160739455fd5b2b9ea3c806140a2d6d1f6e8c7fbf0a302c39
+  data.tar.gz: 9e4c2c2a1182e11a4064a59fe4c8d50c6b51a1b5dcbb79d1407200156b919b6c1d4a7589fc7be4e74eea10859199d94301da44788eee470f7f3e5e08eab876c9

data/lib/ethereum/abi/contract_translator.rb

@@ -155,6 +155,7 @@ module Ethereum
       def listen(log, noprint: true)
         result = decode_event log.topics, log.data
         p result if noprint
+        result['_from'] = Utils.encode_hex(log.address)
         result
       rescue ValueError
         nil # api compatibility

data/lib/ethereum/tester/abi_contract.rb

@@ -16,7 +16,9 @@ module Ethereum
         if listen
           listener = ->(log) {
             result = @translator.listen log, noprint: false
-            log_listener(result) if result && log_listener
+            # result could be nil if the log cannot be parsed into an event
+            # in that case we just pass raw log to listener
+            log_listener.call(result || log) if log_listener
           }
           @state.block.log_listeners.push listener
         end
@@ -26,8 +28,8 @@ module Ethereum
         end
       end
 
-      def listen(x)
-        @translator.listen x
+      def listen(x, noprint: true)
+        @translator.listen x, noprint: noprint
       end
 
       private

data/lib/ethereum/tester/language.rb

@@ -13,8 +13,8 @@ module Ethereum
           begin
             require 'serpent'
             @all[:serpent] = Serpent
-          rescue LoadError
-            # do nothing
+          rescue LoadError => e
+            puts "Failed to load serpent"
           end
 
           if SolidityWrapper.solc_path

data/lib/ethereum/tester/solidity_wrapper.rb

@@ -89,7 +89,11 @@ module Ethereum
           pipe = IO.popen(args, 'w', [:out, :err] => out)
           pipe.write code
           pipe.close_write
-          raise CompileError, 'compilation failed' unless $?.success?
+          unless $?.success?
+            out.rewind
+            output = out.read
+            raise CompileError, "compilation failed:\n#{output}"
+          end
 
           out.rewind
           solc_parse_output out.read
@@ -247,7 +251,7 @@ module Ethereum
 
         def compiler_version
           output = `#{solc_path} --version`.strip
-          output =~ /^Version: ([0-9a-z.-]+)\///m ? $1 : nil
+          output =~ /^Version: ([0-9a-zA-Z.\-+]+)/m ? $1 : nil
         end
 
         ##

data/lib/ethereum/tester/state.rb

@@ -10,7 +10,7 @@ module Ethereum
 
       attr :env, :block, :blocks
 
-      def initialize(env: nil, num_accounts: Fixture::NUM_ACCOUNTS)
+      def initialize(env: nil, privkeys: Fixture.keys, start_alloc: nil, gas_price: Fixture.gas_price, gas_limit: Fixture.gas_limit)
         if env
           @db = env.db
           @env = env
@@ -21,9 +21,15 @@ module Ethereum
 
         @temp_data_dir = Dir.mktmpdir TMP_DIR_PREFIX
 
-        @block = Block.genesis @env, start_alloc: get_start_alloc(num_accounts)
+        @privkeys = privkeys
+        @accounts = @privkeys.map {|k| PrivateKey.new(k).to_address }
+        @gas_price = gas_price
+        @gas_limit = gas_limit
+
+        start_alloc ||= get_start_alloc()
+        @block = Block.genesis @env, start_alloc: start_alloc
         @block.timestamp = 1410973349
-        @block.coinbase = Fixture.accounts[0]
+        @block.coinbase = @accounts[0]
         @block.gas_limit = 10**9
 
         @blocks = [@block]
@@ -32,7 +38,11 @@ module Ethereum
         ObjectSpace.define_finalizer(self) {|id| FileUtils.rm_rf(@temp_data_dir) }
       end
 
-      def contract(code, sender: Fixture.keys[0], endowment: 0, language: :serpent,
+      def head
+        @blocks.last
+      end
+
+      def contract(code, sender: @privkeys[0], endowment: 0, language: :serpent,
                    libraries: nil, path: nil, constructor_call: nil, **kwargs)
         code = Language.format_spaces code
         compiler = Language.get language
@@ -46,7 +56,7 @@ module Ethereum
         address
       end
 
-      def abi_contract(code, sender: Fixture.keys[0], endowment: 0, language: :serpent,
+      def abi_contract(code, sender: @privkeys[0], endowment: 0, language: :serpent,
                        libraries: nil, path: nil, constructor_parameters: nil,
                        log_listener: nil, listen: true, **kwargs)
         code = Language.format_spaces code
@@ -63,13 +73,13 @@ module Ethereum
                            libraries: libraries, path: path, constructor_call: encoded_parameters,
                            **kwargs)
 
-        ABIContract.new(self, translator, address, listen: listen, log_listener: log_listener)
+        ABIContract.new(self, translator, address, listen: listen, log_listener: log_listener, default_key: sender)
       end
 
-      def evm(bytecode, sender: Fixture.keys[0], endowment: 0, gas: nil)
+      def evm(bytecode, sender: @privkeys[0], endowment: 0, gas: nil)
         sendnonce = @block.get_nonce PrivateKey.new(sender).to_address
 
-        tx = Transaction.contract sendnonce, Fixture.gas_price, Fixture.gas_limit, endowment, bytecode
+        tx = Transaction.contract sendnonce, @gas_price, @gas_limit, endowment, bytecode
         tx.sign sender
         tx.startgas = gas if gas
 
@@ -94,7 +104,7 @@ module Ethereum
 
         t1, g1 = Time.now, @block.gas_used
         sendnonce = @block.get_nonce PrivateKey.new(sender).to_address
-        tx = Transaction.new(sendnonce, Fixture.gas_price, Fixture.gas_limit, to, value, evmdata)
+        tx = Transaction.new(sendnonce, @gas_price, @gas_limit, to, value, evmdata)
         @last_tx = tx
         tx.sign(sender)
 
@@ -136,7 +146,7 @@ module Ethereum
         sendnonce = @block.get_nonce PrivateKey.new(sender).to_address
         evmdata = funid ? serpent.encode_abi(funid, *abi) : serpent.encode_datalist(*data)
 
-        tx = Transaction.new(sendnonce, Fixture.gas_price, Fixture.gas_limit, to, value, evmdata)
+        tx = Transaction.new(sendnonce, @gas_price, @gas_limit, to, value, evmdata)
         @last_tx = tx
         tx.sign(sender)
 
@@ -152,7 +162,7 @@ module Ethereum
         sendnonce = @block.get_nonce PrivateKey.new(sender).to_address
         evmdata = funid ? serpent.encode_abi(funid, *abi) : serpent.encode_datalist(*data)
 
-        tx = Transaction.new(sendnonce, Fixture.gas_price, Fixture.gas_limit, to, value, evmdata)
+        tx = Transaction.new(sendnonce, @gas_price, @gas_limit, to, value, evmdata)
         @last_tx = tx
         tx.sign(sender)
 
@@ -165,7 +175,7 @@ module Ethereum
         recorder.pop_records # TODO: implement recorder
       end
 
-      def mine(n=1, coinbase: Fixture.accounts[0])
+      def mine(n=1, coinbase: @accounts[0])
         n.times do |i|
           @block.finalize
           @block.commit_state
@@ -196,10 +206,10 @@ module Ethereum
 
       private
 
-      def get_start_alloc(num_accounts)
+      def get_start_alloc
         o = {}
-        num_accounts.times {|i| o[Fixture.accounts[i]] = {wei: 10**24} }
         (1...5).each {|i| o[Utils.int_to_addr(i)] = {wei: 1} }
+        @accounts.each {|addr| o[addr] = {wei: 10**24} }
         o
       end
 

data/lib/ethereum/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : ascii-8bit -*-
 
 module Ethereum
-  VERSION = '0.9.4'
+  VERSION = '0.9.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-ethereum
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.6
 platform: ruby
 authors:
 - Jan Xie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-20 00:00:00.000000000 Z
+date: 2016-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rlp