Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

merge changes from 2.2.x into develop #10657

Merged
merged 3,349 commits into from
Aug 30, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3349 commits
Select commit Hold shift + click to select a range
714e26c
bump fc to 2.2.x HEAD to get boost 1.77 fixes
spoonincode Jul 12, 2021
5b39d13
use new fc
huangminghuang Jul 12, 2021
19a62be
Merge branch 'release/2.2.x' of github.com:EOSIO/eos into docs/2.2.x-…
Jul 12, 2021
497191a
Merge pull request #10500 from EOSIO/boost177_22x
spoonincode Jul 12, 2021
bd9836b
add handle_sigup
huangminghuang Jul 12, 2021
d77d91f
Add options file configuration to RocksDB and adjust default configur…
Jul 12, 2021
c8f4ea4
disable how to add/remove participants from privacy explainer :doc
Jul 12, 2021
97e6565
Merge pull request #10502 from EOSIO/huangminghuang/update-fc
huangminghuang Jul 12, 2021
cdce4f4
update privacy feature explainer with legal edits :doc
Jul 12, 2021
d745212
ship threaded write
huangminghuang Jul 12, 2021
53a79ef
Add the entry to download Ubuntu 20.04
nickjjzhao Jul 13, 2021
c8e582c
demote eos/latest to eos/v2.2 links :doc
Jul 13, 2021
f278033
demote welcome/latest to welcome/v2.2 links :doc
Jul 13, 2021
654a8cb
Merge pull request #10497 from EOSIO/docs/2.2.x-resource_payer
lparisc Jul 13, 2021
bc7c601
fix broken links in README file :doc
Jul 13, 2021
6019d14
Merge pull request #10505 from EOSIO/jjz-update_readme
lparisc Jul 13, 2021
c2e20ef
Merge branch 'release/2.2.x' into docs/legal-review
Jul 13, 2021
d270f70
Merge pull request #10506 from EOSIO/docs/legal-review
lparisc Jul 13, 2021
817c495
use io_context queue
huangminghuang Jul 13, 2021
871322d
remove no threaded disk write option
huangminghuang Jul 13, 2021
bdf2bea
Add comments to default configuration values
linhuang-blockone Jul 13, 2021
7ea8de4
Add rocksdb manual flush stride option
Jul 14, 2021
8f8d909
Added force-write-stride to control flush frequency
Jul 14, 2021
83d86df
Remove direct RocksDB option variables, make options file preferable …
linhuang-blockone Jul 14, 2021
b8ab7e0
Update base image and build script pipelines.
Jul 14, 2021
764cec6
Make skip flags consistent with documentation and generated flags for…
Jul 14, 2021
3a86aa4
Merge pull request #10511 from EOSIO/sa/allow-skips-r2.2
scottarnette Jul 14, 2021
7d9c1e0
fix empty vector packing
huangminghuang Jul 14, 2021
e5b6495
removing SetBackgroundThreads settings, and max_open_files and num_th…
linhuang-blockone Jul 14, 2021
42dd93a
add threaded-send option
huangminghuang Jul 13, 2021
e8a2a27
add missing include
huangminghuang Jul 14, 2021
e51c389
Merge pull request #10514 from EOSIO/huangminghuang/fix-macos-unpined
huangminghuang Jul 15, 2021
e8fca32
Merge pull request #10386 from EOSIO/test-amqp-unapplied
heifner Jul 15, 2021
6607cfc
address PR comments
huangminghuang Jul 15, 2021
37c28e2
Merge branch 'develop-boxed' into huangminghuang/ship-threaded-write
huangminghuang Jul 15, 2021
b527762
Merge branch 'develop-boxed' into huangminghuang/ship-threaded-send
huangminghuang Jul 15, 2021
403ac27
Fix memory leak (24GB per second) when rodeos starts with --filter-wa…
linhuang-blockone Jul 15, 2021
b536687
remove unused branch
huangminghuang Jul 15, 2021
3c822b9
Merge pull request #10519 from EOSIO/fix_filter_memory_leak
linhuang-blockone Jul 15, 2021
45173c4
enforce thread safety
huangminghuang Jul 15, 2021
26f6359
Merge branch 'develop-boxed' into rocksdb_changes
linhuang-blockone Jul 16, 2021
8cf9ada
Merge pull request #10503 from EOSIO/rocksdb_changes
linhuang-blockone Jul 16, 2021
d8c8d8d
Run sync tests. Remove check that always yields false.
williamblevins Jul 14, 2021
df4c9b4
Update resume from state commit for forkdb v2.
williamblevins Jul 15, 2021
b5077a2
Make undo_stack configurable and add quit function for exception hand…
linhuang-blockone Jul 16, 2021
81ee17c
add feature explainer entry on index and minor edit :doc
Jul 15, 2021
4a29e6f
remove redundant instances of privacy feature docs :doc
Jul 16, 2021
d2633ce
minor edit on README file :doc
Jul 16, 2021
d521d61
fix num_buffered_entries not passed in
huangminghuang Jul 16, 2021
c8b0873
add upgrade guide for eosio 2.2-rc1 :doc
Jul 16, 2021
814c45b
add release notes for eosio 2.2-rc1 :doc
Jul 16, 2021
cdb14bc
Merge pull request #10526 from EOSIO/release_2.2.x_run_sync_tests
brookssw Jul 16, 2021
0f71186
Fix core dump
heifner Jul 16, 2021
5305aea
Merge pull request #10531 from EOSIO/docs/devrel-1580
lparisc Jul 16, 2021
729701d
Merge pull request #10532 from EOSIO/docs/devrel-1579-1583
lparisc Jul 16, 2021
bcd6f95
Merge pull request #10504 from EOSIO/huangminghuang/ship-threaded-write
huangminghuang Jul 16, 2021
d806b2a
variables set to zero, string wraparound, save on program exit
Jul 17, 2021
598d16e
review feedback and save on exit
Jul 17, 2021
45d3ab6
fix formatting errors
Jul 17, 2021
cb4d31e
Merge branch 'develop-boxed' into sk-rodeos-stride
Jul 17, 2021
76354f0
merged develop-boxed to get rid of unpinned 10.15 build error
Jul 17, 2021
eeefaa7
correct line space issue
Jul 17, 2021
6526e2f
Support --return-failure-trace in send_transaction.
jgiszczak Jul 17, 2021
f557b1c
Cleos embedded documentation update for return-failure-trace.
jgiszczak Jul 17, 2021
679572d
Add missing use-old-rpc and read-only exclusion and revise for readab…
jgiszczak Jul 17, 2021
581696f
address review comments
huangminghuang Jul 17, 2021
91c15df
Merge branch 'develop-boxed' into huangminghuang/ship-threaded-send
huangminghuang Jul 17, 2021
51d7e5d
reenable data_size tags
huangminghuang Jul 17, 2021
ba81d9c
fixed the multi-line string literal
Jul 17, 2021
8af98ff
change exception transport prirotiy
huangminghuang Jul 17, 2021
6bf30e2
Merge pull request #10508 from EOSIO/sk-rodeos-stride
nksanthosh Jul 17, 2021
ed28f98
Use EOSIO assertion to signal forks and remove quit function
linhuang-blockone Jul 17, 2021
cfe400b
Use unsupported_feature and make quitting not to be defaulted
linhuang-blockone Jul 18, 2021
0f98de7
change --enable-undo-stack to --disable-undo-stack
linhuang-blockone Jul 18, 2021
3907615
added check for paused / created separate start_consume method
ndcgundlach Jul 18, 2021
bdbfaa0
added start_consume to plugin startup if not paused
ndcgundlach Jul 18, 2021
0e641ec
added informational logging
ndcgundlach Jul 18, 2021
66c8793
fixed syntax error
ndcgundlach Jul 18, 2021
6486006
added call to start_consume
ndcgundlach Jul 18, 2021
b362100
fixed typo
ndcgundlach Jul 18, 2021
9846d4c
added check for speculative execution on startup to start consuming
ndcgundlach Jul 18, 2021
8acc3d8
removed unused code
ndcgundlach Jul 19, 2021
04d2003
Merge branch 'develop-boxed' into enable_undo_stack
linhuang-blockone Jul 19, 2021
1ecab80
Merge pull request #10529 from EOSIO/enable_undo_stack
linhuang-blockone Jul 19, 2021
96adc46
added call to clear fifo trx queue
ndcgundlach Jul 19, 2021
d871f70
took out fifo trx quue clear
ndcgundlach Jul 19, 2021
6404b4d
removed unecessary calls to start_consume
ndcgundlach Jul 19, 2021
e8cdd5d
remove mutex and unneded post
huangminghuang Jul 19, 2021
fc40ffb
Merge pull request #10513 from EOSIO/huangminghuang/ship-threaded-send
huangminghuang Jul 19, 2021
f84ba82
Merge pull request #10541 from EOSIO/amqp_pause_unpause
ndcgundlach Jul 19, 2021
ad707dc
Update README.md
shahabi8 Jun 29, 2021
eb59b41
Update README.md
shahabi8 Jul 14, 2021
fb85e68
disable undo_stack by default, set tested typical rocksdb configurati…
linhuang-blockone Jul 19, 2021
e1ceefe
change --undo-stack to --enable-undo-stack
linhuang-blockone Jul 19, 2021
a80e94f
Merge pull request #10545 from EOSIO/docs/devrel-1592-2.2
lparisc Jul 19, 2021
ae70878
use bpo::value<bool> instead of bool_switch for --nable-undo-stack
linhuang-blockone Jul 20, 2021
e3ba428
Merge pull request #10547 from EOSIO/set_defaults
heifner Jul 20, 2021
929fafe
Init force_write_strade to 1 because it is used in modulus to avoid d…
heifner Jul 20, 2021
ab95694
Merge pull request #10548 from EOSIO/fix-eosio-tester
heifner Jul 20, 2021
77ccdbf
Stop rodeos if unable to listen on wql-listen
heifner Jul 20, 2021
ab4d2e6
Merge pull request #10549 from EOSIO/rodeos-listen
heifner Jul 20, 2021
370719a
post send_update to main thread to avoid overwhelming the main thread
heifner Jul 20, 2021
3a92c03
Merge pull request #10550 from EOSIO/ship-send-priority
heifner Jul 20, 2021
14997ac
Updated to latest eosio-boxed fc with zipkin timer shutdown fix
heifner Jul 20, 2021
c909de9
Merge pull request #10551 from EOSIO/fc-zipkin-timer-boxed
heifner Jul 20, 2021
35d30d4
Add brew package test steps.
williamblevins Jul 19, 2021
4c3083d
Update MacOS package test logic for fresh Anka image.
williamblevins Jul 20, 2021
993086e
Use brew tap to do a better round-trip test.
williamblevins Jul 20, 2021
9f5285a
Encapsulate docker vs anka mechanics.
williamblevins Jul 20, 2021
3de4da1
Make a bash library for functions plus fixes.
williamblevins Jul 20, 2021
f36af42
Fix Formula arch not being a proper ruby symbol.
williamblevins Jul 20, 2021
7ab2ee6
Ensure that http server is shutdown. This appears to hang the step.
williamblevins Jul 20, 2021
403babf
Merge pull request #10554 from EOSIO/release_2.2.x_brew_package_tests
williamblevins Jul 21, 2021
8158a51
Use tested rocksdb_options.ini for sample file and add missing max_wr…
linhuang-blockone Jul 21, 2021
93bc586
Ensure that python3 is installed for macOS 10.14.
williamblevins Jul 21, 2021
55763c8
Address PR ask for not expanding the path in the logs.
williamblevins Jul 21, 2021
9decd47
Make max_bytes_for_level_base match example
linhuang-blockone Jul 21, 2021
a2e14aa
Remove unneeded check for prebuilt images.
williamblevins Jul 21, 2021
c7ebe6c
Merge pull request #10557 from EOSIO/rksbd_option_file
linhuang-blockone Jul 21, 2021
0bd4112
Update to the force-write-stride to 100,000
nksanthosh Jul 21, 2021
9145889
Merge pull request #10558 from EOSIO/release_2.2.x_brew_package_tests
williamblevins Jul 21, 2021
a324cc7
Merge pull request #10561 from EOSIO/nksanthosh-patch-2
nksanthosh Jul 22, 2021
e49943b
Log TRX_TRACE log to correct logger
heifner Jul 22, 2021
6fddfdc
update nodeos chain plugin cli options :doc
Jul 23, 2021
10e4757
update nodeos net plugin cli options :doc
Jul 23, 2021
04f074f
update producer plugin cli options :doc
Jul 23, 2021
5406056
update nodeos resource monitor plugin cli options :doc
Jul 23, 2021
5d5d703
update nodeos state history plugin cli options :doc
Jul 23, 2021
ce3c424
Merge pull request #10565 from EOSIO/prod-log-2.2
heifner Jul 23, 2021
eb5d176
Merge pull request #10569 from EOSIO/docs/devrel-1601-2.2
lparisc Jul 23, 2021
fc0839c
remove broken cleos wrap cmd ref link :doc
Jul 22, 2021
6fbf6b7
update cleos wallet keys cmd from 2.1 :doc
Jul 22, 2021
0db4911
fix broken links in cleos wallet keys cmd :doc
Jul 22, 2021
b0a9213
update cleos wallet create cmd from 2.1 :doc
Jul 22, 2021
0ce29b8
fix broken link in cleos wallet create cmd :doc
Jul 22, 2021
f5f5516
update cleos create account cmd from 2.1 :doc
Jul 22, 2021
aa191bd
fix broken link in cleos create account cmd :doc
Jul 22, 2021
37adca6
update cleos get transaction cmd from 2.1 :doc
Jul 22, 2021
d52a1b9
fix broken link in cleos get transaction cmd :doc
Jul 22, 2021
0169c3b
update eosio overview index file from 2.0 :doc
Jul 22, 2021
96f6ad0
update how to connect to a specific net from 2.1 :doc
Jul 22, 2021
f7a259e
fix broken link in how to connect to specific net :doc
Jul 23, 2021
b90af71
fix broken links in cleos system buyram cmd :doc
Jul 23, 2021
2696a7b
fix broken links in nodeos deep mind logger :doc
Jul 23, 2021
729296f
fix self link in keosd wallet plugin index :doc
Jul 23, 2021
42d2879
update eosio system components raster image :doc
Jul 22, 2021
15e86ad
update single node testnet raster image :doc
Jul 22, 2021
b0ca5d0
update multi node testnet raster image :doc
Jul 22, 2021
7b66391
Merge pull request #10571 from EOSIO/docs/devrel-1575-2.2
lparisc Jul 23, 2021
ed0ffad
Merge pull request #10574 from EOSIO/docs/devrel-1560b-2.2
lparisc Jul 23, 2021
3c7075d
Remove unused receiver and rename used receiver so it is clearer what…
heifner Jul 23, 2021
9efce64
Merge pull request #10575 from EOSIO/rodeos-cleanup-dev-boxed
heifner Jul 23, 2021
0737627
Test rodeos filter current_time
heifner Jul 27, 2021
c802f52
Add current_time support to filters
heifner Jul 27, 2021
1bc26b0
Merge pull request #10582 from EOSIO/rodeos-filter-current-time
heifner Jul 28, 2021
7b1e4cb
Remove debug fc_trace_log as it causes excessive logging
heifner Jul 30, 2021
7d2a274
Merge pull request #10585 from EOSIO/net-plugin-excessive-logging
heifner Jul 30, 2021
22aaa47
use new fc
huangminghuang Jul 12, 2021
5615b9a
Add recover_key support to eosio-tester
heifner Aug 3, 2021
d03838d
Fix recover_key
heifner Aug 3, 2021
722eae5
Another attempt at recover_key
heifner Aug 3, 2021
5cc9c65
Merge pull request #10589 from EOSIO/huangminghuang/update-fc-2.2.x
huangminghuang Aug 3, 2021
1644076
test control plugin fix for case with performance issue
Jul 27, 2021
fbfa03c
fix for restart-scenarios-test-resync and distributed-transactions-te…
Jul 29, 2021
7310f8b
net plugin bugfix for nodes getting out of sync
Aug 2, 2021
20f884d
PR #10580 review concerns addressed
Aug 2, 2021
0d3c34c
PR #10590 concerns addressed
Aug 3, 2021
b5d1292
Merge pull request #10592 from EOSIO/bugfixes-from-develop
dimas1185 Aug 4, 2021
c25534a
ship threaded write
huangminghuang Jul 12, 2021
3bd8e6b
Fix core dump
heifner Jul 16, 2021
8f693d3
move all network operations another thread
huangminghuang Aug 4, 2021
b65969c
Fix interface of recover_key
heifner Aug 4, 2021
e7704e7
Merge pull request #10598 from EOSIO/eosio-teser-recover-key-dev-boxed
heifner Aug 5, 2021
1a8a9ce
address PR comments
huangminghuang Aug 5, 2021
dea6c9a
add session_manager
huangminghuang Aug 6, 2021
4542b33
some code cleanup
huangminghuang Aug 6, 2021
7f91158
Add support for stream_wapper_v1 with std::string route
heifner Aug 9, 2021
a9cf509
Merge pull request #10596 from EOSIO/huangminghuang/ship-threaded-dis…
huangminghuang Aug 9, 2021
e747262
Merge pull request #10597 from EOSIO/huangminghuang/ship-threaded-asy…
huangminghuang Aug 9, 2021
6ca684c
move all network operations another thread
huangminghuang Aug 4, 2021
0adbffa
Merge pull request #10608 from EOSIO/huangminghuang/ship-threaded-asy…
huangminghuang Aug 9, 2021
69add30
Use shared_ptr instead of weak_ptr (explicit and implicit)
heifner Aug 10, 2021
4e2f769
head->block is not always valid, but should send update anyway
heifner Aug 10, 2021
e0bada9
Merge pull request #10606 from EOSIO/EPE-1175-rodeos-streaming-routin…
heifner Aug 10, 2021
805c9f3
Merge pull request #10611 from EOSIO/state-history-weak-dev-boxed
heifner Aug 11, 2021
5509804
Add fallback to v1 send API when possible.
jgiszczak Aug 11, 2021
dddfa16
Use old send RPC in multiversion tests.
jgiszczak Aug 12, 2021
472c937
Start consuming again when connection reestablished to AMQP
heifner Aug 11, 2021
ff6516d
Merge pull request #10615 from EOSIO/amqp-consume-dev-boxed
heifner Aug 12, 2021
d9a7597
Correct format string for system newaccount.
jgiszczak Aug 12, 2021
a6e2784
Update to not automatically create AMQP exchange and queue
heifner Aug 13, 2021
7d2fcbf
Update tests to create queue via curl
heifner Aug 13, 2021
8b87055
Merge branch 'develop-boxed' into huangminghuang/merge-rodeos
huangminghuang Aug 13, 2021
bcc58f1
Escape %2F
heifner Aug 13, 2021
891ab4c
Correctly escape %2F
heifner Aug 13, 2021
3eac840
net plugin bugfix for nodes getting out of sync
Aug 2, 2021
e3d53b4
PR #10590 concerns addressed
Aug 3, 2021
fc3ba1a
back port of net plugin changes from #10390
Aug 14, 2021
b77e326
net plugin fix for node being stopped syncing
Aug 14, 2021
dcb7eba
Enable rabbitmq_management for tests that use an AMQP queue
heifner Aug 14, 2021
db07480
Merge pull request #10620 from EOSIO/net-plugin-bugfix
dimas1185 Aug 14, 2021
8acd9c1
Merge branch 'develop-boxed' into huangminghuang/merge-amqp
huangminghuang Aug 12, 2021
d81b13f
remove amqp_trace_plugin
huangminghuang Aug 16, 2021
c12d505
Merge pull request #10618 from EOSIO/EPE-1192-dont-declar-queue
heifner Aug 16, 2021
b7dbf8d
remove duplicated pip enable
huangminghuang Aug 17, 2021
3b530e4
Merge branch 'EPE-1192-dont-declar-queue' into huangminghuang/merge-amqp
huangminghuang Aug 17, 2021
018cba7
Merge branch 'huangminghuang/merge-amqp' into huangminghuang/merge-ro…
huangminghuang Aug 16, 2021
dee5c64
fix global_property upgrade and warnings
huangminghuang Aug 17, 2021
bbc6d4d
Merge pull request #10619 from EOSIO/huangminghuang/merge-amqp
huangminghuang Aug 17, 2021
c94155f
change eos-vm submodule
huangminghuang Aug 17, 2021
96facb0
Merge pull request #10623 from EOSIO/huangminghuang/merge-amqp
huangminghuang Aug 17, 2021
50b326d
Merge branch 'release/2.2.x' into huangminghuang/merge-rodeos
huangminghuang Aug 17, 2021
984ad42
remove rodeos profile option
huangminghuang Aug 17, 2021
4b65358
Merge branch 'develop-boxed' into huangminghuang/merge-tester
huangminghuang Aug 17, 2021
1741a22
Merge branch 'huangminghuang/merge-tester-0' into huangminghuang/merg…
huangminghuang Aug 17, 2021
84d0e02
Send handshake instead of time for heartbeat
heifner Aug 16, 2021
75c5a94
send_handshake if we have not sent or received a block for half of he…
heifner Aug 16, 2021
9001c15
Send handshake even if info is unchanged
heifner Aug 17, 2021
becb8a0
Ensure that rounds continue on failures.
williamblevins Aug 18, 2021
0f9b280
Set only scheduled buildkite builds to continue on failure by default.
williamblevins Aug 18, 2021
2de5a95
Additional use of old send RPC in multiversion tests.
jgiszczak Aug 19, 2021
dfffefc
Merge pull request #10627 from EOSIO/EPE-1195-handshake-heartbeat-2.2.x
heifner Aug 19, 2021
a1762e9
Additional use of old send RPC in docker multiversion tests.
jgiszczak Aug 19, 2021
274eb51
Merge pull request #10639 from EOSIO/release_2.2.x_rounds2
williamblevins Aug 19, 2021
8d90685
Conditionally use old send RPC when argument is supported.
jgiszczak Aug 19, 2021
9ff9bed
Make building rodeos tester optional
huangminghuang Aug 19, 2021
818fbeb
enable rodeos and tester for ci
huangminghuang Aug 19, 2021
388e4c4
Refactor shared code in send transaction versions.
jgiszczak Aug 19, 2021
3b1e4ac
increase ci timeout
huangminghuang Aug 20, 2021
7b41866
fix long running test
huangminghuang Aug 20, 2021
b43572a
Merge pull request #10642 from EOSIO/huangminghuang/lrt-fix
huangminghuang Aug 20, 2021
6912e2e
Merge pull request #10625 from EOSIO/huangminghuang/merge-rodeos
huangminghuang Aug 20, 2021
eb055bd
detect if no return value instead of catching exception
praphael Aug 16, 2021
5ea02aa
Merge branch 'release/2.2.x' into support_send_transaction_failure_tr…
jgiszczak Aug 21, 2021
5f0e9aa
Merge pull request #10644 from EOSIO/pdr/trace_api_fix-22x
praphael Aug 23, 2021
4c10a68
Merge pull request #10534 from EOSIO/support_send_transaction_failure…
jgiszczak Aug 23, 2021
934e81e
Reset sync_known_lib_num when closing a connection
heifner Aug 20, 2021
eaad4e3
Don't bother asking for blocks if node doesn't have them
heifner Aug 20, 2021
2102e28
Cleanup handling of forked chain
heifner Aug 23, 2021
f5a0e16
Add test for sync problem due to larger LIB
linhuang-blockone Aug 23, 2021
e9fc1c6
Rename to match CMakeList
heifner Aug 23, 2021
feee48a
Add comments to explain reseting sync_known_lib_num
heifner Aug 24, 2021
7f8f17e
Use waitForBlock instead of sleep
heifner Aug 24, 2021
c631747
Add error log if hit unreachable code
heifner Aug 24, 2021
68158ff
Move reusable code for cleaning data dir to Utils
heifner Aug 24, 2021
9613626
Make test fail more often for broken code
heifner Aug 23, 2021
831a23e
Merge pull request #10653 from EOSIO/opt-sync-2.2.x
heifner Aug 25, 2021
091be50
avoid package rodeos and tester
huangminghuang Aug 25, 2021
0ed55dc
Merge pull request #10656 from EOSIO/huangminghuang/dont-package-rode…
huangminghuang Aug 25, 2021
7a56aea
Merge branch 'release/2.2.x' into huangminghuang/merge-2.2.x
huangminghuang Aug 25, 2021
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
4 changes: 2 additions & 2 deletions .cicd/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -eo pipefail
. ./.cicd/helpers/general.sh
mkdir -p "$BUILD_DIR"
[[ -z "$DCMAKE_BUILD_TYPE" ]] && export DCMAKE_BUILD_TYPE='Release'
CMAKE_EXTRAS="-DCMAKE_BUILD_TYPE=\"$DCMAKE_BUILD_TYPE\" -DENABLE_MULTIVERSION_PROTOCOL_TEST=\"true\""
CMAKE_EXTRAS="-DCMAKE_BUILD_TYPE=\"$DCMAKE_BUILD_TYPE\" -DENABLE_RODEOS=ON -DENABLE_TESTER=ON -DENABLE_MULTIVERSION_PROTOCOL_TEST=\"true\" -DAMQP_CONN_STR=\"amqp://guest:guest@localhost:5672\""
if [[ "$(uname)" == 'Darwin' && "$FORCE_LINUX" != 'true' ]]; then
# You can't use chained commands in execute
if [[ "$GITHUB_ACTIONS" == 'true' ]]; then
Expand All @@ -26,7 +26,7 @@ else # Linux
PRE_COMMANDS="cd \"$MOUNTED_DIR/build\""
# PRE_COMMANDS: Executed pre-cmake
# CMAKE_EXTRAS: Executed within and right before the cmake path (cmake CMAKE_EXTRAS ..)
[[ ! "$IMAGE_TAG" =~ 'unpinned' ]] && CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_TOOLCHAIN_FILE=\"$MOUNTED_DIR/.cicd/helpers/clang.make\""
[[ ! "$IMAGE_TAG" =~ 'unpinned' ]] && CMAKE_EXTRAS="$CMAKE_EXTRAS -DTPM2TSS_STATIC=\"On\" -DCMAKE_TOOLCHAIN_FILE=\"$MOUNTED_DIR/.cicd/helpers/clang.make\""
if [[ "$IMAGE_TAG" == 'amazon_linux-2-unpinned' ]]; then
CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER=\"clang++\" -DCMAKE_C_COMPILER=\"clang\""
elif [[ "$IMAGE_TAG" == 'centos-7.7-unpinned' ]]; then
Expand Down
6 changes: 3 additions & 3 deletions .cicd/generate-pipeline.sh
Original file line number Diff line number Diff line change
Expand Up @@ -361,8 +361,8 @@ EOF
skip: $(echo "$PLATFORM_JSON" | jq -r '.PLATFORM_SKIP_VAR | env[.] // empty')${SKIP_SERIAL_TESTS}

