Merge pull request #63 from celestiaorg/evan/prepare-process-proposal

use latest ABCI++ version of core and add the new methods to baseapp

baseapp/abci.go

@@ -396,15 +396,22 @@ func (app *BaseApp) snapshot(height int64) {
 	}
 }
 
-// PreprocessTxs fullfills the lazyledger-core version of the ACBI interface,
-// also proposed here https://github.com/tendermint/spec/issues/194. It allows
-// for arbitrary processing steps before transaction data is included in the block.
-// todo(evan): update documentation after implemented
-func (app *BaseApp) PreprocessTxs(txs abci.RequestPreprocessTxs) abci.ResponsePreprocessTxs {
+// 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.ResponsePreprocessTxs{
-		Txs: txs.Txs,
+	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,
 	}
 }
 

contrib/devtools/dockerfile

@@ -7,7 +7,7 @@ ENV GOLANG_PROTOBUF_VERSION=1.3.5 \
   GRPC_GATEWAY_VERSION=1.14.7 
 
 
-RUN GO111MODULE=on go get \
+RUN GO111MODULE=on go install \
   github.com/golang/protobuf/protoc-gen-go@v${GOLANG_PROTOBUF_VERSION} \
   github.com/gogo/protobuf/protoc-gen-gogo@v${GOGO_PROTOBUF_VERSION} \
   github.com/gogo/protobuf/protoc-gen-gogofast@v${GOGO_PROTOBUF_VERSION} \
@@ -16,7 +16,7 @@ RUN GO111MODULE=on go get \
   github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger@v${GRPC_GATEWAY_VERSION} \
   github.com/regen-network/cosmos-proto/protoc-gen-gocosmos@latest
 
-RUN GO111MODULE=on go get -u github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc
+RUN GO111MODULE=on go install -u github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc
 
 RUN apk add --no-cache \
   nodejs \

go.mod

@@ -26,31 +26,29 @@ require (
 	github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87
 	github.com/improbable-eng/grpc-web v0.14.1
 	github.com/jhump/protoreflect v1.9.0
-	github.com/lib/pq v1.10.2 // indirect
 	github.com/magiconair/properties v1.8.5
 	github.com/mattn/go-isatty v0.0.14
 	github.com/onsi/ginkgo v1.16.4 // indirect
-	github.com/onsi/gomega v1.13.0 // indirect
 	github.com/otiai10/copy v1.6.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.11.0
-	github.com/prometheus/common v0.29.0
+	github.com/prometheus/common v0.30.0
 	github.com/rakyll/statik v0.1.7
 	github.com/regen-network/cosmos-proto v0.3.1
 	github.com/rs/zerolog v1.23.0
-	github.com/spf13/cast v1.3.1
+	github.com/spf13/cast v1.4.1
 	github.com/spf13/cobra v1.2.1
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.8.1
+	github.com/spf13/viper v1.9.0
 	github.com/stretchr/testify v1.7.0
 	github.com/tendermint/btcd v0.1.1
 	github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15
 	github.com/tendermint/go-amino v0.16.0
 	github.com/tendermint/tendermint v0.34.14
-	github.com/tendermint/tm-db v0.6.4
-	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a
-	google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c
-	google.golang.org/grpc v1.40.0
+	github.com/tendermint/tm-db v0.6.6
+	golang.org/x/crypto v0.0.0-20210915214749-c084706c2272
+	google.golang.org/genproto v0.0.0-20210917145530-b395a37504d4
+	google.golang.org/grpc v1.42.0
 	google.golang.org/protobuf v1.27.1
 	gopkg.in/yaml.v2 v2.4.0
 )
@@ -59,7 +57,7 @@ replace google.golang.org/grpc => google.golang.org/grpc v1.33.2
 
 replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 
-replace github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v0.34.14-celestia
+replace github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v0.34.15-celestia
 
 replace github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76