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

Not charge gas for contract dependency loading #797

Merged
merged 1 commit into from
May 22, 2023
Merged

Not charge gas for contract dependency loading #797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 2 additions & 9 deletions x/dex/ante.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,20 +126,13 @@ func (d CheckDexGasDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bo
} else {
memState = utils.GetMemState(ctx.Context())
}
contractLoader := func(addr string) *types.ContractInfoV2 {
contract, err := d.dexKeeper.GetContract(ctx, addr)
if err != nil {
return nil
}
return &contract
}
for _, msg := range tx.GetMsgs() {
switch m := msg.(type) {
case *types.MsgPlaceOrders:
numDependencies := len(memState.GetContractToDependencies(m.ContractAddr, contractLoader))
numDependencies := len(memState.GetContractToDependencies(ctx, m.ContractAddr, d.dexKeeper.GetContractWithoutGasCharge))
dexGasRequired += params.DefaultGasPerOrder * uint64(len(m.Orders)*numDependencies)
case *types.MsgCancelOrders:
numDependencies := len(memState.GetContractToDependencies(m.ContractAddr, contractLoader))
numDependencies := len(memState.GetContractToDependencies(ctx, m.ContractAddr, d.dexKeeper.GetContractWithoutGasCharge))
dexGasRequired += params.DefaultGasPerCancel * uint64(len(m.Cancellations)*numDependencies)
}
}
Expand Down
18 changes: 9 additions & 9 deletions x/dex/cache/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@ func (s *MemState) GetDepositInfo(ctx sdk.Context, contractAddr types.ContractAd
)
}