EOF
else
cat <<EOF
elif [[ "$TEST_NAME" != 'rodeos_test_eosvmoc' ]]; then
cat <<EOF
- label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
command:
- "git clone \$BUILDKITE_REPO eos && cd eos && $GIT_FETCH git checkout -f \$BUILDKITE_COMMIT && git submodule update --init --recursive"
Expand Down Expand Up @@ -658,7 +658,7 @@ EOF
agents:
queue: "$BUILDKITE_TEST_AGENT_QUEUE"
key: "ubuntu2004pb"
timeout: ${TIMEOUT:-10}
timeout: ${TIMEOUT:-20}
skip: ${SKIP_UBUNTU_20_04}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}

- label: ":ubuntu: Ubuntu 20.04 - Test Package"
Expand Down
12 changes: 10 additions & 2 deletions .cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,16 @@ RUN yum update -y && \
yum install -y which git sudo procps-ng util-linux autoconf automake \
libtool make bzip2 bzip2-devel openssl openssl-devel gmp-devel libstdc++ libcurl-devel \
libusbx-devel python3 python3-devel python-devel python-requests python3-requests libedit-devel doxygen \
graphviz patch gcc gcc-c++ vim-common jq postgresql-server postgresql-devel && \
graphviz patch gcc gcc-c++ vim-common jq postgresql-server postgresql-devel net-tools \
libuuid-devel libtasn1-devel expect socat libseccomp-devel && \
yum clean all && rm -rf /var/cache/yum
# install erlang and rabbitmq
RUN curl -s https://packagecloud.io/install/repositories/rabbitmq/erlang/script.rpm.sh | bash && \
yum install -y erlang
RUN curl -s https://packagecloud.io/install/repositories/rabbitmq/rabbitmq-server/script.rpm.sh | bash && \
yum install -y rabbitmq-server
# upgrade pip installation
RUN pip3 install --upgrade pip
# build cmake
RUN curl -LO https://github.com/Kitware/CMake/releases/download/v3.16.2/cmake-3.16.2.tar.gz && \
tar -xzf cmake-3.16.2.tar.gz && \
Expand Down Expand Up @@ -53,4 +61,4 @@ RUN bash -c '. ~/.bashrc; nvm install --lts=dubnium' && \
ln -s "/root/.nvm/versions/node/$(ls -p /root/.nvm/versions/node | sort -Vr | head -1)bin/node" /usr/local/bin/node && \
ln -s "/root/.nvm/versions/node/$(ls -p /root/.nvm/versions/node | sort -Vr | head -1)bin/npm" /usr/local/bin/npm
# setup Postgress
RUN su - postgres -c initdb
RUN su - postgres -c initdb
8 changes: 7 additions & 1 deletion .cicd/platforms/pinned/centos-7.7-pinned.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,16 @@ RUN yum update -y && \
yum --enablerepo=extras install -y which git autoconf automake libtool make bzip2 doxygen \
graphviz bzip2-devel openssl openssl-devel gmp-devel ocaml \
python python-devel python-requests rh-python36 file libusbx-devel \
libcurl-devel patch vim-common jq glibc-locale-source glibc-langpack-en postgresql-server postgresql-devel && \
libcurl-devel patch vim-common jq glibc-locale-source glibc-langpack-en postgresql-server postgresql-devel \
libuuid-devel libtasn1-devel expect socat libseccomp-devel iproute && \
yum clean all && rm -rf /var/cache/yum
# requests module. used by tests
RUN source /opt/rh/rh-python36/enable && python -m pip install requests
# install erlang and rabbitmq
RUN curl -s https://packagecloud.io/install/repositories/rabbitmq/erlang/script.rpm.sh | bash && \
yum install -y erlang
RUN curl -s https://packagecloud.io/install/repositories/rabbitmq/rabbitmq-server/script.rpm.sh | bash && \
yum install -y rabbitmq-server
# build cmake
RUN curl -LO https://github.com/Kitware/CMake/releases/download/v3.16.2/cmake-3.16.2.tar.gz && \
tar -xzf cmake-3.16.2.tar.gz && \
Expand Down
4 changes: 3 additions & 1 deletion .cicd/platforms/pinned/macos-10.15-pinned.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -eo pipefail
VERSION=1
export SDKROOT="$(xcrun --sdk macosx --show-sdk-path)"
brew update
brew install git cmake python libtool libusb graphviz automake wget gmp pkgconfig doxygen openssl jq postgres || :
brew install git cmake python libtool libusb graphviz automake wget gmp pkgconfig doxygen openssl jq postgres rabbitmq || :
pip3 install requests
# install clang from source
git clone --single-branch --branch llvmorg-10.0.0 https://github.com/llvm/llvm-project clang10
Expand All @@ -25,6 +25,8 @@ sudo rm -rf boost_1_72_0.tar.bz2 boost_1_72_0

