Skip to content

Commit 70f92f2

Browse files
committed
infrablockchain renaming - build scripts, docs, cmake, docker, chain bios scripts, INFRABLOCKCHAIN => InfraBlockchain in docs
1 parent ea19c8b commit 70f92f2

File tree

69 files changed

+2107
-2634
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+2107
-2634
lines changed

.buildkite/coverage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ steps:
44
/usr/bin/cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=clang++-4.0 -DCMAKE_C_COMPILER=clang-4.0 -DBOOST_ROOT="${BOOST_ROOT}" -DWASM_ROOT="${WASM_ROOT}" -DOPENSSL_ROOT_DIR="${OPENSSL_ROOT_DIR}" -DBUILD_MONGO_DB_PLUGIN=true -DENABLE_COVERAGE_TESTING=true -DBUILD_DOXYGEN=false && \
55
/usr/bin/ninja
66
echo "--- :spiral_note_pad: Generating Code Coverage Report" && \
7-
/usr/bin/ninja YOSEMITE_ut_coverage && \
7+
/usr/bin/ninja INFRABLOCKCHAIN_ut_coverage && \
88
echo "--- :arrow_up: Publishing Code Coverage Report" && \
9-
buildkite-agent artifact upload "YOSEMITE_ut_coverage/**/*" s3://eos-coverage/$BUILDKITE_JOB_ID && \
9+
buildkite-agent artifact upload "INFRABLOCKCHAIN_ut_coverage/**/*" s3://eos-coverage/$BUILDKITE_JOB_ID && \
1010
cp /config/.coveralls.yml . && \
1111
/usr/local/bin/coveralls-lcov EOSIO_ut_coverage_filtered.info && \
1212
echo "+++ View Report" && \

.buildkite/debug.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ steps:
33
echo "--- Creating symbolic link to job directory :file_folder:" && \
44
sleep 5 && ln -s "$(pwd)" /data/job && cd /data/job && \
55
echo "+++ Building :hammer:" && \
6-
echo 1 | ./yosemite_build.sh -o Debug && \
6+
echo 1 | ./infrablockchain_build.sh -o Debug && \
77
echo "--- Compressing build directory :compression:" && \
88
tar -pczf build.tar.gz build/
99
label: ":darwin: Build"
@@ -14,7 +14,7 @@ steps:
1414
1515
- command: |
1616
echo "+++ :hammer: Building" && \
17-
echo 1 | ./yosemite_build.sh -o Debug && \
17+
echo 1 | ./infrablockchain_build.sh -o Debug && \
1818
echo "--- :compression: Compressing build directory" && \
1919
tar -pczf build.tar.gz build/
2020
label: ":ubuntu: Build"
@@ -29,7 +29,7 @@ steps:
2929
3030
- command: |
3131
echo "+++ :hammer: Building" && \
32-
echo 1 | ./yosemite_build.sh -o Debug && \
32+
echo 1 | ./infrablockchain_build.sh -o Debug && \
3333
echo "--- :compression: Compressing build directory" && \
3434
tar -pczf build.tar.gz build/
3535
label: ":ubuntu: 18.04 Build"
@@ -44,7 +44,7 @@ steps:
4444
4545
- command: |
4646
echo "+++ :hammer: Building" && \
47-
echo 1 | ./yosemite_build.sh -o Debug && \
47+
echo 1 | ./infrablockchain_build.sh -o Debug && \
4848
echo "--- :compression: Compressing build directory" && \
4949
tar -pczf build.tar.gz build/
5050
label: ":fedora: Build"
@@ -59,7 +59,7 @@ steps:
5959
6060
- command: |
6161
echo "+++ :hammer: Building" && \
62-
echo 1 | ./yosemite_build.sh -o Debug && \
62+
echo 1 | ./infrablockchain_build.sh -o Debug && \
6363
echo "--- :compression: Compressing build directory" && \
6464
tar -pczf build.tar.gz build/
6565
label: ":centos: Build"
@@ -74,7 +74,7 @@ steps:
7474
7575
- command: |
7676
echo "+++ :hammer: Building" && \
77-
echo 1 | ./yosemite_build.sh -o Debug && \
77+
echo 1 | ./infrablockchain_build.sh -o Debug && \
7878
echo "--- :compression: Compressing build directory" && \
7979
tar -pczf build.tar.gz build/
8080
label: ":aws: Build"