func (s *MemState) GetContractToDependencies(contractAddress string, loader func(addr string) *types.ContractInfoV2) []string {
func (s *MemState) GetContractToDependencies(ctx sdk.Context, contractAddress string, loader func(sdk.Context, string) (types.ContractInfoV2, error)) []string {
s.contractsToDepsMtx.Lock()
defer s.contractsToDepsMtx.Unlock()
if deps, ok := s.contractsToDependencies.Load(contractAddress); ok {
return deps
}
loadedDownstreams := GetAllDownstreamContracts(contractAddress, loader)
loadedDownstreams := GetAllDownstreamContracts(ctx, contractAddress, loader)
s.contractsToDependencies.Store(contractAddress, loadedDownstreams)
return loadedDownstreams
}
Expand All @@ -106,8 +106,8 @@ func (s *MemState) ClearContractToDependencies() {
s.contractsToDependencies = datastructures.NewTypedSyncMap[string, []string]()
}

func (s *MemState) SetDownstreamsToProcess(contractAddress string, loader func(addr string) *types.ContractInfoV2) {
s.contractsToProcess.AddAll(s.GetContractToDependencies(contractAddress, loader))
func (s *MemState) SetDownstreamsToProcess(ctx sdk.Context, contractAddress string, loader func(sdk.Context, string) (types.ContractInfoV2, error)) {
s.contractsToProcess.AddAll(s.GetContractToDependencies(ctx, contractAddress, loader))
}

func (s *MemState) GetContractToProcess() *datastructures.SyncSet[string] {
Expand Down Expand Up @@ -245,15 +245,15 @@ func DeepDelete(kvStore sdk.KVStore, storePrefix []byte, matcher func([]byte) bo

// BFS traversal over a acyclic graph
// Includes the root contract itself.
func GetAllDownstreamContracts(contractAddress string, loader func(addr string) *types.ContractInfoV2) []string {
func GetAllDownstreamContracts(ctx sdk.Context, contractAddress string, loader func(sdk.Context, string) (types.ContractInfoV2, error)) []string {
res := []string{contractAddress}
seen := datastructures.NewSyncSet(res)
downstreams := []*types.ContractInfoV2{}
populater := func(target *types.ContractInfoV2) {
for _, dep := range target.Dependencies {
if downstream := loader(dep.Dependency); downstream != nil && !seen.Contains(downstream.ContractAddr) {
if downstream, err := loader(ctx, dep.Dependency); err == nil && !seen.Contains(downstream.ContractAddr) {
if !downstream.Suspended {
downstreams = append(downstreams, downstream)
downstreams = append(downstreams, &downstream)
seen.Add(downstream.ContractAddr)
}
} else {
Expand All @@ -264,8 +264,8 @@ func GetAllDownstreamContracts(contractAddress string, loader func(addr string)
}
}
// init first layer downstreams
if contract := loader(contractAddress); contract != nil {
populater(contract)
if contract, err := loader(ctx, contractAddress); err == nil {
populater(&contract)
} else {
return res
}
Expand Down
8 changes: 1 addition & 7 deletions x/dex/cache/cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,11 +222,5 @@ func TestGetAllDownstreamContracts(t *testing.T) {
"sei1ery8l6jquynn9a4cz2pff6khg8c68f7urt33l5n9dng2cwzz4c4q4hncrd",
"sei1wl59k23zngj34l7d42y9yltask7rjlnxgccawc7ltrknp6n52fpsj6ctln",
"sei1stwdtk6ja0705v8qmtukcp4vd422p5vy4jr5wdc4qk44c57k955qcannhd",
}, dex.GetAllDownstreamContracts("sei1ery8l6jquynn9a4cz2pff6khg8c68f7urt33l5n9dng2cwzz4c4q4hncrd", func(addr string) *types.ContractInfoV2 {
c, err := keeper.GetContract(ctx, addr)
if err != nil {
return nil
}
return &c
}))
}, dex.GetAllDownstreamContracts(ctx, "sei1ery8l6jquynn9a4cz2pff6khg8c68f7urt33l5n9dng2cwzz4c4q4hncrd", keeper.GetContractWithoutGasCharge))
}
4 changes: 4 additions & 0 deletions x/dex/keeper/contract.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ func (k Keeper) GetContract(ctx sdk.Context, contractAddr string) (types.Contrac
return res, nil
}

func (k Keeper) GetContractWithoutGasCharge(ctx sdk.Context, contractAddr string) (types.ContractInfoV2, error) {
return k.GetContract(ctx.WithGasMeter(sdk.NewInfiniteGasMeter()), contractAddr)
}

func (k Keeper) GetContractGasLimit(ctx sdk.Context, contractAddr sdk.AccAddress) (uint64, error) {
bech32ContractAddr := contractAddr.String()
contract, err := k.GetContract(ctx, bech32ContractAddr)
Expand Down
33 changes: 33 additions & 0 deletions x/dex/keeper/contract_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,3 +283,36 @@ func TestClearDependenciesForContract(t *testing.T) {
require.Nil(t, err)
require.Equal(t, int64(0), downB.NumIncomingDependencies)
}

func TestGetContractWithoutGasCharge(t *testing.T) {
keeper, ctx := keepertest.DexKeeper(t)
_ = keeper.SetContract(ctx, &types.ContractInfoV2{
Creator: keepertest.TestAccount,
ContractAddr: keepertest.TestContract,
CodeId: 1,
RentBalance: 1000000,
})
// regular gas meter case
ctx = ctx.WithGasMeter(sdk.NewGasMeter(10000))
contract, err := keeper.GetContractWithoutGasCharge(ctx, keepertest.TestContract)
require.Nil(t, err)
require.Equal(t, keepertest.TestContract, contract.ContractAddr)
require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed())
require.Equal(t, uint64(10000), ctx.GasMeter().Limit())

// regular gas meter out of gas case
ctx = ctx.WithGasMeter(sdk.NewGasMeter(1))
contract, err = keeper.GetContractWithoutGasCharge(ctx, keepertest.TestContract)
require.Nil(t, err)
require.Equal(t, keepertest.TestContract, contract.ContractAddr)
require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed())
require.Equal(t, uint64(1), ctx.GasMeter().Limit())

// infinite gas meter case
ctx = ctx.WithGasMeter(sdk.NewInfiniteGasMeter())
contract, err = keeper.GetContractWithoutGasCharge(ctx, keepertest.TestContract)
require.Nil(t, err)
require.Equal(t, keepertest.TestContract, contract.ContractAddr)
require.Equal(t, uint64(0), ctx.GasMeter().GasConsumed())
require.Equal(t, uint64(0), ctx.GasMeter().Limit())
}
8 changes: 1 addition & 7 deletions x/dex/keeper/msgserver/msg_server_cancel_orders.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,6 @@ func (k msgServer) CancelOrders(goCtx context.Context, msg *types.MsgCancelOrder
}
}
ctx.EventManager().EmitEvents(events)
utils.GetMemState(ctx.Context()).SetDownstreamsToProcess(msg.ContractAddr, func(addr string) *types.ContractInfoV2 {
contract, err := k.GetContract(ctx, addr)
if err != nil {
return nil
}
return &contract
})
utils.GetMemState(ctx.Context()).SetDownstreamsToProcess(ctx, msg.ContractAddr, k.GetContractWithoutGasCharge)
return &types.MsgCancelOrdersResponse{}, nil
}
8 changes: 1 addition & 7 deletions x/dex/keeper/msgserver/msg_server_place_orders.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,7 @@ func (k msgServer) PlaceOrders(goCtx context.Context, msg *types.MsgPlaceOrders)
k.SetNextOrderID(ctx, msg.ContractAddr, nextID)
ctx.EventManager().EmitEvents(events)

utils.GetMemState(ctx.Context()).SetDownstreamsToProcess(msg.ContractAddr, func(addr string) *types.ContractInfoV2 {
contract, err := k.GetContract(ctx, addr)
if err != nil {
return nil
}
return &contract
})
utils.GetMemState(ctx.Context()).SetDownstreamsToProcess(ctx, msg.ContractAddr, k.GetContractWithoutGasCharge)
return &types.MsgPlaceOrdersResponse{
OrderIds: idsInResp,
}, nil
Expand Down
96 changes: 12 additions & 84 deletions x/dex/module_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,7 @@ func TestEndBlockMarketOrder(t *testing.T) {
Amount: sdk.MustNewDecFromStr("2000000"),
},
)
dexutils.GetMemState(ctx.Context()).SetDownstreamsToProcess(contractAddr.String(), func(addr string) *types.ContractInfoV2 {
c, err := dexkeeper.GetContract(ctx, addr)
if err != nil {
return nil
}
return &c
})
dexutils.GetMemState(ctx.Context()).SetDownstreamsToProcess(ctx, contractAddr.String(), dexkeeper.GetContractWithoutGasCharge)

ctx = ctx.WithBlockHeight(1)
testApp.EndBlocker(ctx, abci.RequestEndBlock{})
Expand All @@ -147,13 +141,7 @@ func TestEndBlockMarketOrder(t *testing.T) {
Data: "{\"position_effect\":\"Open\",\"leverage\":\"1\"}",
},
)
dexutils.GetMemState(ctx.Context()).SetDownstreamsToProcess(contractAddr.String(), func(addr string) *types.ContractInfoV2 {
c, err := dexkeeper.GetContract(ctx, addr)
if err != nil {
return nil
}
return &c
})
dexutils.GetMemState(ctx.Context()).SetDownstreamsToProcess(ctx, contractAddr.String(), dexkeeper.GetContractWithoutGasCharge)

ctx = ctx.WithBlockHeight(2)
testApp.EndBlocker(ctx, abci.RequestEndBlock{})
Expand Down Expand Up @@ -185,13 +173,7 @@ func TestEndBlockMarketOrder(t *testing.T) {
Data: "{\"position_effect\":\"Open\",\"leverage\":\"1\"}",
},
)
dexutils.GetMemState(ctx.Context()).SetDownstreamsToProcess(contractAddr.String(), func(addr string) *types.ContractInfoV2 {
c, err := dexkeeper.GetContract(ctx, addr)
if err != nil {
return nil
}
return &c
})
dexutils.GetMemState(ctx.Context()).SetDownstreamsToProcess(ctx, contractAddr.String(), dexkeeper.GetContractWithoutGasCharge)

