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

Invalidate block when missing predicate context #901

Merged
merged 4 commits into from
Sep 27, 2023
+88 −60
Merged

Invalidate block when missing predicate context #901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
64b2bfa
Invalidate block when missing predicate context
StephenButtolph Sep 25, 2023
003e4c3
Fix tests
StephenButtolph Sep 26, 2023
a55888a
Merge branch 'master' into require-block-context
ceyonur Sep 27, 2023
f5b7b2a
Update core/predicate_check.go
aaronbuchwald Sep 27, 2023
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
10 changes: 10 additions & 0 deletions core/predicate_check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package core

import (
"errors"
"fmt"

"github.com/ava-labs/subnet-evm/core/types"
Expand All @@ -14,6 +15,8 @@ import (
"github.com/ethereum/go-ethereum/log"
)

var ErrMissingPredicateContext = errors.New("missing predicate context")

// CheckPredicates verifies the predicates of [tx] and returns the result. Returning an error invalidates the block.
func CheckPredicates(rules params.Rules, predicateContext *precompileconfig.PredicateContext, tx *types.Transaction) (map[common.Address][]byte, error) {
// Check that the transaction can cover its IntrinsicGas (including the gas required by the predicate) before
Expand All @@ -35,6 +38,13 @@ func CheckPredicates(rules params.Rules, predicateContext *precompileconfig.Pred
// Prepare the predicate storage slots from the transaction's access list
predicateArguments := predicateutils.PreparePredicateStorageSlots(rules, tx.AccessList())

// If there are no predicates to verify, return early and skip requiring the proposervm block
// context to be populated.

if predicateContext == nil || predicateContext.ProposerVMBlockCtx == nil {
return nil, ErrMissingPredicateContext
}

for address, predicates := range predicateArguments {
// Since [address] is only added to [predicateArguments] when there's a valid predicate in the ruleset
// there's no need to check if the predicate exists here.
Expand Down
108 changes: 78 additions & 30 deletions core/predicate_check_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
type predicateCheckTest struct {
accessList types.AccessList
gas uint64
predicateContext *precompileconfig.PredicateContext
createPredicates func(t testing.TB) map[common.Address]precompileconfig.Predicater
expectedRes map[common.Address][]byte
expectedErr error
Expand All @@ -32,14 +33,27 @@ func TestCheckPredicate(t *testing.T) {
addr4 := common.HexToAddress("0xdd")
predicateResultBytes1 := []byte{1, 2, 3}
predicateResultBytes2 := []byte{3, 2, 1}
predicateContext := &precompileconfig.PredicateContext{
ProposerVMBlockCtx: &block.Context{
PChainHeight: 10,
},
}
for name, test := range map[string]predicateCheckTest{
"no predicates, no access list passes": {
gas: 53000,
expectedRes: make(map[common.Address][]byte),
expectedErr: nil,
"no predicates, no access list, no context passes": {
gas: 53000,
predicateContext: nil,
expectedRes: make(map[common.Address][]byte),
expectedErr: nil,
},
"no predicates, no access list, with context passes": {
gas: 53000,
predicateContext: predicateContext,
expectedRes: make(map[common.Address][]byte),
expectedErr: nil,
},
"no predicates, with access list passes": {
gas: 57300,
"no predicates, with access list, no context passes": {
gas: 57300,
predicateContext: nil,
accessList: types.AccessList([]types.AccessTuple{
{
Address: addr1,
Expand All @@ -51,8 +65,9 @@ func TestCheckPredicate(t *testing.T) {
expectedRes: make(map[common.Address][]byte),
expectedErr: nil,
},
"predicate no access list passes": {
gas: 53000,
"predicate, no access list, no context passes": {
gas: 53000,
predicateContext: nil,
createPredicates: func(t testing.TB) map[common.Address]precompileconfig.Predicater {
predicate := precompileconfig.NewMockPredicater(gomock.NewController(t))
return map[common.Address]precompileconfig.Predicater{
Expand All @@ -62,13 +77,27 @@ func TestCheckPredicate(t *testing.T) {
expectedRes: make(map[common.Address][]byte),
expectedErr: nil,
},
"predicate named by access list returns empty": {
"predicate, no access list, no block context passes": {
gas: 53000,
predicateContext: &precompileconfig.PredicateContext{
ProposerVMBlockCtx: nil,
},
createPredicates: func(t testing.TB) map[common.Address]precompileconfig.Predicater {
predicate := precompileconfig.NewMockPredicater(gomock.NewController(t))
return map[common.Address]precompileconfig.Predicater{
addr1: predicate,
}
},
expectedRes: make(map[common.Address][]byte),
expectedErr: nil,
},
"predicate named by access list, without context errors": {
gas: 53000,
predicateContext: nil,
createPredicates: func(t testing.TB) map[common.Address]precompileconfig.Predicater {
predicate := precompileconfig.NewMockPredicater(gomock.NewController(t))
arg := common.Hash{1}
predicate.EXPECT().PredicateGas(arg[:]).Return(uint64(0), nil).Times(2)
predicate.EXPECT().VerifyPredicate(gomock.Any(), [][]byte{arg[:]}).Return(nil)
predicate.EXPECT().PredicateGas(arg[:]).Return(uint64(0), nil).Times(1)
return map[common.Address]precompileconfig.Predicater{
addr1: predicate,
}
Expand All @@ -81,13 +110,34 @@ func TestCheckPredicate(t *testing.T) {
},
},
}),
expectedRes: map[common.Address][]byte{
addr1: nil,
expectedErr: ErrMissingPredicateContext,
},
"predicate named by access list, without block context errors": {
gas: 53000,
predicateContext: &precompileconfig.PredicateContext{
ProposerVMBlockCtx: nil,
},
expectedErr: nil,
createPredicates: func(t testing.TB) map[common.Address]precompileconfig.Predicater {
predicate := precompileconfig.NewMockPredicater(gomock.NewController(t))
arg := common.Hash{1}
predicate.EXPECT().PredicateGas(arg[:]).Return(uint64(0), nil).Times(1)
return map[common.Address]precompileconfig.Predicater{
addr1: predicate,
}
},
accessList: types.AccessList([]types.AccessTuple{
{
Address: addr1,
StorageKeys: []common.Hash{
{1},
},
},
}),
expectedErr: ErrMissingPredicateContext,
},
"predicate named by access list returns non-empty": {
gas: 53000,
gas: 53000,
predicateContext: predicateContext,
createPredicates: func(t testing.TB) map[common.Address]precompileconfig.Predicater {
predicate := precompileconfig.NewMockPredicater(gomock.NewController(t))
arg := common.Hash{1}
Expand All @@ -111,7 +161,8 @@ func TestCheckPredicate(t *testing.T) {
expectedErr: nil,
},
"predicate returns gas err": {
gas: 53000,
gas: 53000,
predicateContext: predicateContext,
createPredicates: func(t testing.TB) map[common.Address]precompileconfig.Predicater {
predicate := precompileconfig.NewMockPredicater(gomock.NewController(t))
arg := common.Hash{1}
Expand All @@ -131,7 +182,8 @@ func TestCheckPredicate(t *testing.T) {
expectedErr: testErr,
},
"two predicates one named by access list returns non-empty": {
gas: 53000,
gas: 53000,
predicateContext: predicateContext,
createPredicates: func(t testing.TB) map[common.Address]precompileconfig.Predicater {
predicate := precompileconfig.NewMockPredicater(gomock.NewController(t))
arg := common.Hash{1}
Expand All @@ -156,7 +208,8 @@ func TestCheckPredicate(t *testing.T) {
expectedErr: nil,
},
"two predicates both named by access list returns non-empty": {
gas: 53000,
gas: 53000,
predicateContext: predicateContext,
createPredicates: func(t testing.TB) map[common.Address]precompileconfig.Predicater {
ctrl := gomock.NewController(t)
predicate1 := precompileconfig.NewMockPredicater(ctrl)
Expand Down Expand Up @@ -193,7 +246,8 @@ func TestCheckPredicate(t *testing.T) {
expectedErr: nil,
},
"two predicates niether named by access list": {
gas: 61600,
gas: 61600,
predicateContext: predicateContext,
createPredicates: func(t testing.TB) map[common.Address]precompileconfig.Predicater {
predicate := precompileconfig.NewMockPredicater(gomock.NewController(t))
return map[common.Address]precompileconfig.Predicater{
Expand All @@ -219,7 +273,8 @@ func TestCheckPredicate(t *testing.T) {
expectedErr: nil,
},
"insufficient gas": {
gas: 53000,
gas: 53000,
predicateContext: predicateContext,
createPredicates: func(t testing.TB) map[common.Address]precompileconfig.Predicater {
predicate := precompileconfig.NewMockPredicater(gomock.NewController(t))
arg := common.Hash{1}
Expand Down Expand Up @@ -255,16 +310,9 @@ func TestCheckPredicate(t *testing.T) {
AccessList: test.accessList,
Gas: test.gas,
})
predicateContext := &precompileconfig.PredicateContext{
ProposerVMBlockCtx: &block.Context{
PChainHeight: 10,
},
}
predicateRes, err := CheckPredicates(rules, predicateContext, tx)
if test.expectedErr == nil {
require.NoError(err)
} else {
require.ErrorIs(err, test.expectedErr)
predicateRes, err := CheckPredicates(rules, test.predicateContext, tx)
require.ErrorIs(err, test.expectedErr)
if test.expectedErr != nil {
return
}
require.Equal(test.expectedRes, predicateRes)
Expand Down
4 changes: 0 additions & 4 deletions x/warp/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,6 @@ func (c *Config) PredicateGas(predicateBytes []byte) (uint64, error) {
}

func (c *Config) verifyPredicate(predicateContext *precompileconfig.PredicateContext, predicateBytes []byte) bool {
if predicateContext == nil || predicateContext.ProposerVMBlockCtx == nil {
return false
}

unpackedPredicateBytes, err := predicateutils.UnpackPredicate(predicateBytes)
if err != nil {
return false
Expand Down
26 changes: 0 additions & 26 deletions x/warp/predicate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,32 +230,6 @@ func createValidPredicateTest(snowCtx *snow.Context, numKeys uint64, predicateBy
}
}

func TestWarpNilProposerCtx(t *testing.T) {
numKeys := 1
snowCtx := createSnowCtx([]validatorRange{
{
start: 0,
end: numKeys,
weight: 20,
publicKey: true,
},
})
predicateBytes := createPredicate(numKeys)
test := testutils.PredicateTest{
Config: NewDefaultConfig(subnetEVMUtils.NewUint64(0)),
PredicateContext: &precompileconfig.PredicateContext{
SnowCtx: snowCtx,
ProposerVMBlockCtx: nil,
},
StorageSlots: [][]byte{predicateBytes},
Gas: GasCostPerSignatureVerification + uint64(len(predicateBytes))*GasCostPerWarpMessageBytes + uint64(numKeys)*GasCostPerWarpSigner,
GasErr: nil,
PredicateRes: set.NewBits().Bytes(),
}

test.Run(t)
}

func TestWarpMessageFromPrimaryNetwork(t *testing.T) {
require := require.New(t)
numKeys := 10
Expand Down