.buildkite/long_running_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ steps:
33
echo "--- Creating symbolic link to job directory :file_folder:" && \
44
sleep 5 && ln -s "$(pwd)" /data/job && cd /data/job && \
55
echo "+++ Building :hammer:" && \
6-
echo 1 | ./yosemite_build.sh && \
6+
echo 1 | ./infrablockchain_build.sh && \
77
echo "--- Compressing build directory :compression:" && \
88
tar -pczf build.tar.gz build/
99
label: ":darwin: Build"

.buildkite/pipeline.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
steps:
22
- command: |
33
echo "+++ :hammer: Building" && \
4-
echo 1 | ./yosemite_build.sh && \
4+
echo 1 | ./infrablockchain_build.sh && \
55
echo "--- :compression: Compressing build directory" && \
66
tar -pczf build.tar.gz build/
77
label: ":ubuntu: 18.04 Build"
@@ -16,7 +16,7 @@ steps:
1616
timeout: 60
1717
- command: |
1818
echo "+++ :hammer: Building" && \
19-
echo 1 | ./yosemite_build.sh && \
19+
echo 1 | ./infrablockchain_build.sh && \
2020
echo "--- :compression: Compressing build directory" && \
2121
tar -pczf build.tar.gz build/
2222
label: ":centos: Build"

.gitignore

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ var/lib/node_*
8585
*.iws
8686
.DS_Store
8787

88-
yosemite_config/config_yosemite_testnet_boot_local.ini
89-
yosemite_bios/reset_yosemite_testnet_on_local.sh
90-
yosemite_bios/reset_std_token_yosemite_testnet_on_local.sh
91-
yosemite_bios/stop_yosemite_testnet_node_local.sh
92-
yosemite_bios/start_yosemite_testnet_node_local.sh
93-
yosemite_bios/clean_data_yosemite_testnet_on_local.sh
88+
infrablockchain_config/config_infrablockchain_testnet_boot_local.ini
89+
infrablockchain_bios/reset_infrablockchain_testnet_on_local.sh
90+
infrablockchain_bios/reset_std_token_infrablockchain_testnet_on_local.sh
91+
infrablockchain_bios/stop_infrablockchain_testnet_node_local.sh
92+
infrablockchain_bios/start_infrablockchain_testnet_node_local.sh
93+
infrablockchain_bios/clean_data_infrablockchain_testnet_on_local.sh

CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
cmake_minimum_required( VERSION 3.5 )
22

3-
project( YOSEMITE )
3+
project( InfraBlockchain )
44

55
enable_testing()
66

7-
set( REPRESENTATIVE_INSTALL_NAME yosemite )
7+
set( REPRESENTATIVE_INSTALL_NAME infrablockchain )
88

99
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
1010
message(WARNING "CMAKE_INSTALL_PREFIX is set to default path of ${CMAKE_INSTALL_PREFIX}, resetting to ${CMAKE_INSTALL_PREFIX}/${REPRESENTATIVE_INSTALL_NAME}")
@@ -30,7 +30,7 @@ include( SetupTargetMacros )
3030
include( InstallDirectoryPermissions )
3131
include( MASSigning )
3232

33-
set( BLOCKCHAIN_NAME "YOSEMITE" )
33+
set( BLOCKCHAIN_NAME "InfraBlockchain" )
3434
set( CMAKE_CXX_STANDARD 14 )
3535
set( CMAKE_CXX_EXTENSIONS ON )
3636
set( CXX_STANDARD_REQUIRED ON)
@@ -242,14 +242,14 @@ if ("${INFRABLOCKCHAIN_NATIVE_TOKEN_PRECISION}" STREQUAL "")
242242
set(INFRABLOCKCHAIN_NATIVE_TOKEN_PRECISION "4")
243243
endif()
244244

245-
message( STATUS "Using S(${INFRABLOCKCHAIN_NATIVE_TOKEN_PRECISION},${INFRABLOCKCHAIN_NATIVE_TOKEN_SYMBOL_NAME}) as YOSEMITE Native Token Symbol" )
245+
message( STATUS "Using S(${INFRABLOCKCHAIN_NATIVE_TOKEN_PRECISION},${INFRABLOCKCHAIN_NATIVE_TOKEN_SYMBOL_NAME}) as InfraBlockchain Native Token Symbol" )
246246

247247

248248
if ("${EOSIO_ROOT_KEY}" STREQUAL "")
249249
set(EOSIO_ROOT_KEY "EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV")
250250
endif()
251251

252-
message( STATUS "Using '${EOSIO_ROOT_KEY}' as public key for 'yosemite' account" )
252+
message( STATUS "Using '${EOSIO_ROOT_KEY}' as public key for 'infrasys' account" )
253253

254254
include(wasm)
255255
add_subdirectory( libraries )

