Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[1.0] Kayan 1.0 spring #757

Merged
merged 2 commits into from
Aug 7, 2024
Merged

[1.0] Kayan 1.0 spring #757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b1e413
test with spring
taokayan Aug 6, 2024
4b1c1ed
cicd for spring
taokayan Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/contract.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
33 changes: 19 additions & 14 deletions tests/basic_evm_tester.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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;
}
Expand All @@ -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 &&
Expand Down
8 changes: 4 additions & 4 deletions tests/eosio.system_tester.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) {
Expand Down Expand Up @@ -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;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use control->head_active_producers()

//BOOST_REQUIRE_EQUAL( 21, producer_keys.size() );
//BOOST_REQUIRE_EQUAL( name("defproducera"), producer_keys[0].producer_name );

return producer_names;
}
Expand Down