Skip to content

Commit

Permalink
Merge remote-tracking branch 'spring/savanna' into GH-3-process-votes
Browse files Browse the repository at this point in the history
  • Loading branch information
heifner committed Apr 12, 2024
2 parents 4d70ab3 + 8ae27a1 commit 23b5739
Show file tree
Hide file tree
Showing 149 changed files with 40 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/submod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- name: Checkout
run: |
git clone https://github.com/${GITHUB_REPOSITORY} .
git clone https://x-access-token:${{github.token}}@github.com/${GITHUB_REPOSITORY} .
git fetch -v --prune origin +refs/pull/${PR_NUMBER}/merge:refs/remotes/pull/${PR_NUMBER}/merge
git checkout --force --progress refs/remotes/pull/${PR_NUMBER}/merge
git submodule sync --recursive
Expand Down
Empty file modified CMakeModules/CMakeASM-LLVMWARInformation.cmake
100755 → 100644
Empty file.
Empty file modified CMakeModules/CMakeDetermineASM-LLVMWARCompiler.cmake
100755 → 100644
Empty file.
Empty file modified CMakeModules/CMakeTestASM-LLVMWARCompiler.cmake
100755 → 100644
Empty file.
31 changes: 28 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,31 @@
AntelopeIO/leap
Copyright (c) 2021-2022 EOS Network Foundation (ENF) and its contributors. All rights reserved.
This ENF software is based upon:
SPRING 1.0 BETA SOFTWARE LICENSE

Issued by EOS NETWORK FOUNDATION ("ENF")

The SPRING 1.0 Beta Software (the "Software") is pre-release MIT based
software in part. The feedback you provide on quality and usability helps us
identify issues, fix them and work towards final version of the Software.

This is not a commercial release of the Software. No compensation will be paid
to those participating in this Beta Software release.

Terms of Use:

Non-exclusive, limited term of 3 months, royalty free and all recommendations
for improvements and code amendments are owned by ENF.

Copyright 2024, EOS Network Foundation. All rights reserved.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

This software contains code from EOSIO/eos. That inclusion is under the
following license:

