feat: integrate ostracon (#317)

* fix: treat addresses as strings

* fix: compile errors, test failures

* fix: works-1

* feat: integrate ostracon

* fix: bump up ostracon

* fix: lint error

* fix: bump up ostracon

* fix: self review

* fix: modify changelog

* fix: disable arm building

* fix: bls build failure on arm

* fix: bls build failure on arm

* fix: bls build failure on arm

.github/workflows/test.yml

@@ -38,8 +38,19 @@ jobs:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- go-arch: ["amd64", "arm", "arm64"]
+ include:
+ - goarch: "amd64"
+ gcc: "gcc"
+ package: ""
+ - goarch: "arm64"
+ gcc: "aarch64-linux-gnu-gcc"
+ package: "g++-aarch64-linux-gnu"
+ - goarch: "arm"
+ gcc: "arm-linux-gnueabi-gcc"
+ package: "g++-arm-linux-gnueabi"
  steps:
+ - run: sudo apt update && sudo apt install -y ${{ matrix.package }} qemu-user-binfmt
+ if: "matrix.package != ''"
  - uses: actions/checkout@v2
  - uses: actions/setup-go@v2.1.3
  with:
@@ -52,7 +63,7 @@ jobs:
  go.mod
  go.sum
  - name: Build
- run: GOARCH=${{ matrix.go-arch }} LEDGER_ENABLED=false make build
+ run: GOOS=linux CGO_ENABLED=1 GOARCH=${{ matrix.goarch }} CC=${{ matrix.gcc }} LEDGER_ENABLED=false make build
 
  # TODO: disable test-race. please enable this after fixing concurrent checkTx
  # test-cosmovisor:

CHANGELOG.md

@@ -67,6 +67,7 @@
 * (api) [\#130](https://github.com/line/lfb-sdk/pull/130) Rename rest apis
 * (auth) [\#265](https://github.com/line/lfb-sdk/pull/265) Introduce sig block height for the new replay protection
 * (global) [\#298](https://github.com/line/lfb-sdk/pull/298) Treat addresses as strings
+* (ostracon) [\#317](https://github.com/line/lfb-sdk/pull/317) Integrate Ostracon including vrf election and voter concept
 
 ### Build, CI
 * (ci) [\#234](https://github.com/line/lfb-sdk/pull/234) Fix branch name in ci script

baseapp/abci.go

@@ -12,7 +12,7 @@ import (
 
  "github.com/gogo/protobuf/proto"
  abci "github.com/line/ostracon/abci/types"
- ostproto "github.com/line/ostracon/proto/ostracon/types"
+ ocproto "github.com/line/ostracon/proto/ostracon/types"
  "google.golang.org/grpc/codes"
  grpcstatus "google.golang.org/grpc/status"
 
@@ -28,13 +28,13 @@ import (
 func (app *BaseApp) InitChain(req abci.RequestInitChain) (res abci.ResponseInitChain) {
  // On a new chain, we consider the init chain block height as 0, even though
  // req.InitialHeight is 1 by default.
- initHeader := ostproto.Header{ChainID: req.ChainId, Time: req.Time}
+ initHeader := ocproto.Header{ChainID: req.ChainId, Time: req.Time}
 
  // If req.InitialHeight is > 1, then we set the initial version in the
  // stores.
  if req.InitialHeight > 1 {
  app.initialHeight = req.InitialHeight
- initHeader = ostproto.Header{ChainID: req.ChainId, Height: req.InitialHeight, Time: req.Time}
+ initHeader = ocproto.Header{ChainID: req.ChainId, Height: req.InitialHeight, Time: req.Time}
  err := app.cms.SetInitialVersion(req.InitialHeight)
  if err != nil {
  panic(err)

baseapp/abci_test.go

@@ -5,7 +5,7 @@ import (
  "testing"
 
  abci "github.com/line/ostracon/abci/types"
- ostprototypes "github.com/line/ostracon/proto/ostracon/types"
+ ocprototypes "github.com/line/ostracon/proto/ostracon/types"
  "github.com/line/tm-db/v2/memdb"
  "github.com/stretchr/testify/require"
 
@@ -106,7 +106,7 @@ func TestGetBlockRentionHeight(t *testing.T) {
  tc.bapp.SetParamStore(&paramStore{db: memdb.NewDB()})
  tc.bapp.InitChain(abci.RequestInitChain{
  ConsensusParams: &abci.ConsensusParams{
- Evidence: &ostprototypes.EvidenceParams{
+ Evidence: &ocprototypes.EvidenceParams{
  MaxAgeNumBlocks: tc.maxAgeBlocks,
  },
  },

baseapp/baseapp.go

@@ -11,7 +11,7 @@ import (
  abci "github.com/line/ostracon/abci/types"
  "github.com/line/ostracon/crypto/tmhash"
  "github.com/line/ostracon/libs/log"
- ostproto "github.com/line/ostracon/proto/ostracon/types"
+ ocproto "github.com/line/ostracon/proto/ostracon/types"
  tmdb "github.com/line/tm-db/v2"
 
  "github.com/line/lfb-sdk/codec/types"
@@ -274,7 +274,7 @@ func (app *BaseApp) init() error {
  }
 
  // needed for the export command which inits from store but never calls initchain
- app.setCheckState(ostproto.Header{})
+ app.setCheckState(ocproto.Header{})
  app.Seal()
 
  // make sure the snapshot interval is a multiple of the pruning KeepEvery interval
@@ -350,7 +350,7 @@ func (app *BaseApp) IsSealed() bool { return app.sealed }
 // (i.e. a CacheMultiStore) and a new Context with the same multi-store branch,
 // provided header, and minimum gas prices set. It is set on InitChain and reset
 // on Commit.
-func (app *BaseApp) setCheckState(header ostproto.Header) {
+func (app *BaseApp) setCheckState(header ocproto.Header) {
  ms := app.cms.CacheMultiStore()
  app.checkStateMtx.Lock()
  defer app.checkStateMtx.Unlock()
@@ -369,7 +369,7 @@ func (app *BaseApp) setCheckState(header ostproto.Header) {
 // (i.e. a CacheMultiStore) and a new Context with the same multi-store branch,
 // and provided header. It is set on InitChain and BeginBlock and set to nil on
 // Commit.
-func (app *BaseApp) setDeliverState(header ostproto.Header) {
+func (app *BaseApp) setDeliverState(header ocproto.Header) {
  ms := app.cms.CacheMultiStore()
  app.deliverState = &state{
  ms: ms,
@@ -394,14 +394,14 @@ func (app *BaseApp) GetConsensusParams(ctx sdk.Context) *abci.ConsensusParams {
  }
 
  if app.paramStore.Has(ctx, ParamStoreKeyEvidenceParams) {
- var ep ostproto.EvidenceParams
+ var ep ocproto.EvidenceParams
 
  app.paramStore.Get(ctx, ParamStoreKeyEvidenceParams, &ep)
  cp.Evidence = &ep
  }
 
  if app.paramStore.Has(ctx, ParamStoreKeyValidatorParams) {
- var vp ostproto.ValidatorParams
+ var vp ocproto.ValidatorParams
 
  app.paramStore.Get(ctx, ParamStoreKeyValidatorParams, &vp)
  cp.Validator = &vp

baseapp/baseapp_test.go

@@ -16,7 +16,7 @@ import (
  "github.com/gogo/protobuf/jsonpb"
  abci "github.com/line/ostracon/abci/types"
  "github.com/line/ostracon/libs/log"
- ostproto "github.com/line/ostracon/proto/ostracon/types"
+ ocproto "github.com/line/ostracon/proto/ostracon/types"
  tmdb "github.com/line/tm-db/v2"
  "github.com/line/tm-db/v2/memdb"
  "github.com/stretchr/testify/assert"
@@ -76,7 +76,7 @@ func (ps *paramStore) Get(_ sdk.Context, key []byte, ptr interface{}) {
 }
 
 func defaultLogger() log.Logger {
- return log.NewTMLogger(log.NewSyncWriter(os.Stdout)).With("module", "sdk/app")
+ return log.NewOCLogger(log.NewSyncWriter(os.Stdout)).With("module", "sdk/app")
 }
 
 func newBaseApp(name string, options ...func(*BaseApp)) *BaseApp {
@@ -154,7 +154,7 @@ func setupBaseAppWithSnapshots(t *testing.T, blocks uint, blockTxs int, options
  r := rand.New(rand.NewSource(3920758213583))
  keyCounter := 0
  for height := int64(1); height <= int64(blocks); height++ {
- app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: height}})
+ app.BeginBlock(abci.RequestBeginBlock{Header: ocproto.Header{Height: height}})
  for txNum := 0; txNum < blockTxs; txNum++ {
  tx := txTest{Msgs: []sdk.Msg{}}
  for msgNum := 0; msgNum < 100; msgNum++ {
@@ -225,13 +225,13 @@ func TestLoadVersion(t *testing.T) {
  require.Equal(t, emptyCommitID, lastID)
 
  // execute a block, collect commit ID
- header := ostproto.Header{Height: 1}
+ header := ocproto.Header{Height: 1}
  app.BeginBlock(abci.RequestBeginBlock{Header: header})
  res := app.Commit()
  commitID1 := sdk.CommitID{Version: 1, Hash: res.Data}
 
  // execute a block, collect commit ID
- header = ostproto.Header{Height: 2}
+ header = ocproto.Header{Height: 2}
  app.BeginBlock(abci.RequestBeginBlock{Header: header})
  res = app.Commit()
  commitID2 := sdk.CommitID{Version: 2, Hash: res.Data}
@@ -330,7 +330,7 @@ func TestSetLoader(t *testing.T) {
  require.Nil(t, err)
 
  // "execute" one block
- app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: 2}})
+ app.BeginBlock(abci.RequestBeginBlock{Header: ocproto.Header{Height: 2}})
  res := app.Commit()
  require.NotNil(t, res.Data)
 
@@ -375,7 +375,7 @@ func TestLoadVersionInvalid(t *testing.T) {
  err = app.LoadVersion(-1)
  require.Error(t, err)
 
- header := ostproto.Header{Height: 1}
+ header := ocproto.Header{Height: 1}
  app.BeginBlock(abci.RequestBeginBlock{Header: header})
  res := app.Commit()
  commitID1 := sdk.CommitID{Version: 1, Hash: res.Data}
@@ -425,7 +425,7 @@ func TestLoadVersionPruning(t *testing.T) {
  // Commit seven blocks, of which 7 (latest) is kept in addition to 6, 5
  // (keep recent) and 3 (keep every).
  for i := int64(1); i <= 7; i++ {
- app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: i}})
+ app.BeginBlock(abci.RequestBeginBlock{Header: ocproto.Header{Height: i}})
  res := app.Commit()
  lastCommitID = sdk.CommitID{Version: i, Hash: res.Data}
  }
@@ -624,7 +624,7 @@ func TestInitChainer(t *testing.T) {
  require.Equal(t, value, res.Value)
 
  // commit and ensure we can still query
- header := ostproto.Header{Height: app.LastBlockHeight() + 1}
+ header := ocproto.Header{Height: app.LastBlockHeight() + 1}
  app.BeginBlock(abci.RequestBeginBlock{Header: header})
  app.Commit()
 
@@ -662,14 +662,14 @@ func TestBeginBlock_WithInitialHeight(t *testing.T) {
 
  require.PanicsWithError(t, "invalid height: 4; expected: 3", func() {
  app.BeginBlock(abci.RequestBeginBlock{
- Header: ostproto.Header{
+ Header: ocproto.Header{
  Height: 4,
  },
  })
  })
 
  app.BeginBlock(abci.RequestBeginBlock{
- Header: ostproto.Header{
+ Header: ocproto.Header{
  Height: 3,
  },
  })
@@ -951,7 +951,7 @@ func TestCheckTx(t *testing.T) {
  require.Equal(t, nTxs, storedCounter)
 
  // If a block is committed, CheckTx state should be reset.
- header := ostproto.Header{Height: 1}
+ header := ocproto.Header{Height: 1}
  app.BeginBlock(abci.RequestBeginBlock{Header: header})
  app.EndBlock(abci.RequestEndBlock{})
  app.Commit()
@@ -990,7 +990,7 @@ func TestDeliverTx(t *testing.T) {
  txPerHeight := 5
 
  for blockN := 0; blockN < nBlocks; blockN++ {
- header := ostproto.Header{Height: int64(blockN) + 1}
+ header := ocproto.Header{Height: int64(blockN) + 1}
  app.BeginBlock(abci.RequestBeginBlock{Header: header})
 
  for i := 0; i < txPerHeight; i++ {
@@ -1044,7 +1044,7 @@ func TestMultiMsgDeliverTx(t *testing.T) {
  // run a multi-msg tx
  // with all msgs the same route
 
- header := ostproto.Header{Height: 1}
+ header := ocproto.Header{Height: 1}
  app.BeginBlock(abci.RequestBeginBlock{Header: header})
  tx := newTxCounter(0, 0, 1, 2)
  txBytes, err := codec.MarshalBinaryBare(tx)
@@ -1125,7 +1125,7 @@ func TestSimulateTx(t *testing.T) {
  nBlocks := 3
  for blockN := 0; blockN < nBlocks; blockN++ {
  count := int64(blockN + 1)
- header := ostproto.Header{Height: count}
+ header := ocproto.Header{Height: count}
  app.BeginBlock(abci.RequestBeginBlock{Header: header})
 
  tx := newTxCounter(count, count)
@@ -1180,7 +1180,7 @@ func TestRunInvalidTransaction(t *testing.T) {
 
  app := setupBaseApp(t, anteOpt, routerOpt)
 
- header := ostproto.Header{Height: 1}
+ header := ocproto.Header{Height: 1}
  app.BeginBlock(abci.RequestBeginBlock{Header: header})
 
  // transaction with no messages
@@ -1308,7 +1308,7 @@ func TestTxGasLimits(t *testing.T) {
 
  app := setupBaseApp(t, anteOpt, routerOpt)
 
- header := ostproto.Header{Height: 1}
+ header := ocproto.Header{Height: 1}
  app.BeginBlock(abci.RequestBeginBlock{Header: header})
 
  testCases := []struct {
@@ -1422,7 +1422,7 @@ func TestMaxBlockGasLimits(t *testing.T) {
  tx := tc.tx
 
  // reset the block gas
- header := ostproto.Header{Height: app.LastBlockHeight() + 1}
+ header := ocproto.Header{Height: app.LastBlockHeight() + 1}
  app.BeginBlock(abci.RequestBeginBlock{Header: header})
 
  // execute the transaction multiple times
@@ -1475,7 +1475,7 @@ func TestCustomRunTxPanicHandler(t *testing.T) {
 
  app := setupBaseApp(t, anteOpt, routerOpt)
 
- header := ostproto.Header{Height: 1}
+ header := ocproto.Header{Height: 1}
  app.BeginBlock(abci.RequestBeginBlock{Header: header})
 
  app.AddRunTxRecoveryHandler(func(recoveryObj interface{}) error {
@@ -1517,7 +1517,7 @@ func TestBaseAppAnteHandler(t *testing.T) {
  app.InitChain(abci.RequestInitChain{})
  registerTestCodec(cdc)
 
- header := ostproto.Header{Height: app.LastBlockHeight() + 1}
+ header := ocproto.Header{Height: app.LastBlockHeight() + 1}
  app.BeginBlock(abci.RequestBeginBlock{Header: header})
 
  // execute a tx that will fail ante handler execution
@@ -1625,7 +1625,7 @@ func TestGasConsumptionBadTx(t *testing.T) {
 
  app.InitChain(abci.RequestInitChain{})
 
- header := ostproto.Header{Height: app.LastBlockHeight() + 1}
+ header := ocproto.Header{Height: app.LastBlockHeight() + 1}
  app.BeginBlock(abci.RequestBeginBlock{Header: header})
 
  tx := newTxCounter(5, 0)
@@ -1689,7 +1689,7 @@ func TestQuery(t *testing.T) {
  require.Equal(t, 0, len(res.Value))
 
  // query is still empty after a DeliverTx before we commit
- header := ostproto.Header{Height: app.LastBlockHeight() + 1}
+ header := ocproto.Header{Height: app.LastBlockHeight() + 1}
  app.BeginBlock(abci.RequestBeginBlock{Header: header})
 
  _, resTx, err := app.Deliver(aminoTxEncoder(), tx)
@@ -1715,7 +1715,7 @@ func TestGRPCQuery(t *testing.T) {
  app := setupBaseApp(t, grpcQueryOpt)
 
  app.InitChain(abci.RequestInitChain{})
- header := ostproto.Header{Height: app.LastBlockHeight() + 1}
+ header := ocproto.Header{Height: app.LastBlockHeight() + 1}
  app.BeginBlock(abci.RequestBeginBlock{Header: header})
  app.Commit()
 
@@ -1772,7 +1772,7 @@ func TestP2PQuery(t *testing.T) {
 func TestGetMaximumBlockGas(t *testing.T) {
  app := setupBaseApp(t)
  app.InitChain(abci.RequestInitChain{})
- ctx := app.NewContext(true, ostproto.Header{})
+ ctx := app.NewContext(true, ocproto.Header{})
 
  app.StoreConsensusParams(ctx, &abci.ConsensusParams{Block: &abci.BlockParams{MaxGas: 0}})
  require.Equal(t, uint64(0), app.getMaximumBlockGas(ctx))
@@ -1990,7 +1990,7 @@ func TestWithRouter(t *testing.T) {
  txPerHeight := 5
 
  for blockN := 0; blockN < nBlocks; blockN++ {
- header := ostproto.Header{Height: int64(blockN) + 1}
+ header := ocproto.Header{Height: int64(blockN) + 1}
  app.BeginBlock(abci.RequestBeginBlock{Header: header})
 
  for i := 0; i < txPerHeight; i++ {

baseapp/grpcrouter_test.go

@@ -54,7 +54,7 @@ func TestRegisterQueryServiceTwice(t *testing.T) {
  // Setup baseapp.
  db := memdb.NewDB()
  encCfg := simapp.MakeTestEncodingConfig()
- app := baseapp.NewBaseApp("test", log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, encCfg.TxConfig.TxDecoder())
+ app := baseapp.NewBaseApp("test", log.NewOCLogger(log.NewSyncWriter(os.Stdout)), db, encCfg.TxConfig.TxDecoder())
  app.SetInterfaceRegistry(encCfg.InterfaceRegistry)
  testdata.RegisterInterfaces(encCfg.InterfaceRegistry)