ctx = ctx.WithBlockHeight(3)
testApp.EndBlocker(ctx, abci.RequestEndBlock{})
Expand Down Expand Up @@ -283,13 +265,7 @@ func TestEndBlockLimitOrder(t *testing.T) {
Amount: sdk.MustNewDecFromStr("2000000"),
},
)
dexutils.GetMemState(ctx.Context()).SetDownstreamsToProcess(contractAddr.String(), func(addr string) *types.ContractInfoV2 {
c, err := dexkeeper.GetContract(ctx, addr)
if err != nil {
return nil
}
return &c
})
dexutils.GetMemState(ctx.Context()).SetDownstreamsToProcess(ctx, contractAddr.String(), dexkeeper.GetContractWithoutGasCharge)

ctx = ctx.WithBlockHeight(1)
testApp.EndBlocker(ctx, abci.RequestEndBlock{})
Expand Down Expand Up @@ -329,13 +305,7 @@ func TestEndBlockLimitOrder(t *testing.T) {
Data: "{\"position_effect\":\"Open\",\"leverage\":\"1\"}",
},
)
dexutils.GetMemState(ctx.Context()).SetDownstreamsToProcess(contractAddr.String(), func(addr string) *types.ContractInfoV2 {
c, err := dexkeeper.GetContract(ctx, addr)
if err != nil {
return nil
}
return &c
})
dexutils.GetMemState(ctx.Context()).SetDownstreamsToProcess(ctx, contractAddr.String(), dexkeeper.GetContractWithoutGasCharge)

