Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat!: reject proposals with un-decodable txs for appVersion two and above #3006

Merged
merged 6 commits into from
Jan 16, 2024
Merged

feat!: reject proposals with un-decodable txs for appVersion two and above #3006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9a80161
test: failing test
rootulp Jan 11, 2024
0df7f26
feat!: reject proposals with undecodable txs
rootulp Jan 11, 2024
0b7ba89
feat: preserve old behavior for v1
rootulp Jan 12, 2024
0647006
refactor: prefer v1 and v2 consts
rootulp Jan 12, 2024
c4aa247
Update app/test/process_proposal_test.go
rootulp Jan 14, 2024
e0b5715
Update app/test/process_proposal_test.go
rootulp Jan 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions app/process_proposal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"time"

"github.com/celestiaorg/celestia-app/app/ante"
v1 "github.com/celestiaorg/celestia-app/pkg/appconsts/v1"
"github.com/celestiaorg/celestia-app/pkg/blob"
"github.com/celestiaorg/celestia-app/pkg/da"
"github.com/celestiaorg/celestia-app/pkg/shares"
Expand Down Expand Up @@ -58,10 +59,14 @@ func (app *App) ProcessProposal(req abci.RequestProcessProposal) (resp abci.Resp

sdkTx, err := app.txConfig.TxDecoder()(tx)
if err != nil {
// we don't reject the block here because it is not a block validity
// rule that all transactions included in the block data are
// decodable
continue
if req.Header.Version.App == v1.Version {
// For appVersion 1, there was no block validity rule that all
// transactions must be decodable.
continue
}
// An error here means that a tx was included in the block that is not decodable.
logInvalidPropBlock(app.Logger(), req.Header, fmt.Sprintf("tx %d is not decodable", idx))
return reject()
rootulp marked this conversation as resolved.
Show resolved Hide resolved
}

// handle non-blob transactions first
Expand Down
41 changes: 39 additions & 2 deletions app/test/process_proposal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,14 @@ import (
abci "github.com/tendermint/tendermint/abci/types"
tmrand "github.com/tendermint/tendermint/libs/rand"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
"github.com/tendermint/tendermint/proto/tendermint/version"
coretypes "github.com/tendermint/tendermint/types"

"github.com/celestiaorg/celestia-app/app"
"github.com/celestiaorg/celestia-app/app/encoding"
"github.com/celestiaorg/celestia-app/pkg/appconsts"
v1 "github.com/celestiaorg/celestia-app/pkg/appconsts/v1"
v2 "github.com/celestiaorg/celestia-app/pkg/appconsts/v2"
"github.com/celestiaorg/celestia-app/pkg/blob"
"github.com/celestiaorg/celestia-app/pkg/da"
appns "github.com/celestiaorg/celestia-app/pkg/namespace"
Expand Down Expand Up @@ -83,6 +86,7 @@ func TestProcessProposal(t *testing.T) {
name string
input *tmproto.Data
mutator func(*tmproto.Data)
appVersion uint64
expectedResult abci.ResponseProcessProposal_Result
}

Expand All @@ -91,6 +95,7 @@ func TestProcessProposal(t *testing.T) {
name: "valid untouched data",
input: validData(),
mutator: func(d *tmproto.Data) {},
appVersion: v1.Version,
expectedResult: abci.ResponseProcessProposal_ACCEPT,
},
{
Expand All @@ -99,6 +104,7 @@ func TestProcessProposal(t *testing.T) {
mutator: func(d *tmproto.Data) {
d.Txs = d.Txs[1:]
},
appVersion: v1.Version,
expectedResult: abci.ResponseProcessProposal_REJECT,
},
{
Expand All @@ -107,6 +113,7 @@ func TestProcessProposal(t *testing.T) {
mutator: func(d *tmproto.Data) {
d.Txs = append(d.Txs, blobTxs[3])
},
appVersion: v1.Version,
expectedResult: abci.ResponseProcessProposal_REJECT,
},
{
Expand All @@ -123,6 +130,7 @@ func TestProcessProposal(t *testing.T) {
blobTxBytes, _ := blobTx.Marshal()
d.Txs[0] = blobTxBytes
},
appVersion: v1.Version,
expectedResult: abci.ResponseProcessProposal_REJECT,
},
{
Expand All @@ -139,6 +147,7 @@ func TestProcessProposal(t *testing.T) {
blobTxBytes, _ := blobTx.Marshal()
d.Txs[0] = blobTxBytes
},
appVersion: v1.Version,
expectedResult: abci.ResponseProcessProposal_REJECT,
},
{
Expand All @@ -155,6 +164,7 @@ func TestProcessProposal(t *testing.T) {
blobTxBytes, _ := blobTx.Marshal()
d.Txs[0] = blobTxBytes
},
appVersion: v1.Version,
expectedResult: abci.ResponseProcessProposal_REJECT,
},
{
Expand All @@ -171,6 +181,7 @@ func TestProcessProposal(t *testing.T) {
blobTxBytes, _ := blobTx.Marshal()
d.Txs[0] = blobTxBytes
},
appVersion: v1.Version,
expectedResult: abci.ResponseProcessProposal_REJECT,
},
{
Expand All @@ -187,6 +198,7 @@ func TestProcessProposal(t *testing.T) {
blobTxBytes, _ := blobTx.Marshal()
d.Txs[0] = blobTxBytes
},
appVersion: v1.Version,
expectedResult: abci.ResponseProcessProposal_REJECT,
},
{
Expand All @@ -199,6 +211,7 @@ func TestProcessProposal(t *testing.T) {
d.Txs[0] = blobTxBytes
d.Hash = calculateNewDataHash(t, d.Txs)
},
appVersion: v1.Version,
expectedResult: abci.ResponseProcessProposal_REJECT,
},
{
Expand All @@ -216,6 +229,7 @@ func TestProcessProposal(t *testing.T) {
// Erasure code the data to update the data root so this doesn't doesn't fail on an incorrect data root.
d.Hash = calculateNewDataHash(t, d.Txs)
},
appVersion: v1.Version,
expectedResult: abci.ResponseProcessProposal_REJECT,
},
{
Expand All @@ -225,6 +239,7 @@ func TestProcessProposal(t *testing.T) {
// swapping the order will cause the data root to be different
d.Txs[0], d.Txs[1], d.Txs[2] = d.Txs[1], d.Txs[2], d.Txs[0]
},
appVersion: v1.Version,
expectedResult: abci.ResponseProcessProposal_REJECT,
},
{
Expand All @@ -234,14 +249,29 @@ func TestProcessProposal(t *testing.T) {
btx, _ := coretypes.UnmarshalBlobTx(blobTxs[3])
d.Txs = append(d.Txs, btx.Tx)
},
appVersion: v1.Version,
expectedResult: abci.ResponseProcessProposal_REJECT,
},
{
name: "undecodable tx",
name: "undecodable tx with app version 1",
input: validData(),
mutator: func(d *tmproto.Data) {
d.Txs = append(d.Txs, tmrand.Bytes(300))
d.Txs = append([][]byte{tmrand.Bytes(300)}, d.Txs...)
// Update the data hash so that the test doesn't fail due to an incorrect data root.
d.Hash = calculateNewDataHash(t, d.Txs)
},
appVersion: v1.Version,
expectedResult: abci.ResponseProcessProposal_ACCEPT,
},
{
name: "undecodable tx with app version 2",
input: validData(),
mutator: func(d *tmproto.Data) {
d.Txs = append([][]byte{tmrand.Bytes(300)}, d.Txs...)
// Update the data hash so that the test doesn't fail due to an incorrect data root.
d.Hash = calculateNewDataHash(t, d.Txs)
},
appVersion: v2.Version,
expectedResult: abci.ResponseProcessProposal_REJECT,
},
{
Expand All @@ -251,6 +281,7 @@ func TestProcessProposal(t *testing.T) {
// swap txs at index 2 and 3 (essentially swapping a PFB with a normal tx)
d.Txs[3], d.Txs[2] = d.Txs[2], d.Txs[3]
},
appVersion: v1.Version,
expectedResult: abci.ResponseProcessProposal_REJECT,
},
{
Expand All @@ -260,6 +291,7 @@ func TestProcessProposal(t *testing.T) {
d.Txs = append(d.Txs, badSigBlobTx)
d.Hash = calculateNewDataHash(t, d.Txs)
},
appVersion: v1.Version,
expectedResult: abci.ResponseProcessProposal_REJECT,
},
{
Expand All @@ -269,6 +301,7 @@ func TestProcessProposal(t *testing.T) {
d.Txs = append(d.Txs, blobTxWithInvalidNonce)
d.Hash = calculateNewDataHash(t, d.Txs)
},
appVersion: v1.Version,
expectedResult: abci.ResponseProcessProposal_REJECT,
},
{
Expand All @@ -295,6 +328,7 @@ func TestProcessProposal(t *testing.T) {
// square with a tampered sequence start indicator
d.Hash = dah.Hash()
},
appVersion: v1.Version,
expectedResult: abci.ResponseProcessProposal_REJECT,
},
}
Expand All @@ -318,6 +352,9 @@ func TestProcessProposal(t *testing.T) {
Height: 1,
DataHash: resp.BlockData.Hash,
ChainID: testutil.ChainID,
Version: version.Consensus{
App: tt.appVersion,
},
},
})
assert.Equal(t, tt.expectedResult, res.Result, fmt.Sprintf("expected %v, got %v", tt.expectedResult, res.Result))
Expand Down
Loading
Loading