Skip to content

Commit

Permalink
add commit block, fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@quasisamurai
quasisamurai committed Sep 4, 2024
1 parent 0316a8a commit 3eb0a8f
Show file tree
Hide file tree
Showing 4 changed files with 95 additions and 57 deletions.
32 changes: 31 additions & 1 deletion testutil/test_helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ import (
"time"

wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
abci "github.com/cometbft/cometbft/abci/types"
abcit "github.com/cometbft/cometbft/abci/types"
tmrand "github.com/cometbft/cometbft/libs/rand"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/client"
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
Expand Down Expand Up @@ -547,7 +549,7 @@ func (suite *IBCConnectionTestSuite) SendMsgsNoCheck(chain *ibctesting.TestChain
return nil, err
}

//chain.commitBlock(resp)
suite.commitBlock(resp, chain)

suite.Coordinator.IncrementTime()

Expand Down Expand Up @@ -613,3 +615,31 @@ func (suite *IBCConnectionTestSuite) ExecuteContract(contract, sender sdk.AccAdd
return contractKeeper.Execute(suite.ChainA.GetContext(), contract, sender, msg, funds)

}

func (suite *IBCConnectionTestSuite) commitBlock(res *abci.ResponseFinalizeBlock, chain *ibctesting.TestChain) {
_, err := chain.App.Commit()
require.NoError(chain.TB, err)

// set the last header to the current header
// use nil trusted fields
chain.LastHeader = chain.CurrentTMClientHeader()

// val set changes returned from previous block get applied to the next validators
// of this block. See tendermint spec for details.
chain.Vals = chain.NextVals

chain.NextVals = ibctesting.ApplyValSetChanges(chain, chain.Vals, res.ValidatorUpdates)

// increment the current header
chain.CurrentHeader = cmtproto.Header{
ChainID: chain.ChainID,
Height: chain.App.LastBlockHeight() + 1,
AppHash: chain.App.LastCommitID().Hash,
// NOTE: the time is increased by the coordinator to maintain time synchrony amongst
// chains.
Time: chain.CurrentHeader.Time,
ValidatorsHash: chain.Vals.Hash(),
NextValidatorsHash: chain.NextVals.Hash(),
ProposerAddress: chain.CurrentHeader.ProposerAddress,
}
}
10 changes: 5 additions & 5 deletions x/ibc-hooks/ibc_middleware_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ func (suite *HooksTestSuite) TestOnRecvPacketHooks() {
expPass bool
}{
{"override", func(status *testutils.Status) {
suite.GetNeutronZoneApp(suite.ChainB).HooksTransferIBCModule.
suite.GetNeutronZoneApp(suite.ChainB).TransferStack.
ICS4Middleware.Hooks = testutils.TestRecvOverrideHooks{Status: status}
}, true},
{"before and after", func(status *testutils.Status) {
suite.GetNeutronZoneApp(suite.ChainB).HooksTransferIBCModule.
suite.GetNeutronZoneApp(suite.ChainB).TransferStack.
ICS4Middleware.Hooks = testutils.TestRecvBeforeAfterHooks{Status: status}
}, true},
}
Expand Down Expand Up @@ -87,7 +87,7 @@ func (suite *HooksTestSuite) TestOnRecvPacketHooks() {
data := transfertypes.NewFungibleTokenPacketData(trace.GetFullDenomPath(), amount.String(), suite.ChainA.SenderAccount.GetAddress().String(), receiver, "")
packet := channeltypes.NewPacket(data.GetBytes(), seq, suite.TransferPath.EndpointA.ChannelConfig.PortID, suite.TransferPath.EndpointA.ChannelID, suite.TransferPath.EndpointB.ChannelConfig.PortID, suite.TransferPath.EndpointB.ChannelID, clienttypes.NewHeight(1, 100), 0)

ack := suite.GetNeutronZoneApp(suite.ChainB).HooksTransferIBCModule.
ack := suite.GetNeutronZoneApp(suite.ChainB).TransferStack.
OnRecvPacket(suite.ChainB.GetContext(), packet, suite.ChainA.SenderAccount.GetAddress())

if tc.expPass {
Expand All @@ -96,14 +96,14 @@ func (suite *HooksTestSuite) TestOnRecvPacketHooks() {
suite.Require().False(ack.Success())
}

if _, ok := suite.GetNeutronZoneApp(suite.ChainB).HooksTransferIBCModule.
if _, ok := suite.GetNeutronZoneApp(suite.ChainB).TransferStack.
ICS4Middleware.Hooks.(testutils.TestRecvOverrideHooks); ok {
suite.Require().True(status.OverrideRan)
suite.Require().False(status.BeforeRan)
suite.Require().False(status.AfterRan)
}

if _, ok := suite.GetNeutronZoneApp(suite.ChainB).HooksTransferIBCModule.
if _, ok := suite.GetNeutronZoneApp(suite.ChainB).TransferStack.
ICS4Middleware.Hooks.(testutils.TestRecvBeforeAfterHooks); ok {
suite.Require().False(status.OverrideRan)
suite.Require().True(status.BeforeRan)
Expand Down
36 changes: 17 additions & 19 deletions x/ibc-rate-limit/genesis_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ package ibc_rate_limit_test
import (
"testing"

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/stretchr/testify/suite"

"github.com/neutron-org/neutron/v4/testutil/apptesting"
"github.com/neutron-org/neutron/v4/x/ibc-rate-limit/types"
)

type GenesisTestSuite struct {
Expand All @@ -23,21 +21,21 @@ func (suite *GenesisTestSuite) SetupTest() {
}

func (suite *GenesisTestSuite) TestInitExportGenesis() {
testAddress := sdk.AccAddress([]byte("addr1_______________")).String()
suite.SetupTest()
k := suite.App.RateLimitingICS4Wrapper

initialGenesis := types.GenesisState{
Params: types.Params{
ContractAddress: testAddress,
},
}

k.InitGenesis(suite.Ctx, initialGenesis)

suite.Require().Equal(testAddress, k.GetParams(suite.Ctx).ContractAddress)

exportedGenesis := k.ExportGenesis(suite.Ctx)

suite.Require().Equal(initialGenesis, *exportedGenesis)
//testAddress := sdk.AccAddress([]byte("addr1_______________")).String()
//suite.SetupTest()
//k := suite.App.RateLimitingICS4Wrapper
//
//initialGenesis := types.GenesisState{
// Params: types.Params{
// ContractAddress: testAddress,
// },
//}
//
//k.InitGenesis(suite.Ctx, initialGenesis)
//
//suite.Require().Equal(testAddress, k.GetParams(suite.Ctx).ContractAddress)
//
//exportedGenesis := k.ExportGenesis(suite.Ctx)
//
//suite.Require().Equal(initialGenesis, *exportedGenesis)
}
74 changes: 42 additions & 32 deletions x/ibc-rate-limit/ibc_middleware_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (

sdkmath "cosmossdk.io/math"
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
"github.com/neutron-org/neutron/v4/testutil"
"github.com/stretchr/testify/require"
"golang.org/x/exp/slices"
Expand Down Expand Up @@ -70,8 +71,8 @@ func (suite *MiddlewareTestSuite) MessageFromAToB(denom string, amount sdkmath.I

func (suite *MiddlewareTestSuite) MessageFromBToA(denom string, amount sdkmath.Int) sdk.Msg {
coin := sdk.NewCoin(denom, amount)
port := suite.Path.EndpointB.ChannelConfig.PortID
channel := suite.Path.EndpointB.ChannelID
port := suite.TransferPath.EndpointB.ChannelConfig.PortID
channel := suite.TransferPath.EndpointB.ChannelID
accountFrom := suite.ChainB.SenderAccount.GetAddress().String()
accountTo := suite.ChainA.SenderAccount.GetAddress().String()
timeoutHeight := clienttypes.NewHeight(10, 100)
Expand Down Expand Up @@ -273,13 +274,15 @@ func (suite *MiddlewareTestSuite) BuildChannelQuota(name, channel, denom string,

// Test that Sending IBC messages works when the middleware isn't configured
func (suite *MiddlewareTestSuite) TestSendTransferNoContract() {
suite.ConfigureTransferChannel()
one := sdkmath.NewInt(1)
_, err := suite.AssertSend(true, suite.MessageFromAToB(sdk.DefaultBondDenom, one))
suite.Require().NoError(err)
}

// Test that Receiving IBC messages works when the middleware isn't configured
func (suite *MiddlewareTestSuite) TestReceiveTransferNoContract() {
suite.ConfigureTransferChannel()
one := sdkmath.NewInt(1)
_, err := suite.AssertReceive(true, suite.MessageFromBToA(sdk.DefaultBondDenom, one))
suite.Require().NoError(err)
Expand All @@ -301,7 +304,7 @@ func (suite *MiddlewareTestSuite) initializeEscrow() (totalEscrow, expectedSed s
// Send from A to B
_, _, err := suite.FullSendAToB(suite.MessageFromAToB(sdk.DefaultBondDenom, transferAmount.Sub(sendAmount)))
suite.Require().NoError(err)
// Send from A to B
// Send from B to A
_, _, err = suite.FullSendBToA(suite.MessageFromBToA(sdk.DefaultBondDenom, transferAmount.Sub(sendAmount)))
suite.Require().NoError(err)

Expand Down Expand Up @@ -364,12 +367,14 @@ func (suite *MiddlewareTestSuite) fullSendTest(native bool) map[string]string {

// Test rate limiting on sends
func (suite *MiddlewareTestSuite) TestSendTransferWithRateLimitingNative() {
suite.ConfigureTransferChannel()
// Sends denom=stake from A->B. Rate limit receives "stake" in the packet. Nothing to do in the contract
suite.fullSendTest(true)
}

// Test rate limiting on sends
func (suite *MiddlewareTestSuite) TestSendTransferWithRateLimitingNonNative() {
suite.ConfigureTransferChannel()
// Sends denom=ibc/C053D637CCA2A2BA030E2C5EE1B28A16F71CCB0E45E8BE52766DC1B241B77878 from A->B.
// Rate limit receives "transfer/channel-0/stake" in the packet (because transfer.relay.SendTransfer is called before the middleware)
// and should hash it before calculating the value
Expand All @@ -378,6 +383,7 @@ func (suite *MiddlewareTestSuite) TestSendTransferWithRateLimitingNonNative() {

// Test rate limits are reset when the specified time period has passed
func (suite *MiddlewareTestSuite) TestSendTransferReset() {
suite.ConfigureTransferChannel()
// Same test as above, but the quotas get reset after time passes
attrs := suite.fullSendTest(true)
parts := strings.Split(attrs["weekly_period_end"], ".") // Splitting timestamp into secs and nanos
Expand Down Expand Up @@ -427,8 +433,8 @@ func (suite *MiddlewareTestSuite) fullRecvTest(native bool) {

// Setup contract
suite.GetNeutronZoneApp(suite.ChainA)
creator := app.AccountKeeper.GetModuleAddress(govtypes.ModuleName)
suite.StoreTestCode(suite.ChainA.GetContext(), creator, "./bytecode/rate_limiter.wasm")
testOwner := sdktypes.MustAccAddressFromBech32(testutil.TestOwnerAddress)
suite.StoreTestCode(suite.ChainA.GetContext(), testOwner, "./bytecode/rate_limiter.wasm")
quotas := suite.BuildChannelQuota("weekly", channel, localDenom, 604800, 4, 4)
addr := suite.InstantiateRLContract(quotas)
suite.RegisterRateLimitingContract(addr)
Expand All @@ -448,13 +454,15 @@ func (suite *MiddlewareTestSuite) fullRecvTest(native bool) {
}

func (suite *MiddlewareTestSuite) TestRecvTransferWithRateLimitingNative() {
suite.ConfigureTransferChannel()
// Sends denom=stake from B->A.
// Rate limit receives "stake" in the packet and should wrap it before calculating the value
// types.ReceiverChainIsSource(packet.GetSourcePort(), packet.GetSourceChannel(), data.Denom) should return false => Wrap the token
suite.fullRecvTest(true)
}

func (suite *MiddlewareTestSuite) TestRecvTransferWithRateLimitingNonNative() {
suite.ConfigureTransferChannel()
// Sends denom=ibc/C053D637CCA2A2BA030E2C5EE1B28A16F71CCB0E45E8BE52766DC1B241B77878 from B->A.
// Rate limit receives "transfer/channel-0/stake" in the packet and should turn it into "stake"
// types.ReceiverChainIsSource(packet.GetSourcePort(), packet.GetSourceChannel(), data.Denom) should return true => unprefix. If unprefixed is not local, hash.
Expand All @@ -463,8 +471,8 @@ func (suite *MiddlewareTestSuite) TestRecvTransferWithRateLimitingNonNative() {

// Test no rate limiting occurs when the contract is set, but no quotas are configured for the path
func (suite *MiddlewareTestSuite) TestSendTransferNoQuota() {
suite.ConfigureTransferChannel()
// Setup contract
//app := suite.GetNeutronZoneApp(suite.ChainA)
testOwner := sdktypes.MustAccAddressFromBech32(testutil.TestOwnerAddress)
suite.StoreTestCode(suite.ChainA.GetContext(), testOwner, "./bytecode/rate_limiter.wasm")
addr := suite.InstantiateRLContract(``)
Expand All @@ -481,9 +489,8 @@ func (suite *MiddlewareTestSuite) TestFailedSendTransfer() {
suite.ConfigureTransferChannel()
suite.initializeEscrow()
// Setup contract
app := suite.GetNeutronZoneApp(suite.ChainA)
creator := app.AccountKeeper.GetModuleAddress(govtypes.ModuleName)
suite.StoreTestCode(suite.ChainA.GetContext(), creator, "./bytecode/rate_limiter.wasm")
testOwner := sdktypes.MustAccAddressFromBech32(testutil.TestOwnerAddress)
suite.StoreTestCode(suite.ChainA.GetContext(), testOwner, "./bytecode/rate_limiter.wasm")
quotas := suite.BuildChannelQuota("weekly", "channel-0", sdk.DefaultBondDenom, 604800, 1, 1)
addr := suite.InstantiateRLContract(quotas)
suite.RegisterRateLimitingContract(addr)
Expand All @@ -498,8 +505,8 @@ func (suite *MiddlewareTestSuite) TestFailedSendTransfer() {

// Use the whole quota
coins := sdk.NewCoin(sdk.DefaultBondDenom, quota)
port := suite.Path.EndpointA.ChannelConfig.PortID
channel := suite.Path.EndpointA.ChannelID
port := suite.TransferPath.EndpointA.ChannelConfig.PortID
channel := suite.TransferPath.EndpointA.ChannelID
accountFrom := suite.ChainA.SenderAccount.GetAddress().String()
timeoutHeight := clienttypes.NewHeight(10, 100)
msg := transfertypes.NewMsgTransfer(port, channel, coins, accountFrom, "INVALID", timeoutHeight, 0, "")
Expand Down Expand Up @@ -550,12 +557,14 @@ func (suite *MiddlewareTestSuite) TestFailedSendTransfer() {

func (suite *MiddlewareTestSuite) TestUnsetRateLimitingContract() {
// Setup contract
app := suite.GetNeutronZoneApp(suite.ChainA)
creator := app.AccountKeeper.GetModuleAddress(govtypes.ModuleName)
suite.StoreTestCode(suite.ChainA.GetContext(), creator, "./bytecode/rate_limiter.wasm")
suite.ConfigureTransferChannel()
testOwner := sdktypes.MustAccAddressFromBech32(testutil.TestOwnerAddress)
suite.StoreTestCode(suite.ChainA.GetContext(), testOwner, "./bytecode/rate_limiter.wasm")
addr := suite.InstantiateRLContract("")
suite.RegisterRateLimitingContract(addr)

app := suite.GetNeutronZoneApp(suite.ChainA)

// Unset the contract param
params, err := types.NewParams("")
suite.Require().NoError(err)
Expand All @@ -566,24 +575,25 @@ func (suite *MiddlewareTestSuite) TestUnsetRateLimitingContract() {
}

// Test rate limits are reverted if a "send" fails
//func (suite *MiddlewareTestSuite) TestNonICS20() {
// suite.initializeEscrow()
// // Setup contract
// app := suite.GetNeutronZoneApp(suite.ChainA)
// testOwner := sdktypes.MustAccAddressFromBech32(testutil.TestOwnerAddress)
// suite.StoreTestCode(suite.ChainA.GetContext(), testOwner, "./bytecode/rate_limiter.wasm")
// quotas := suite.BuildChannelQuota("weekly", "channel-0", sdk.DefaultBondDenom, 604800, 1, 1)
// addr := suite.InstantiateRLContract(quotas)
// suite.RegisterRateLimitingContract(addr)
//
// data := []byte("{}")
// _, err := app.RateLimitingICS4Wrapper.SendPacket(suite.ChainA.GetContext(), capabilitytypes.NewCapability(1), "wasm.neutron1873ls0d60tg7hk00976teq9ywhzv45u3hk2urw8t3eau9eusa4eqtun9xn", "channel-0", clienttypes.NewHeight(0, 0), 1, data)
//
// suite.Require().Error(err)
// // This will error out, but not because of rate limiting
// suite.Require().NotContains(err.Error(), "rate limit")
// suite.Require().Contains(err.Error(), "channel not found")
//}
func (suite *MiddlewareTestSuite) TestNonICS20() {
suite.ConfigureTransferChannel()
suite.initializeEscrow()
// Setup contract
app := suite.GetNeutronZoneApp(suite.ChainA)
testOwner := sdktypes.MustAccAddressFromBech32(testutil.TestOwnerAddress)
suite.StoreTestCode(suite.ChainA.GetContext(), testOwner, "./bytecode/rate_limiter.wasm")
quotas := suite.BuildChannelQuota("weekly", "channel-0", sdk.DefaultBondDenom, 604800, 1, 1)
addr := suite.InstantiateRLContract(quotas)
suite.RegisterRateLimitingContract(addr)

data := []byte("{}")
_, err := app.RateLimitingICS4Wrapper.SendPacket(suite.ChainA.GetContext(), capabilitytypes.NewCapability(1), "wasm.neutron1873ls0d60tg7hk00976teq9ywhzv45u3hk2urw8t3eau9eusa4eqtun9xn", "channel-0", clienttypes.NewHeight(0, 0), 1, data)

suite.Require().Error(err)
// This will error out, but not because of rate limiting
suite.Require().NotContains(err.Error(), "rate limit")
suite.Require().Contains(err.Error(), "channel not found")
}

//func (suite *MiddlewareTestSuite) TestDenomRestrictionFlow() {
// // Setup contract
Expand Down

0 comments on commit 3eb0a8f

Please sign in to comment.