Make ostracon/main based on Tendermint v0.34.8

.github/workflows/coverage.yml

@@ -2,9 +2,6 @@ name: Test Coverage
 on:
   pull_request:
   push:
-    branches:
-      - master
-      - release/**
 
 jobs:
   split-test-files:

.github/workflows/linkchecker.yml

@@ -1,12 +1,12 @@
-name: Check Markdown links
-on: 
-  schedule:
-    - cron: '* */24 * * *'
-jobs:
-  markdown-link-check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@master
-      - uses: gaurav-nelson/github-action-markdown-link-check@1.0.7
-        with:
-          folder-path: "docs"
+#name: Check Markdown links
+#on:
+#  schedule:
+#    - cron: '* */24 * * *'
+#jobs:
+#  markdown-link-check:
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@master
+#      - uses: gaurav-nelson/github-action-markdown-link-check@1.0.7
+#        with:
+#          folder-path: "docs"

.github/workflows/lint.yaml

@@ -5,8 +5,6 @@ name: Lint
 on:
   pull_request:
   push:
-    branches:
-      - master
 jobs:
   golangci:
     name: golangci-lint

.github/workflows/linter.yml

@@ -1,14 +1,11 @@
 name: Lint
 on:
   push:
-    branches:
-      - master
     paths:
       - "**.md"
       - "**.yml"
       - "**.yaml"
   pull_request:
-    branches: [master]
     paths:
       - "**.md"
 

.github/workflows/proto-docker.yml

@@ -4,8 +4,6 @@ on:
     paths:
       - "tools/proto/*"
   push:
-    branches:
-      - master
     paths:
       - "tools/proto/*"
   schedule:

.github/workflows/proto.yml

@@ -13,10 +13,10 @@ jobs:
       - uses: actions/checkout@master
       - name: lint
         run: make proto-lint
-  proto-breakage:
-    runs-on: ubuntu-latest
-    timeout-minutes: 4
-    steps:
-      - uses: actions/checkout@master
-      - name: check-breakage
-        run: make proto-check-breaking-ci
+#  proto-breakage:
+#    runs-on: ubuntu-latest
+#    timeout-minutes: 4
+#    steps:
+#      - uses: actions/checkout@master
+#      - name: check-breakage
+#        run: make proto-check-breaking-ci

.github/workflows/tests.yml

@@ -65,14 +65,7 @@ jobs:
             **/**.go
             go.mod
             go.sum
-      - uses: actions/cache@v2.1.4
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-        if: env.GIT_DIFF
-      - uses: actions/cache@v2.1.4
+      - uses: actions/cache@v1
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-${{ github.sha }}-tm-binary
@@ -97,14 +90,7 @@ jobs:
             **/**.go
             go.mod
             go.sum
-      - uses: actions/cache@v2.1.4
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-        if: env.GIT_DIFF
-      - uses: actions/cache@v2.1.4
+      - uses: actions/cache@v1
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-${{ github.sha }}-tm-binary
@@ -128,14 +114,7 @@ jobs:
             **/**.go
             go.mod
             go.sum
-      - uses: actions/cache@v2.1.4
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-        if: env.GIT_DIFF
-      - uses: actions/cache@v2.1.4
+      - uses: actions/cache@v1
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-${{ github.sha }}-tm-binary

.gitignore

@@ -56,3 +56,5 @@ test/fuzz/**/corpus
 test/fuzz/**/crashers
 test/fuzz/**/suppressions
 test/fuzz/**/*.zip
+crypto/vrf/internal/vrf/lib
+crypto/vrf/internal/vrf/include

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "crypto/vrf/internal/vrf/libsodium"]
+	path = crypto/vrf/internal/vrf/libsodium
+	url = https://github.com/algorand/libsodium.git

CHANGELOG.md

@@ -1,5 +1,44 @@
 # Changelog
 
