Skip to content

Commit

Permalink
Merge branch 'main' into ud/del-unused
Browse files Browse the repository at this point in the history
  • Loading branch information
Unique-Divine authored Oct 1, 2024
2 parents d050ca5 + 48c8146 commit f2483b8
Show file tree
Hide file tree
Showing 5 changed files with 208 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/proto-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
# timeout-minutes: 5
# steps:
# - uses: actions/checkout@v4
# - uses: bufbuild/buf-setup-action@v1.36.0
# - uses: bufbuild/buf-setup-action@v1.42.0
# - uses: bufbuild/buf-lint-action@v1
# with:
# input: "proto"
Expand All @@ -31,7 +31,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: bufbuild/buf-setup-action@v1.36.0
- uses: bufbuild/buf-setup-action@v1.42.0
with:
github_token: ${{ github.token }}
- uses: bufbuild/buf-breaking-action@v1
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [#2023](https://github.com/NibiruChain/nibiru/pull/2023) - fix(evm)!: adjusted generation and parsing of the block bloom events
- [#2030](https://github.com/NibiruChain/nibiru/pull/2030) - refactor(eth/rpc): Delete unused code and improve logging in the eth and debug namespaces
- [#2031](https://github.com/NibiruChain/nibiru/pull/2031) - fix(evm): debug calls with custom tracer and tracer options
- [#2032](https://github.com/NibiruChain/nibiru/pull/2032) - feat(evm): ante handler to prohibit authz grant evm messages
- [#2039](https://github.com/NibiruChain/nibiru/pull/2039) - refactor(rpc-backend): remove unnecessary interface code
- [#2044](https://github.com/NibiruChain/nibiru/pull/2044) - feat(evm): evm tx indexer service implemented
- [#2045](https://github.com/NibiruChain/nibiru/pull/2045) - test(evm): backend tests with test network and real txs
Expand Down Expand Up @@ -174,7 +175,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Bump `github.com/hashicorp/go-getter` from 1.7.1 to 1.7.5 ([#1858](https://github.com/NibiruChain/nibiru/pull/1858), [#1938](https://github.com/NibiruChain/nibiru/pull/1938))
- Bump `github.com/btcsuite/btcd` from 0.23.3 to 0.24.0 ([#1862](https://github.com/NibiruChain/nibiru/pull/1862))
- Bump `pozetroninc/github-action-get-latest-release` from 0.7.0 to 0.8.0 ([#1863](https://github.com/NibiruChain/nibiru/pull/1863))
- Bump `bufbuild/buf-setup-action` from 1.30.1 to 1.36.0 ([#1891](https://github.com/NibiruChain/nibiru/pull/1891), [#1900](https://github.com/NibiruChain/nibiru/pull/1900), [#1923](https://github.com/NibiruChain/nibiru/pull/1923), [#1972](https://github.com/NibiruChain/nibiru/pull/1972), [#1974](https://github.com/NibiruChain/nibiru/pull/1974), [#1988](https://github.com/NibiruChain/nibiru/pull/1988))
- Bump `bufbuild/buf-setup-action` from 1.30.1 to 1.42.0 ([#1891](https://github.com/NibiruChain/nibiru/pull/1891), [#1900](https://github.com/NibiruChain/nibiru/pull/1900), [#1923](https://github.com/NibiruChain/nibiru/pull/1923), [#1972](https://github.com/NibiruChain/nibiru/pull/1972), [#1974](https://github.com/NibiruChain/nibiru/pull/1974), [#1988](https://github.com/NibiruChain/nibiru/pull/1988), [#2043](https://github.com/NibiruChain/nibiru/pull/2043))
- Bump `axios` from 1.7.3 to 1.7.4 ([#2016](https://github.com/NibiruChain/nibiru/pull/2016))

## [v1.5.0](https://github.com/NibiruChain/nibiru/releases/tag/v1.5.0) - 2024-06-21
Expand Down
1 change: 1 addition & 0 deletions app/ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ func NewAnteHandlerNonEVM(
) sdk.AnteHandler {
return sdk.ChainAnteDecorators(
ante.AnteDecoratorPreventEtheruemTxMsgs{}, // reject MsgEthereumTxs
ante.AnteDecoratorAuthzGuard{}, // disable certain messages in authz grant "generic"
authante.NewSetUpContextDecorator(),
wasmkeeper.NewLimitSimulationGasDecorator(opts.WasmConfig.SimulationGasLimit),
wasmkeeper.NewCountTXDecorator(opts.TxCounterStoreKey),
Expand Down
138 changes: 138 additions & 0 deletions app/ante/auth_grard_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
package ante_test

import (
"time"

sdkclienttx "github.com/cosmos/cosmos-sdk/client/tx"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/authz"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

"github.com/NibiruChain/nibiru/v2/app"
"github.com/NibiruChain/nibiru/v2/app/ante"
"github.com/NibiruChain/nibiru/v2/x/evm"
"github.com/NibiruChain/nibiru/v2/x/evm/evmtest"
)

func (s *AnteTestSuite) TestAnteDecoratorAuthzGuard() {
testCases := []struct {
name string
txMsg func() sdk.Msg
wantErr string
}{
{
name: "sad: authz generic grant with evm message",
txMsg: func() sdk.Msg {
someTime := time.Now()
expiryTime := someTime.Add(time.Hour)
genericGrant, err := authz.NewGrant(
someTime,
authz.NewGenericAuthorization(sdk.MsgTypeURL(&evm.MsgEthereumTx{})), &expiryTime,
)
s.Require().NoError(err)
return &authz.MsgGrant{Grant: genericGrant}
},
wantErr: "not allowed",
},
{
name: "happy: authz generic grant with non evm message",
txMsg: func() sdk.Msg {
someTime := time.Now()
expiryTime := someTime.Add(time.Hour)
genericGrant, err := authz.NewGrant(
someTime,
authz.NewGenericAuthorization(sdk.MsgTypeURL(&stakingtypes.MsgCreateValidator{})), &expiryTime,
)
s.Require().NoError(err)
return &authz.MsgGrant{Grant: genericGrant}
},
wantErr: "",
},
{
name: "happy: authz non generic grant",
txMsg: func() sdk.Msg {
someTime := time.Now()
expiryTime := someTime.Add(time.Hour)
genericGrant, err := authz.NewGrant(
someTime,
&banktypes.SendAuthorization{},
&expiryTime,
)
s.Require().NoError(err)
return &authz.MsgGrant{Grant: genericGrant}
},
wantErr: "",
},
{
name: "happy: non authz message",
txMsg: func() sdk.Msg {
return &evm.MsgEthereumTx{}
},
wantErr: "",
},
{
name: "sad: authz exec with a single evm message",
txMsg: func() sdk.Msg {
msgExec := authz.NewMsgExec(
sdk.AccAddress("nibiuser"),
[]sdk.Msg{
&evm.MsgEthereumTx{},
},
)
return &msgExec
},
wantErr: "ExtensionOptionsEthereumTx",
},
{
name: "sad: authz exec with evm message and non evm message",
txMsg: func() sdk.Msg {
msgExec := authz.NewMsgExec(
sdk.AccAddress("nibiuser"),
[]sdk.Msg{
&banktypes.MsgSend{},
&evm.MsgEthereumTx{},
},
)
return &msgExec
},
wantErr: "ExtensionOptionsEthereumTx",
},
{
name: "happy: authz exec without evm messages",
txMsg: func() sdk.Msg {
msgExec := authz.NewMsgExec(
sdk.AccAddress("nibiuser"),
[]sdk.Msg{
&banktypes.MsgSend{},
},
)
return &msgExec
},
wantErr: "",
},
}

for _, tc := range testCases {
s.Run(tc.name, func() {
deps := evmtest.NewTestDeps()
anteDec := ante.AnteDecoratorAuthzGuard{}

encCfg := app.MakeEncodingConfig()
txBuilder, err := sdkclienttx.Factory{}.
WithChainID(s.ctx.ChainID()).
WithTxConfig(encCfg.TxConfig).
BuildUnsignedTx(tc.txMsg())
s.Require().NoError(err)

_, err = anteDec.AnteHandle(
deps.Ctx, txBuilder.GetTx(), false, evmtest.NextNoOpAnteHandler,
)
if tc.wantErr != "" {
s.Require().ErrorContains(err, tc.wantErr)
return
}
s.Require().NoError(err)
})
}
}
72 changes: 65 additions & 7 deletions app/ante/authz_guard.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,67 @@
// Copyright (c) 2023-2024 Nibi, Inc.
package ante

// TODO: https://github.com/NibiruChain/nibiru/issues/1915
// feat(ante): Add an authz guard to disable authz Ethereum txs and provide
// additional security around the default functionality exposed by the module.
//
// Implemenetation Notes
// UD-NOTE - IsAuthzMessage fn. Use authz import with module name
// UD-NOTE - Define set of disabled txMsgs
import (
"cosmossdk.io/errors"
sdk "github.com/cosmos/cosmos-sdk/types"
errortypes "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/x/authz"

"github.com/NibiruChain/nibiru/v2/x/evm"
)

// AnteDecoratorAuthzGuard filters autz messages
type AnteDecoratorAuthzGuard struct{}

// AnteHandle rejects "authz grant generic --msg-type '/eth.evm.v1.MsgEthereumTx'"
// Also rejects authz exec tx.json with any MsgEthereumTx inside
func (rmd AnteDecoratorAuthzGuard) AnteHandle(
ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler,
) (newCtx sdk.Context, err error) {
for _, msg := range tx.GetMsgs() {
// Do not allow grant for MsgEthereumTx
if msgGrant, ok := msg.(*authz.MsgGrant); ok {
if msgGrant.Grant.Authorization == nil {
return ctx, errors.Wrapf(
errortypes.ErrInvalidType,
"grant authorization is missing",
)
}
authorization, err := msgGrant.Grant.GetAuthorization()
if err != nil {
return ctx, errors.Wrapf(
errortypes.ErrInvalidType,
"failed unmarshaling generic authorization %s", err,
)
}
if genericAuth, ok := authorization.(*authz.GenericAuthorization); ok {
if genericAuth.MsgTypeURL() == sdk.MsgTypeURL(&evm.MsgEthereumTx{}) {
return ctx, errors.Wrapf(
errortypes.ErrNotSupported,
"authz grant generic for msg type %s is not allowed",
genericAuth.MsgTypeURL(),
)
}
}
}
// Also reject MsgEthereumTx in exec
if msgExec, ok := msg.(*authz.MsgExec); ok {
msgsInExec, err := msgExec.GetMessages()
if err != nil {
return ctx, errors.Wrapf(
errortypes.ErrInvalidType,
"failed getting exec messages %s", err,
)
}
for _, msgInExec := range msgsInExec {
if _, ok := msgInExec.(*evm.MsgEthereumTx); ok {
return ctx, errors.Wrapf(
errortypes.ErrInvalidType,
"MsgEthereumTx needs to be contained within a tx with 'ExtensionOptionsEthereumTx' option",
)
}
}
}
}
return next(ctx, tx, simulate)
}

0 comments on commit f2483b8

Please sign in to comment.