Skip to content

Commit

Permalink
Sync with master (#156)
Browse files Browse the repository at this point in the history
* Change getvalues cmd type to getallvalues

* support transfer to multi address

* end

* Update README.md

* Update README.md

* Add files via upload

* Update README.md

* Update README.md

* Updated logo

* Add files via upload

* Delete img/resilientdb_logo_light-text-modern-v3-1.png

* Add files via upload

* Update README.md

* Update README.md

* Updated loqo quality

* Fixed light logo bug | removed nexres refs

* add mvcc for mem-kv

* add history

* add mvcc

* add mvcc for kv

* add mvcc for kv

* rm unused code

* remove log

* remove unused log

* rm unused log

* add glog init

* format code

* Update README.md

* Update README.md

* Update kv_client.h

* Update CHANGELOG.md

* Update CHANGELOG.md

* support old api command line

* change license

* format code

* change to apache license

* del file

* change apache license

* add notice file

* change apache license

* Fix the failure memory order argument to atomic_compare_exchange_strong_explicit

The failure memory order cannot be release or acq_rel. Clang since llvm/llvm-project@fed5644 diagnoses an invalid argument.

* Update README.md

* Update copyright date in NOTICE (#129)

* Use .asf.yaml to manage GitHub settings

  .asf.yaml is a configuration file that a project may use to control various features such as notification schemes, website staging, GitHub settings, and Pelican builds.
how to use: this:https://cwiki.apache.org/confluence/display/INFRA/git+-+.asf.yaml+features↳
  
Set the code merge method to squash
Set GitHub notifications to: [email protected]
Set protected_branches

* add bazel version (#132)

Co-authored-by: Ubuntu <[email protected]>

* Change the deploy logging type

Change a log from Info to Error which is used by the deployment scripts.

* update state client to obtain the replica state

* add get block numbers

* fix get txn bug

* add GetRequestFromReplica interface (#133)

* add GetRequestFromReplica interface

* fix test case failed

---------

Co-authored-by: JunchaoChen <[email protected]>

* change the script path in start_contract_service.sh

* Fix incorrect comment intervals in Prometheus config (#135)

Co-authored-by: ic4y <[email protected]>

* kv-service python api (#136)

* kv-service python api

* update

* update kv_operation.py route to bazel-out and update readme (#137)

* update kv_operation.py route to bazel-out and update readme

* update readme

* Update README.md

* Update README.md

---------

Co-authored-by: cjcchen <[email protected]>

* ResView Branch (#138)

* "Added basic data collection, pointed out spots for web socket"

* "Added data gathering points and prints for testing"

* "Fixed bugs with compiling stats"

* "Changed message collection to be per message rather than queried periodically"

* "Added conversion of stats values to JSON, need to fix replica id setting"

* "Added more precision to timestamps in JSON"

* "Added new data to the summary view"

* "Got transaction detail collection working"

* "Changed to GETALLVALUES based on main repo"

* Changed Produced JSON to include txn_number

* "Added websocket to send to front end, slightly inconsistent"

* Add files via upload

* "Added ability to receive messages from front end"

* "Viewchange Update"

* "Removed possible infinite loop in sending summary"

* "Fixing file inclusion issue"

* "Added 2 new apis in same thread to save resources"

* "Adjusted make faulty endpoint"

* "Removed vestigial variables, turned off faulty switch for PR"

* "Fixed failing response manager test"

* "Fixed issue with data carryover between instances" (#139)

* add poe (#140)

* Update CHANGELOG.md

* Update CHANGELOG.md (#141)

* add disclaimer

* Fix Bug (#142)

* fix viewchange bug

* format code

* rm unused log

* rm unused log

* fix ut

* fix apache header

* format

* add apache license check workflow

* add npm in workflow

* Fix Apache License (#143)

* add npm in workflow

* test

* add workflow

* add path

* add path

* add path

* add path

* add path

* add path

* add path

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add license

* add loc

* add loc

* add loc

* fix build

* add url in notice

* add thirdparty license

* rm rocksdb

* fix name error

* mv DISCLAIMER-WIP

* fix typo

* add version

* add license in wip

* Update DISCLAIMER-WIP

* Update DISCLAIMER-WIP

* Update README.md

* civetweb

* civetweb

* add civetweb build

* Install (#145)

* add non-root install

* rm unused file

* add

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* update install

* Update README.md

* Update README.md

* add non-root install

* Update README.md

* Update README.md

* Update README.md

* Update DISCLAIMER-WIP

* Update DISCLAIMER-WIP

* Update LICENSE

* Update LICENSE

* add license

---------

Co-authored-by: Ubuntu <[email protected]>
Co-authored-by: Ubuntu <[email protected]>

* Update DISCLAIMER-WIP

* Add missing ASF headers (#150)

Provide dev/check-license script to perform RAT checks

* Update .licenserc.yaml (#151)

* Update .licenserc.yaml

* add license header

* add config

* add config

* add config

* add config

* add config

* add config

* Update README.md

* Update README.md

* Update README.md (#152)

* Update CHANGELOG.md (#153)

* Update index.js

* [License]Add the missing license file (#154)

* Update LICENSE

---------

Co-authored-by: Gopal Nambiar <[email protected]>
Co-authored-by: Glenn Chen <[email protected]>
Co-authored-by: cjcchen <[email protected]>
Co-authored-by: ResilientDB <[email protected]>
Co-authored-by: Ubuntu <[email protected]>
Co-authored-by: JunchaoChen <[email protected]>
Co-authored-by: AtariDreams <[email protected]>
Co-authored-by: Haoran Yu <[email protected]>
Co-authored-by: Calvin Kirs <[email protected]>
Co-authored-by: Ubuntu <[email protected]>
Co-authored-by: ic4y <[email protected]>
Co-authored-by: ic4y <[email protected]>
Co-authored-by: Jiazhi Sun <[email protected]>
Co-authored-by: Saipranav-Kotamreddy <[email protected]>
Co-authored-by: Ubuntu <[email protected]>
Co-authored-by: Ubuntu <[email protected]>
Co-authored-by: Ubuntu <[email protected]>
Co-authored-by: JB Onofré <[email protected]>
  • Loading branch information
19 people authored Sep 27, 2024
1 parent 84f8e24 commit 4dae1ad
Show file tree
Hide file tree
Showing 519 changed files with 10,933 additions and 17,214 deletions.
40 changes: 40 additions & 0 deletions .asf.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

github:
description: Global-Scale Sustainable Blockchain Fabric
#homepage: resilientdb.apache.org
labels:
- crypto
- smart-contracts
- blockchain
- solidity
- distributed-database
- key-value-database
- distributed-ledger
- blockchain-platform
- utxo
enabled_merge_buttons:
squash: true
merge: false
rebase: false
protected_branches:
master:

notifications:
commits: [email protected]
issues: [email protected]
pullrequests: [email protected]
1 change: 1 addition & 0 deletions .bazelversion
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6.0.0
23 changes: 22 additions & 1 deletion .github/workflows/build-push.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#

name: ci

on:
Expand Down Expand Up @@ -30,6 +49,7 @@ jobs:
with:
file: ./Docker/Dockerfile
context: .
platforms: linux/amd64
push: true
tags: expolab/resdb:amd64

Expand All @@ -39,5 +59,6 @@ jobs:
with:
file: ./Docker/Dockerfile_mac
context: .
platforms: linux/arm64
push: true
tags: expolab/resdb:arm64
tags: expolab/resdb:arm64
19 changes: 19 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#

name: bazel-build CI

on:
Expand Down
37 changes: 37 additions & 0 deletions .github/workflows/license.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#

name: Check Apache License

on:
push

jobs:
ubuntu-build:
name: check license
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
with:
repository: ${{github.repository}}
ref: ${{ env.BRANCH_NAME }}

- name: Check License Header
uses: apache/skywalking-eyes/header@main
33 changes: 29 additions & 4 deletions .github/workflows/loc.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,29 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#

name: LOC

on:
push:
branches:
push:
branches:
- master

jobs:
build:
runs-on: ubuntu-latest
Expand All @@ -16,9 +35,15 @@ jobs:
repository: ${{github.repository}}
ref: ${{ env.BRANCH_NAME }}

- name: NPM Init
run: npm init -y

- name: NPM Install
run: npm install badgen @actions/core glob-gitignore

- name: Launch the local action
uses: ./ # Uses an action in the root directory
id: badge
uses: ./third_party/loc_script/ # Uses an action in the root directory
with:
debug: true
directory: ./
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#

name: Doxygen Action

on:
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/ut.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#

name: Unite Test

on:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ bazel-*
venv
sdk_validator/venv
__pycache__
MODULE.*
apache_release
31 changes: 31 additions & 0 deletions .licenserc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
header:
license:
spdx-id: Apache-2.0
copyright-owner: Apache Software Foundation

paths-ignore:
- '.*'
- '.**/**'
- 'repositories.bzl'
- 'CNAME'
- 'WORKSPACE'
- '**/*.conf'
- '**/*.config'
- '**/*.json'
- '**/*.sol'
- '**/*.pri'
- '**/*.pub'
- 'Doxyfile'
- 'header'
- 'dev/.rat-excludes'
- '**/*.md'
- 'DISCLAIMER-WIP'
- 'NOTICE'
- 'LICENSE'
- 'documents/doxygen/.gitignore'
- 'third_party/loc_script/src/index.js'



comment: on-failure

19 changes: 19 additions & 0 deletions BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#

package(default_visibility = ["//visibility:public"])

load("@rules_foreign_cc//foreign_cc:defs.bzl", "make")
Expand Down
39 changes: 39 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,44 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-->

# Change Log

### Apache ResilientDB v1.10.0 ([2024-4-16](https://github.com/resilientdb/resilientdb/releases/tag/v1.10.0-rc01))

Add the prototype of PoE. ([Junchao Chen](https://github.com/cjcchen))

* Implement the base version of the Proof-of-Execution (PoE) Consensus Protocol [EDBT 2011].

Add ResView Data Collection and APIs ([Saipranav-Kotamreddy](https://github.com/Saipranav-Kotamreddy))

* Consensus data such as PBFT messages and states is now collected and stored
* Added APIs to query consensus data and progress of replicas
* Added APIs to trigger faultiness and test view change

### NexRes v1.9.0 ([2023-11-29](https://github.com/resilientdb/resilientdb/releases/tag/nexres-v1.9.0))

Support Multi-version Key-Value Interface. ([Junchao Chen](https://github.com/cjcchen))

* Get and Set need to provide a version number to fetch the correct version of the data (if exists) or write to the correct version of data (if not overwritten already), respectively.
* Provide interfaces to obtain historical data with a specific version or a range of versions.


### NexRes v1.8.0 ([2023-08-21](https://github.com/resilientdb/resilientdb/releases/tag/nexres-v1.8.0))

**Implemented Enhancements:** The view-change recovery protocol was extensively expanded to support the following Byzantine failures through primary/leader replacement and replica recovery. ([Dakai Kang](https://github.com/DakaiKang))
Expand Down
19 changes: 19 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-->

# Contributor Covenant Code of Conduct

## Our Pledge
Expand Down
22 changes: 22 additions & 0 deletions DISCLAIMER-WIP
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Apache ResilientDB is an effort undergoing incubation at the Apache Software
Foundation (ASF), sponsored by the Apache Incubator PMC.

Incubation is required of all newly accepted projects until a further review
indicates that the infrastructure, communications, and decision making process
have stabilized in a manner consistent with other successful ASF projects.

While incubation status is not necessarily a reflection of the completeness
or stability of the code, it does indicate that the project has yet to be
fully endorsed by the ASF.

Some of the incubating project’s releases may not be fully compliant with ASF policy.
For example, releases may have incomplete or un-reviewed licensing conditions.
What follows is a list of known issues the project is currently aware of
(note that this list, by definition, is likely to be incomplete):

If you are planning to incorporate this work into your product/project, please
be aware that you will need to conduct a thorough licensing review to determine
the overall implications of including this work. For the current status of this
project through the Apache Incubator visit:
https://incubator.apache.org/projects/resilientdb.html

Loading

0 comments on commit 4dae1ad

Please sign in to comment.