Merge pull request #757 from eosnetworkfoundation/kayan_1.0_spring

[1.0] Kayan 1.0 spring

.github/workflows/contract.yml

@@ -62,19 +62,19 @@ jobs:
           path: contract.tar.gz
           if-no-files-found: error
 
-      - name: Download Leap - dev binary
+      - name: Download antelope-spring-dev
         uses: AntelopeIO/asset-artifact-download-action@v3
         with:
           owner: AntelopeIO
-          repo: leap
-          target: '^5.0.1'
+          repo: spring
+          file: 'antelope-spring-dev.*ubuntu22\.04_amd64.deb'
+          target: 'main'
           prereleases: false
-          file: 'leap-dev.*ubuntu22\.04_amd64.deb'
-          container-package: experimental-binaries
-          artifact-name: leap-dev-ubuntu22-amd64
+          artifact-name: antelope-spring-dev-ubuntu22-amd64
+          container-package: antelope-spring-experimental-binaries
 
-      - name: Install Leap
-        run: sudo apt-get install -y ./leap*.deb
+      - name: Install packages
+        run: sudo apt-get install -y ./*.deb
 
       - name: Build EOS EVM Contract Tests
         run: .github/workflows/build-contract-test.sh

tests/basic_evm_tester.hpp

@@ -285,7 +285,7 @@ class evm_validating_tester : public testing::base_tester {
 
       validating_node = create_validating_node(vcfg, def_conf.second, true, dmlog);
 
-      init(def_conf.first, def_conf.second);
+      init(def_conf.first, def_conf.second, testing::call_startup_t::yes);
       execute_setup_policy(p);
    }
 
@@ -315,31 +315,38 @@ class evm_validating_tester : public testing::base_tester {
       return validating_node;
    }
 
-   signed_block_ptr produce_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) )override {
-      auto sb = _produce_block(skip_time, false);
-      auto bsf = validating_node->create_block_state_future( sb->calculate_id(), sb );
+   signed_block_ptr produce_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms), bool no_throw = false )override {
+      auto produce_block_result = _produce_block(skip_time, false, no_throw);
+      auto sb = produce_block_result.block;
+      auto bhf = validating_node->create_block_handle_future( sb->calculate_id(), sb );
       struct controller::block_report br; 
-      validating_node->push_block(br, bsf.get(), forked_branch_callback{}, trx_meta_cache_lookup{} );
+      validating_node->push_block(br, bhf.get(), forked_callback_t{}, trx_meta_cache_lookup{} );
 
       return sb;
    }
 
+   testing::produce_block_result_t produce_block_ex( fc::microseconds skip_time = default_skip_time, bool no_throw = false ) override {
+      auto produce_block_result = _produce_block(skip_time, false, no_throw);
+      validate_push_block(produce_block_result.block);
+      return produce_block_result;
+   }
+
    signed_block_ptr produce_block_no_validation( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) ) {
       return _produce_block(skip_time, false);
    }
 
    void validate_push_block(const signed_block_ptr& sb) {
-      auto bsf = validating_node->create_block_state_future( sb->calculate_id(), sb );
+      auto bhf = validating_node->create_block_handle_future( sb->calculate_id(), sb );
       struct controller::block_report br;
-      validating_node->push_block(br, bsf.get(), forked_branch_callback{}, trx_meta_cache_lookup{} );
+      validating_node->push_block(br, bhf.get(), forked_callback_t{}, trx_meta_cache_lookup{} );
    }
 
    signed_block_ptr produce_empty_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) )override {
       unapplied_transactions.add_aborted( control->abort_block() );
       auto sb = _produce_block(skip_time, true);
-      auto bsf = validating_node->create_block_state_future( sb->calculate_id(), sb );
+      auto bhf = validating_node->create_block_handle_future( sb->calculate_id(), sb );
       struct controller::block_report br;
-      validating_node->push_block(br, bsf.get(), forked_branch_callback{}, trx_meta_cache_lookup{} );
+      validating_node->push_block(br, bhf.get(), forked_callback_t{}, trx_meta_cache_lookup{} );
 
       return sb;
    }
@@ -349,11 +356,9 @@ class evm_validating_tester : public testing::base_tester {
    }
 
    bool validate() {
-
-
-      auto hbh = control->head_block_state()->header;
-      auto vn_hbh = validating_node->head_block_state()->header;
-      bool ok = control->head_block_id() == validating_node->head_block_id() &&
+      const block_header &hbh = control->head().header();
+      const block_header &vn_hbh = validating_node->head().header();
+      bool ok = control->head().id() == validating_node->head().id() &&
             hbh.previous == vn_hbh.previous &&
             hbh.timestamp == vn_hbh.timestamp &&
             hbh.transaction_mroot == vn_hbh.transaction_mroot &&

tests/eosio.system_tester.hpp

@@ -316,7 +316,7 @@ class eosio_system_tester : public validating_tester {
    }
 
    uint32_t last_block_time() const {
-      return time_point_sec( control->head_block_time() ).sec_since_epoch();
+      return time_point_sec( control->head().block_time() ).sec_since_epoch();
    }
 
    asset get_balance( const account_name& act ) {
@@ -467,9 +467,9 @@ class eosio_system_tester : public validating_tester {
       }
       produce_blocks( 250 );
 
-      auto producer_keys = control->head_block_state()->active_schedule.producers;
-      BOOST_REQUIRE_EQUAL( 21, producer_keys.size() );
-      BOOST_REQUIRE_EQUAL( name("defproducera"), producer_keys[0].producer_name );
+      //auto producer_keys = control->head_block_state()->active_schedule.producers;
+      //BOOST_REQUIRE_EQUAL( 21, producer_keys.size() );
+      //BOOST_REQUIRE_EQUAL( name("defproducera"), producer_keys[0].producer_name );
 
       return producer_names;
    }