+## v1.0.0
+
+*Jun 29, 2021*
+
+* Changed from the consensus way which the entire validator agrees to a part of the validators is elected as a voter to
+  consensus. The selected validator is called `voter`
+* The voter to be elected has been changed so that it can be determined in the n-1 block from the one determined by
+  the n-2 block.
+* A BLS signature library was added. The ability to use the BLS signature library will be added in the next version.
+* When distributing rewards in Cosmos-SDK, some ABCIs have been modified to distribute the voting power of elected
+  voters.
+
+### BREAKING CHANGES
+- State
+  - [state] [\#92](https://github.com/line/tendermint/pull/92) Add `VoterParams` to Genesis state
+  - [state] [\#100](https://github.com/line/tendermint/pull/100) Remove `NextVoters` from state
+- Go API
+  - [types] [\#83](https://github.com/line/tendermint/pull/83) Add `StakingPower` to `Validator`
+  - [consensus] [\#83](https://github.com/line/tendermint/pull/83) Change calculation of `VotingPower`
+- Blockchain Protocol
+  - [state] [\#7](https://github.com/line/tendermint/issues/7) Add round, proof in block
+- P2P Protocol
+  - [abci] [\#100](https://github.com/line/tendermint/pull/100) Add `voters_hash` field, which is needed for verification of a block header
+  - [abci] [\#102](https://github.com/line/tendermint/pull/102) Add voting power in `VoterInfo` of abci
+
+### FEATURES
+- [types] [\#40](https://github.com/line/tendermint/issues/40) Add vrf interface and add a function generating vrf proof to PrivValidator
+- [lib/rand] [\#43](https://github.com/line/tendermint/issues/43) Implementation of selection algorithms using categorical distributions
+- [state] [\#44](https://github.com/line/tendermint/issues/44) Add genesis seed for electing proposer of first block
+- [types] [\#48](https://github.com/line/tendermint/issues/48) Replace Tendermint's PoS to VRF-based Random Sampling
+- [rpc] [\#78](https://github.com/line/tendermint/pull/78) Add `Voters` rpc
+- [consensus] [\#83](https://github.com/line/tendermint/pull/83) Selection voters using random sampling without replacement
+- [consensus] [\#92](https://github.com/line/tendermint/pull/92) Apply calculation of voter count
+- [BLS] [\#81](https://github.com/line/tendermint/issues/81) Modify to generate at the same time as Ed25519 key generation
+- [lite] [\#100](https://github.com/line/tendermint/pull/100) Lite calls `Genesis()` rpc when it starts up
+
+### BUG FIXES
+- [circleCI] [\#76](https://github.com/line/tendermint/pull/76) Fix contract test job of circleCI
+
 ## v0.0.0
 
 *Mar 15, 2021*

DOCKER/Dockerfile

@@ -25,7 +25,7 @@ ENV TMHOME /tendermint
 # could execute bash commands.
 RUN apk update && \
     apk upgrade && \
-    apk --no-cache add curl jq bash && \
+    apk --no-cache add git make gcc libc-dev build-base curl jq bash && \
     addgroup ostracon && \
     adduser -S -G ostracon ostracon -h "$TMHOME"
 

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2021 LINE TECH PLUS Pte., Ltd.
+   Copyright 2021 LINE Plus Corporation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Makefile

@@ -1,8 +1,23 @@
 PACKAGES=$(shell go list ./...)
+SRCPATH=$(shell pwd)
 OUTPUT?=build/tendermint
 
-BUILD_TAGS?=tendermint
+INCLUDE = -I=${GOPATH}/src/github.com/tendermint/tendermint -I=${GOPATH}/src -I=${GOPATH}/src/github.com/gogo/protobuf/protobuf
+BUILD_TAGS?='tendermint'
 VERSION := $(shell git describe --always)
+CGO_OPTPTION=0
+LIBSODIUM_TARGET=
+PREPARE_LIBSODIUM_TARGET=
+ifeq ($(LIBSODIUM), 1)
+  BUILD_TAGS='libsodium tendermint'
+  LIBSODIUM_TARGET=libsodium
+ifneq ($(OS), Windows_NT)
+ifeq ($(shell uname -s), Linux)
+  PREPARE_LIBSODIUM_TARGET=prepare-libsodium-linux
+endif
+endif
+endif
+LIBSODIM_BUILD_TAGS='libsodium tendermint'
 LD_FLAGS = -X github.com/tendermint/tendermint/version.TMCoreSemVer=$(VERSION)
 BUILD_FLAGS = -mod=readonly -ldflags "$(LD_FLAGS)"
 HTTPS_GIT := https://github.com/line/ostracon.git
@@ -17,13 +32,11 @@ endif
 
 # handle race
 ifeq (race,$(findstring race,$(TENDERMINT_BUILD_OPTIONS)))
-  CGO_ENABLED=1
   BUILD_FLAGS += -race
 endif
 
 # handle cleveldb
 ifeq (cleveldb,$(findstring cleveldb,$(TENDERMINT_BUILD_OPTIONS)))
-  CGO_ENABLED=1
   BUILD_TAGS += cleveldb
 endif
 
@@ -55,14 +68,22 @@ include tests.mk
 ###                                Build Ostracon                           ###
 ###############################################################################
 
-build:
-	CGO_ENABLED=$(CGO_ENABLED) go build $(BUILD_FLAGS) -tags '$(BUILD_TAGS)' -o $(OUTPUT) ./cmd/tendermint/
+build: $(LIBSODIUM_TARGET)
+	CGO_ENABLED=1 go build $(BUILD_FLAGS) -tags "$(BUILD_TAGS)" -o $(OUTPUT) ./cmd/tendermint/
 .PHONY: build
 
 install:
-	CGO_ENABLED=$(CGO_ENABLED) go install $(BUILD_FLAGS) -tags $(BUILD_TAGS) ./cmd/tendermint
+	CGO_ENABLED=1 go install $(BUILD_FLAGS) -tags "$(BUILD_TAGS)" ./cmd/tendermint
 .PHONY: install
 
+###############################################################################
+###                                 Mockery                                 ###
+###############################################################################
+
+mock-gen:
+	go generate ./...
+.PHONY: mock
+
 ###############################################################################
 ###                                Protobuf                                 ###
 ###############################################################################
@@ -73,7 +94,7 @@ proto-all: proto-gen proto-lint proto-check-breaking
 proto-gen:
 	@docker pull -q tendermintdev/docker-build-proto
 	@echo "Generating Protobuf files"
-	@docker run -v $(shell pwd):/workspace --workdir /workspace tendermintdev/docker-build-proto sh ./scripts/protocgen.sh
+	@docker run --rm -v $(shell pwd):/workspace --workdir /workspace tendermintdev/docker-build-proto sh ./scripts/protocgen.sh
 .PHONY: proto-gen
 
 proto-lint:
@@ -82,7 +103,7 @@ proto-lint:
 
 proto-format:
 	@echo "Formatting Protobuf files"
-	docker run -v $(shell pwd):/workspace --workdir /workspace tendermintdev/docker-build-proto find ./ -not -path "./third_party/*" -name *.proto -exec clang-format -i {} \;
+	docker run --rm -v $(shell pwd):/workspace --workdir /workspace tendermintdev/docker-build-proto find ./ -not -path "./third_party/*" -name *.proto -exec clang-format -i {} \;
 .PHONY: proto-format
 
 proto-check-breaking:
@@ -109,6 +130,22 @@ install_abci:
 ###                              Distribution                               ###
 ###############################################################################
 
+########################################
+### libsodium
+
+prepare-libsodium-linux:
+	apt-get update && apt-get -y install libtool libboost-all-dev autoconf build-essential
+
+libsodium:
+	cd $(SRCPATH)/crypto/vrf/internal/vrf/libsodium && \
+    		./autogen.sh && \
+    		./configure --disable-shared --prefix="$(SRCPATH)/crypto/vrf/internal/vrf/" &&	\
+    		$(MAKE) && \
+    		$(MAKE) install
+
+########################################
+### Distribution
+
 # dist builds binaries for all platforms and packages them for distribution
 # TODO add abci to these scripts
 dist:
@@ -210,9 +247,26 @@ build-docker: build-linux
 ###                       Local testnet using docker                        ###
 ###############################################################################
 
+DOCKER_HOME = /go/src/github.com/tendermint/tendermint
+DOCKER_CMD = docker run --rm \
+                        -v `pwd`:$(DOCKER_HOME) \
+                        -w $(DOCKER_HOME)
+DOCKER_IMG = golang:1.15-alpine
+BUILD_CMD = apk add --update --no-cache git make gcc libc-dev build-base curl jq file gmp-dev clang \
+	&& cd $(DOCKER_HOME) \
+	&& make build
+
+# Login docker-container for confirmation building linux binary
+build-shell:
+	$(DOCKER_CMD) -it --entrypoint '' ${DOCKER_IMG} /bin/sh
+.PHONY: build-shell
+
 # Build linux binary on other platforms
+
 build-linux:
-	GOOS=linux GOARCH=amd64 $(MAKE) build
+	# Build Linux binary
+	$(DOCKER_CMD) ${DOCKER_IMG} /bin/sh -c "$(BUILD_CMD)"
+
 .PHONY: build-linux
 
 build-docker-localnode:
@@ -252,6 +306,6 @@ endif
 # prerequisits: build-contract-tests-hooks build-linux
 # the two build commands were not added to let this command run from generic containers or machines.
 # The binaries should be built beforehand
-contract-tests:
+contract-tests: build-docker-localnode
 	dredd
 .PHONY: contract-tests

NOTICE

@@ -1,5 +1,5 @@
    Copyright 2016 All in Bits, Inc
-   Copyright 2021 LINE TECH PLUS Pte., Ltd.
+   Copyright 2021 LINE Plus Corporation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

abci/example/kvstore/helpers.go

@@ -2,15 +2,22 @@ package kvstore
 
 import (
 	"github.com/tendermint/tendermint/abci/types"
+	"github.com/tendermint/tendermint/crypto"
+	"github.com/tendermint/tendermint/crypto/composite"
 	tmrand "github.com/tendermint/tendermint/libs/rand"
 )
 
+// Generates a default private key for use in an example or test.
+func GenDefaultPrivKey() crypto.PrivKey {
+	return composite.GenPrivKey()
+}
+
 // RandVal creates one random validator, with a key derived
 // from the input value
 func RandVal(i int) types.ValidatorUpdate {
-	pubkey := tmrand.Bytes(32)
+	pk := GenDefaultPrivKey().PubKey()
 	power := tmrand.Uint16() + 1
-	v := types.UpdateValidator(pubkey, int64(power), "")
+	v := types.NewValidatorUpdate(pk, int64(power))
 	return v
 }