ctx = ctx.WithBlockHeight(2)
testApp.EndBlocker(ctx, abci.RequestEndBlock{})
Expand Down Expand Up @@ -368,13 +338,7 @@ func TestEndBlockLimitOrder(t *testing.T) {
Data: "{\"position_effect\":\"Open\",\"leverage\":\"1\"}",
},
)
dexutils.GetMemState(ctx.Context()).SetDownstreamsToProcess(contractAddr.String(), func(addr string) *types.ContractInfoV2 {
c, err := dexkeeper.GetContract(ctx, addr)
if err != nil {
return nil
}
return &c
})
dexutils.GetMemState(ctx.Context()).SetDownstreamsToProcess(ctx, contractAddr.String(), dexkeeper.GetContractWithoutGasCharge)

ctx = ctx.WithBlockHeight(3)
testApp.EndBlocker(ctx, abci.RequestEndBlock{})
Expand Down Expand Up @@ -414,13 +378,7 @@ func TestEndBlockRollback(t *testing.T) {
PositionDirection: types.PositionDirection_LONG,
},
)
dexutils.GetMemState(ctx.Context()).SetDownstreamsToProcess(keepertest.TestContract, func(addr string) *types.ContractInfoV2 {
c, err := dexkeeper.GetContract(ctx, addr)
if err != nil {
return nil
}
return &c
})
dexutils.GetMemState(ctx.Context()).SetDownstreamsToProcess(ctx, keepertest.TestContract, dexkeeper.GetContractWithoutGasCharge)
ctx = ctx.WithBlockHeight(1)
testApp.EndBlocker(ctx, abci.RequestEndBlock{})
// No state change should've been persisted
Expand Down Expand Up @@ -456,13 +414,7 @@ func TestEndBlockPartialRollback(t *testing.T) {
PositionDirection: types.PositionDirection_LONG,
},
)
dexutils.GetMemState(ctx.Context()).SetDownstreamsToProcess(keepertest.TestContract, func(addr string) *types.ContractInfoV2 {
c, err := dexkeeper.GetContract(ctx, addr)
if err != nil {
return nil
}
return &c
})
dexutils.GetMemState(ctx.Context()).SetDownstreamsToProcess(ctx, keepertest.TestContract, dexkeeper.GetContractWithoutGasCharge)
// GOOD CONTRACT
testAccount, _ := sdk.AccAddressFromBech32("sei1yezq49upxhunjjhudql2fnj5dgvcwjj87pn2wx")
amounts := sdk.NewCoins(sdk.NewCoin("usei", sdk.NewInt(1000000)), sdk.NewCoin("uusdc", sdk.NewInt(1000000)))
Expand Down Expand Up @@ -511,13 +463,7 @@ func TestEndBlockPartialRollback(t *testing.T) {
Amount: sdk.MustNewDecFromStr("10000"),
},
)
dexutils.GetMemState(ctx.Context()).SetDownstreamsToProcess(contractAddr.String(), func(addr string) *types.ContractInfoV2 {
c, err := dexkeeper.GetContract(ctx, addr)
if err != nil {
return nil
}
return &c
})
dexutils.GetMemState(ctx.Context()).SetDownstreamsToProcess(ctx, contractAddr.String(), dexkeeper.GetContractWithoutGasCharge)

