Skip to content

Commit

Permalink
Update into Finschia (#601)
Browse files Browse the repository at this point in the history
* Update `git@github.com:Finschia/ostracon.git`

* Update `finschia.org`

* Update `dev@finschia.org`

* Add `Copyright 2023 Finschia Foundation`

* Update `Copyright 2023 Finschia Foundation`

* Rename `module github.com/Finschia/ostracon`

* Update `github.com/Finschia/ostracon` in `.md`

* Update `github.com/line/ostracon` in others

* Revert `github.com/tendermint/tendermint`

* Update `github.com/Finschia/ostracon` in `.proto`

* Re-generate `pb.go` files

* Re-generate `mocks` files

* Update `https://api.github.com/repos/Finschia/ostracon`

* Update `Finschia/finschia-sdk`

* (fixup) `Finschia/finschia-sdk`

* Fix typo of `Ostracon`

* Fix the wrong link of docs of `vrf-based-proposer-election`
  • Loading branch information
tnasu authored Apr 17, 2023
1 parent c80f1b7 commit 1c9c22c
Show file tree
Hide file tree
Showing 516 changed files with 2,634 additions and 2,317 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
elif [[ $GITHUB_REF == refs/heads/* ]]; then
VERSION=$(echo ${GITHUB_REF#refs/heads/} | sed -r 's#/+#-#g')
DEFAULT_BRANCH=$(curl -s -H "Accept: application/vnd.github.v3+json" \
https://api.github.com/repos/line/ostracon | \
https://api.github.com/repos/Finschia/ostracon | \
grep default_branch | \
cut -d"\"" -f4)
if [ "$DEFAULT_BRANCH" = "$VERSION" ]; then
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/proto-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
elif [[ $GITHUB_REF == refs/heads/* ]]; then
VERSION=$(echo ${GITHUB_REF#refs/heads/} | sed -r 's#/+#-#g')
DEFAULT_BRANCH=$(curl -s -H "Accept: application/vnd.github.v3+json" \
https://api.github.com/repos/line/ostracon | \
https://api.github.com/repos/Finschia/ostracon | \
grep default_branch | \
cut -d"\"" -f4)
if [ "$DEFAULT_BRANCH" = "$VERSION" ]; then
Expand Down
252 changes: 126 additions & 126 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ representative at an online or offline event.

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
[dl_oss_dev@linecorp.com](mailto:dl_oss_dev@linecorp.com).
[dev@finschia.org](mailto:dev@finschia.org).
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
Expand Down
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ main Ostracon project, the following process leads to the best chance of
landing changes in `main`.

All work on the code base should be motivated by a [Github
Issue](https://github.com/line/ostracon/issues).
[Search](https://github.com/line/ostracon/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)
Issue](https://github.com/Finschia/ostracon/issues).
[Search](https://github.com/Finschia/ostracon/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)
is a good place start when looking for places to contribute. If you
would like to work on an issue which already exists, please indicate so
by leaving a comment.

All new contributions should start with a [Github
Issue](https://github.com/line/ostracon/issues/new/choose). The
Issue](https://github.com/Finschia/ostracon/issues/new/choose). The
issue helps capture the problem you're trying to solve and allows for
early feedback. Once the issue is created the process can proceed in different
directions depending on how well defined the problem and potential
Expand Down Expand Up @@ -46,12 +46,12 @@ Please note that Go requires code to live under absolute paths, which complicate
While my fork lives at `https://github.com/ebuchman/ostracon`,
the code should never exist at `$GOPATH/src/github.com/ebuchman/ostracon`.
Instead, we use `git remote` to add the fork as a new remote for the original repo,
`$GOPATH/src/github.com/line/ostracon`, and do all the work there.
`$GOPATH/src/github.com/Finschia/ostracon`, and do all the work there.

For instance, to create a fork and work on a branch of it, I would:

- Create the fork on GitHub, using the fork button.
- Go to the original repo checked out locally (i.e. `$GOPATH/src/github.com/line/ostracon`)
- Go to the original repo checked out locally (i.e. `$GOPATH/src/github.com/Finschia/ostracon`)
- `git remote rename origin upstream`
- `git remote add origin git@github.com:ebuchman/basecoin.git`

Expand Down Expand Up @@ -149,7 +149,7 @@ easy to reference the pull request where a change was introduced.

The latest state of development is on `main`, which must never fail `make test`. _Never_ force push `main`, unless fixing broken git history (which we rarely do anyways).

To begin contributing, create a development branch either on `github.com/line/ostracon`, or your fork (using `git remote add origin`).
To begin contributing, create a development branch either on `github.com/Finschia/ostracon`, or your fork (using `git remote add origin`).

Make changes, and before submitting a pull request, update the `CHANGELOG_PENDING.md` to record your change. Also, run either `git rebase` or `git merge` on top of the latest `main`. (Since pull requests are squash-merged, either is fine!)

Expand Down
2 changes: 1 addition & 1 deletion DOCKER/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN make build-linux

# stage 2
FROM golang:1.18-alpine
LABEL maintainer="hello@blockchain.line.me"
LABEL maintainer="hello@finschia.org"

# Ostracon will be looking for the genesis file in /ostracon/config/genesis.json
# (unless you change `genesis_file` in config.toml). You can put your config.toml and
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2021 LINE Plus Corporation
Copyright 2023 Finschia Foundation

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PACKAGES=$(shell go list ./...)
SRCPATH=$(shell pwd)
OUTPUT?=build/ostracon

INCLUDE = -I=${GOPATH}/src/github.com/line/ostracon -I=${GOPATH}/src -I=${GOPATH}/src/github.com/gogo/protobuf/protobuf
INCLUDE = -I=${GOPATH}/src/github.com/Finschia/ostracon -I=${GOPATH}/src -I=${GOPATH}/src/github.com/gogo/protobuf/protobuf
BUILD_TAGS ?= ostracon
VERSION := $(shell git describe --always)
ifeq ($(LIBSODIUM), 1)
Expand All @@ -12,9 +12,9 @@ else
BUILD_TAGS += r2ishiguro
LIBSODIUM_TARGET =
endif
LD_FLAGS = -X github.com/line/ostracon/version.OCCoreSemVer=$(VERSION)
LD_FLAGS = -X github.com/Finschia/ostracon/version.OCCoreSemVer=$(VERSION)
BUILD_FLAGS = -mod=readonly -ldflags "$(LD_FLAGS)"
HTTPS_GIT := https://github.com/line/ostracon.git
HTTPS_GIT := https://github.com/Finschia/ostracon.git
DOCKER_BUF := docker run -v $(shell pwd):/workspace --workdir /workspace bufbuild/buf
CGO_ENABLED ?= 0
TARGET_OS ?= $(shell go env GOOS)
Expand Down Expand Up @@ -192,7 +192,7 @@ go.sum: go.mod
draw_deps:
@# requires brew install graphviz or apt-get install graphviz
go get github.com/RobotsAndPencils/goviz
@goviz -i github.com/line/ostracon/cmd/ostracon -d 3 | dot -Tpng -o dependency-graph.png
@goviz -i github.com/Finschia/ostracon/cmd/ostracon -d 3 | dot -Tpng -o dependency-graph.png
.PHONY: draw_deps

get_deps_bin_size:
Expand All @@ -208,9 +208,9 @@ get_deps_bin_size:

# generates certificates for TLS testing in remotedb and RPC server
gen_certs: clean_certs
certstrap init --common-name "blockchain.line.me" --passphrase ""
certstrap init --common-name "finschia.org" --passphrase ""
certstrap request-cert --common-name "server" -ip "127.0.0.1" --passphrase ""
certstrap sign "server" --CA "blockchain.line.me" --passphrase ""
certstrap sign "server" --CA "finschia.org" --passphrase ""
mv out/server.crt rpc/jsonrpc/server/test.crt
mv out/server.key rpc/jsonrpc/server/test.key
rm -rf out
Expand All @@ -228,7 +228,7 @@ clean_certs:

format:
find . -name '*.go' -type f -not -path "*.git*" -not -name '*.pb.go' -not -name '*pb_test.go' | xargs gofmt -w -s
find . -name '*.go' -type f -not -path "*.git*" -not -name '*.pb.go' -not -name '*pb_test.go' | xargs goimports -w -local github.com/line/ostracon
find . -name '*.go' -type f -not -path "*.git*" -not -name '*.pb.go' -not -name '*pb_test.go' | xargs goimports -w -local github.com/Finschia/ostracon
.PHONY: format

lint:
Expand Down Expand Up @@ -293,7 +293,7 @@ build_c-amazonlinux:
### Local testnet using docker ###
###############################################################################

DOCKER_HOME = /go/src/github.com/line/ostracon
DOCKER_HOME = /go/src/github.com/Finschia/ostracon
DOCKER_CMD = docker run --rm \
-v `pwd`:$(DOCKER_HOME) \
-w $(DOCKER_HOME)
Expand Down
1 change: 1 addition & 0 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Copyright 2016 All in Bits, Inc
Copyright 2021 LINE Plus Corporation
Copyright 2023 Finschia Foundation

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Ostracon

![example workflow](https://github.com/line/ostracon/actions/workflows/build.yml/badge.svg)
![example workflow](https://github.com/line/ostracon/actions/workflows/coverage.yml/badge.svg)
![example workflow](https://github.com/Finschia/ostracon/actions/workflows/build.yml/badge.svg)
![example workflow](https://github.com/Finschia/ostracon/actions/workflows/coverage.yml/badge.svg)

[Ostracon](docs/en/01-overview.md "Ostracon: A Fast, Secure Consensus Layer for The Blockchain of New Token Economy")
is forked from Tendermint Core [v0.34.19](https://github.com/tendermint/tendermint/tree/v0.34.19) at 2021-03-15.
Expand All @@ -16,16 +16,16 @@ is forked from Tendermint Core [v0.34.19](https://github.com/tendermint/tendermi

## git clone
```shell
git clone https://github.com/line/ostracon.git
git clone https://github.com/Finschia/ostracon.git
# or
git clone git@github.com:line/ostracon.git
git clone git@github.com:Finschia/ostracon.git
```

### git clone with recursive if you want to use libsodium
```shell
git clone --recursive https://github.com/line/ostracon.git
git clone --recursive https://github.com/Finschia/ostracon.git
# or
git clone --recursive git@github.com:line/ostracon.git
git clone --recursive git@github.com:Finschia/ostracon.git
```

### git submodule if you forget to clone with submodule
Expand Down
4 changes: 2 additions & 2 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
For more information on how to upgrade to Ostracon 1.0, please see [UPGRADING.md](https://github.com/line/ostracon/blob/release/v1.0.0/UPGRADING.md).
For a full list of user-facing changes, please see [CHANGELOG.md](https://github.com/line/ostracon/blob/release/v1.0.0/CHANGELOG.md).
For more information on how to upgrade to Ostracon 1.0, please see [UPGRADING.md](https://github.com/Finschia/ostracon/blob/release/v1.0.0/UPGRADING.md).
For a full list of user-facing changes, please see [CHANGELOG.md](https://github.com/Finschia/ostracon/blob/release/v1.0.0/CHANGELOG.md).
2 changes: 1 addition & 1 deletion UPGRADING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This guide provides instructions for upgrading to specific versions of Ostracon.

## v1.0.0

**Ostracon [v1.0.0](https://github.com/line/ostracon/blob/v1.0.0/CHANGELOG.md#v100)**
**Ostracon [v1.0.0](https://github.com/Finschia/ostracon/blob/v1.0.0/CHANGELOG.md#v100)**

## v0.0.0

Expand Down
6 changes: 3 additions & 3 deletions abci/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (

"github.com/tendermint/tendermint/abci/types"

ocabci "github.com/line/ostracon/abci/types"
"github.com/line/ostracon/libs/service"
tmsync "github.com/line/ostracon/libs/sync"
ocabci "github.com/Finschia/ostracon/abci/types"
"github.com/Finschia/ostracon/libs/service"
tmsync "github.com/Finschia/ostracon/libs/sync"
)

//go:generate mockery --case underscore --name Client
Expand Down
8 changes: 4 additions & 4 deletions abci/client/grpc_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (

"github.com/tendermint/tendermint/abci/types"

ocabci "github.com/line/ostracon/abci/types"
tmnet "github.com/line/ostracon/libs/net"
"github.com/line/ostracon/libs/service"
tmsync "github.com/line/ostracon/libs/sync"
ocabci "github.com/Finschia/ostracon/abci/types"
tmnet "github.com/Finschia/ostracon/libs/net"
"github.com/Finschia/ostracon/libs/service"
tmsync "github.com/Finschia/ostracon/libs/sync"
)

var _ Client = (*grpcClient)(nil)
Expand Down
6 changes: 3 additions & 3 deletions abci/client/grpc_client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (

"github.com/tendermint/tendermint/abci/types"

"github.com/line/ostracon/abci/server"
ocabci "github.com/line/ostracon/abci/types"
"github.com/line/ostracon/libs/rand"
"github.com/Finschia/ostracon/abci/server"
ocabci "github.com/Finschia/ostracon/abci/types"
"github.com/Finschia/ostracon/libs/rand"
"github.com/stretchr/testify/require"
)

Expand Down
6 changes: 3 additions & 3 deletions abci/client/local_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package abcicli
import (
"github.com/tendermint/tendermint/abci/types"

ocabci "github.com/line/ostracon/abci/types"
"github.com/line/ostracon/libs/service"
tmsync "github.com/line/ostracon/libs/sync"
ocabci "github.com/Finschia/ostracon/abci/types"
"github.com/Finschia/ostracon/libs/service"
tmsync "github.com/Finschia/ostracon/libs/sync"
)

var _ Client = (*localClient)(nil)
Expand Down
2 changes: 1 addition & 1 deletion abci/client/local_client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/tendermint/tendermint/abci/types"

ocabci "github.com/line/ostracon/abci/types"
ocabci "github.com/Finschia/ostracon/abci/types"
"github.com/stretchr/testify/require"
)

Expand Down
Loading

0 comments on commit 1c9c22c

Please sign in to comment.