merge diffs of branch main to resolve conflicts with it

.github/workflows/release.yml

@@ -18,12 +18,12 @@ jobs:
         with:
           go-version: '^1.15.4'
 
-      - run: echo https://github.com/tendermint/tendermint/blob/${GITHUB_REF#refs/tags/}/CHANGELOG.md#${GITHUB_REF#refs/tags/} > ../release_notes.md 
+      - run: echo https://github.com/line/ostracon/blob/${GITHUB_REF#refs/tags/}/CHANGELOG.md#${GITHUB_REF#refs/tags/} > ../RELEASE_NOTES.md
 
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
         with:
           version: latest
-          args: release --rm-dist --release-notes=../release_notes.md
+          args: release --rm-dist --release-notes=../RELEASE_NOTES.md
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.goreleaser.yml

@@ -5,7 +5,7 @@ env:
   - GO111MODULE=on
 
 builds:
-  - id: "Tendermint"
+  - id: "Ostracon"
     main: ./cmd/tendermint/main.go
     ldflags:
       - -s -w -X github.com/tendermint/tendermint/version.TMCoreSemVer={{ .Version }}

CHANGELOG.md

@@ -1,60 +1,56 @@
 # Changelog
 
-## v0.3
-* 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.
-* Base Tendermint version is v0.33.5. please see the [CHANGELOGS](./CHANGELOG_OF_TENDERMINT.md#v0.33.5) of the Tendermint.
+## v1.0.0
 
-### BREAKING CHANGES:
+*Jun 29, 2021*
 
-- State
-  - [state] [\#100](https://github.com/line/tendermint/pull/100) Remove `NextVoters` from state
-
-- 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:
-- [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
-
-
-
-## v0.2
-* 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`
-* Base Tendermint version is v0.33.4. please see the [CHANGELOGS](./CHANGELOG_OF_TENDERMINT.md#v0.33.4) of the Tendermint.
-
-### BREAKING CHANGES:
+* 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:
+### 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:
+### BUG FIXES
 - [circleCI] [\#76](https://github.com/line/tendermint/pull/76) Fix contract test job of circleCI
 
+## v0.0.0
 
+*Mar 15, 2021*
 
-## v0.1
-Base Tendermint v0.33.3. please see the [CHANGELOG](./CHANGELOG_OF_TENDERMINT.md#v0.33.3)
+This release rewrite to ostracon.
 
-### BREAKING CHANGES:
-- Blockchain Protocol
-  - [state] [\#7](https://github.com/line/tendermint/issues/7) Add round, proof in block
+## PreHistory
+Initial ostracon is based on the tendermint v0.34.8
 
-### 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
+## [tendermint v0.34.8] - 2021-02-25
+
+* (tendermint) [v0.34.8](https://github.com/tendermint/tendermint/releases/tag/v0.34.8).
+
+Please refer [CHANGELOG_OF_TENDERMINT_v0.34.8](https://github.com/tendermint/tendermint/blob/v0.34.8/CHANGELOG.md)
+<!-- Release links -->