ciri 0.0.3 → 0.0.4

data/ciri-rlp/lib/ciri/rlp/version.rb

@@ -1,5 +1,5 @@
 module Ciri
   module RLP
-    VERSION = "0.1.1"
+    VERSION = "0.2.1"
   end
 end

data/ciri-rlp/spec/ciri/fixture_spec.rb

@@ -62,9 +62,9 @@ RSpec.describe Ciri::RLP do
           expect {
             rlp_decoded = Ciri::RLP.decode(Ciri::Utils.to_bytes out_value)
             if Ciri::Utils.to_hex(Ciri::RLP.encode(rlp_decoded)) != out_value
-              raise Ciri::RLP::InvalidValueError, "not invalid encoding"
+              raise Ciri::RLP::InvalidError, "not invalid encoding"
             end
-          }.to raise_error(Ciri::RLP::InvalidValueError)
+          }.to raise_error(Ciri::RLP::InvalidError)
         elsif in_value == 'VALID'
           expect {Ciri::RLP.decode(Ciri::Utils.to_bytes out_value)}.to_not raise_error
         else

data/ciri-utils/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ciri-utils (0.2.0)
+    ciri-utils (0.2.1)
       digest-sha3 (~> 1.1.0)
 
 GEM

data/ciri-utils/lib/ciri/utils/version.rb

@@ -1,5 +1,5 @@
 module Ciri
   module Utils
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/ciri.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.authors = ["Jiang Jinyang"]
   spec.email = ["jjyruby@gmail.com"]
 
-  spec.summary = %q{Ciri project intent to implement a full feature set Ethereum client.}
-  spec.description = %q{Ciri aims to be a feature complete, long maintained and stable Ethereum client.}
+  spec.summary = %q{Ciri is an ongoing Ethereum implementation.}
+  spec.description = %q{It aims to be a feature complete Ethereum implementation and expects to achieve both research-friendly and high-performance.}
   spec.homepage = "https://github.com/ciri-ethereum/ciri"
   spec.license = "Apache 2.0"
 
@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # components
-  spec.add_dependency 'ciri-utils', '~> 0.2.0'
-  spec.add_dependency 'ciri-rlp', '~> 0.1.1'
+  spec.add_dependency 'ciri-utils', '~> 0.2.1'
+  spec.add_dependency 'ciri-rlp', '~> 0.2.1'
   spec.add_dependency 'ciri-crypto', '~> 0.1.1'
 
   spec.add_dependency 'ffi', '~> 1.9.23'

data/lib/ciri/chain/header.rb

@@ -15,29 +15,31 @@
 # limitations under the License.
 
 
+require 'ciri/rlp'
+
 module Ciri
   class Chain
 
     # block header
     class Header
-      include Ciri::RLP::Serializable
+      include RLP::Serializable
 
       schema [
-               :parent_hash,
-               :ommers_hash,
-               :beneficiary,
-               :state_root,
-               :transactions_root,
-               :receipts_root,
-               :logs_bloom,
+               {parent_hash: RLP::RawString},
+               {ommers_hash: RLP::RawString},
+               {beneficiary: RLP::RawString},
+               {state_root: RLP::RawString},
+               {transactions_root: RLP::RawString},
+               {receipts_root: RLP::RawString},
+               {logs_bloom: RLP::RawString},
                {difficulty: Integer},
                {number: Integer},
                {gas_limit: Integer},
                {gas_used: Integer},
                {timestamp: Integer},
-               :extra_data,
-               :mix_hash,
-               :nonce,
+               {extra_data: RLP::RawString},
+               {mix_hash: RLP::RawString},
+               {nonce: RLP::RawString},
              ]
 
       # header hash

data/lib/ciri/chain/header_chain.rb

@@ -71,16 +71,7 @@ module Ciri
         return header.difficulty if header.number == 0
 
         fork_schema = @fork_config.choose_fork(header.number)
-        difficulty_time_factor = fork_schema.difficulty_time_factor(header, parent_header)
-
-        x = parent_header.difficulty / 2048
-
-        # difficulty bomb
-        height = fork_schema.difficulty_virtual_height(header.number)
-        height_factor = 2 ** (height / 100000 - 2)
-
-        difficulty = (parent_header.difficulty + x * difficulty_time_factor + height_factor).to_i
-        [header.difficulty, difficulty].max
+        fork_schema.calculate_difficulty(header, parent_header)
       end
 
       # write header

data/lib/ciri/chain/transaction.rb

@@ -99,7 +99,11 @@ module Ciri
       end
 
       # validate transaction