CMakeModules/installer.cmake

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
include(InstallRequiredSystemLibraries)
22

3-
set(CPACK_PACKAGE_CONTACT "contact@yosemiteX.com")
3+
set(CPACK_PACKAGE_CONTACT "contact@infrablockchain.com")
44
set(CPACK_OUTPUT_FILE_PREFIX ${CMAKE_BINARY_DIR}/packages)
55
if(NOT DEFINED CMAKE_INSTALL_PREFIX)
66
set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install)
77
endif()
88

99
SET(CPACK_PACKAGE_DIRECTORY "${CMAKE_BINARY_DIR}/install")
10-
set(CPACK_PACKAGE_NAME "YOSEMITE")
11-
set(CPACK_PACKAGE_VENDOR "Yosemite X Inc.")
10+
set(CPACK_PACKAGE_NAME "InfraBlockchain")
11+
set(CPACK_PACKAGE_VENDOR "Blockchain Labs Inc.")
1212
set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
1313
set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
1414
set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
1515
set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
16-
set(CPACK_PACKAGE_DESCRIPTION "Software for the YOSEMITE Public Blockchain")
17-
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Software for the YOSEMITE Public Blockchain")
16+
set(CPACK_PACKAGE_DESCRIPTION "Software for the InfraBlockchain")
17+
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Software for the InfraBlockchain")
1818
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
19-
set(CPACK_PACKAGE_INSTALL_DIRECTORY "YOSEMITE ${CPACK_PACKAGE_VERSION}")
19+
set(CPACK_PACKAGE_INSTALL_DIRECTORY "InfraBlockchain ${CPACK_PACKAGE_VERSION}")
2020

2121
if(WIN32)
2222
set(CPACK_GENERATOR "ZIP;NSIS")
2323
set(CPACK_NSIS_EXECUTABLES_DIRECTORY .)
24-
set(CPACK_NSIS_PACKAGE_NAME "YOSEMITE v${CPACK_PACKAGE_VERSION}")
24+
set(CPACK_NSIS_PACKAGE_NAME "InfraBlockchain v${CPACK_PACKAGE_VERSION}")
2525
set(CPACK_NSIS_DISPLAY_NAME "${CPACK_NSIS_PACKAGE_NAME}")
26-
set(CPACK_NSIS_DEFINES " !define MUI_STARTMENUPAGE_DEFAULTFOLDER \\\"YOSEMITE\\\"")
26+
set(CPACK_NSIS_DEFINES " !define MUI_STARTMENUPAGE_DEFAULTFOLDER \\\"InfraBlockchain\\\"")
2727
# windows zip files usually don't have a single directory inside them, unix tgz usually do
2828
set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
2929
elseif(APPLE)
@@ -41,7 +41,7 @@ else()
4141
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
4242
set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY TRUE)
4343
set(CPACK_DEBIAN_PACKAGE_CONTROL_STRICT_PERMISSION TRUE)
44-
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/YosemiteLabs/yosemite-public-blockchain")
44+
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/YosemiteLabs/infrablockchain")
4545
endif()
4646

4747
include(CPack)

Docker/Dockerfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ ARG branch=master
33
ARG native_token_symbol=DUSD
44
ARG native_token_precision=4
55

6-
RUN git clone -b $branch https://github.com/YosemiteLabs/yosemite-public-blockchain.git --recursive \
7-
&& cd yosemite-public-blockchain && echo "$branch:$(git rev-parse HEAD)" > /etc/yosemite-version \
6+
RUN git clone -b $branch https://github.com/YosemiteLabs/infrablockchain.git --recursive \
7+
&& cd infrablockchain && echo "$branch:$(git rev-parse HEAD)" > /etc/infrablockchain-version \
88
&& cmake -H. -B"/tmp/build" -GNinja -DCMAKE_BUILD_TYPE=Release -DWASM_ROOT=/opt/wasm -DCMAKE_CXX_COMPILER=clang++ \
99
-DCMAKE_C_COMPILER=clang -DCMAKE_INSTALL_PREFIX=/tmp/build -DBUILD_MONGO_DB_PLUGIN=true \
1010
-DINFRABLOCKCHAIN_NATIVE_TOKEN_SYMBOL_NAME=$native_token_symbol -DINFRABLOCKCHAIN_NATIVE_TOKEN_PRECISION=$native_token_precision \
@@ -14,13 +14,13 @@ FROM ubuntu:18.04
1414

