Skip to content

Commit

Permalink
Release/2.0.x (#47)
Browse files Browse the repository at this point in the history
* Remove unnecessary conversion of contractPath to empty path

* enhance cleos multisig review to show proposed transaction ID and optionally show requested approvals EOSIO#6272

* add cleos multisig invalidate command to call eosio.msig::invalidate

* state history plugin

* fix GMP & secp256 linker order for EosioTesterBuild.cmake.in

This is the same fix from pr EOSIO#6268 but for EosioTesterBuild.cmake.in too

* state history plugin

* bump version to 1.5.0-rc1

* Update README to reflect new package names

* Change from 1.5.0 to 1.5.0-rc1

* Fix requires in spec file to resolve dependency resolution issues with rpms

* Fix requires in spec file to resolve dependency resolution issues with rpms

* Remove unneeded req_trx vector

* Remove needless copy of signed_block. Only create pending_notify if needed.

* Remove unused blk_buffer

* separate out version suffix so that RPM packages produce an acceptable specfile

* address PR review feedback

* Make signed_block copy constructor private to avoid accidental copies.

* add release suffix to doxygen cmake module

* move signed_block instead of making copy

* Avoid copy constructor for push_block

* add release suffix to EOSIO_VERSION in tester cmake modules

* Add which comment

* Update tests for private signed_block copy constructor

* Avoid making copies of signed_block

* export the new bash vars

* Use rvalue for signed_block

* Update buildkite pipeline to use new queues

* Update buildkite pipeline to use new queues

* Special case msg_handler visit of signed_block to avoid hidden move from net_message

* pass along trigger_send

* Use move for rvalue

* Added Mongo History API link

* Added ZMQ Light History API

* Added Chintai ZMQ Watcher

* Added State History API

* Stop the unix_server from listening in shutdown stage as well.

* bump version to rc2

* update rpm names to match the real files

* Fix deb package names in README

* Fix package naming scheme for debs

* Update LICENSE path

* add a test that reduces the size of the producer set to validate that it does not create protocol level issues

* promote rc2 to release

* add missing release to deb packages

* remove x86_64 arch dep specification on AMI2 build script

I can't find any reason we need to explcitly request the x86_64 versions of packages for AMI2. Removing this apparently extraneous specification makes the build script "just work" on new ARM8 instances

* Use 64-bit float printing of 128-bit floats on non x86_64

For platforms other then x86_64, have the 128-bit float console print API (printqf()) convert to a 64-bit float before printing. While this loses precision it’s enough to get the unit tests for printqf() working on ARM8, which actually was the only unit_test unit test that failed on that platform.

* prebump to 1.6.0 and add develop suffix

* Do not broadcast block if peer lib is larger than block number

* Provide more efficient sha256_less

* Simply by removing unused large_msg_notify

* Remove unused node_transaction_state.packed_txn

* Store serialized transaction as shared_ptr to minimize copies

* Not possible for serialized_txn to be empty

* Remove find_plugin overhead

* Minimize shared_ptr copies

* Use sha256_less for all sets/maps with ids

* Add explicit constructors

* Add accept_transaction that takes a packed_transaction_ptr to avoid copy

* Pass id and packed_transaction by const& since never moved

* Remove copy assignment operator. Remove used std::move.

* Minimize packed_transaction copies. Store packed_transaction_ptr in transaction_metadata.

* Cache chain_plugin lookup

* Update tester for transaction_metadata packed_transaction_ptr

* Remove packed_tansaction to net_message copy

* Remove unused constructor

* Explicitly disable copy/move construction

* Remove inflight update of node_transaction_state as it is not needed

* Remove connections for unused signals that only logged

* Fix sync check for lib

* add a test that verifies proposing an empty producer schedule does not break things

* Allow disablement of net_plugin's listen socket

Disable net_plugin's listen socket when p2p-listen-endpoint is empty. This is useful for security and for an easier way of running multiple nodeos without it conflicting when you don't actually need to service incoming connections.

* More descriptive memo to distinguish from other transfers

* Revert "Fix sync check for lib"

This reverts commit 52a6f19.

* Update the bios-boot-tutorial.py script and readme.md:
1. args.contracts_dir doesn't end in a forward slash, therefor when it is concatenated with a subpath, the subpath has to start with a forward slash; this pattern is present in other similar variables as well
2. system contract has to be initialized before it can be used (e.g. creating staked acconts)
3. commands list updated to include the new addition stepInitSystemContract
4. readme.md updated as well to reflect the current status of the script and requirements

* README.md refactored
- correcting spelling errors, and caps
- better bash commands
- simpler command line to launch the script
- improved prerequisites
- include steps to follow after prerequisites

* Correct typos

* Correct link format

* Add eosio.cdt steps

* merge v1.0.2 (#12)

* boscore basic improvement (#2)

* kafka_plugin code

* Automatic installation librdkafka/cppkafka

* Feature/ci

* Feature/48 kafka plugin

* add CMakeModules/FindCppkafka.cmake

* Production of block in time zone sequence

* P2p self discovery

* P2p self discovery

* add notify_plugin

* add api "get_block_detail"

* add free res limit and blklst code

* update free res limit and blklst code

* update res code

* update unittest code

* revert submodule version

* code typo

* update  blklist code

* update sync name list db object error code

* update  code

* update  index code

* Feature/5 ramdom

* Revert "Merge branch 'feature/5-ramdom' into 'develop'"

This reverts merge request !8

* adjust for setup BOSCore

* change description

* adjust the kafka plugin dependency be more special

* use boscore repository to improve security

* change version tag

* finish for docker/builder

* pass to build docker and update readme

* add actionseed, global action sequence (#5)

* delete renamed old file

* BOSCore v1.0.1-1.4.3

* restructure the version schema

* fix __gmpn_set_str error when build bos.contract

* prepare for the v1.0.1

* finish BOS basic functions

* add README files

* update info

* Release/1.0.x (#11)

* boscore basic improvement (#2)

* kafka_plugin code

* Automatic installation librdkafka/cppkafka

* Feature/ci

* Feature/48 kafka plugin

* add CMakeModules/FindCppkafka.cmake

* Production of block in time zone sequence

* P2p self discovery

* P2p self discovery

* add notify_plugin

* add api "get_block_detail"

* add free res limit and blklst code

* update free res limit and blklst code

* update res code

* update unittest code

* revert submodule version

* code typo

* update  blklist code

* update sync name list db object error code

* update  code

* update  index code

* Feature/5 ramdom

* Revert "Merge branch 'feature/5-ramdom' into 'develop'"

This reverts merge request !8

* adjust for setup BOSCore

* change description

* adjust the kafka plugin dependency be more special

* use boscore repository to improve security

* change version tag

* finish for docker/builder

* pass to build docker and update readme

* add actionseed, global action sequence (#5)

* delete renamed old file

* BOSCore v1.0.1-1.4.3

* restructure the version schema

* fix __gmpn_set_str error when build bos.contract

* prepare for the v1.0.1

* add README files

* update info

* readme for kafka & add time for action (#5)

* 重启 节点,黑名单 失效,fixes #7 (#8)

* restart sync list db

* recovery system account bos to eosio

* recovery system account bos to eosio

* recovery system account bos to eosio

* Fix/#3 notify plugin (#10)

* Add debug info

* comment log

* rm log for notify_plugin

* prepare for v1.0.2

* Better name for eosio contracts directory

* dummy checkin to trigger another build

* Added scrit to support recursive search for files with FC_REFLECT or FC_REFLECT_ENUM to verify order and completeness.  Supports comments with @swap to support different order from definition and @ignore to ignore a specific field for reflection.  Still need to support FC_REFLECT_DERIVED. GH EOSIO#3127

* Added @ignore comment for field that is left out of reflect definition. GH EOSIO#3127

* Fixed pull request comments.

* bump version to 1.5.1

* Consolidated Security Fixes for 1.5.1

- Only allow authorizations that are satisfiable by `eosio.code` for self-addressed deferred transactions
- Only allow authorizations that are satisfiable by `eosio.code` OR on the parent action for self-addressed inline actions sent from direct actions
- Only allow authorizations that are satisfiable by `eosio.code` for self-addressed inline actions sent from recipient handlers

Co-authored-by: arhag <[email protected]>
Co-authored-by: Bart Wyatt <[email protected]>

* Peer review changes. Fix move.

* Spelling correction

* Spelling correction #2

* Remove unused max-implicit-request config

* Switch interface from packed_transaction_ptr to transaction_metadata_ptr

* Thread pool does not need to be optional

* Add transaction_metadata create_signing_keys_future method

* Start transaction signature earily in thread pool

* Refactor packed_transaction for better encapsulation

* Add transaction_metadata create_signing_keys_future method

* Start transaction signature earily in thread pool

* Update txn_test_gen_plugin to overlap transaction submit @taokayan

* release v1.0.3 to master (#15)

* boscore basic improvement (#2)

* kafka_plugin code

* Automatic installation librdkafka/cppkafka

* Feature/ci

* Feature/48 kafka plugin

* add CMakeModules/FindCppkafka.cmake

* Production of block in time zone sequence

* P2p self discovery

* P2p self discovery

* add notify_plugin

* add api "get_block_detail"

* add free res limit and blklst code

* update free res limit and blklst code

* update res code

* update unittest code

* revert submodule version

* code typo

* update  blklist code

* update sync name list db object error code

* update  code

* update  index code

* Feature/5 ramdom

* Revert "Merge branch 'feature/5-ramdom' into 'develop'"

This reverts merge request !8

* adjust for setup BOSCore

* change description

* adjust the kafka plugin dependency be more special

* use boscore repository to improve security

* change version tag

* finish for docker/builder

* pass to build docker and update readme

* add actionseed, global action sequence (#5)

* delete renamed old file

* BOSCore v1.0.1-1.4.3

* restructure the version schema

* fix __gmpn_set_str error when build bos.contract

* prepare for the v1.0.1

* finish BOS basic functions

* add README files

* update info

* Release/1.0.x (#11)

* boscore basic improvement (#2)

* kafka_plugin code

* Automatic installation librdkafka/cppkafka

* Feature/ci

* Feature/48 kafka plugin

* add CMakeModules/FindCppkafka.cmake

* Production of block in time zone sequence

* P2p self discovery

* P2p self discovery

* add notify_plugin

* add api "get_block_detail"

* add free res limit and blklst code

* update free res limit and blklst code

* update res code

* update unittest code

* revert submodule version

* code typo

* update  blklist code

* update sync name list db object error code

* update  code

* update  index code

* Feature/5 ramdom

* Revert "Merge branch 'feature/5-ramdom' into 'develop'"

This reverts merge request !8

* adjust for setup BOSCore

* change description

* adjust the kafka plugin dependency be more special

* use boscore repository to improve security

* change version tag

* finish for docker/builder

* pass to build docker and update readme

* add actionseed, global action sequence (#5)

* delete renamed old file

* BOSCore v1.0.1-1.4.3

* restructure the version schema

* fix __gmpn_set_str error when build bos.contract

* prepare for the v1.0.1

* add README files

* update info

* readme for kafka & add time for action (#5)

* 重启 节点,黑名单 失效,fixes #7 (#8)

* restart sync list db

* recovery system account bos to eosio

* recovery system account bos to eosio

* recovery system account bos to eosio

* Fix/#3 notify plugin (#10)

* Add debug info

* comment log

* rm log for notify_plugin

* prepare for v1.0.2

* merge v1.0.2 (#13)

* boscore basic improvement (#2)

* kafka_plugin code

* Automatic installation librdkafka/cppkafka

* Feature/ci

* Feature/48 kafka plugin

* add CMakeModules/FindCppkafka.cmake

* Production of block in time zone sequence

* P2p self discovery

* P2p self discovery

* add notify_plugin

* add api "get_block_detail"

* add free res limit and blklst code

* update free res limit and blklst code

* update res code

* update unittest code

* revert submodule version

* code typo

* update  blklist code

* update sync name list db object error code

* update  code

* update  index code

* Feature/5 ramdom

* Revert "Merge branch 'feature/5-ramdom' into 'develop'"

This reverts merge request !8

* adjust for setup BOSCore

* change description

* adjust the kafka plugin dependency be more special

* use boscore repository to improve security

* change version tag

* finish for docker/builder

* pass to build docker and update readme

* add actionseed, global action sequence (#5)

* delete renamed old file

* BOSCore v1.0.1-1.4.3

* restructure the version schema

* fix __gmpn_set_str error when build bos.contract

* prepare for the v1.0.1

* add README files

* update info

* prepare for v1.0.2

* patch the EOSIO 1.5.1 security bug fixes

* prepare for v1.0.3

* adjust the slogon

* Remove redundant signing_keys check

* state history plugin: permission_object bug EOSIO#6495

* Add deadline to key recovery

* Modify producer_plugin to have its own thead_pool instead of using chain-threads

* Move thread_pool join/stop to plugin shutdown so that they are joined before application quit

* Fix signature future deadline from starting too early

* Fix overflow of deadline and deadline check

* initial setup of billing CPU for signatures recovered earlier

* Return 400 on get_block with uonexist block number.
For issue 6374

* fix issue 5488

* Add action_trace.block_num index. Remove action_trace.trx_id index.

* Fix return codes of build scripts so that buildkite can fail properly

* Make recovery cache non-thread local and guard by mutex

* Calculate cpu usage of signature recovery

* Add signature-cpu-billable-pct option to chain_plugin

* Add missing include of mutex

* Assert signature-cpu-billable-pct is 0-100

* Fix capture of cpu_usage. move flat_set<public_key_type> into attribute

* clear recovered_pub_keys to preserve previous behaviour

* use `assign` instead of `resize`+`memcpy` to update `shared_blob` data

Co-Authored-By: Kayan <[email protected]>

* Add move into tuple creation

* bump version to 1.6.0-rc1

* add explicitly defaulted move semantics

* Store unpacked_trx as signed_transaction

* get_uncached_id no longer needed for thread safety

* get_raw_transaction no longer needed for thread safety

* Remove cached signed_transaction since now cached in packed_transaction

* Test should honor existing compression

* Cleanup of packed_transaction interface. Fixes for comments on PR EOSIO#6471

* Update to fc with unpack verify

* fc renamed reflector_verify to reflector_init

* bump version to 1.5.2

* Update to latest fc with updated verify_init

* Consolidated Security Fixes for 1.5.3

- Add missing implementation of dtor, copy ctor, etc for blob_types of fc::variant

Co-Authored-By: Matt Witherspoon <[email protected]>

* bump version to 1.5.3

* bump version to 1.6.0-rc2

* Consolidated Security Fixes for 1.6.0-rc2

- Add missing implementation of dtor, copy ctor, etc for blob_types of fc::variant

Co-Authored-By: Matt Witherspoon <[email protected]>

* update developer portal link

update the getting started link to the latest version

* prepare for 2.0.1

* adjust the location paramater

* apply 1.5.3 patch

* modify the location type

* fix cmake error

* Use https url for wabt submodule

A user agent that doesn't respect hsts could potentially be coerced into downloading malicious sources for wabt via a mitm attack. Prevent this by using a https upstream like the other submodules already do

* Add libtinfo5 dependency to deb package. Resolves EOSIO#6590

Also clean up unused variables and force control directory permissions
to comply with Debian specifications regardless of umask.

* fix aragument name error

* merge v2.0.1 version (#36)

* Bump version to 1.6.0

* Consolidated Security Fixes for 1.6.0

- Force compilation support for c++ exceptions for the wabt submodule
- Allow limiting the time a node will spend processing scheduled transactions

Co-Authored-By: Matt Witherspoon <[email protected]>
Co-Authored-By: Bart Wyatt <[email protected]>

* Consolidated Security Fixes for 1.6.1

- net_plugin security fixes
- Additional checktime calls to limit cpu usage
- Limit memory usage in producer_plugin

Co-Authored-By: Kevin Heifner <[email protected]>
Co-Authored-By: Matt Witherspoon <[email protected]>
Co-authored-by: Kayan <[email protected]>

* Bump version to 1.6.1

* Fix boost 1.67 brew install

The latest homebrew code balks at something in the old 1.67 package file. Fix the package file and store it locally in our repo for now.

We try and pin the boost version because boost upgrades invalidate nodeos data files.

* Set proper directory for baked in macOS LLVM_DIR

Some users (including myself) were seeing llvm@4 unpacked to 4.0.1_1 instead of 4.0.1. Stuff unpacked to the Cellar directory appears to be a kind of implementation detail — /usr/local/opt is the proper place to reference here.

* Add bk step to gather brew files for automatic update

* Update version to 1.6.2

* add noninteractive option for build scripts

* Limit assert message to 1024 chars

* Don't unlink what we install via brew

unlinking eveything we install makes no sense -- it means things like cmake aren't in the path any longer like the script expects. So don't do that any more. Unfortuately this old script requires that gettext be force linked. So implement that behavior explictly for now

* Make sure python-devel is installed for amazon linux builds

* fc version 1.6.x

* merge missed code

* merge missed code

* merge missed code

* prepare v2.0.2
  • Loading branch information
vlbos authored and Vardhamana committed Feb 28, 2019
1 parent 2f26403 commit 7342e06
Show file tree
Hide file tree
Showing 328 changed files with 6,825 additions and 60,899 deletions.
23 changes: 20 additions & 3 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,7 @@ steps:
- "os=high-sierra"
artifact_paths:
- "build/packages/*.tar.gz"
- "build/packages/*.rb"
timeout: 60
- command: |
Expand All @@ -412,6 +413,7 @@ steps:
- "os=mojave"
artifact_paths:
- "build/packages/*.tar.gz"
- "build/packages/*.rb"
timeout: 60
- command: |
Expand Down Expand Up @@ -442,7 +444,7 @@ steps:
cd /data/job/build/packages && bash generate_package.sh deb
label: ":ubuntu: 18.04 Package builder"
agents:
- "role=linux-builder"
queue: "automation-large-builder-fleet"
artifact_paths:
- "build/packages/*.deb"
plugins:
Expand All @@ -469,7 +471,7 @@ steps:
cd /data/job/build/packages && bash generate_package.sh rpm
label: ":fedora: Package builder"
agents:
- "role=linux-builder"
queue: "automation-large-builder-fleet"
artifact_paths:
- "build/packages/x86_64/*.rpm"
plugins:
Expand All @@ -496,7 +498,7 @@ steps:
cd /data/job/build/packages && bash generate_package.sh rpm
label: ":centos: Package builder"
agents:
- "role=linux-builder"
queue: "automation-large-builder-fleet"
artifact_paths:
- "build/packages/x86_64/*.rpm"
plugins:
Expand All @@ -507,3 +509,18 @@ steps:
OS: "el7"
PKGTYPE: "rpm"
timeout: 60
- wait

- command: |
echo "--- :arrow_down: Downloading brew files" && \
buildkite-agent artifact download "build/packages/eosio.rb" . --step ":darwin: High Sierra Package Builder" && \
mv build/packages/eosio.rb build/packages/eosio_highsierra.rb && \
buildkite-agent artifact download "build/packages/eosio.rb" . --step ":darwin: Mojave Package Builder"
label: ":darwin: Brew Updater"
agents:
queue: "automation-large-builder-fleet"
artifact_paths:
- "build/packages/eosio_highsierra.rb"
- "build/packages/eosio.rb"
timeout: 60
8 changes: 4 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<!-- PLEASE FILL OUT THE FOLLOWING MARKDOWN TEMPLATE -->
<!-- Give your PR a title that is sufficient to understand what is being changed. -->

**Change Description**
## Change Description

<!-- Describe the change you made, the motivation for it, and the impact it will have. Reference issues or pull requests where possible (use '#XX' or 'GH-XX' where XX is the issue or pull request number). -->

**Consensus Changes**
## Consensus Changes

<!-- If this PR introduces a change to the validation of blocks in the chain or consensus in general, please describe the impact. -->


**API Changes**
## API Changes

<!-- If this PR introduces API changes, please describe the changes here. What will developers need to know before upgrading to this version? -->


**Documentation Additions**
## Documentation Additions

<!-- List all the information that needs to be added to the documentation after merge. -->
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
url = https://github.com/EOSIO/fc
[submodule "libraries/wabt"]
path = libraries/wabt
url = http://github.com/EOSIO/wabt
url = https://github.com/EOSIO/wabt
12 changes: 9 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
if (UNIX)
if (APPLE)
if (LLVM_DIR STREQUAL "" OR NOT LLVM_DIR)
set(LLVM_DIR "/usr/local/Cellar/llvm@4/4.0.1/lib/cmake/llvm")
set(LLVM_DIR "/usr/local/opt/llvm@4/lib/cmake/llvm/")
endif()
endif()
endif()
Expand All @@ -33,9 +33,15 @@ set( CMAKE_CXX_STANDARD 14 )
set( CMAKE_CXX_EXTENSIONS ON )
set( CXX_STANDARD_REQUIRED ON)

set(VERSION_MAJOR 1)
set(VERSION_MAJOR 2)
set(VERSION_MINOR 0)
set(VERSION_PATCH 3)
set(VERSION_PATCH 2)

if(VERSION_SUFFIX)
set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}")
else()
set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
endif()

set( CLI_CLIENT_EXECUTABLE_NAME cleos )
set( NODE_EXECUTABLE_NAME nodeos )
Expand Down
4 changes: 2 additions & 2 deletions CMakeModules/EosioTester.cmake.in
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
cmake_minimum_required( VERSION 3.5 )
message(STATUS "Setting up Eosio Tester @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ at @EOS_ROOT_DIR@")
message(STATUS "Setting up Eosio Tester @VERSION_FULL@ at @EOS_ROOT_DIR@")

set(CMAKE_CXX_COMPILER @CMAKE_CXX_COMPILER@)
set(CMAKE_C_COMPILER @CMAKE_C_COMPILER@)

set(EOSIO_VERSION "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@")
set(EOSIO_VERSION "@VERSION_FULL@")

enable_testing()

Expand Down
6 changes: 3 additions & 3 deletions CMakeModules/EosioTesterBuild.cmake.in
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
cmake_minimum_required( VERSION 3.5 )
message(STATUS "Setting up Eosio Tester @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ at @EOS_ROOT_DIR@")
message(STATUS "Setting up Eosio Tester @VERSION_FULL@ at @EOS_ROOT_DIR@")

set(CMAKE_CXX_COMPILER @CMAKE_CXX_COMPILER@)
set(CMAKE_C_COMPILER @CMAKE_C_COMPILER@)

set(EOSIO_VERSION "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@")
set(EOSIO_VERSION "@VERSION_FULL@")

enable_testing()

Expand Down Expand Up @@ -98,8 +98,8 @@ macro(add_eosio_test test_name)
${liblogging}
${libchainbase}
${libbuiltins}
${GMP_LIBRARIES}
${libsecp256k1}
${GMP_LIBRARIES}

LLVMX86Disassembler
LLVMX86AsmParser
Expand Down
2 changes: 1 addition & 1 deletion CMakeModules/doxygen.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include(FindDoxygen)
if(NOT DOXYGEN_FOUND)
message(STATUS "Doxygen not found. Contract documentation will not be generated.")
else()
set(DOXY_EOS_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" CACHE INTERNAL "Version string used in PROJECT_NUMBER.")
set(DOXY_EOS_VERSION "${VERSION_FULL}" CACHE INTERNAL "Version string used in PROJECT_NUMBER.")
# CMake strips trailing path separators off of variables it knows are paths,
# so the trailing '/' Doxygen expects is embedded in the doxyfile.
set(DOXY_DOC_DEST_DIR "${CMAKE_BINARY_DIR}/docs" CACHE PATH "Path to the doxygen output")
Expand Down
3 changes: 2 additions & 1 deletion Docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ RUN git clone -b $branch https://github.com/boscore/bos.git --recursive \
&& cmake -H. -B"/tmp/build" -GNinja -DCMAKE_BUILD_TYPE=Release -DWASM_ROOT=/opt/wasm -DCMAKE_CXX_COMPILER=clang++ \
-DCMAKE_C_COMPILER=clang -DCMAKE_INSTALL_PREFIX=/tmp/build -DBUILD_MONGO_DB_PLUGIN=true -DCORE_SYMBOL_NAME=$symbol \
-DOPENSSL_ROOT_DIR="${OPENSSL_ROOT_DIR}" \
&& cmake --build /tmp/build --target install && rm /tmp/build/bin/eosiocpp
&& cmake --build /tmp/build --target install



FROM ubuntu:18.04
Expand Down
9 changes: 5 additions & 4 deletions Docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@ Simple and fast setup of BOSCore on Docker is also available.
```bash
git clone https://github.com/boscore/bos.git --recursive --depth 1
cd bos/Docker
docker build . -t boscore/bos
docker build . -t boscore/bos -s BOS
```

The above will build off the most recent commit to the master branch by default. If you would like to target a specific branch/tag, you may use a build argument. For example, if you wished to generate a docker image based off of the v1.0.3 tag, you could do the following:
The above will build off the most recent commit to the master branch by default. If you would like to target a specific branch/tag, you may use a build argument. For example, if you wished to generate a docker image based off of the v2.0.2 tag, you could do the following:

```bash
docker build -t boscore/bos:v1.0.3 --build-arg branch=v1.0.3 .
docker build -t boscore/bos:v2.0.2 --build-arg branch=v2.0.2 .

```

By default, the symbol in eosio.system is set to SYS. You can override this using the symbol argument while building the docker image.
Expand Down Expand Up @@ -197,4 +198,4 @@ The `blocks` data are stored under `--data-dir` by default, and the wallet files

### About MongoDB Plugin

Currently, the mongodb plugin is disabled in `config.ini` by default, you have to change it manually in `config.ini` or you can mount a `config.ini` file to `/opt/eosio/bin/data-dir/config.ini` in the docker-compose file.
Currently, the mongodb plugin is disabled in `config.ini` by default, you have to change it manually in `config.ini` or you can mount a `config.ini` file to `/opt/eosio/bin/data-dir/config.ini` in the docker-compose file.
3 changes: 0 additions & 3 deletions Docker/config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,6 @@ network-version-match = 0
# number of blocks to retrieve in a chunk from any individual peer during synchronization (eosio::net_plugin)
sync-fetch-span = 100

# maximum sizes of transaction or block messages that are sent without first sending a notice (eosio::net_plugin)
max-implicit-request = 1500

# Enable block production, even if the chain is stale. (eosio::producer_plugin)
enable-stale-production = false

Expand Down
22 changes: 16 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# BOSCore - Born for DApps. Born for Usability.

## BOSCore Version: v1.0.3
### Basic EOSIO Version: v1.4.4
## BOSCore Version: v2.0.2
### Basic EOSIO Version: v1.6.2

# Background
The emergence of EOS has brought new imagination to the blockchain. In just a few months since the main network was launched, the version has undergone dozens of upgrades, not only the stability has been greatly improved, but also the new functions have been gradually realized. The node team is also actively involved in building the EOSIO ecosystem. What is even more exciting is that EOS has attracted more and more development teams. There are already hundreds of DApp running on the EOS main network. The transaction volume and circulation market value far exceed Ethereum, and the space for development is growing broader.
Expand All @@ -20,18 +20,28 @@ As BOS continues to develop, developer rewards will be appropriately adjusted to

## Links
1. [Website](https://boscore.io)
2. [Developer Telegram Group](https://t.me/BOSCoreDev)
3. [WhitePaper](https://github.com/boscore/Documentation/blob/master/BOSCoreTechnicalWhitePaper.md)
4. [白皮书](https://github.com/boscore/Documentation/blob/master/zh-CN/BOSCoreTechnicalWhitePaper.md)
2. [Developer Telegram Group](https://t.me/BOSDevelopers)
3. [Community Telegram Group](https://t.me/boscorecommunity)
4. [WhitePaper](https://github.com/boscore/Documentation/blob/master/BOSCoreTechnicalWhitePaper.md)
5. [白皮书](https://github.com/boscore/Documentation/blob/master/zh-CN/BOSCoreTechnicalWhitePaper.md)

## Start
1. Build from code : `bash ./eosio_build.sh -s BOS`
2. Docker Style,check [Docker](./Docker/README.md)

## BOSCore Workflow
BOSCore encourage community developer actively participate in contributing the code, members should follow the workflow below.
![BOSCore Workflow](./images/bos-workflow.png)

Attention:
1. Only allow Feature Branch or bug fix to submit PR to Develop Branch.
2. Rebase is required before submitting PR to Develop Branch.
3. Treat update of eosio/eos code as new feature.
4. Emergent issues must repaired by adopting hotfixes mode.

BOSCore bases on EOSIO, so you can also referer:

[Getting Started](https://developers.eos.io/eosio-nodeos/docs/overview-1)

[EOSIO Developer Portal](https://developers.eos.io).


21 changes: 16 additions & 5 deletions README_CN.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# BOSCore - 更可用的链,为DApp而生。

## BOSCore Version: v1.0.3
### Basic EOSIO Version: v1.4.4
## BOSCore Version: v2.0.2
### Basic EOSIO Version: v1.6.2

# 背景
EOS的出现给区块链带来了新的想象力,主网启动短短几个月以来,版本经历了几十次升级,不仅稳定性得到了很大提高,并且新功能也逐步实现,各个节点团队也积极参与建设EOSIO生态。让人更加兴奋的是,EOS已经吸引了越来越多的开发团队,当前已经有数百个DApp在EOS主网上面运行,其交易量和流通市值远超以太坊,可发展的空间愈来愈广阔。
Expand All @@ -20,14 +20,25 @@ BOS链的代码完全由社区贡献并维护,每个生态参与者都可以

## 资源
1. [官网](https://boscore.io)
2. [开发者社群](https://t.me/BOSCoreDev)
3. [WhitePaper](https://github.com/boscore/Documentation/blob/master/BOSCoreTechnicalWhitePaper.md)
4. [白皮书](https://github.com/boscore/Documentation/blob/master/zh-CN/BOSCoreTechnicalWhitePaper.md)
2. [Developer Telegram Group](https://t.me/BOSDevelopers)
3. [Community Telegram Group](https://t.me/boscorecommunity)
4. [WhitePaper](https://github.com/boscore/Documentation/blob/master/BOSCoreTechnicalWhitePaper.md)
5. [白皮书](https://github.com/boscore/Documentation/blob/master/zh-CN/BOSCoreTechnicalWhitePaper.md)

## 开始
1. 源码直接编译: `bash ./eosio_build.sh -s BOS`
2. Docker方式部署,参看 [Docker](./Docker/README.md)

## BOSCore 开发流程
BOSCore 鼓励社区开发者参与代码贡献,社区成员应当遵循以下工作流:
![BOSCore Workflow](./images/bos-workflow.png)

注意:
1. 只有待发布的 Feature Branch 或者Bug修复才应该向 Develop Branch 提交
2. 向 Develop Branch 提交 PR 之前需要现在本地执行 rebase 操作
3. EOSIO 主网版本作为一个 Feature Branch 来对待
4. 紧急问题修复采用 hotfixes 模式

BOSCore是基于EOSIO技术的扩展,所以EOSIO的相关资料也可以参考:

[EOSIO 开始](https://developers.eos.io/eosio-nodeos/docs/overview-1)
Expand Down
4 changes: 0 additions & 4 deletions contracts/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ set(STANDARD_INCLUDE_FOLDERS ${CMAKE_SOURCE_DIR}/contracts ${CMAKE_BINARY_DIR}/c
add_subdirectory(eosiolib)
add_subdirectory(musl)
add_subdirectory(libc++)
add_subdirectory(simple.token)
add_subdirectory(eosio.token)
add_subdirectory(eosio.msig)
add_subdirectory(eosio.sudo)
Expand All @@ -18,17 +17,14 @@ add_subdirectory(identity)
add_subdirectory(stltest)
add_subdirectory(test.inline)

#add_subdirectory(bancor)
add_subdirectory(hello)
add_subdirectory(asserter)
add_subdirectory(infinite)
add_subdirectory(proxy)
add_subdirectory(test_api)
add_subdirectory(test_api_mem)
add_subdirectory(test_api_db)
add_subdirectory(test_api_multi_index)
add_subdirectory(test_ram_limit)
#add_subdirectory(social)
add_subdirectory(eosio.bios)
add_subdirectory(noop)
add_subdirectory(tic_tac_toe)
Expand Down
2 changes: 1 addition & 1 deletion contracts/asserter/asserter.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @file
* @copyright defined in eos/LICENSE.txt
* @copyright defined in eos/LICENSE
*/

#include <asserter/asserter.hpp> /// defines assert_def struct (abi)
Expand Down
2 changes: 1 addition & 1 deletion contracts/asserter/asserter.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @file
* @copyright defined in eos/LICENSE.txt
* @copyright defined in eos/LICENSE
*/

#include <eosiolib/eosio.hpp>
Expand Down
8 changes: 0 additions & 8 deletions contracts/bancor/CMakeLists.txt

This file was deleted.

18 changes: 0 additions & 18 deletions contracts/bancor/bancor.cpp

This file was deleted.

22 changes: 0 additions & 22 deletions contracts/bancor/bancor.hpp

This file was deleted.

Loading

0 comments on commit 7342e06

Please sign in to comment.