EOSIO/eos
Copyright (c) 2017-2021 block.one and its contributors. All rights reserved.
Expand Down
Empty file modified docs/02_cleos/03_command-reference/convert/index.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/convert/pack_action_data.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/convert/pack_transaction.md
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file modified docs/02_cleos/03_command-reference/create/account.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/create/index.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/create/key.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/get/accounts.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/get/block.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/get/code.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/get/currency-balance.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/get/currency-stats.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/get/currency.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/get/index.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/get/info.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/get/schedule.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/get/servants.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/get/table.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/get/transaction.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/get/transaction_id.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/multisig/index.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/multisig/multisig-approve.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/multisig/multisig-cancel.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/multisig/multisig-exec.md
100755 → 100644
Empty file.
Empty file.
Empty file modified docs/02_cleos/03_command-reference/multisig/multisig-propose.md
100755 → 100644
Empty file.
Empty file.
Empty file modified docs/02_cleos/03_command-reference/multisig/multisig-review.md
100755 → 100644
Empty file.
Empty file.
Empty file modified docs/02_cleos/03_command-reference/net/connect.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/net/disconnect.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/net/index.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/push/index.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/push/push-action.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/push/push-transaction.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/push/push-transactions.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/set/index.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/set/set-abi.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/set/set-code.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/set/set-contract.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/system/index.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/system/system-bidname.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/system/system-bidnameinfo.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/system/system-buyram.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/system/system-canceldelay.md
100755 → 100644
Empty file.
Empty file.
Empty file modified docs/02_cleos/03_command-reference/system/system-delegatebw.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/system/system-listbw.md
100755 → 100644
Empty file.
Empty file.
Empty file modified docs/02_cleos/03_command-reference/system/system-newaccount.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/system/system-regproducer.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/system/system-regproxy.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/system/system-rex-buyrex.md
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified docs/02_cleos/03_command-reference/system/system-rex-deposit.md
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file modified docs/02_cleos/03_command-reference/system/system-rex-lendrex.md
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file modified docs/02_cleos/03_command-reference/system/system-rex-rentcpu.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/system/system-rex-rentnet.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/system/system-rex-rexexec.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/system/system-rex-sellrex.md
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified docs/02_cleos/03_command-reference/system/system-rex.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/system/system-sellram.md
100755 → 100644
Empty file.
Empty file.
Empty file modified docs/02_cleos/03_command-reference/system/system-unregprod.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/system/system-unregproxy.md
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified docs/02_cleos/03_command-reference/transfer.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/version/client.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/version/index.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/wallet/create.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/wallet/create_key.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/wallet/import.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/wallet/index.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/wallet/keys.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/wallet/list.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/wallet/lock.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/wallet/lock_all.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/wallet/open.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/wallet/private_keys.md
100755 → 100644
Empty file.
Empty file modified docs/02_cleos/03_command-reference/wallet/unlock.md
100755 → 100644
Empty file.
Empty file modified libraries/builtins/README.txt
100755 → 100644
Empty file.
Empty file modified libraries/builtins/fixdfti.c
100755 → 100644
Empty file.
Empty file modified libraries/builtins/fixsfti.c
100755 → 100644
Empty file.
Empty file modified libraries/builtins/fixtfti.c
100755 → 100644
Empty file.
Empty file modified libraries/builtins/fixunsdfti.c
100755 → 100644
Empty file.
Empty file modified libraries/builtins/fixunssfti.c
100755 → 100644
Empty file.
Empty file modified libraries/builtins/fixunstfti.c
100755 → 100644
Empty file.
Empty file modified libraries/builtins/floattidf.c
100755 → 100644
Empty file.
Empty file modified libraries/builtins/floatuntidf.c
100755 → 100644
Empty file.
Empty file modified libraries/chain/include/eosio/chain/platform_timer_accuracy.hpp
100755 → 100644
Empty file.
Empty file modified libraries/testing/contracts/eosio.bios/eosio.bios.wasm
100755 → 100644
Empty file.
Empty file.
Empty file.
6 changes: 4 additions & 2 deletions plugins/net_plugin/net_plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2201,7 +2201,7 @@ namespace eosio {
// static, thread safe
void sync_manager::send_handshakes() {
my_impl->connections.for_each_connection( []( const connection_ptr& ci ) {
if( ci->current() ) {
if( ci->connected() ) {
ci->send_handshake();
}
} );
Expand All @@ -2227,6 +2227,7 @@ namespace eosio {
if( !is_sync_required( chain_info.head_num ) || target <= chain_info.lib_num ) {
peer_dlog( c, "We are already caught up, my irr = ${b}, head = ${h}, target = ${t}",
("b", chain_info.lib_num)( "h", chain_info.head_num )( "t", target ) );
c->send_handshake(); // let peer know it is not syncing from us
return;
}

Expand Down Expand Up @@ -2316,8 +2317,8 @@ namespace eosio {
note.known_blocks.ids.push_back(make_block_id(cc.earliest_available_block_num()));
}
c->enqueue( note );
c->peer_syncing_from_us = true;
}
c->peer_syncing_from_us = true;
return;
}

Expand Down Expand Up @@ -2359,6 +2360,7 @@ namespace eosio {
}
return;
} else {
c->peer_syncing_from_us = false;
peer_dlog( c, "Block discrepancy is within network latency range.");
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ namespace eosio::trace_api {
const auto offset = file.tellp();
file.write(data.data(), data.size());
file.flush();
file.sync();
return offset;
}

Expand Down
13 changes: 7 additions & 6 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,13 @@ set_property(TEST ship_test_unix PROPERTY LABELS nonparallelizable_tests)
add_test(NAME ship_if_test COMMAND tests/ship_test.py -v --activate-if --num-clients 10 --num-requests 5000 ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
set_property(TEST ship_if_test PROPERTY LABELS nonparallelizable_tests)

add_test(NAME ship_streamer_test COMMAND tests/ship_streamer_test.py -v --num-clients 10 ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
set_property(TEST ship_streamer_test PROPERTY LABELS long_running_tests)
add_test(NAME ship_streamer_if_test COMMAND tests/ship_streamer_test.py -v --num-clients 10 --activate-if ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
set_property(TEST ship_streamer_if_test PROPERTY LABELS long_running_tests)
add_test(NAME ship_streamer_if_fetch_finality_data_test COMMAND tests/ship_streamer_test.py -v --num-clients 10 --activate-if --finality-data-history ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
set_property(TEST ship_streamer_if_fetch_finality_data_test PROPERTY LABELS long_running_tests)
# Disable failing ship tests until https://github.com/AntelopeIO/leap/issues/2323 see https://github.com/AntelopeIO/spring/issues/20
#add_test(NAME ship_streamer_test COMMAND tests/ship_streamer_test.py -v --num-clients 10 ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
#set_property(TEST ship_streamer_test PROPERTY LABELS long_running_tests)
#add_test(NAME ship_streamer_if_test COMMAND tests/ship_streamer_test.py -v --num-clients 10 --activate-if ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
#set_property(TEST ship_streamer_if_test PROPERTY LABELS long_running_tests)
#add_test(NAME ship_streamer_if_fetch_finality_data_test COMMAND tests/ship_streamer_test.py -v --num-clients 10 --activate-if --finality-data-history ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
#set_property(TEST ship_streamer_if_fetch_finality_data_test PROPERTY LABELS long_running_tests)

add_test(NAME p2p_dawn515_test COMMAND tests/p2p_tests/dawn_515/test.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
set_property(TEST p2p_dawn515_test PROPERTY LABELS nonparallelizable_tests)
Expand Down
Empty file modified tutorials/bios-boot-tutorial/accounts.json
100755 → 100644
Empty file.
Empty file modified unittests/contracts/eosio.mechanics/eosmechanics.wasm
100755 → 100644
Empty file.
Empty file modified unittests/contracts/eosio.msig/eosio.msig.wasm
100755 → 100644
Empty file.
Empty file modified unittests/contracts/eosio.system/eosio.system.wasm
100755 → 100644
Empty file.
Empty file modified unittests/contracts/eosio.token/eosio.token.wasm
100755 → 100644
Empty file.
Empty file modified unittests/contracts/eosio.wrap/eosio.wrap.wasm
100755 → 100644
Empty file.
Empty file modified unittests/contracts/getcode_deepindent.wasm
100755 → 100644
Empty file.
Empty file modified unittests/contracts/locals-yc.wasm
100755 → 100644
Empty file.
Empty file modified unittests/test-contracts/action_results/action_results.wasm
100755 → 100644
Empty file.
Empty file modified unittests/test-contracts/asserter/asserter.wasm
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file modified unittests/test-contracts/deferred_test/deferred_test.wasm
100755 → 100644
Empty file.
Empty file.
Empty file modified unittests/test-contracts/get_sender_test/get_sender_test.wasm
100755 → 100644
Empty file.
Empty file.
Empty file modified unittests/test-contracts/get_table_test/get_table_test.wasm
100755 → 100644
Empty file.
Empty file modified unittests/test-contracts/integration_test/integration_test.wasm
100755 → 100644
Empty file.
Empty file.
Empty file modified unittests/test-contracts/no_auth_table/no_auth_table.wasm
100755 → 100644
Empty file.
Empty file modified unittests/test-contracts/noop/noop.wasm
100755 → 100644
Empty file.
Empty file modified unittests/test-contracts/params_test/params_test.wasm
100755 → 100644
Empty file.
Empty file modified unittests/test-contracts/payloadless/payloadless.wasm
100755 → 100644
Empty file.
Empty file modified unittests/test-contracts/proxy/proxy.wasm
100755 → 100644
Empty file.
Empty file.
Empty file modified unittests/test-contracts/reject_all/reject_all.wasm
100755 → 100644
Empty file.
Empty file.
Empty file modified unittests/test-contracts/snapshot_test/snapshot_test.wasm
100755 → 100644
Empty file.
Empty file modified unittests/test-contracts/test_api/test_api.wasm
100755 → 100644
Empty file.
Empty file modified unittests/test-contracts/test_api_db/test_api_db.wasm
100755 → 100644
Empty file.
Empty file.
Empty file modified unittests/test-contracts/wasm_config_bios/wasm_config_bios.wasm
100755 → 100644
Empty file.

0 comments on commit 23b5739

Please sign in to comment.