1515
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install openssl ca-certificates && rm -rf /var/lib/apt/lists/*
1616
COPY --from=builder /usr/local/lib/* /usr/local/lib/
17-
COPY --from=builder /tmp/build/bin /opt/yosemite/bin
17+
COPY --from=builder /tmp/build/bin /opt/infrablockchain/bin
1818
COPY --from=builder /tmp/build/contracts /contracts
19-
COPY --from=builder /yosemite-public-blockchain/Docker/config.ini /
20-
COPY --from=builder /etc/yosemite-version /etc
21-
COPY --from=builder /yosemite-public-blockchain/Docker/yosemited.sh /opt/yosemite/bin/yosemited.sh
22-
ENV EOSIO_ROOT=/opt/yosemite
23-
ENV YOSEMITE_ROOT=/opt/yosemite
24-
RUN chmod +x /opt/yosemite/bin/yosemited.sh
19+
COPY --from=builder /infrablockchain/Docker/config.ini /
20+
COPY --from=builder /etc/infrablockchain-version /etc
21+
COPY --from=builder /infrablockchain/Docker/infra-node.sh /opt/infrablockchain/bin/infra-node.sh
22+
ENV EOSIO_ROOT=/opt/infrablockchain
23+
ENV INFRABLOCKCHAIN_ROOT=/opt/infrablockchain
24+
RUN chmod +x /opt/infrablockchain/bin/infra-node.sh
2525
ENV LD_LIBRARY_PATH /usr/local/lib
26-
ENV PATH /opt/yosemite/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
26+
ENV PATH /opt/infrablockchain/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

Docker/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Run in docker
22

3-
Simple and fast setup of YOSEMITE on Docker is also available.
3+
Simple and fast setup of InfraBlockchain on Docker is also available.
44

55
## Install Dependencies
66

@@ -12,11 +12,11 @@ Simple and fast setup of YOSEMITE on Docker is also available.
1212
- At least 7GB RAM (Docker -> Preferences -> Advanced -> Memory -> 7GB or above)
1313
- If the build below fails, make sure you've adjusted Docker Memory settings and try again.
1414

15-
## Build yosemite image
15+
## Build infrablockchain image
1616

1717
```bash
18-
git clone https://github.com/YosemiteLabs/yosemite-public-blockchain --recursive --depth 1
19-
cd yosemite-public-blockchain/Docker
18+
git clone https://github.com/YosemiteLabs/infrablockchain --recursive --depth 1
19+
cd infrablockchain/Docker
2020
docker build . -t yosemitex/yosemite
2121
```
2222

Docker/config.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ p2p-listen-endpoint = 0.0.0.0:9876
8787
p2p-max-nodes-per-host = 1
8888

8989
# The name supplied to identify this node amongst the peers. (eosio::net_plugin)
90-
agent-name = "YOSEMITE Test Agent"
90+
agent-name = "InfraBlockchain Test Agent"
9191

9292
# Can be 'any' or 'producers' or 'specified' or 'none'. If 'specified', peer-key must be specified at least once. If only 'producers', peer-key is not required. 'producers' and 'specified' may be combined. (eosio::net_plugin)
9393
allowed-connection = any
@@ -124,20 +124,20 @@ max-irreversible-block-age = -1
124124

125125
# ID of producer controlled by this node (e.g. inita; may specify multiple times) (eosio::producer_plugin)
126126
# producer-name =
127-
producer-name = yosemite
127+
producer-name = infrasys
128128

129129
# (DEPRECATED - Use signature-provider instead) Tuple of [public key, WIF private key] (may specify multiple times) (eosio::producer_plugin)
130130
# private-key =
131131

132132
# Key=Value pairs in the form <public-key>=<provider-spec>
133133
# Where:
134-
# <public-key> is a string form of a vaild YOSEMITE public key
134+
# <public-key> is a string form of a vaild InfraBlockchain public key
135135
#
136136
# <provider-spec> is a string in the form <provider-type>:<data>
137137
#
138138
# <provider-type> is KEY, or KEYSTORE
139139
#
140-
# KEY:<data> is a string form of a valid YOSEMITE private key which maps to the provided public key
140+
# KEY:<data> is a string form of a valid InfraBlockchain private key which maps to the provided public key
141141
#
142142
# KEYSTORE:<data> is the URL where infra-keystore is available and the appropriate wallet(s) are unlocked (eosio::producer_plugin)
143143
signature-provider = YOS7qFXz5bvLYphF8S8XXTYgExnN2hXRBSMHTXs8oartApBx5upR3=KEY:YPV_5J7MF5bWVzjLczmVFMwiRjD5TVBG1o8UELy4jkaikXETbaMHZSb

0 commit comments

Comments
 (0)