-      def validate!(fork_schema: nil)
+      def validate!
+        raise NotImplementedError
+      end
+
+      def validate_sender!
         begin
           sender
         rescue Ciri::Crypto::ECDSASignatureError => e
@@ -107,30 +111,8 @@ module Ciri
         rescue Ciri::Types::Errors::InvalidError => e
           raise InvalidError.new(e.to_s)
         end
-
-        raise InvalidError.new('signature rvs error') unless signature.valid?
-        # raise InvalidError.new('signature s is low') unless signature.low_s?
-        raise InvalidError.new('gas_price overflow') unless UInt256.valid?(gas_price)
-        raise InvalidError.new('nonce overflow') unless UInt256.valid?(nonce)
-        raise InvalidError.new('gas_limit overflow') unless UInt256.valid?(gas_limit)
-        raise InvalidError.new('value overflow') unless UInt256.valid?(value)
-
-        if fork_schema
-          if (reason = fork_schema.validate_transaction(self))
-            raise InvalidError.new(reason)
-          end
-
-          begin
-            intrinsic_gas = fork_schema.intrinsic_gas_of_transaction(self)
-          rescue StandardError
-            raise InvalidError.new 'intrinsic gas calculation error'
-          end
-          raise InvalidError.new 'intrinsic gas not enough' unless intrinsic_gas <= gas_limit
-        end
       end
 
-      private
-
       # return chain_id by v
       def chain_id
         if eip_155_signed_transaction?

data/lib/ciri/db/account_db.rb

@@ -103,10 +103,6 @@ module Ciri
         db[find_account(address).code_hash] || ''.b
       end
 
-      def touch_account(address)
-        update_account(address, find_account(address))
-      end
-
       def find_account(address)
         rlp_encoded_account = @trie[convert_key address]
         if rlp_encoded_account.nil? || rlp_encoded_account.size == 0

data/lib/ciri/db/backend/errors.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+# Copyright 2018 Jiang Jinyang <https://justjjy.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+module Ciri
+  module DB
+    module Backend
+
+      class InvalidError < StandardError
+      end
+
+    end
+  end
+end

data/lib/ciri/db/backend/memory.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 
 
-require_relative 'rocks_db'
 require 'forwardable'
+require_relative 'errors'
 
 module Ciri
   module DB
@@ -37,9 +37,6 @@ module Ciri
           end
         end
 
-        class InvalidError < StandardError
-        end
-
         extend Forwardable
 
         def initialize
@@ -51,24 +48,20 @@ module Ciri
           @db = orig.instance_variable_get(:@db).dup
         end
 
-        def_delegators :@db, :[], :[]=, :fetch, :delete, :include?
+        def_delegators :db, :[], :[]=, :fetch, :delete, :include?
 
         def get(key)
-          @db[key]
+          db[key]
         end
 
         def put(key, value)
-          @db[key] = value
-        end
-
-        def each(&blk)
-          keys.each(&blk)
+          db[key] = value
         end
 
         def batch
           b = Batch.new
           yield(b)
-          @db.merge! b.value
+          db.merge! b.value
         end
 
         def close
@@ -79,6 +72,11 @@ module Ciri
           @db.nil?
         end
 
+        private
+        def db
+          @db || raise(InvalidError.new 'db is closed')
+        end
+
       end
     end
   end

data/lib/ciri/db/backend/rocks.rb

@@ -15,8 +15,9 @@
 # limitations under the License.
 
 
-require_relative 'rocks_db'
 require 'forwardable'
+require_relative 'rocks_db'
+require_relative 'errors'
 
 module Ciri
   module DB
@@ -24,17 +25,23 @@ module Ciri
 
       # implement kvstore
       class Rocks
-
-        class InvalidError < StandardError
-        end
-
         extend Forwardable
 
         def initialize(path)
           @db = RocksDB::DB.new(path)
         end
 
-        def_delegators :db, :get, :put, :[], :[]=
+        def_delegators :db, :get, :put, :[], :[]=, :delete
+
+        def fetch(key)
+          value = self[key]
+          raise KeyError.new("key not found: #{key.inspect}") if value.nil?
+          value
+        end
+
+        def include?(key)
+          !self[key].nil?
+        end
 
         def each(&blk)
           inter_each(only_key: false, &blk)

data/lib/ciri/db/backend/rocks_db.rb

@@ -237,6 +237,10 @@ module Ciri
 
           alias []= put
 
