fleshing out regeneration/refactor of app

app/abci.go

@@ -7,9 +7,10 @@ import (
 	"sort"
 
 	"github.com/celestiaorg/celestia-app/x/payment/types"
-	abci "github.com/celestiaorg/celestia-core/abci/types"
-	core "github.com/celestiaorg/celestia-core/proto/tendermint/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	abci "github.com/tendermint/tendmint/abci/types"
+	"github.com/tendermint/tendmint/pkg/consts"
+	core "github.com/tendermint/tendmint/proto/tendermint/types"
 )
 
 // This file should contain all of the altered ABCI methods
@@ -88,7 +89,11 @@ func (app *App) PreprocessTxs(txs abci.RequestPreprocessTxs) abci.ResponsePrepro
 
 func hasWirePayForMessage(tx sdk.Tx) bool {
 	for _, msg := range tx.GetMsgs() {
-		if msg.Type() == types.TypeMsgPayforMessage {
+		svcMsg, ok := msg.(sdk.ServiceMsg)
+		if !ok {
+			continue
+		}
+		if svcMsg.SerivceMethod == types.TypeMsgPayforMessage {
 			return true
 		}
 	}
@@ -142,3 +147,9 @@ func (app *App) processMsg(msg sdk.Msg) (core.Message, *types.TxSignedTransactio
 
 	return coreMsg, signedData, nil
 }
+
+// SquareSize returns the current square size. Currently, the square size is
+// hardcoded. todo(evan): don't hardcode the square size
+func (app *App) SquareSize() uint64 {
+	return consts.MaxSquareSize
+}

app/abci_test.go

@@ -8,9 +8,6 @@ import (
 	"testing"
 
 	"github.com/celestiaorg/celestia-app/x/payment/types"
-	abci "github.com/celestiaorg/celestia-core/abci/types"
-	"github.com/celestiaorg/celestia-core/libs/log"
-	core "github.com/celestiaorg/celestia-core/proto/tendermint/types"
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
@@ -28,6 +25,9 @@ import (
 	"github.com/spf13/cast"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	abci "github.com/tendermint/tendmint/abci/types"
+	"github.com/tendermint/tendmint/libs/log"
+	core "github.com/tendermint/tendmint/proto/tendermint/types"
 	dbm "github.com/tendermint/tm-db"
 )