Merge pull request #10657 from EOSIO/huangminghuang/merge-2.2.x

merge changes from 2.2.x into develop
EOSIO · Aug 30, 2021 · d42cb43 · d42cb43
2 parents 55907f1 + 7a56aea
commit d42cb43
Show file tree

Hide file tree

Showing 160 changed files with 6,723 additions and 2,107 deletions.
diff --git a/.cicd/build.sh b/.cicd/build.sh
@@ -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
@@ -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

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
@@ -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"
@@ -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"

diff --git a/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile b/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile
@@ -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 && \
@@ -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
diff --git a/.cicd/platforms/pinned/centos-7.7-pinned.dockerfile b/.cicd/platforms/pinned/centos-7.7-pinned.dockerfile
@@ -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 && \

diff --git a/.cicd/platforms/pinned/macos-10.15-pinned.sh b/.cicd/platforms/pinned/macos-10.15-pinned.sh
@@ -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
@@ -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
diff --git a/.cicd/platforms/pinned/macos-11-pinned.sh b/.cicd/platforms/pinned/macos-11-pinned.sh
@@ -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
@@ -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
diff --git a/.cicd/platforms/pinned/ubuntu-18.04-pinned.dockerfile b/.cicd/platforms/pinned/ubuntu-18.04-pinned.dockerfile
@@ -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
@@ -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/*
diff --git a/.cicd/platforms/pinned/ubuntu-20.04-pinned.dockerfile b/.cicd/platforms/pinned/ubuntu-20.04-pinned.dockerfile
@@ -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/*
 

diff --git a/.cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile b/.cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile
@@ -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 && \
@@ -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
diff --git a/.cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile b/.cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile
@@ -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 && \
@@ -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
diff --git a/.cicd/platforms/unpinned/macos-10.15-unpinned.sh b/.cicd/platforms/unpinned/macos-10.15-unpinned.sh
@@ -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
diff --git a/.cicd/platforms/unpinned/macos-11-unpinned.sh b/.cicd/platforms/unpinned/macos-11-unpinned.sh
@@ -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
diff --git a/.cicd/platforms/unpinned/ubuntu-18.04-unpinned.dockerfile b/.cicd/platforms/unpinned/ubuntu-18.04-unpinned.dockerfile
@@ -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

diff --git a/.cicd/platforms/unpinned/ubuntu-20.04-unpinned.dockerfile b/.cicd/platforms/unpinned/ubuntu-20.04-unpinned.dockerfile
@@ -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/*
 

diff --git a/.gitignore b/.gitignore
@@ -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

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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)
 
@@ -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)

diff --git a/README.md b/README.md
@@ -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)
 
 ---
@@ -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
@@ -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

diff --git a/docs/00_install/00_install-prebuilt-binaries.md b/docs/00_install/00_install-prebuilt-binaries.md
@@ -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
@@ -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

diff --git a/...s/02_usage/03_development-environment/10_local-single-node-testnet-consensus.md b/...s/02_usage/03_development-environment/10_local-single-node-testnet-consensus.md
@@ -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)
 

diff --git a/docs/01_nodeos/02_usage/03_development-environment/index.md b/docs/01_nodeos/02_usage/03_development-environment/index.md
@@ -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
 

diff --git a/docs/01_nodeos/03_plugins/net_api_plugin/index.md b/docs/01_nodeos/03_plugins/net_api_plugin/index.md
@@ -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.