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

CYB-542 merge eos-1.8.3..1.8.13 #55

Merged
merged 2,063 commits into from
Apr 2, 2020
Merged

CYB-542 merge eos-1.8.3..1.8.13 #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2063 commits
Select commit Hold shift + click to select a range
1f9bdc2
If verifying catchup and num in notice is less than lib, nothing to do.
heifner Dec 2, 2019
4c7bf98
Add const, extra logging. remove dead code
heifner Dec 2, 2019
58342f6
Additional logging when block is not applied to head
heifner Nov 27, 2019
6d7b078
If peer sending less than lib and we have notified it of our lib, the…
heifner Dec 2, 2019
79acf67
Handshakes needed in 1.8
heifner Dec 2, 2019
0a82e39
Always cancel wait when receive block
heifner Dec 2, 2019
89850d9
on fork should be true if not found
heifner Dec 2, 2019
97495fa
Add const
heifner Dec 3, 2019
30a0ee6
Merge pull request #8246 from EOSIO/mac-llvm4-from-source
NorseGaud Dec 3, 2019
a3a795a
Merge pull request #8272 from EOSIO/cicd-c7.7-r1.8
scottarnette Dec 3, 2019
a32ad9d
Fix for llvm4 and incorrect openssl in Travis build environment.
scottarnette Dec 2, 2019
fb02112
Merge pull request #8271 from EOSIO/net-plugin-sync-1.8
heifner Dec 3, 2019
8abaf9c
Merge pull request #8278 from EOSIO/cicd-travis-update-r1.8
scottarnette Dec 4, 2019
e1bee35
known_blocks.pending is head NOT known_trx.pending
heifner Dec 6, 2019
c9e00b3
Merge pull request #8286 from EOSIO/net-plugin-handshake-1.8
heifner Dec 9, 2019
e4eb04d
Enable debug level logging for net_plugin, http_plugin, and producer_…
heifner Nov 25, 2019
e54d36a
Merge pull request #8294 from EOSIO/enable-defult-debug-1.8
heifner Dec 9, 2019
16df7fe
fix bios boot tutorial script and README.md
Dec 10, 2019
ed44a63
correct comment and get rid of the not needed sleep lines.
Dec 10, 2019
91eeec3
If requesting next chuck and determine nothing to request, send hands…
heifner Dec 10, 2019
610f863
Use error code to avoid exceptions from boost asio
heifner Dec 10, 2019
5083c32
Merge pull request #8301 from EOSIO/net-plugin-lirr-1.8
heifner Dec 10, 2019
434926b
Merge pull request #8302 from EOSIO/net-plugin-terminate-1.8
heifner Dec 10, 2019
8411aba
Merge pull request #8297 from EOSIO/docs/1.8.x-bios-boot-tutorial
lparisc Dec 10, 2019
a7da930
Fixed corner case for failures and added debug logging.
Dec 10, 2019
7426bd2
Increased time to wait for shutdown.
Dec 10, 2019
aec0d20
Cleaned up log statements.
Dec 11, 2019
5a23649
Merge pull request #8310 from EOSIO/under-min-avail-timing-fix_1.8
brianjohnson5972 Dec 11, 2019
b0dbceb
Allow tags to create Contract Builders.
scottarnette Dec 12, 2019
a3d3722
Allow retries on passed steps.
scottarnette Dec 12, 2019
8142cdd
Merge pull request #8323 from EOSIO/cicd-retries-r1.8
scottarnette Dec 13, 2019
39cfb15
increase tester state size from 8 MiB to 16 MiB
arhag Dec 17, 2019
71b23f0
Merge pull request #8338 from EOSIO/increase-tester-state-size-1.8
arhag Dec 17, 2019
fbd55ab
modifications to trigger LRTs and Multiver on anything but scheduled
Dec 17, 2019
31d9ab9
Merge pull request #8342 from EOSIO/1.8.x-trigger-on-everything-but-s…
NorseGaud Dec 17, 2019
437115c
bump version to 1.8.7
arhag Dec 17, 2019
91618aa
Merge pull request #8346 from EOSIO/bump-version-to-1.8.7
arhag Dec 17, 2019
b31e735
Fix linking OpenSSL
Dec 19, 2019
6b8820d
Fix whitespace
kj4ezj Dec 19, 2019
b30fa70
Consistent package builder timeouts
kj4ezj Dec 19, 2019
b58e7d2
Build EOSIO Docker images for every commit
kj4ezj Dec 19, 2019
bfc612e
Build Docker container up front to be used for testing, then tag with…
kj4ezj Dec 19, 2019
85b2976
Add sync-from-genesis test to every build
kj4ezj Dec 19, 2019
a4d424c
Unified look-and-feel across pipelines
kj4ezj Dec 19, 2019
901277b
Include link to origin in triggered build
kj4ezj Dec 19, 2019
d98d1fb
Pass timeout through to sync test
kj4ezj Dec 19, 2019
de8a797
Delete the pipeline.yml, obsolete since eos-buildkite-pipelines PR 61
kj4ezj Dec 20, 2019
5b16f87
Commit messages sometimes have invalid YAML syntax which breaks the p…
kj4ezj Dec 20, 2019
ceeb23a
Merge pull request #8368 from EOSIO/zach-1.8-sync-test
kj4ezj Dec 20, 2019
72d0d55
Merge pull request #8362 from EOSIO/fix/release/1.8.x/linking-tester
arhag Dec 21, 2019
ebeb597
Revert "Only send handshake if it has changed from last send."
spoonincode Dec 31, 2019
d46c2dd
Merge pull request #8380 from EOSIO/revert_1e63a33_18x
spoonincode Dec 31, 2019
63bf8e2
Propagate exceptions out of on_incoming_block push_block so net_plugi…
heifner Jan 2, 2020
b00197c
Merge pull request #8386 from EOSIO/block-except-1.8
larryk85 Jan 2, 2020
8882331
bump version
Jan 2, 2020
ab2c027
Merge pull request #8389 from EOSIO/release_1.8.x_bump_version
arhag Jan 2, 2020
84e6bc0
Disable eosio-sync-from-genesis test on eosio-lrt pipeline
kj4ezj Jan 3, 2020
1feb82a
Include the actual source pipeline slug in the build message
kj4ezj Jan 3, 2020
1fa1290
Consistent variable names across Buildkite
kj4ezj Jan 3, 2020
e02a7a5
Remove dashes from test name
kj4ezj Jan 3, 2020
1b2bf47
Add SKIP_SYNC_TESTS variable
kj4ezj Jan 3, 2020
139c952
Fix duplicate deletion of the same docker container on some tagged bu…
kj4ezj Jan 3, 2020
dd5c9a7
Add eosio-resume-from-state configuration to pipeline.jsonc
kj4ezj Jan 2, 2020
23bdb0f
Add eosio-resume-from-state test to eosio pipeline
kj4ezj Jan 3, 2020
f86745d
Make multiversion protocol test conditional.
jgiszczak Dec 19, 2019
9329491
Merge pull request #8392 from EOSIO/zach-1.8-resume-from-state
kj4ezj Jan 3, 2020
3494d9d
Merge pull request #8394 from EOSIO/conditional-multiversion-test-1.8…
jgiszczak Jan 6, 2020
766ae8c
Update sync_next_expected_num via checking sync_last_requested_num in…
heifner Jan 6, 2020
e01b5dd
Merge pull request #8400 from EOSIO/net-plugin-sync-check-1.8
heifner Jan 7, 2020
7675dad
Add better logging of exceptions in emit
heifner Jan 9, 2020
5b910a1
return more from producer_plugin's get_runtime_options()
spoonincode Nov 20, 2019
749385c
Consolidated Security Fixes for 1.8.9
heifner Jan 9, 2020
e6780d1
Merge pull request #8415 from EOSIO/emit-except-log-1.8
heifner Jan 9, 2020
b986866
Merge pull request #8416 from EOSIO/more_pp_get_runtime_options_18x
spoonincode Jan 9, 2020
847ed65
Merge pull request #8418 from EOSIO/1.8.9-security-omnibus
heifner Jan 10, 2020
c521143
bump version to 1.8.9
arhag Jan 10, 2020
c2bcba1
Merge pull request #8421 from EOSIO/bump-version-to-1.8.9
arhag Jan 10, 2020
3dfa0b6
fix discovery of openssl in tester cmake when OPENSSL_ROOT_DIR not set
spoonincode Jan 10, 2020
4df1b61
Merge pull request #8426 from EOSIO/openssl_tester_pathfix_18x
arhag Jan 10, 2020
9a93eea
Update fc.
swatanabe-b1 Jan 10, 2020
06d519a
Merge pull request #8429 from EOSIO/fix_logger_crash-1.8
swatanabe-b1 Jan 13, 2020
98419ec
ping sleep + anka plugin upgrade + boost fix
Jan 16, 2020
bb7e78d
testing llvm install fix
Jan 16, 2020
9387d99
testing llvm fix
Jan 16, 2020
b8023e8
slash to COMMIT ENV
Jan 16, 2020
6ec3091
reverted changes
Jan 16, 2020
2596c3d
version bump to get a new hash
Jan 16, 2020
9f95130
Merge pull request #8454 from EOSIO/1.8.x-ping-sleep
NorseGaud Jan 16, 2020
53b4770
NorseGaud -> EOSIO for anka plugin now that we have approval to manag…
Jan 17, 2020
7bfe7b0
Merge pull request #8469 from EOSIO/1.8.x-use-forked-anka-plugin
arhag Jan 17, 2020
5448d34
Port multiversion test into main EOS pipeline.
scottarnette Jan 22, 2020
cf6b358
Allow aliases of variants in ABI (port of EOSIO/eos#7377)
arhag Jan 22, 2020
fb12adc
avoid passing http-max-response-time-ms to old nodeos version in mult…
arhag Jan 21, 2020
2ec6667
Fixing docker name collision issues during build.
scottarnette Jan 22, 2020
a4c203a
Merge pull request #8485 from EOSIO/handle-variant-aliases-1.8
arhag Jan 23, 2020
10d0c07
Consolidated Security Fixes for 1.8.10
heifner Jan 23, 2020
01c81d3
Merge pull request #8492 from EOSIO/cicd-docker-collision-r1.8
scottarnette Jan 23, 2020
a20c573
The new policy would be, drop all incoming blocks.
heifner Jan 23, 2020
0b45b1a
Merge pull request #8487 from EOSIO/cicd-multiversion-port-r1.8
scottarnette Jan 23, 2020
12bb9fa
Inform net_plugin if block was accepted
heifner Jan 23, 2020
0202c79
Change received transaction from info level log to debug level
heifner Jan 24, 2020
95aaab2
Merge pull request #8495 from EOSIO/drop-late-blocks-1.8
heifner Jan 25, 2020
a7db164
Add new cpu-duty-cycle-pct option
heifner Jan 25, 2020
63fb285
Merge remote-tracking branch 'origin/release/1.8.x' into duty-cycle-1.8
heifner Jan 25, 2020
fbccc44
Fix scheduling of start block
heifner Jan 25, 2020
0b0c4f4
Make sure we are in production window
heifner Jan 25, 2020
db297f1
Additional logging and comments
heifner Jan 25, 2020
6e38a67
Keep http_plugin_impl alive until all posted jobs finish
heifner Jan 27, 2020
87efe32
Merge pull request #8509 from EOSIO/http-plugin-shutdown-1.8
heifner Jan 27, 2020
34ff720
added logic to prevent lrt pipeline from triggering itself and fixed …
Jan 27, 2020
4ae007d
Bump version to 1.8.10
heifner Jan 27, 2020
cefa987
Merge pull request #8516 from EOSIO/1.8.10-security-omnibus
heifner Jan 27, 2020
0a2b757
Merge pull request #8520 from EOSIO/1.8.x-LRT-disable-trigger
heifner Jan 27, 2020
81e176a
Merge pull request #8519 from EOSIO/bump-version-to-1.8.10
heifner Jan 27, 2020
a9e0a48
Merge remote-tracking branch 'origin/release/1.8.x' into duty-cycle-1.8
heifner Jan 28, 2020
de8ceb6
Fold produce-time-offset-us & cpu-duty-cycle-pct together and last-bl…
heifner Jan 28, 2020
ee36f5e
Simplify duty cycle off / next block calculation
heifner Jan 28, 2020
cfefa29
Rename cpu-duty-cyle-pct to cpu-effort-percent and last-block-cpu-dut…
heifner Jan 29, 2020
bafe965
Fix late-block-drop for when duty cycle is off and there is no pendin…
heifner Jan 30, 2020
e150095
Process async_write callback at high priority to prevent it from bloc…
heifner Jan 31, 2020
b9d44ad
Merge pull request #8547 from EOSIO/net-plugin-send-priority-1.8
heifner Jan 31, 2020
2ced476
Merge remote-tracking branch 'origin/release/1.8.x' into duty-cycle-1.8
heifner Jan 31, 2020
c80eacc
Remove last of 'duty cycle' nomenclature since flag is not needed.
heifner Jan 31, 2020
1a4f39f
Use term block_time_interval instead of block_time
heifner Jan 31, 2020
4a5992d
Rename current_block_time to pending_start_block_time which is a bett…
heifner Jan 31, 2020
1403ae7
Remove unneeded check of is_building_block() for drop late block
heifner Jan 31, 2020
de178e3
Merge pull request #8554 from EOSIO/drop-late-check-1.8
heifner Feb 1, 2020
4492cdf
Read-only mode never sets _pending_block_mode and returns out of star…
heifner Feb 3, 2020
f76137b
Merge pull request #8558 from EOSIO/read-only-1.8
heifner Feb 3, 2020
65ec5b1
Merge remote-tracking branch 'origin/release/1.8.x' into duty-cycle-1.8
heifner Feb 4, 2020
d43272d
Simplify cpu effort start block calculation
heifner Feb 4, 2020
7214110
Clean up code for clarity
heifner Feb 4, 2020
6c62aed
added checks for irreversible mode
ndcgundlach Oct 10, 2019
42b5aae
merged immutable fix changes from 8056
ndcgundlach Oct 16, 2019
5cdb3e5
Added timestamp to producer watermarks to prevent reproducing the sam…
brianjohnson5972 Feb 4, 2020
9790fc6
Removed irroneous check and fixed minimum offset calculation for time…
brianjohnson5972 Feb 4, 2020
403897c
Remove unneeded log message
heifner Feb 4, 2020
8029cd2
fixed broken unit test
ndcgundlach Feb 4, 2020
9f9b974
Merge pull request #8566 from EOSIO/fix_8056_1_8
heifner Feb 4, 2020
5d00ad5
Merge remote-tracking branch 'origin/release/1.8.x' into duty-cycle-1.8
heifner Feb 4, 2020
5baa6b2
Merge pull request #8507 from EOSIO/duty-cycle-1.8
heifner Feb 5, 2020
48a9107
Merge pull request #8569 from EOSIO/timestamp-watermark_v1.8.x
heifner Feb 5, 2020
aee056e
Allow for unlinkable blocks even when not syncing as 2.0 clients will…
heifner Feb 5, 2020
0cf4abc
Extend cpu percent effort to include immediate speculative block afte…
heifner Feb 5, 2020
84e6e83
Revert "Extend cpu percent effort to include immediate speculative bl…
heifner Feb 5, 2020
c0a7868
Extend cpu percent effort to include immediate speculative block afte…
heifner Feb 5, 2020
66c545e
Merge pull request #8572 from EOSIO/net-plugin-unlinkable-1.8
heifner Feb 5, 2020
1270593
Add const
heifner Feb 5, 2020
4851c85
Add needed return after schedule_delayed_production_loop when switchi…
heifner Feb 5, 2020
816328a
Merge pull request #8574 from EOSIO/duty-cycle-last-block-1.8
heifner Feb 6, 2020
766e090
Bump version to 1.8.11
jeffreyssmith2nd Feb 6, 2020
0766437
Merge pull request #8586 from EOSIO/version-bump-1.8.11
jeffreyssmith2nd Feb 6, 2020
ff470b9
Backport of Github Actions.
scottarnette Feb 7, 2020
b975a93
Backport of Github Actions.
scottarnette Feb 7, 2020
fa03383
Skip sync from genesis and resume from state test on tagged builds
Feb 7, 2020
cc83114
Merge pull request #8605 from EOSIO/skip-sync-test-on-tag-18x
emorybarlow Feb 7, 2020
6c4ce4b
Merge pull request #8611 from EOSIO/cicd-actions-r1.8
scottarnette Feb 7, 2020
0bbfdfa
Init class membors
heifner Feb 10, 2020
1caf3e2
Merge pull request #8616 from EOSIO/net-message-init-1.8
heifner Feb 12, 2020
b503a0f
remove brew's python@2 install
spoonincode Feb 12, 2020
91728e1
Merge pull request #8634 from EOSIO/remove_brew_python2_18x
arhag Feb 13, 2020
84b894f
Bump version to 1.8.12
jeffreyssmith2nd Feb 13, 2020
0aeb418
Merge pull request #8642 from EOSIO/version-bump-1.8.12
jeffreyssmith2nd Feb 13, 2020
029699f
Fix format message.
swatanabe-b1 Feb 14, 2020
6b82ca9
Merge pull request #8653 from EOSIO/permission-format-1.8
swatanabe-b1 Feb 18, 2020
563c059
Do not attempt to exec a trx if account cpu does not have sufficient …
heifner Feb 12, 2020
49f246e
Use tx_cpu_usage_exceeded instead of deadline exception
heifner Feb 12, 2020
2958183
Add test for indication of cpu time stopping exec of trx
heifner Feb 13, 2020
d6f2ed2
Code cleanup to use is_producing_block() for validation check instead…
heifner Feb 13, 2020
7d7cfed
Modify push_scheduled_transaction to have all non-default args to mat…
heifner Feb 13, 2020
a1c83d8
Factor in greylist_cpu_usage_exceeded & block_cpu_usage_exceeded alon…
heifner Feb 13, 2020
432090e
Evaluate block exhausted via timer instead of just looking at excepti…
heifner Feb 13, 2020
57de171
Assert expected explicit_billed_cpu_time value
heifner Feb 14, 2020
978d492
Assert expected explicit_billed_cpu_time value
heifner Feb 14, 2020
25f15dc
Assert when limited cpu time to bill not equal to cpu time to bill
heifner Feb 14, 2020
2a16ce0
Fix logic in validate_account_cpu_usage
heifner Feb 17, 2020
b3fa910
Explicitly disallow greylisting when validating block
heifner Feb 17, 2020
e02e737
Consolidate logic of validate_cpu_usage_to_bill & validate_account_cp…
heifner Feb 17, 2020
94323af
Allow explicit billing of 0
heifner Feb 17, 2020
e3a4f7b
Match logic of producer_plugin
heifner Feb 17, 2020
f614394
Use explicit billing for test since the test is not testing billing
heifner Feb 17, 2020
866bfa8
Make test clearer and add additional checks
heifner Feb 17, 2020
1050cd3
Move deadline check up
heifner Feb 17, 2020
9e25db8
Remove restriction on 0 billed cpu
heifner Feb 17, 2020
610f20d
Use explicit billing in core tester to avoid timing issues'
heifner Feb 18, 2020
7380072
Update tests to use correct account cpu limit and correct non-explici…
heifner Feb 19, 2020
853864b
Add test case for explicit billing over account cpu limit
heifner Feb 19, 2020
54b36db
Update comments
heifner Feb 19, 2020
6b10a4a
Cleanup tests from peer review comments
heifner Feb 20, 2020
b558139
Rename block_is_exhausted which was failure_is_subjective to execepti…
heifner Feb 20, 2020
b9a09fc
Do not set exhausted flag.
heifner Feb 22, 2020
60f2768
Produce block immediately if block is exhausted (max_block_cpu_usage …
heifner Feb 13, 2020
b6ae257
Add max-block-cpu-usage-threshold-us & max-block-net-usage-threshold-…
heifner Feb 18, 2020
c69a31b
int32_t instead of uint32_t since values are negative
heifner Feb 18, 2020
34225c9
Handle exhaustion in start_block of pending trxs
heifner Feb 19, 2020
7e29f14
Fixed use of uint32_t instead of int32_t
heifner Feb 19, 2020
eb4b906
Correct move unsigned vs signed mismatches
heifner Feb 19, 2020
ecbb9d7
Do not consider exhausted if scheduled is exhausted
heifner Feb 20, 2020
53265bc
Simplify block_is_exhausted
heifner Feb 20, 2020
0c0ea61
Revert unneeded calculate_block_offset
heifner Feb 20, 2020
064f4f5
No need to restrict exhausted check to when producing
heifner Feb 20, 2020
5678101
Simplify now that block production always starts at .000 or .500
heifner Feb 20, 2020
def3a30
Add indication of why block is being produced immediately in the log
heifner Feb 20, 2020
eaa63f9
Only call schedule_maybe_produce_block when producing
heifner Feb 20, 2020
c45b5d0
Move call to schedule_maybe_produce_block into on_incoming_transactio…
heifner Feb 20, 2020
59d6f52
Add additional log detail for block execeptions
heifner Feb 20, 2020
4d7478f
Add exception to log message so it is easier to grep
heifner Feb 21, 2020
a0dba75
Do not allow for 50ms leeway for next block as this now prevents inco…
heifner Feb 21, 2020
dc2dcc2
Use head_block_time instead of pending_block_time since there is not …
heifner Feb 21, 2020
1f31474
Remove block time from late block log message since we don't know wha…
heifner Feb 21, 2020
30dfe2f
Remove head block num to avoid possibly confusing log message
heifner Feb 21, 2020
946539e
Update incoming-defer-ratio description
heifner Feb 24, 2020
f4da74a
Actions now recognizes when all jobs are skipped.
scottarnette Feb 24, 2020
f214408
Merge pull request #8690 from EOSIO/defer-desc-1.8
heifner Feb 24, 2020
a3bb4e6
Merge pull request #8696 from EOSIO/cicd-actions-tweak-r1.8
scottarnette Feb 25, 2020
dfedac5
Merge pull request #8678 from EOSIO/opt-cpu-check-1.8
heifner Feb 25, 2020
5344ab4
Merge branch 'release/1.8.x' into produce-on-max-block-usage-1.8
heifner Feb 26, 2020
90b8d84
Merge pull request #8682 from EOSIO/prod-time-1.8
heifner Feb 26, 2020
c5a0df3
Merge pull request #8680 from EOSIO/produce-on-max-block-usage-1.8
heifner Feb 26, 2020
93d2fd3
Fix reruns on forked PRs.
scottarnette Feb 26, 2020
97cd1a0
Relay block as soon as block header is validated for light validation…
heifner Feb 25, 2020
161c325
Add new light_validation_mode method since skip_auth_check requires p…
heifner Feb 25, 2020
b7aac70
Revert "Add new light_validation_mode method since skip_auth_check re…
heifner Feb 26, 2020
ad99144
Add is_trusted_producer method
heifner Feb 26, 2020
6768f85
Use is_trusted_producer for if on_pre_accepted_block should bcast blo…
heifner Feb 26, 2020
a7d403e
Merge pull request #8715 from EOSIO/cicd-actions-fix-r1.8
scottarnette Feb 27, 2020
6e4a27a
Merge pull request #8705 from EOSIO/relay-block-on-accepted-header-1.8
heifner Feb 27, 2020
49d2ff9
Fixed error statement to correctly indicate failure information.
brianjohnson5972 Feb 27, 2020
fe2e5d7
Fixed name to be more descriptive.
brianjohnson5972 Feb 27, 2020
5fdaba1
Added extra sleep time to account for slower propogation of blocks th…
brianjohnson5972 Feb 27, 2020
52b6483
Added logging to indicate when production is paused and resumed.
brianjohnson5972 Feb 27, 2020
0a43ccb
Added block time offset for 1.7 node to avoid test errors due to stan…
brianjohnson5972 Feb 27, 2020
64e3be2
Cleaned up logs.
brianjohnson5972 Feb 28, 2020
093bf06
Added test comment to explain the needed parameter.
brianjohnson5972 Feb 28, 2020
3e581a9
Merge pull request #8722 from EOSIO/fix-multiple-version-protocol-int…
heifner Mar 2, 2020
eae64ab
Add api-read-only mode
heifner Feb 24, 2020
7e6842f
Add basic test of api-read-only
heifner Feb 25, 2020
f9a89b1
Update description of api-read-only
heifner Feb 25, 2020
dc90c83
Rename api-read-only to api to avoid confusion
heifner Feb 27, 2020
7acd476
WIP
heifner Feb 27, 2020
fe71fc2
Add p2p-acccept-transactions & api-accept-transactions. Rewrite descr…
heifner Feb 28, 2020
ac4d907
Remove unused vars
heifner Feb 28, 2020
166d49d
Add assert for transactions configured for producer nodes
heifner Feb 28, 2020
d0037af
api not p2p
heifner Feb 28, 2020
982577d
Fix merge and remove setting of max_nodes_per_host to match 2.0 behav…
heifner Mar 1, 2020
f23ed4e
Merge pull request #8742 from EOSIO/api-read-only-1.8
heifner Mar 3, 2020
78521a3
Bump version to 1.8.13
heifner Mar 12, 2020
eb4456f
Merge pull request #8806 from EOSIO/version-bump-1.8.13
Mar 12, 2020
0e02af3
Merge tag 'v1.8.13' of github.com:EOSIO/eos into merge-1.8.13-533
adrianopol Mar 30, 2020
00b625f
CYB-542 fixes after merge eos-1.8.3..1.8.13
adrianopol Mar 31, 2020
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
5 changes: 3 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,16 @@ endif()
set(CMAKE_EXPORT_COMPILE_COMMANDS "ON")
set(BUILD_DOXYGEN FALSE CACHE BOOL "Build doxygen documentation on every make")
set(BUILD_MONGO_DB_PLUGIN FALSE CACHE BOOL "Build mongo database plugin")
set(ENABLE_MULTIVERSION_PROTOCOL_TEST FALSE CACHE BOOL "Enable nodeos multiversion protocol test")

# add defaults for openssl
if("${OPENSSL_ROOT_DIR}" STREQUAL "")
if(NOT "$ENV{OPENSSL_ROOT_DIR}" STREQUAL "")
set(OPENSSL_ROOT_DIR $ENV{OPENSSL_ROOT_DIR})
set(OPENSSL_INCLUDE_DIR ${OPENSSL_ROOT_DIR}/include)
elseif(APPLE)
set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl")
set(OPENSSL_INCLUDE_DIR "/usr/local/opt/openssl/include")
set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl@1.1")
set(OPENSSL_INCLUDE_DIR "/usr/local/opt/openssl@1.1/include")
else() # GNU
set(OPENSSL_ROOT_DIR "/usr/include/openssl")
set(OPENSSL_INCLUDE_DIR "/usr/include/openssl/include")
Expand Down
37 changes: 20 additions & 17 deletions CMakeModules/EosioTester.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,28 +45,31 @@ find_package(Boost 1.67 REQUIRED COMPONENTS
iostreams
unit_test_framework)

find_library(libtester eosio_testing @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
find_library(libchain eosio_chain @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
find_library(libtester eosio_testing @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
find_library(libchain eosio_chain @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
if ( "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" )
find_library(libfc fc_debug @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
find_library(libsecp256k1 secp256k1_debug @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
find_library(libfc fc_debug @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
find_library(libsecp256k1 secp256k1_debug @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
else()
find_library(libfc fc @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
find_library(libsecp256k1 secp256k1 @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
find_library(libfc fc @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
find_library(libsecp256k1 secp256k1 @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
endif()

find_library(libwasm WASM @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
find_library(libwast WAST @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
find_library(libwabt wabt @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
find_library(libir IR @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
find_library(libplatform Platform @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
find_library(liblogging Logging @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
find_library(libruntime Runtime @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
find_library(libwasm WASM @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
find_library(libwast WAST @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
find_library(libwabt wabt @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
find_library(libir IR @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
find_library(libplatform Platform @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
find_library(liblogging Logging @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
find_library(libruntime Runtime @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
find_library(libsoftfloat softfloat @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
find_library(liboscrypto crypto @OPENSSL_ROOT_DIR@/lib)
find_library(libosssl ssl @OPENSSL_ROOT_DIR@/lib)
find_library(libchainbase chainbase @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
find_library(libbuiltins builtins @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
find_library(libsoftfloat softfloat @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
get_filename_component(cryptodir @OPENSSL_CRYPTO_LIBRARY@ DIRECTORY)
find_library(liboscrypto crypto "${cryptodir}" NO_DEFAULT_PATH)
get_filename_component(ssldir @OPENSSL_SSL_LIBRARY@ DIRECTORY)
find_library(libosssl ssl "${ssldir}" NO_DEFAULT_PATH)
find_library(libchainbase chainbase @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
find_library(libbuiltins builtins @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
find_library(GMP_LIBRARIES NAMES libgmp.a gmp.lib gmp libgmp-10 mpir
HINTS ENV GMP_LIB_DIR
ENV GMP_DIR
Expand Down
40 changes: 21 additions & 19 deletions CMakeModules/EosioTesterBuild.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,29 +43,31 @@ find_package(Boost 1.67 REQUIRED COMPONENTS
iostreams
unit_test_framework)

find_library(libtester eosio_testing @CMAKE_BINARY_DIR@/libraries/testing)
find_library(libchain eosio_chain @CMAKE_BINARY_DIR@/libraries/chain)
find_library(libtester eosio_testing @CMAKE_BINARY_DIR@/libraries/testing NO_DEFAULT_PATH)
find_library(libchain eosio_chain @CMAKE_BINARY_DIR@/libraries/chain NO_DEFAULT_PATH)
if ( "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" )
find_library(libfc fc_debug @CMAKE_BINARY_DIR@/libraries/fc)
find_library(libsecp256k1 secp256k1_debug @CMAKE_BINARY_DIR@/libraries/fc/secp256k1)
find_library(libfc fc_debug @CMAKE_BINARY_DIR@/libraries/fc NO_DEFAULT_PATH)
find_library(libsecp256k1 secp256k1_debug @CMAKE_BINARY_DIR@/libraries/fc/secp256k1 NO_DEFAULT_PATH)

else()
find_library(libfc fc @CMAKE_BINARY_DIR@/libraries/fc)
find_library(libsecp256k1 secp256k1 @CMAKE_BINARY_DIR@/libraries/fc/secp256k1)
find_library(libfc fc @CMAKE_BINARY_DIR@/libraries/fc NO_DEFAULT_PATH)
find_library(libsecp256k1 secp256k1 @CMAKE_BINARY_DIR@/libraries/fc/secp256k1 NO_DEFAULT_PATH)
endif()

find_library(libwasm WASM @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/WASM)
find_library(libwast WAST @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/WAST)
find_library(libir IR @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/IR)
find_library(libwabt wabt @CMAKE_BINARY_DIR@/libraries/wabt)
find_library(libplatform Platform @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Platform)
find_library(liblogging Logging @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Logging)
find_library(libruntime Runtime @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Runtime)
find_library(libsoftfloat softfloat @CMAKE_BINARY_DIR@/libraries/softfloat)
find_library(liboscrypto crypto @OPENSSL_ROOT_DIR@/lib)
find_library(libosssl ssl @OPENSSL_ROOT_DIR@/lib)
find_library(libchainbase chainbase @CMAKE_BINARY_DIR@/libraries/chainbase)
find_library(libbuiltins builtins @CMAKE_BINARY_DIR@/libraries/builtins)
find_library(libwasm WASM @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/WASM NO_DEFAULT_PATH)
find_library(libwast WAST @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/WAST NO_DEFAULT_PATH)
find_library(libir IR @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/IR NO_DEFAULT_PATH)
find_library(libwabt wabt @CMAKE_BINARY_DIR@/libraries/wabt NO_DEFAULT_PATH)
find_library(libplatform Platform @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Platform NO_DEFAULT_PATH)
find_library(liblogging Logging @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Logging NO_DEFAULT_PATH)
find_library(libruntime Runtime @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Runtime NO_DEFAULT_PATH)
find_library(libsoftfloat softfloat @CMAKE_BINARY_DIR@/libraries/softfloat NO_DEFAULT_PATH)
get_filename_component(cryptodir @OPENSSL_CRYPTO_LIBRARY@ DIRECTORY)
find_library(liboscrypto crypto "${cryptodir}" NO_DEFAULT_PATH)
get_filename_component(ssldir @OPENSSL_SSL_LIBRARY@ DIRECTORY)
find_library(libosssl ssl "${ssldir}" NO_DEFAULT_PATH)
find_library(libchainbase chainbase @CMAKE_BINARY_DIR@/libraries/chainbase NO_DEFAULT_PATH)
find_library(libbuiltins builtins @CMAKE_BINARY_DIR@/libraries/builtins NO_DEFAULT_PATH)
find_library(GMP_LIBRARIES NAMES libgmp.a gmp.lib gmp libgmp-10 mpir
HINTS ENV GMP_LIB_DIR
ENV GMP_DIR
Expand Down
6 changes: 3 additions & 3 deletions cicd/docker-run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ project="${project##*/}"
readonly project="${project,,}" # low case

case "$project" in
(daobet) readonly org=daocasino ;;
(haya) readonly org=mixbytes ;;
(daobet*) readonly org=daocasino ;;
(haya*) readonly org=mixbytes ;;
esac

readonly default_build_type=RelWithDebInfo
Expand Down Expand Up @@ -162,7 +162,7 @@ cmd_image() {
# main

case "$project" in
(haya|daobet) ;;
(haya*|daobet*) ;;
(*) die "Bad project name: $project." ;;
esac

Expand Down
Loading