# install nvm for ship_test
cd ~ && brew install nvm && mkdir -p ~/.nvm && echo "export NVM_DIR=$HOME/.nvm" >> ~/.bash_profile && echo 'source $(brew --prefix nvm)/nvm.sh' >> ~/.bash_profile && cat ~/.bash_profile && source ~/.bash_profile && echo $NVM_DIR && nvm install --lts=dubnium
# add sbin to path from rabbitmq-server
echo "export PATH=$PATH:/usr/local/sbin" >> ~/.bash_profile
# initialize postgres configuration files
sudo rm -rf /usr/local/var/postgres
initdb --locale=C -E UTF-8 /usr/local/var/postgres
4 changes: 3 additions & 1 deletion .cicd/platforms/pinned/macos-11-pinned.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -eo pipefail
VERSION=1
brew update
brew install git cmake python libtool libusb graphviz automake wget gmp pkgconfig doxygen openssl jq postgres || :
brew install git cmake python libtool libusb graphviz automake wget gmp pkgconfig doxygen openssl jq postgres rabbitmq || :
# install clang from source
git clone --single-branch --branch llvmorg-10.0.0 https://github.com/llvm/llvm-project clang10
mkdir clang10/build
Expand All @@ -23,6 +23,8 @@ sudo rm -rf boost_1_72_0.tar.bz2 boost_1_72_0

