ruby-ethereum 0.9.3 → 0.9.4

data/lib/ethereum/tester/state.rb

@@ -8,13 +8,18 @@ module Ethereum
 
       TMP_DIR_PREFIX = 'eth-tester-'.freeze
 
-      attr :block, :blocks
+      attr :env, :block, :blocks
 
-      def initialize(num_accounts=Fixture::NUM_ACCOUNTS)
-        @temp_data_dir = Dir.mktmpdir TMP_DIR_PREFIX
+      def initialize(env: nil, num_accounts: Fixture::NUM_ACCOUNTS)
+        if env
+          @db = env.db
+          @env = env
+        else
+          @db = DB::EphemDB.new
+          @env = Env.new @db
+        end
 
-        @db = DB::EphemDB.new
-        @env = Env.new @db
+        @temp_data_dir = Dir.mktmpdir TMP_DIR_PREFIX
 
         @block = Block.genesis @env, start_alloc: get_start_alloc(num_accounts)
         @block.timestamp = 1410973349
@@ -27,45 +32,44 @@ 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, gas: nil)
+      def contract(code, sender: Fixture.keys[0], endowment: 0, language: :serpent,
+                   libraries: nil, path: nil, constructor_call: nil, **kwargs)
         code = Language.format_spaces code
-        opcodes = Language.get(language).compile(code)
-        addr = evm(opcodes, sender: sender, endowment: endowment)
-        raise AssertError, "Contract code empty" if @block.get_code(addr).empty?
-        addr
-      end
+        compiler = Language.get language
+
+        bytecode = compiler.compile code, path: path, libraries: libraries, **kwargs
+        bytecode += constructor_call if constructor_call
 
-      def abi_contract(code, **kwargs)
-        sender        = kwargs.delete(:sender) || Fixture.keys[0]
-        endowment     = kwargs.delete(:endowment) || 0
-        language      = kwargs.delete(:language) || :serpent
-        contract_name = kwargs.delete(:contract_name) || ''
-        gas           = kwargs.delete(:gas) || nil
-        log_listener  = kwargs.delete(:log_listener) || nil
-        listen        = kwargs.delete(:listen) || true
+        address = evm bytecode, sender: sender, endowment: endowment
+        raise AssertError, "Contract code empty" if @block.get_code(address).empty?
+
+        address
+      end
 
+      def abi_contract(code, sender: Fixture.keys[0], endowment: 0, language: :serpent,
+                       libraries: nil, path: nil, constructor_parameters: nil,
+                       log_listener: nil, listen: true, **kwargs)
         code = Language.format_spaces code
+        compiler = Language.get language
 
-        if contract_name.true?
-          raise ArgumentError, "language must be solidity when contract name is given" unless language == :solidity
-          cn_args = {contract_name: contract_name}
-        else
-          cn_args = kwargs
-        end
+        contract_interface = compiler.mk_full_signature code, path: path, **kwargs
+        translator = ABI::ContractTranslator.new contract_interface
 
-        lang = Language.get language
-        opcodes = lang.compile code, **cn_args
-        addr = evm(opcodes, sender: sender, endowment: endowment, gas: gas)
-        raise AssertError, "Contract code empty" if @block.get_code(addr).empty?
+        encoded_parameters = constructor_parameters ?
+          translator.encode_constructor_arguments(constructor_parameters) :
+          nil
 
-        abi = lang.mk_full_signature(code, **cn_args)
-        ABIContract.new(self, abi, addr, listen: listen, log_listener: log_listener)
+        address = contract(code, sender: sender, endowment: endowment, language: language,
+                           libraries: libraries, path: path, constructor_call: encoded_parameters,
+                           **kwargs)
+
+        ABIContract.new(self, translator, address, listen: listen, log_listener: log_listener)
       end
 