+          def delete(key)
+            RocksDBLib.delete(@db, @writeoptions, key)
+          end
+
           def new_iterator
             Iterator.new(@db, @readoptions)
           end

data/lib/ciri/evm.rb

@@ -66,7 +66,8 @@ module Ciri
           raise InvalidTransition.new("overflow header gas_used, total_gas_used: #{total_gas_used}, block gas_used: #{block.header.gas_used}")
         end
 
-        receipts << Types::Receipt.new(state_root: result.state_root, gas_used: total_gas_used, logs: result.logs)
+        receipt = fork_schema.make_receipt(execution_result: result, gas_used: total_gas_used)
+        receipts << receipt
       end
 
       if check_gas_used && total_gas_used != block.header.gas_used
@@ -162,6 +163,10 @@ module Ciri
         miner_account.balance += fee
         state.set_balance(block_info.coinbase, miner_account.balance)
 
+        # EIP158 fork, we need to delete miner account if account become empty
+        vm.sub_state.add_touched_account(block_info.coinbase)
+        vm.delete_empty_accounts
+
         # destroy accounts
         vm.execution_context.all_suicide_accounts.each do |address|
           state.set_balance(address, 0)

data/lib/ciri/evm/execution_context.rb

@@ -24,7 +24,7 @@ module Ciri
 
       include Utils::Logger
 
-      attr_accessor :instruction, :depth, :pc, :output, :exception, :gas_limit, :block_info, :sub_state, :fork_schema
+      attr_accessor :instruction, :depth, :pc, :exception, :gas_limit, :block_info, :sub_state, :fork_schema
       attr_reader :children, :remain_gas, :machine_state
 
       def initialize(instruction:, depth: 0, gas_limit:, remain_gas: gas_limit, fork_schema:, pc: 0,
@@ -67,11 +67,15 @@ module Ciri
         @output ||= output
       end
 
+      def output
+        @output || ''.b
+      end
+
       def set_pc(pc)
         @pc = pc
       end
 
-      def revert
+      def revert_sub_state
         @sub_state = SubState::EMPTY
       end
 

data/lib/ciri/evm/instruction.rb

@@ -32,7 +32,6 @@ module Ciri
       def get_op(pos)
         code_size = (bytes_code || ''.b).size
         return OP::STOP if pos >= code_size
-        # return OP::INVALID if pos >= code_size
         bytes_code[pos].ord
       end
 

data/lib/ciri/evm/op.rb

@@ -19,6 +19,7 @@ require 'ciri/utils'
 require 'ciri/utils/number'
 require 'ciri/types/address'
 require_relative 'op_call'
+require_relative 'op/errors'
 
 module Ciri
   class EVM
@@ -446,8 +447,12 @@ module Ciri
           init = vm.memory_fetch(mem_pos, size)
           create_gas = vm.remain_gas
           vm.consume_gas(create_gas)
+
           child_context = vm.execution_context.child_context(gas_limit: create_gas)
-          contract_address, _ = vm.create_contract(value: value, init: init, touch_nonce: true, context: child_context)
+          child_context.instruction.value = value
+          child_context.instruction.bytes_code = init
+
+          contract_address, _ = vm.create_contract(context: child_context)
           vm.execution_context.return_gas(child_context.remain_gas)
 
           vm.push contract_address
@@ -468,17 +473,18 @@ module Ciri
         vm.set_output vm.memory_fetch(index, size)
       end
 
-      def_op :DELEGATECALL, -0xf4, 6, 1 do |vm|
+      def_op :DELEGATECALL, 0xf4, 6, 1 do |vm|
         OPCall::DelegateCall.new.call(vm)
       end
 
       STATICCALL = 0xfa
 
-      # TODO REVERT need to be implement in forks
-      def_op :REVERT, -0xfd, 2, 0 do |vm|
+      def_op :REVERT, 0xfd, 2, 0 do |vm|
         index, size = vm.pop_list(2, Integer)
-        vm.output = vm.memory_fetch(index, size)
         vm.extend_memory(index, size)
+        output = vm.memory_fetch(index, size)
+        vm.set_exception RevertError.new
+        vm.set_output output
       end
 
       def_op :INVALID, 0xfe, 0, 0 do |vm|

data/lib/ciri/evm/op/errors.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+# Copyright 2018 Jiang Jinyang <https://justjjy.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+module Ciri
+  class EVM
+    module OP
+
+      class OPError < StandardError
+      end
+
+      class RevertError < OPError
+        def set_output(output)
+          @output = output
+        end
+
+        def output
+          @output || ''.b
+        end
+      end
+
+    end
+  end
+end