# install nvm for ship_test
cd ~ && brew install nvm && mkdir -p ~/.nvm && echo "export NVM_DIR=$HOME/.nvm" >> ~/.bash_profile && echo 'source $(brew --prefix nvm)/nvm.sh' >> ~/.bash_profile && cat ~/.bash_profile && source ~/.bash_profile && echo $NVM_DIR && nvm install --lts=dubnium
# add sbin to path from rabbitmq-server
echo "export PATH=$PATH:/usr/local/sbin" >> ~/.bash_profile
# initialize postgres configuration files
sudo rm -rf /usr/local/var/postgres
initdb --locale=C -E UTF-8 /usr/local/var/postgres
5 changes: 3 additions & 2 deletions .cicd/platforms/pinned/ubuntu-18.04-pinned.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ RUN apt-get update && \
autotools-dev python2.7 python2.7-dev python3 python3-pip python3-requests \
python3-dev python-configparser python-requests python-pip \
autoconf libtool g++ gcc curl zlib1g-dev sudo ruby libusb-1.0-0-dev\
libcurl4-gnutls-dev pkg-config patch vim-common jq libpq-dev postgresql postgresql-server-dev-all && \
libcurl4-gnutls-dev pkg-config patch vim-common jq libpq-dev postgresql postgresql-server-dev-all rabbitmq-server \
libtasn1-dev libnss3-dev iproute2 expect gawk socat python3-pip libseccomp-dev uuid-dev && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
# build cmake
Expand Down Expand Up @@ -60,4 +61,4 @@ RUN bash -c '. ~/.bashrc; nvm install --lts=dubnium' && \
RUN curl -sL https://deb.nodesource.com/setup_13.x | sudo -E bash -
RUN apt-get update && apt-get install -y nodejs && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
rm -rf /var/lib/apt/lists/*
2 changes: 1 addition & 1 deletion .cicd/platforms/pinned/ubuntu-20.04-pinned.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN apt-get update && \
autotools-dev python2.7 python2.7-dev python3 python3-pip python3-requests \
python3-dev python-configparser \
autoconf libtool g++ gcc curl zlib1g-dev sudo ruby libusb-1.0-0-dev \
libcurl4-gnutls-dev pkg-config patch vim-common jq gnupg libpq-dev postgresql postgresql-server-dev-all && \
libcurl4-gnutls-dev pkg-config patch vim-common jq gnupg libpq-dev postgresql postgresql-server-dev-all rabbitmq-server && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

Expand Down
8 changes: 7 additions & 1 deletion .cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ RUN yum update -y && \
libusbx-devel python3 python3-devel python-devel python-requests python3-requests libedit-devel doxygen \
graphviz clang patch llvm-devel llvm-static vim-common jq postgresql-server postgresql-devel && \
yum clean all && rm -rf /var/cache/yum
# install erlang and rabbitmq
RUN curl -s https://packagecloud.io/install/repositories/rabbitmq/erlang/script.rpm.sh | bash && \
yum install -y erlang
RUN curl -s https://packagecloud.io/install/repositories/rabbitmq/rabbitmq-server/script.rpm.sh | bash && \
yum install -y rabbitmq-server
# build cmake
RUN curl -LO https://github.com/Kitware/CMake/releases/download/v3.16.2/cmake-3.16.2.tar.gz && \
tar -xzf cmake-3.16.2.tar.gz && \
cd cmake-3.16.2 && \
Expand All @@ -32,4 +38,4 @@ RUN bash -c '. ~/.bashrc; nvm install --lts=dubnium' && \
ln -s "/root/.nvm/versions/node/$(ls -p /root/.nvm/versions/node | sort -Vr | head -1)bin/node" /usr/local/bin/node && \
ln -s "/root/.nvm/versions/node/$(ls -p /root/.nvm/versions/node | sort -Vr | head -1)bin/npm" /usr/local/bin/npm
# setup Postgress
RUN su - postgres -c initdb
RUN su - postgres -c initdb
7 changes: 6 additions & 1 deletion .cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ RUN yum update -y && \
yum clean all && rm -rf /var/cache/yum
# requests module. used by tests
RUN source /opt/rh/rh-python36/enable && python -m pip install requests
# install erlang and rabbitmq
RUN curl -s https://packagecloud.io/install/repositories/rabbitmq/erlang/script.rpm.sh | bash && \
yum install -y erlang
RUN curl -s https://packagecloud.io/install/repositories/rabbitmq/rabbitmq-server/script.rpm.sh | bash && \
yum install -y rabbitmq-server
# build cmake
RUN curl -LO https://github.com/Kitware/CMake/releases/download/v3.16.2/cmake-3.16.2.tar.gz && \
tar -xzf cmake-3.16.2.tar.gz && \
Expand Down Expand Up @@ -46,4 +51,4 @@ RUN yum install -y nodejs && \
yum clean all && rm -rf /var/cache/yum
# setup Postgress
RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8 && \
su - postgres -c initdb
su - postgres -c initdb
4 changes: 3 additions & 1 deletion .cicd/platforms/unpinned/macos-10.15-unpinned.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ set -eo pipefail
VERSION=1
export SDKROOT="$(xcrun --sdk macosx --show-sdk-path)"
brew update
brew install git cmake python libtool libusb graphviz automake wget gmp pkgconfig doxygen openssl jq boost postgres || :
brew install git cmake python libtool libusb graphviz automake wget gmp pkgconfig doxygen openssl jq boost postgres rabbitmq || :
pip3 install requests
# install nvm for ship_test
cd ~ && brew install nvm && mkdir -p ~/.nvm && echo "export NVM_DIR=$HOME/.nvm" >> ~/.bash_profile && echo 'source $(brew --prefix nvm)/nvm.sh' >> ~/.bash_profile && cat ~/.bash_profile && source ~/.bash_profile && echo $NVM_DIR && nvm install --lts=dubnium
# add sbin to path from rabbitmq-server
echo "export PATH=$PATH:/usr/local/sbin" >> ~/.bash_profile
# initialize postgres configuration files
sudo rm -rf /usr/local/var/postgres
initdb --locale=C -E UTF-8 /usr/local/var/postgres
4 changes: 3 additions & 1 deletion .cicd/platforms/unpinned/macos-11-unpinned.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ set -eo pipefail
VERSION=1
export SDKROOT="$(xcrun --sdk macosx --show-sdk-path)"
brew update
brew install git cmake python libtool libusb graphviz automake wget gmp pkgconfig doxygen openssl jq boost postgres || :
brew install git cmake python libtool libusb graphviz automake wget gmp pkgconfig doxygen openssl jq boost postgres rabbitmq || :
# install nvm for ship_test
cd ~ && brew install nvm && mkdir -p ~/.nvm && echo "export NVM_DIR=$HOME/.nvm" >> ~/.bash_profile && echo 'source $(brew --prefix nvm)/nvm.sh' >> ~/.bash_profile && cat ~/.bash_profile && source ~/.bash_profile && echo $NVM_DIR && nvm install --lts=dubnium
# add sbin to path from rabbitmq-server
echo "export PATH=$PATH:/usr/local/sbin" >> ~/.bash_profile
# initialize postgres configuration files
sudo rm -rf /usr/local/var/postgres
initdb --locale=C -E UTF-8 /usr/local/var/postgres
2 changes: 1 addition & 1 deletion .cicd/platforms/unpinned/ubuntu-18.04-unpinned.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN apt-get update && \
bzip2 automake libbz2-dev libssl-dev doxygen graphviz libgmp3-dev \
autotools-dev python2.7 python2.7-dev python3 python3-dev python3-pip python3-requests \
autoconf libtool curl zlib1g-dev sudo ruby libusb-1.0-0-dev \
libcurl4-gnutls-dev pkg-config patch llvm-7-dev clang-7 vim-common jq libpq-dev postgresql postgresql-server-dev-all && \
libcurl4-gnutls-dev pkg-config patch llvm-7-dev clang-7 vim-common jq libpq-dev postgresql postgresql-server-dev-all rabbitmq-server && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
# build cmake
Expand Down
2 changes: 1 addition & 1 deletion .cicd/platforms/unpinned/ubuntu-20.04-unpinned.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN apt-get update && \
bzip2 automake libbz2-dev libssl-dev doxygen graphviz libgmp3-dev \
autotools-dev python2.7 python2.7-dev python3 python3-dev python3-pip python3-requests \
autoconf libtool curl zlib1g-dev sudo ruby libusb-1.0-0-dev libpq-dev postgresql postgresql-server-dev-all \
libcurl4-gnutls-dev pkg-config patch llvm-7-dev clang-7 vim-common jq g++ gnupg && \
libcurl4-gnutls-dev pkg-config patch llvm-7-dev clang-7 vim-common jq g++ gnupg rabbitmq-server && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ moc_*
genesis.json
hardfork.hpp

libraries/utilities/git_revision.cpp
libraries/egenesis/egenesis_brief.cpp
libraries/egenesis/egenesis_full.cpp
libraries/egenesis/embed_genesis
Expand Down
6 changes: 5 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set( CMAKE_CXX_EXTENSIONS ON )
set( CXX_STANDARD_REQUIRED ON)

set(VERSION_MAJOR 2)
set(VERSION_MINOR 1)
set(VERSION_MINOR 2)
set(VERSION_PATCH 0)
set(VERSION_SUFFIX rc1)

Expand Down Expand Up @@ -126,7 +126,11 @@ else()
endif()
endif()

option(ENABLE_RODEOS "enable building rodeos" OFF)
option(ENABLE_TESTER "enable building eosio-tester" OFF)

option(EOSIO_ENABLE_DEVELOPER_OPTIONS "enable developer options for EOSIO" OFF)
option(EOSIO_REQUIRE_FULL_VALIDATION "remove runtime options allowing light validation" OFF)

# based on http://www.delorie.com/gnu/docs/gdb/gdb_70.html
# uncomment this line to tell GDB about macros (slows compile times)
Expand Down
15 changes: 9 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,8 @@ EOSIO currently supports the following operating systems:

1. Amazon Linux 2
2. CentOS 7
2. CentOS 7.x
4. Ubuntu 18.04
4. Ubuntu 20.04
5. MacOS 10.14 (Mojave)
6. MacOS 10.15 (Catalina)

---
Expand Down Expand Up @@ -85,8 +83,13 @@ brew remove eosio

#### Ubuntu 18.04 Package Install
```sh
wget https://github.com/eosio/eos/releases/download/v2.1.0-rc1/eosio_2.1.0-rc1-ubuntu-18.04_amd64.deb
sudo apt install ./eosio_2.1.0-rc1-ubuntu-18.04_amd64.deb
wget https://github.com/eosio/eos/releases/download/v2.2.0-rc1/eosio_2.2.0-rc1-ubuntu-18.04_amd64.deb
sudo apt install ./eosio_2.2.0-rc1-ubuntu-18.04_amd64.deb
```
#### Ubuntu 20.04 Package Install
```sh
wget https://github.com/eosio/eos/releases/download/v2.2.0-rc1/eosio_2.2.0-rc1-ubuntu-20.04_amd64.deb
sudo apt install ./eosio_2.2.0-rc1-ubuntu-20.04_amd64.deb
```
#### Ubuntu Package Uninstall
```sh
Expand All @@ -97,8 +100,8 @@ sudo apt remove eosio

#### RPM Package Install
```sh
wget https://github.com/eosio/eos/releases/download/v2.1.0-rc1/eosio-2.1.0-rc1.el7.x86_64.rpm
sudo yum install ./eosio-2.1.0-rc1.el7.x86_64.rpm
wget https://github.com/eosio/eos/releases/download/v2.2.0-rc1/eosio-2.2.0-rc1.el7.x86_64.rpm
sudo yum install ./eosio-2.2.0-rc1.el7.x86_64.rpm
```
#### RPM Package Uninstall
```sh
Expand Down
8 changes: 4 additions & 4 deletions docs/00_install/00_install-prebuilt-binaries.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ brew remove eosio

#### Ubuntu 18.04 Package Install
```sh
wget https://github.com/eosio/eos/releases/download/v2.1.0-rc1/eosio_2.1.0-rc1-ubuntu-18.04_amd64.deb
sudo apt install ./eosio_2.1.0-rc1-ubuntu-18.04_amd64.deb
wget https://github.com/eosio/eos/releases/download/v2.2.0-rc1/eosio_2.2.0-rc1-ubuntu-18.04_amd64.deb
sudo apt install ./eosio_2.2.0-rc1-ubuntu-18.04_amd64.deb
```
#### Ubuntu Package Uninstall
```sh
Expand All @@ -37,8 +37,8 @@ sudo apt remove eosio

#### RPM Package Install
```sh
wget https://github.com/eosio/eos/releases/download/v2.1.0-rc1/eosio-2.1.0-rc1.el7.x86_64.rpm
sudo yum install ./eosio-2.1.0-rc1.el7.x86_64.rpm
wget https://github.com/eosio/eos/releases/download/v2.2.0-rc1/eosio-2.2.0-rc1.el7.x86_64.rpm
sudo yum install ./eosio-2.2.0-rc1.el7.x86_64.rpm
```
#### RPM Package Uninstall
```sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ link_text: Local Single-Node Testnet With Consensus Protocol

## Goal

This section describes how to set up a single-node blockchain configuration running on a single host with [consensus protocol](https://developers.eos.io/welcome/latest/protocol/consensus_protocol) enabled. This is referred to as a _**single host, single-node testnet with consensus**_. We will set up one node on your local computer and have it produce blocks. The following diagram depicts the desired single host testnet.
This section describes how to set up a single-node blockchain configuration running on a single host with [consensus protocol](https://developers.eos.io/welcome/v2.2/protocol/consensus_protocol) enabled. This is referred to as a _**single host, single-node testnet with consensus**_. We will set up one node on your local computer and have it produce blocks. The following diagram depicts the desired single host testnet.

![Single host single node testnet](single-host-single-node-testnet.png)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ This is the go-to option for smart contract developers, aspiring Block Producers
While this option can technically be used for smart contract development, it may be overkill. This is most beneficial for those who are working on aspects of core development, such as benchmarking, optimization and experimentation. It's also a good option for hands-on learning and concept proofing.

* [Configure Nodeos as a Local Two-Node Testnet](20_local-multi-node-testnet.md)
* [Configure Nodeos as a Local 21-Node Testnet](https://developers.eos.io/welcome/latest/tutorials/bios-boot-sequence)
* [Configure Nodeos as a Local 21-Node Testnet](https://developers.eos.io/welcome/v2.2/tutorials/bios-boot-sequence)

## Official Testnet

Expand Down
2 changes: 1 addition & 1 deletion docs/01_nodeos/03_plugins/net_api_plugin/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The `net_api_plugin` provides four RPC API endpoints:
* connections
* status

See [Net API Reference Documentation](https://developers.eos.io/manuals/eos/latest/nodeos/plugins/net_api_plugin/api-reference/index).
See [Net API Reference Documentation](https://developers.eos.io/manuals/eos/v2.2/nodeos/plugins/net_api_plugin/api-reference/index).

[[caution | Caution]]
| This plugin exposes endpoints that allow management of p2p connections. Running this plugin on a publicly accessible node is not recommended as it can be exploited.
Expand Down
Loading