Skip to content

Commit

Permalink
Merge pull request #139 from celestiaorg/evan/celestia-ize-46
Browse files Browse the repository at this point in the history
chore: Swap tendermint for celestia-core for v0.46.0-beta2
  • Loading branch information
evan-forbes authored May 6, 2022
2 parents ec252e2 + 8782f76 commit 3358ea3
Show file tree
Hide file tree
Showing 14 changed files with 85 additions and 676 deletions.
3 changes: 1 addition & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@
# most precedence.

# Primary repo maintainers
* @aaronc @alexanderbez

* @liamsi @evan-forbes
65 changes: 0 additions & 65 deletions .github/labeler.yml

This file was deleted.

3 changes: 2 additions & 1 deletion .github/workflows/atlas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ name: Atlas
on:
push:
branches:
- master
- v[0-9]+.[0-9]+.x-celestia
- release/**
paths:
- "x/**/atlas/*"
pull_request:
Expand Down
18 changes: 5 additions & 13 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Build & Push
# Build & Push builds the simapp docker image on every push to master and
# and pushes the image to https://hub.docker.com/r/interchainio/simapp/tags
name: Build Simapp Docker
# Builds the simapp docker image on every push to default branch.
on:
push:
branches:
- master
- v[0-9]+.[0-9]+.x-celestia
- release/**
tags:
- "v[0-9]+.[0-9]+.[0-9]+" # Push events to matching v*, i.e. v1.0, v20.15.10
- "v[0-9]+.[0-9]+.[0-9]+-rc*" # Push events to matching v*, i.e. v1.0-rc1, v20.15.10-rc5
Expand Down Expand Up @@ -44,15 +44,7 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Login to DockerHub
if: ${{ github.event_name != 'pull_request' }}
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Publish to Docker Hub
- name: Build but do not Publish to Docker Hub
uses: docker/build-push-action@v2
with:
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.prep.outputs.tags }}
11 changes: 0 additions & 11 deletions .github/workflows/labeler.yml

This file was deleted.

3 changes: 2 additions & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ on:
pull_request:
push:
branches:
- master
- v[0-9]+.[0-9]+.x-celestia
- release/**
jobs:
golangci:
name: golangci-lint
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-sims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ jobs:
steps:
- name: install runsim
run: |
export GO111MODULE="on" && go get github.com/cosmos/tools/cmd/[email protected]
- uses: actions/cache@v3
export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/[email protected]
- uses: actions/cache@v3.0.2
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/sims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ name: Sims
# Sims workflow runs multiple types of simulations (nondeterminism, import-export, after-import, multi-seed-short)
# This workflow will run on all Pull Requests, if a .go, .mod or .sum file have been changed
on:
schedule:
- cron: "* */2 * * *"
release:
types: [published]
pull_request:
push:
branches:
- v[0-9]+.[0-9]+.x-celestia
- release/**

jobs:
cleanup-runs:
Expand Down Expand Up @@ -37,7 +38,7 @@ jobs:
- name: Display go version
run: go version
- name: Install runsim
run: export GO111MODULE="on" && go get github.com/cosmos/tools/cmd/[email protected]
run: export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/[email protected]
- uses: actions/cache@v3
with:
path: ~/go/bin
Expand Down
22 changes: 3 additions & 19 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ on:
pull_request:
push:
branches:
- master
- v[0-9]+.[0-9]+.x-celestia
- release/**

permissions:
contents: read

jobs:
cleanup-runs:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -177,23 +178,6 @@ jobs:
file: ./coverage.txt
if: env.GIT_DIFF

test-rosetta:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- uses: technote-space/[email protected]
id: git_diff
with:
PATTERNS: |
**/**.go
go.mod
go.sum
- name: test rosetta
run: |
make test-rosetta
# if: env.GIT_DIFF

liveness-test:
runs-on: ubuntu-latest
timeout-minutes: 15
Expand Down
19 changes: 19 additions & 0 deletions baseapp/abci.go
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,25 @@ func (app *BaseApp) snapshot(height int64) {
}
}

// PreprocessTxs fullfills the celestia-core version of the ACBI interface. It
// allows for arbitrary processing steps before transaction data is included in
// the block.
func (app *BaseApp) PrepareProposal(req abci.RequestPrepareProposal) abci.ResponsePrepareProposal {
// TODO(evan): fully implement
// pass through txs w/o processing for now
return abci.ResponsePrepareProposal{
BlockData: req.BlockData,
}
}

// ProcessProposal fulfills the celestia-core version of the ABCI++ interface.
// It allows for arbitrary processing to occur after recieving a proposal block
func (app *BaseApp) ProcessProposal(req abci.RequestProcessProposal) abci.ResponseProcessProposal {
return abci.ResponseProcessProposal{
Result: abci.ResponseProcessProposal_ACCEPT,
}
}

// Query implements the ABCI interface. It delegates to CommitMultiStore if it
// implements Queryable.
func (app *BaseApp) Query(req abci.RequestQuery) (res abci.ResponseQuery) {
Expand Down
16 changes: 4 additions & 12 deletions contrib/devtools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,25 +57,17 @@ tools-stamp: statik runsim
# in a row.
touch $@

# Install the runsim binary with a temporary workaround of entering an outside
# directory as the "go get" command ignores the -mod option and will polute the
# go.{mod, sum} files.
#
# ref: https://github.com/golang/go/issues/30515
# Install the runsim binary.
statik: $(STATIK)
$(STATIK):
@echo "Installing statik..."
@(cd /tmp && go get github.com/rakyll/[email protected])
@(cd /tmp && go install github.com/rakyll/[email protected])

# Install the runsim binary with a temporary workaround of entering an outside
# directory as the "go get" command ignores the -mod option and will polute the
# go.{mod, sum} files.
#
# ref: https://github.com/golang/go/issues/30515
# Install the runsim binary.
runsim: $(RUNSIM)
$(RUNSIM):
@echo "Installing runsim..."
@(cd /tmp && go get github.com/cosmos/tools/cmd/[email protected])
@(cd /tmp && go install github.com/cosmos/tools/cmd/[email protected])

tools-clean:
rm -f $(STATIK) $(GOLANGCI_LINT) $(RUNSIM)
Expand Down
8 changes: 7 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ require (
github.com/tendermint/tm-db v0.6.6
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac
google.golang.org/grpc v1.45.0
google.golang.org/grpc v1.46.0
google.golang.org/protobuf v1.28.0
pgregory.net/rapid v0.4.7
sigs.k8s.io/yaml v1.3.0
Expand All @@ -69,6 +69,10 @@ require (
github.com/aws/aws-sdk-go v1.40.45 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
github.com/celestiaorg/go-leopard v0.1.0 // indirect
github.com/celestiaorg/merkletree v0.0.0-20210714075610-a84dc3ddbbe4 // indirect
github.com/celestiaorg/nmt v0.8.0 // indirect
github.com/celestiaorg/rsmt2d v0.5.0 // indirect
github.com/cenkalti/backoff/v4 v4.1.1 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
Expand Down Expand Up @@ -131,6 +135,7 @@ require (
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
github.com/ulikunitz/xz v0.5.8 // indirect
github.com/vivint/infectious v0.0.0-20200605153912-25a574ae18a3 // indirect
github.com/zondax/hid v0.9.1-0.20220302062450-5552068d2266 // indirect
go.etcd.io/bbolt v1.3.6 // indirect
go.opencensus.io v0.23.0 // indirect
Expand All @@ -157,6 +162,7 @@ replace (
// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.0
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.2.0-tm-v0.35.4
)

retract v0.43.0
Loading

0 comments on commit 3358ea3

Please sign in to comment.