-      def evm(opcodes, sender: Fixture.keys[0], endowment: 0, gas: nil)
+      def evm(bytecode, sender: Fixture.keys[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, opcodes
+        tx = Transaction.contract sendnonce, Fixture.gas_price, Fixture.gas_limit, endowment, bytecode
         tx.sign sender
         tx.startgas = gas if gas
 
@@ -83,7 +87,7 @@ module Ethereum
         _send_tx(*args, **kwargs)[:output]
       end
 
-      def _send_tx(sender, to, value, evmdata: '', output: nil, funid: nil, abi: nil, profiling: 0)
+      def _send_tx(sender, to, value, evmdata: '', funid: nil, abi: nil, profiling: 0)
         if funid || abi
           raise ArgumentError, "Send with funid+abi is deprecated. Please use the abi_contract mechanism."
         end
@@ -124,8 +128,13 @@ module Ethereum
       end
 
       def mkspv(sender, to, value, data: [], funid: nil, abi: nil)
+        raise NotImplemented
+
+        serpent = Language.get :serpent
+        raise "ruby-serpent not installed" unless serpent
+
         sendnonce = @block.get_nonce PrivateKey.new(sender).to_address
-        evmdata = funid ? Serpent.encode_abi(funid, *abi) : Serpent.encode_datalist(*data)
+        evmdata = funid ? serpent.encode_abi(funid, *abi) : serpent.encode_datalist(*data)
 
         tx = Transaction.new(sendnonce, Fixture.gas_price, Fixture.gas_limit, to, value, evmdata)
         @last_tx = tx
@@ -135,8 +144,13 @@ module Ethereum
       end
 
       def verifyspv(sender, to, value, data: [], funid: nil, abi: nil, proof: [])
+        raise NotImplemented
+
+        serpent = Language.get(:serpent)
+        raise "ruby-serpent not installed" unless serpent
+
         sendnonce = @block.get_nonce PrivateKey.new(sender).to_address
-        evmdata = funid ? Serpent.encode_abi(funid, *abi) : Serpent.encode_datalist(*data)
+        evmdata = funid ? serpent.encode_abi(funid, *abi) : serpent.encode_datalist(*data)
 
         tx = Transaction.new(sendnonce, Fixture.gas_price, Fixture.gas_limit, to, value, evmdata)
         @last_tx = tx

data/lib/ethereum/utils.rb

@@ -187,6 +187,10 @@ module Ethereum
       keccak256_rlp([normalize_address(sender), nonce])[12..-1]
     end
 
+    def mk_metropolis_contract_address(sender, initcode)
+      keccak256(normalize_address(sender) + initcode)[12..-1]
+    end
+
     def remove_0x_head(s)
       s[0,2] == '0x' ? s[2..-1] : s
     end
@@ -209,5 +213,24 @@ module Ethereum
       end
     end
 
+    def child_dao_list
+      source = '0x4a574510c7014e4ae985403536074abe582adfc8'
+
+      main = [ 
+        '0xbb9bc244d798123fde783fcc1c72d3bb8c189413', # TheDAO
+        '0x807640a13483f8ac783c557fcdf27be11ea4ac7a'  # TheDAO extrabalance
+      ]
+
+      child_daos = []
+      child_extra_balances = []
+      (1...58).each do |i|
+        child_addr = "0x#{encode_hex mk_contract_address(source, i)}"
+        child_daos.push child_addr
+        child_extra_balances.push "0x#{encode_hex mk_contract_address(child_addr, 0)}"
+      end
+
+      main + child_daos + child_extra_balances
+    end
+
   end
 end

data/lib/ethereum/version.rb

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

data/lib/ethereum/vm.rb

@@ -273,7 +273,7 @@ module Ethereum
           case op
           when :BLOCKHASH
             s0 = stk.pop
-            stk.push Utils.big_endian_to_int(ext.block_hash(s0))
+            stk.push ext.block_hash(s0)
           when :COINBASE
             stk.push Utils.big_endian_to_int(ext.block_coinbase)
           when :TIMESTAMP

metadata

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