ctx = ctx.WithBlockHeight(1)
testApp.EndBlocker(ctx, abci.RequestEndBlock{})
Expand Down Expand Up @@ -683,13 +629,7 @@ func TestEndBlockRollbackWithRentCharge(t *testing.T) {
Amount: sdk.MustNewDecFromStr("10000"),
},
)
dexutils.GetMemState(ctx.Context()).SetDownstreamsToProcess(contractAddr.String(), func(addr string) *types.ContractInfoV2 {
c, err := dexkeeper.GetContract(ctx, addr)
if err != nil {
return nil
}
return &c
})
dexutils.GetMemState(ctx.Context()).SetDownstreamsToProcess(ctx, contractAddr.String(), dexkeeper.GetContractWithoutGasCharge)
// overwrite params for testing
params := dexkeeper.GetParams(ctx)
params.MinProcessableRent = 0
Expand Down Expand Up @@ -846,13 +786,7 @@ func TestOrderCountUpdate(t *testing.T) {
Amount: sdk.MustNewDecFromStr("2000000"),
},
)
dexutils.GetMemState(ctx.Context()).SetDownstreamsToProcess(contractAddr.String(), func(addr string) *types.ContractInfoV2 {
c, err := dexkeeper.GetContract(ctx, addr)
if err != nil {
return nil
}
return &c
})
dexutils.GetMemState(ctx.Context()).SetDownstreamsToProcess(ctx, contractAddr.String(), dexkeeper.GetContractWithoutGasCharge)

ctx = ctx.WithBlockHeight(1)
testApp.EndBlocker(ctx, abci.RequestEndBlock{})
Expand Down Expand Up @@ -889,13 +823,7 @@ func TestOrderCountUpdate(t *testing.T) {
PositionDirection: types.PositionDirection_LONG,
},
)
dexutils.GetMemState(ctx.Context()).SetDownstreamsToProcess(contractAddr.String(), func(addr string) *types.ContractInfoV2 {
c, err := dexkeeper.GetContract(ctx, addr)
if err != nil {
return nil
}
return &c
})
dexutils.GetMemState(ctx.Context()).SetDownstreamsToProcess(ctx, contractAddr.String(), dexkeeper.GetContractWithoutGasCharge)
ctx = ctx.WithBlockHeight(2)
testApp.EndBlocker(ctx, abci.RequestEndBlock{})
require.Equal(t, uint64(2), dexkeeper.GetOrderCountState(ctx, contractAddr.String(), pair.PriceDenom, pair.AssetDenom, types.PositionDirection_LONG, sdk.NewDec(1)))
Expand Down