diff --git a/proto/dex/params.proto b/proto/dex/params.proto index d38d59fa33..e23b06c3c9 100644 --- a/proto/dex/params.proto +++ b/proto/dex/params.proto @@ -43,4 +43,8 @@ message Params { (gogoproto.jsontag) = "gas_allowance_per_settlement", (gogoproto.moretags) = "yaml:\"gas_allowance_per_settlement\"" ]; + uint64 min_processable_rent = 9 [ + (gogoproto.jsontag) = "min_processable_rent", + (gogoproto.moretags) = "yaml:\"min_processable_rent\"" + ]; } diff --git a/x/dex/contract/abci.go b/x/dex/contract/abci.go index 532d27add0..e846ab2d92 100644 --- a/x/dex/contract/abci.go +++ b/x/dex/contract/abci.go @@ -2,6 +2,7 @@ package contract import ( "context" + "errors" "fmt" "sync" "time" @@ -34,6 +35,7 @@ const LogExecSigSendAfter = 2 * time.Second type environment struct { validContractsInfo []types.ContractInfoV2 failedContractAddresses datastructures.SyncSet[string] + outOfRentContractAddresses datastructures.SyncSet[string] settlementsByContract *datastructures.TypedSyncMap[string, []*types.SettlementEntry] executionTerminationSignals *datastructures.TypedSyncMap[string, chan struct{}] registeredPairs *datastructures.TypedSyncMap[string, []types.Pair] @@ -43,7 +45,7 @@ type environment struct { eventManagerMutex *sync.Mutex } -func EndBlockerAtomic(ctx sdk.Context, keeper *keeper.Keeper, validContractsInfo []types.ContractInfoV2, tracingInfo *tracing.Info) ([]types.ContractInfoV2, sdk.Context, bool) { +func EndBlockerAtomic(ctx sdk.Context, keeper *keeper.Keeper, validContractsInfo []types.ContractInfoV2, tracingInfo *tracing.Info) ([]types.ContractInfoV2, []types.ContractInfoV2, sdk.Context, bool) { tracer := tracingInfo.Tracer spanCtx, span := tracingInfo.Start("DexEndBlockerAtomic") defer span.End() @@ -78,7 +80,7 @@ func EndBlockerAtomic(ctx sdk.Context, keeper *keeper.Keeper, validContractsInfo postRunRents := keeper.GetRentsForContracts(cachedCtx, seiutils.Map(validContractsInfo, func(c types.ContractInfoV2) string { return c.ContractAddr })) TransferRentFromDexToCollector(ctx, keeper.BankKeeper, preRunRents, postRunRents) msCached.Write() - return env.validContractsInfo, ctx, true + return env.validContractsInfo, []types.ContractInfoV2{}, ctx, true } // persistent contract rent charges for failed contracts and discard everything else @@ -103,7 +105,7 @@ func EndBlockerAtomic(ctx sdk.Context, keeper *keeper.Keeper, validContractsInfo // restore keeper in-memory state newGoContext := context.WithValue(ctx.Context(), dexutils.DexMemStateContextKey, memStateCopy) - return filterNewValidContracts(ctx, env), ctx.WithContext(newGoContext), false + return filterNewValidContracts(ctx, env), getOutOfRentContracts(env), ctx.WithContext(newGoContext), false } func newEnv(ctx sdk.Context, validContractsInfo []types.ContractInfoV2, keeper *keeper.Keeper) *environment { @@ -123,6 +125,7 @@ func newEnv(ctx sdk.Context, validContractsInfo []types.ContractInfoV2, keeper * return &environment{ validContractsInfo: validContractsInfo, failedContractAddresses: datastructures.NewSyncSet([]string{}), + outOfRentContractAddresses: datastructures.NewSyncSet([]string{}), settlementsByContract: settlementsByContract, executionTerminationSignals: executionTerminationSignals, registeredPairs: registeredPairs, @@ -132,6 +135,14 @@ func newEnv(ctx sdk.Context, validContractsInfo []types.ContractInfoV2, keeper * } } +func (e *environment) addError(contractAddr string, err error) { + if err == types.ErrInsufficientRent { + e.outOfRentContractAddresses.Add(contractAddr) + return + } + e.failedContractAddresses.Add(contractAddr) +} + func cacheContext(ctx sdk.Context, env *environment) (sdk.Context, sdk.CacheMultiStore) { cachedCtx, msCached := store.GetCachedContext(ctx) goCtx := context.WithValue(cachedCtx.Context(), dexcache.CtxKeyExecTermSignal, env.executionTerminationSignals) @@ -159,7 +170,7 @@ func handleDeposits(spanCtx context.Context, ctx sdk.Context, env *environment, continue } if err := keeperWrapper.HandleEBDeposit(spanCtx, ctx, tracer, contract.ContractAddr); err != nil { - env.failedContractAddresses.Add(contract.ContractAddr) + env.addError(contract.ContractAddr, err) } } } @@ -180,7 +191,7 @@ func handleSettlements(ctx context.Context, sdkCtx sdk.Context, env *environment } if err := HandleSettlements(sdkCtx, contractAddr, keeper, settlements); err != nil { sdkCtx.Logger().Error(fmt.Sprintf("Error handling settlements for %s", contractAddr)) - env.failedContractAddresses.Add(contractAddr) + env.addError(contractAddr, err) } return true }) @@ -197,7 +208,7 @@ func handleUnfulfilledMarketOrders(ctx context.Context, sdkCtx sdk.Context, env } if err := CancelUnfulfilledMarketOrders(ctx, sdkCtx, contract.ContractAddr, keeper, registeredPairs, tracer); err != nil { sdkCtx.Logger().Error(fmt.Sprintf("Error cancelling unfulfilled market orders for %s", contract.ContractAddr)) - env.failedContractAddresses.Add(contract.ContractAddr) + env.addError(contract.ContractAddr, err) } } } @@ -230,10 +241,10 @@ func orderMatchingRunnable(ctx context.Context, sdkContext sdk.Context, env *env if !pairFound || !found { sdkContext.Logger().Error(fmt.Sprintf("No pair or order book for %s", contractInfo.ContractAddr)) - env.failedContractAddresses.Add(contractInfo.ContractAddr) + env.addError(contractInfo.ContractAddr, errors.New("no pair found (internal error)")) } else if settlements, err := HandleExecutionForContract(ctx, sdkContext, contractInfo, keeper, pairs, orderBooks, tracer); err != nil { sdkContext.Logger().Error(fmt.Sprintf("Error for EndBlock of %s", contractInfo.ContractAddr)) - env.failedContractAddresses.Add(contractInfo.ContractAddr) + env.addError(contractInfo.ContractAddr, err) } else { env.settlementsByContract.Store(contractInfo.ContractAddr, settlements) } @@ -247,16 +258,29 @@ func orderMatchingRunnable(ctx context.Context, sdkContext sdk.Context, env *env func filterNewValidContracts(ctx sdk.Context, env *environment) []types.ContractInfoV2 { newValidContracts := []types.ContractInfoV2{} for _, contract := range env.validContractsInfo { - if !env.failedContractAddresses.Contains(contract.ContractAddr) { + if !env.failedContractAddresses.Contains(contract.ContractAddr) && !env.outOfRentContractAddresses.Contains(contract.ContractAddr) { newValidContracts = append(newValidContracts, contract) } } for _, failedContractAddress := range env.failedContractAddresses.ToOrderedSlice(datastructures.StringComparator) { dexutils.GetMemState(ctx.Context()).DeepFilterAccount(ctx, failedContractAddress) } + for _, outOfRentContractAddress := range env.outOfRentContractAddresses.ToOrderedSlice(datastructures.StringComparator) { + dexutils.GetMemState(ctx.Context()).DeepFilterAccount(ctx, outOfRentContractAddress) + } return newValidContracts } +func getOutOfRentContracts(env *environment) []types.ContractInfoV2 { + outOfRentContracts := []types.ContractInfoV2{} + for _, contract := range env.validContractsInfo { + if env.outOfRentContractAddresses.Contains(contract.ContractAddr) { + outOfRentContracts = append(outOfRentContracts, contract) + } + } + return outOfRentContracts +} + func TransferRentFromDexToCollector(ctx sdk.Context, bankKeeper bankkeeper.Keeper, preRents map[string]uint64, postRents map[string]uint64) { total := uint64(0) for addr, preRent := range preRents { diff --git a/x/dex/keeper/contract.go b/x/dex/keeper/contract.go index 0fcd716aba..7f4f5bcb52 100644 --- a/x/dex/keeper/contract.go +++ b/x/dex/keeper/contract.go @@ -99,7 +99,7 @@ func (k Keeper) ChargeRentForGas(ctx sdk.Context, contractAddr string, gasUsed u if err := k.SetContract(ctx, &contract); err != nil { return err } - return errors.New("insufficient rent") + return types.ErrInsufficientRent } contract.RentBalance -= uint64(gasPrice) return k.SetContract(ctx, &contract) diff --git a/x/dex/keeper/params.go b/x/dex/keeper/params.go index e6e3e3bab4..520cdf8213 100644 --- a/x/dex/keeper/params.go +++ b/x/dex/keeper/params.go @@ -16,6 +16,10 @@ func (k Keeper) GetSettlementGasAllowance(ctx sdk.Context, numSettlements int) u return k.GetParams(ctx).GasAllowancePerSettlement * uint64(numSettlements) } +func (k Keeper) GetMinProcessableRent(ctx sdk.Context) uint64 { + return k.GetParams(ctx).MinProcessableRent +} + // SetParams set the params func (k Keeper) SetParams(ctx sdk.Context, params types.Params) { k.Paramstore.SetParamSet(ctx, ¶ms) diff --git a/x/dex/module.go b/x/dex/module.go index 0cc06978ff..4188d273f9 100644 --- a/x/dex/module.go +++ b/x/dex/module.go @@ -227,7 +227,7 @@ func (am AppModule) getAllContractInfo(ctx sdk.Context) []types.ContractInfoV2 { // Do not process any contract that has zero rent balance defer telemetry.MeasureSince(time.Now(), am.Name(), "get_all_contract_info") allRegisteredContracts := am.keeper.GetAllContractInfo(ctx) - validContracts := utils.Filter(allRegisteredContracts, func(c types.ContractInfoV2) bool { return c.RentBalance > 0 }) + validContracts := utils.Filter(allRegisteredContracts, func(c types.ContractInfoV2) bool { return c.RentBalance > am.keeper.GetMinProcessableRent(ctx) }) telemetry.SetGauge(float32(len(allRegisteredContracts)), am.Name(), "num_of_registered_contracts") telemetry.SetGauge(float32(len(validContracts)), am.Name(), "num_of_valid_contracts") telemetry.SetGauge(float32(len(allRegisteredContracts)-len(validContracts)), am.Name(), "num_of_zero_balance_contracts") @@ -282,6 +282,7 @@ func (am AppModule) EndBlock(ctx sdk.Context, _ abci.RequestEndBlock) (ret []abc validContractsInfo := am.getAllContractInfo(ctx) validContractsInfoAtBeginning := validContractsInfo + outOfRentContractsInfo := []types.ContractInfoV2{} // Each iteration is atomic. If an iteration finishes without any error, it will return, // otherwise it will rollback any state change, filter out contracts that cause the error, // and proceed to the next iteration. The loop is guaranteed to finish since @@ -289,11 +290,12 @@ func (am AppModule) EndBlock(ctx sdk.Context, _ abci.RequestEndBlock) (ret []abc iterCounter := len(validContractsInfo) endBlockerStartTime := time.Now() for len(validContractsInfo) > 0 { - newValidContractsInfo, ctx, ok := contract.EndBlockerAtomic(ctx, &am.keeper, validContractsInfo, am.tracingInfo) + newValidContractsInfo, newOutOfRentContractsInfo, ctx, ok := contract.EndBlockerAtomic(ctx, &am.keeper, validContractsInfo, am.tracingInfo) if ok { break } validContractsInfo = newValidContractsInfo + outOfRentContractsInfo = newOutOfRentContractsInfo // technically we don't really need this if `EndBlockerAtomic` guarantees that `validContractsInfo` size will // always shrink if not `ok`, but just in case, we decided to have an explicit termination criteria here to @@ -305,16 +307,24 @@ func (am AppModule) EndBlock(ctx sdk.Context, _ abci.RequestEndBlock) (ret []abc } } telemetry.MeasureSince(endBlockerStartTime, am.Name(), "total_end_blocker_atomic") - validContractAddrs := map[string]struct{}{} + validContractAddrs, outOfRentContractAddrs := map[string]struct{}{}, map[string]struct{}{} for _, c := range validContractsInfo { validContractAddrs[c.ContractAddr] = struct{}{} } + for _, c := range outOfRentContractsInfo { + outOfRentContractAddrs[c.ContractAddr] = struct{}{} + } for _, c := range validContractsInfoAtBeginning { - if _, ok := validContractAddrs[c.ContractAddr]; !ok { - ctx.Logger().Error(fmt.Sprintf("Unregistering invalid contract %s", c.ContractAddr)) - am.keeper.DoUnregisterContract(ctx, c) - telemetry.IncrCounter(float32(1), am.Name(), "total_unregistered_contracts") + if _, ok := validContractAddrs[c.ContractAddr]; ok { + continue + } + if _, ok := outOfRentContractAddrs[c.ContractAddr]; ok { + telemetry.IncrCounter(float32(1), am.Name(), "total_out_of_rent_contracts") + continue } + ctx.Logger().Error(fmt.Sprintf("Unregistering invalid contract %s", c.ContractAddr)) + am.keeper.DoUnregisterContract(ctx, c) + telemetry.IncrCounter(float32(1), am.Name(), "total_unregistered_contracts") } return []abci.ValidatorUpdate{} diff --git a/x/dex/module_test.go b/x/dex/module_test.go index 5b00085afa..c1b5667b60 100644 --- a/x/dex/module_test.go +++ b/x/dex/module_test.go @@ -616,6 +616,10 @@ func TestEndBlockRollbackWithRentCharge(t *testing.T) { Amount: sdk.MustNewDecFromStr("10000"), }, ) + // overwrite params for testing + params := dexkeeper.GetParams(ctx) + params.MinProcessableRent = 0 + dexkeeper.SetParams(ctx, params) ctx = ctx.WithBlockHeight(1) creatorBalanceBefore := bankkeeper.GetBalance(ctx, testAccount, "usei") @@ -625,8 +629,9 @@ func TestEndBlockRollbackWithRentCharge(t *testing.T) { require.Equal(t, 0, len(matchResult.Orders)) // rent should still be charged even if the contract failed, so no rent should be sent to the creator after // auto unregister - _, err = dexkeeper.GetContract(ctx, contractAddr.String()) - require.NotNil(t, err) // auto-unregistered + c, err := dexkeeper.GetContract(ctx, contractAddr.String()) + require.Nil(t, err) // out-of-rent contract should not be auto-unregistered + require.Equal(t, uint64(0), c.RentBalance) // rent balance should be drained creatorBalanceAfter := bankkeeper.GetBalance(ctx, testAccount, "usei") require.Equal(t, creatorBalanceBefore, creatorBalanceAfter) } @@ -671,6 +676,6 @@ func TestEndBlockContractWithoutPair(t *testing.T) { ti := tracing.Info{ Tracer: &tr, } - _, _, success := contract.EndBlockerAtomic(ctx, &testApp.DexKeeper, []types.ContractInfoV2{contractInfo}, &ti) + _, _, _, success := contract.EndBlockerAtomic(ctx, &testApp.DexKeeper, []types.ContractInfoV2{contractInfo}, &ti) require.True(t, success) } diff --git a/x/dex/types/errors.go b/x/dex/types/errors.go index fcbbf797b8..cef72ac0b4 100644 --- a/x/dex/types/errors.go +++ b/x/dex/types/errors.go @@ -21,5 +21,6 @@ var ( ErrPairNotRegistered = sdkerrors.Register(ModuleName, 16, "pair is not registered") ErrContractNotExists = sdkerrors.Register(ModuleName, 17, "Error finding contract info") ErrParsingContractInfo = sdkerrors.Register(ModuleName, 18, "Error parsing contract info") + ErrInsufficientRent = sdkerrors.Register(ModuleName, 19, "Error contract does not have sufficient fee") ErrCircularContractDependency = sdkerrors.Register(ModuleName, 1103, "circular contract dependency detected") ) diff --git a/x/dex/types/params.go b/x/dex/types/params.go index b2bb7a1908..4599264b24 100644 --- a/x/dex/types/params.go +++ b/x/dex/types/params.go @@ -17,6 +17,7 @@ var ( KeyDefaultGasPerCancel = []byte("KeyDefaultGasPerCancel") KeyMinRentDeposit = []byte("KeyMinRentDeposit") KeyGasAllowancePerSettlement = []byte("KeyGasAllowancePerSettlement") + KeyMinProcessableRent = []byte("KeyMinProcessableRent") ) const ( @@ -27,6 +28,7 @@ const ( DefaultDefaultGasPerCancel = 55000 DefaultMinRentDeposit = 10000000 // 10 sei DefaultGasAllowancePerSettlement = 10000 + DefaultMinProcessableRent = 100000 ) var DefaultSudoCallGasPrice = sdk.NewDecWithPrec(1, 1) // 0.1 @@ -49,6 +51,7 @@ func DefaultParams() Params { DefaultGasPerCancel: DefaultDefaultGasPerCancel, MinRentDeposit: DefaultMinRentDeposit, GasAllowancePerSettlement: DefaultGasAllowancePerSettlement, + MinProcessableRent: DefaultMinProcessableRent, } } @@ -63,6 +66,7 @@ func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs { paramtypes.NewParamSetPair(KeyDefaultGasPerCancel, &p.DefaultGasPerCancel, validateUint64Param), paramtypes.NewParamSetPair(KeyMinRentDeposit, &p.MinRentDeposit, validateUint64Param), paramtypes.NewParamSetPair(KeyGasAllowancePerSettlement, &p.GasAllowancePerSettlement, validateUint64Param), + paramtypes.NewParamSetPair(KeyMinProcessableRent, &p.MinProcessableRent, validateUint64Param), } } diff --git a/x/dex/types/params.pb.go b/x/dex/types/params.pb.go index 383a933dfe..36119e16c5 100644 --- a/x/dex/types/params.pb.go +++ b/x/dex/types/params.pb.go @@ -34,6 +34,7 @@ type Params struct { DefaultGasPerCancel uint64 `protobuf:"varint,6,opt,name=default_gas_per_cancel,json=defaultGasPerCancel,proto3" json:"default_gas_per_cancel" yaml:"default_gas_per_cancel"` MinRentDeposit uint64 `protobuf:"varint,7,opt,name=min_rent_deposit,json=minRentDeposit,proto3" json:"min_rent_deposit" yaml:"min_rent_deposit"` GasAllowancePerSettlement uint64 `protobuf:"varint,8,opt,name=gas_allowance_per_settlement,json=gasAllowancePerSettlement,proto3" json:"gas_allowance_per_settlement" yaml:"gas_allowance_per_settlement"` + MinProcessableRent uint64 `protobuf:"varint,9,opt,name=min_processable_rent,json=minProcessableRent,proto3" json:"min_processable_rent" yaml:"min_processable_rent"` } func (m *Params) Reset() { *m = Params{} } @@ -117,6 +118,13 @@ func (m *Params) GetGasAllowancePerSettlement() uint64 { return 0 } +func (m *Params) GetMinProcessableRent() uint64 { + if m != nil { + return m.MinProcessableRent + } + return 0 +} + func init() { proto.RegisterType((*Params)(nil), "seiprotocol.seichain.dex.Params") } @@ -124,41 +132,44 @@ func init() { func init() { proto.RegisterFile("dex/params.proto", fileDescriptor_e49286500ccff43e) } var fileDescriptor_e49286500ccff43e = []byte{ - // 544 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x94, 0x31, 0x6f, 0xd3, 0x4c, - 0x18, 0xc7, 0xe3, 0xf7, 0x2d, 0x6d, 0xf1, 0x80, 0x22, 0x87, 0x16, 0x53, 0x15, 0x5f, 0x65, 0x24, - 0xd4, 0x25, 0xf1, 0x80, 0x18, 0x28, 0x03, 0x22, 0x2d, 0xca, 0x82, 0x44, 0xe4, 0x4e, 0xb0, 0x58, - 0x17, 0xfb, 0xc1, 0x39, 0xf5, 0x7c, 0x67, 0xf9, 0x2e, 0x22, 0xf9, 0x06, 0x8c, 0x8c, 0x2c, 0x48, - 0xfd, 0x38, 0x1d, 0x3b, 0x22, 0x86, 0x13, 0x4a, 0x16, 0xe4, 0xd1, 0x9f, 0x00, 0xdd, 0x39, 0xa1, - 0xb4, 0x75, 0x3a, 0xe5, 0xf2, 0xff, 0xfd, 0x75, 0xbf, 0x7b, 0x22, 0x3d, 0xb1, 0xdb, 0x09, 0x4c, - 0x83, 0x1c, 0x17, 0x38, 0x13, 0xbd, 0xbc, 0xe0, 0x92, 0x3b, 0xae, 0x00, 0x62, 0x4e, 0x31, 0xa7, - 0x3d, 0x01, 0x24, 0x1e, 0x63, 0xc2, 0x7a, 0x09, 0x4c, 0xf7, 0x1e, 0xa6, 0x3c, 0xe5, 0x06, 0x05, - 0xfa, 0x54, 0xf7, 0xfd, 0xef, 0x5b, 0xf6, 0xe6, 0xd0, 0x5c, 0xe0, 0xcc, 0x6c, 0x37, 0x2f, 0x48, - 0x0c, 0x91, 0x60, 0x38, 0x17, 0x63, 0x2e, 0xa3, 0x02, 0x24, 0x30, 0x49, 0x38, 0x73, 0xad, 0x03, - 0xeb, 0x70, 0xa3, 0xff, 0xba, 0x54, 0x68, 0x6d, 0xa7, 0x52, 0x08, 0xcd, 0x70, 0x46, 0x8f, 0xfc, - 0x75, 0x0d, 0x3f, 0xdc, 0x35, 0xe8, 0x74, 0x49, 0xc2, 0x15, 0x70, 0xa4, 0xdd, 0x11, 0x93, 0x84, - 0x47, 0x31, 0xa6, 0x34, 0x4a, 0xb1, 0x88, 0x4c, 0xcf, 0xfd, 0xef, 0xc0, 0x3a, 0xbc, 0xdf, 0x7f, - 0x7b, 0xa1, 0x50, 0xeb, 0xa7, 0x42, 0xcf, 0x52, 0x22, 0xc7, 0x93, 0x51, 0x2f, 0xe6, 0x59, 0x10, - 0x73, 0x91, 0x71, 0xb1, 0xfc, 0xe8, 0x8a, 0xe4, 0x2c, 0x90, 0xb3, 0x1c, 0x44, 0xef, 0x04, 0xe2, - 0x52, 0xa1, 0xa6, 0xcb, 0xc2, 0xb6, 0x0e, 0x8f, 0x31, 0xa5, 0x03, 0x2c, 0x86, 0x3a, 0x71, 0xa8, - 0xbd, 0x33, 0x82, 0x94, 0xb0, 0x68, 0x44, 0x79, 0x7c, 0x66, 0xaa, 0x94, 0x64, 0x44, 0xba, 0xff, - 0x9b, 0x69, 0x5f, 0x96, 0x0a, 0x35, 0x17, 0x2a, 0x85, 0xf6, 0xeb, 0x51, 0x1b, 0xb1, 0x1f, 0x3a, - 0x26, 0xef, 0xeb, 0x78, 0x80, 0xc5, 0x3b, 0x1d, 0x3a, 0x89, 0xdd, 0x01, 0x96, 0xdc, 0x72, 0x6d, - 0x18, 0xd7, 0x0b, 0xfd, 0xea, 0x06, 0x5c, 0x29, 0xb4, 0x57, 0x9b, 0x1a, 0xa0, 0x1f, 0xb6, 0x81, - 0x25, 0xd7, 0x2d, 0xd4, 0xde, 0x49, 0xe0, 0x13, 0x9e, 0x50, 0x59, 0x8f, 0x0e, 0x45, 0xc4, 0x8b, - 0x04, 0x0a, 0xf7, 0xde, 0xd5, 0x4c, 0x8d, 0x85, 0xab, 0x99, 0x1a, 0xb1, 0x1f, 0x3a, 0xcb, 0x5c, - 0xff, 0x7c, 0x50, 0xbc, 0xd7, 0xa1, 0x93, 0xdb, 0xbb, 0x37, 0xdb, 0x31, 0x66, 0x31, 0x50, 0x77, - 0xd3, 0xe8, 0x5e, 0x95, 0x0a, 0xad, 0x69, 0x54, 0x0a, 0x3d, 0x69, 0xf6, 0xd5, 0xdc, 0x0f, 0x3b, - 0xd7, 0x84, 0xc7, 0x26, 0x75, 0x3e, 0xd8, 0xed, 0x8c, 0xb0, 0xa8, 0x00, 0x26, 0xa3, 0x04, 0x72, - 0x2e, 0x88, 0x74, 0xb7, 0x8c, 0x2b, 0x28, 0x15, 0xba, 0xc5, 0x2a, 0x85, 0x1e, 0xd5, 0x96, 0x9b, - 0xc4, 0x0f, 0x1f, 0x64, 0x84, 0x85, 0xc0, 0xe4, 0x49, 0x1d, 0x38, 0x5f, 0x2c, 0x7b, 0x5f, 0xbf, - 0x01, 0x53, 0xca, 0x3f, 0x6b, 0x9b, 0x79, 0x8d, 0x00, 0x29, 0x29, 0x64, 0xc0, 0xa4, 0xbb, 0x6d, - 0x3c, 0x83, 0x52, 0xa1, 0x3b, 0x7b, 0x95, 0x42, 0x4f, 0x6b, 0xe7, 0x5d, 0x2d, 0x3f, 0x7c, 0x9c, - 0x62, 0xf1, 0x66, 0x45, 0x87, 0x50, 0x9c, 0xfe, 0x65, 0x47, 0xdb, 0xdf, 0xce, 0x51, 0xeb, 0xf7, - 0x39, 0xb2, 0xfa, 0x83, 0x8b, 0xb9, 0x67, 0x5d, 0xce, 0x3d, 0xeb, 0xd7, 0xdc, 0xb3, 0xbe, 0x2e, - 0xbc, 0xd6, 0xe5, 0xc2, 0x6b, 0xfd, 0x58, 0x78, 0xad, 0x8f, 0xdd, 0x7f, 0xd6, 0x41, 0x00, 0xe9, - 0xae, 0xb6, 0xde, 0x7c, 0x31, 0x6b, 0x1f, 0x4c, 0x03, 0xfd, 0xff, 0x60, 0x36, 0x63, 0xb4, 0x69, - 0xf8, 0xf3, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x06, 0x0d, 0x5e, 0xe5, 0x33, 0x04, 0x00, 0x00, + // 581 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x94, 0x3f, 0x6f, 0xd4, 0x30, + 0x18, 0xc6, 0x2f, 0x50, 0x4a, 0x9b, 0x01, 0x9d, 0xdc, 0x3f, 0x84, 0x52, 0xe2, 0x2a, 0x48, 0xa8, + 0x4b, 0x2f, 0x03, 0x42, 0x88, 0x32, 0x20, 0xae, 0x45, 0xb7, 0x20, 0x71, 0x4a, 0x27, 0x58, 0x22, + 0x5f, 0xf2, 0x92, 0x5a, 0x75, 0xec, 0x28, 0x76, 0x45, 0xfb, 0x0d, 0x3a, 0x32, 0x32, 0xf6, 0xe3, + 0x74, 0xec, 0x88, 0x18, 0x2c, 0xd4, 0x2e, 0x28, 0x63, 0x3e, 0x01, 0xb2, 0x73, 0xc7, 0xd1, 0x6b, + 0xae, 0xd3, 0xf9, 0x9e, 0xdf, 0x23, 0x3f, 0xef, 0x13, 0xc9, 0xaf, 0xdb, 0x4d, 0xe1, 0x24, 0x2c, + 0x48, 0x49, 0x72, 0xd9, 0x2b, 0x4a, 0xa1, 0x04, 0xf2, 0x24, 0x50, 0x7b, 0x4a, 0x04, 0xeb, 0x49, + 0xa0, 0xc9, 0x21, 0xa1, 0xbc, 0x97, 0xc2, 0xc9, 0xc6, 0x6a, 0x26, 0x32, 0x61, 0x51, 0x68, 0x4e, + 0x8d, 0x3f, 0x38, 0x5b, 0x72, 0x17, 0x87, 0xf6, 0x02, 0x74, 0xea, 0x7a, 0x45, 0x49, 0x13, 0x88, + 0x25, 0x27, 0x85, 0x3c, 0x14, 0x2a, 0x2e, 0x41, 0x01, 0x57, 0x54, 0x70, 0xcf, 0xd9, 0x72, 0xb6, + 0x17, 0xfa, 0xef, 0x2a, 0x8d, 0xe7, 0x7a, 0x6a, 0x8d, 0xf1, 0x29, 0xc9, 0xd9, 0x6e, 0x30, 0xcf, + 0x11, 0x44, 0xeb, 0x16, 0x1d, 0x8c, 0x49, 0x34, 0x01, 0x48, 0xb9, 0x2b, 0xf2, 0x38, 0x15, 0x71, + 0x42, 0x18, 0x8b, 0x33, 0x22, 0x63, 0xeb, 0xf3, 0xee, 0x6d, 0x39, 0xdb, 0xcb, 0xfd, 0x0f, 0x17, + 0x1a, 0x77, 0x7e, 0x69, 0xfc, 0x22, 0xa3, 0xea, 0xf0, 0x78, 0xd4, 0x4b, 0x44, 0x1e, 0x26, 0x42, + 0xe6, 0x42, 0x8e, 0x7f, 0x76, 0x64, 0x7a, 0x14, 0xaa, 0xd3, 0x02, 0x64, 0x6f, 0x1f, 0x92, 0x4a, + 0xe3, 0xb6, 0xcb, 0xa2, 0xae, 0x11, 0xf7, 0x08, 0x63, 0x03, 0x22, 0x87, 0x46, 0x41, 0xcc, 0x5d, + 0x1b, 0x41, 0x46, 0x79, 0x3c, 0x62, 0x22, 0x39, 0xb2, 0x56, 0x46, 0x73, 0xaa, 0xbc, 0xfb, 0xb6, + 0xed, 0x9b, 0x4a, 0xe3, 0x76, 0x43, 0xad, 0xf1, 0x66, 0x53, 0xb5, 0x15, 0x07, 0x11, 0xb2, 0x7a, + 0xdf, 0xc8, 0x03, 0x22, 0x3f, 0x1a, 0x11, 0xa5, 0xee, 0x0a, 0xf0, 0xf4, 0x56, 0xd6, 0x82, 0xcd, + 0x7a, 0x65, 0xa6, 0x6e, 0xc1, 0xb5, 0xc6, 0x1b, 0x4d, 0x52, 0x0b, 0x0c, 0xa2, 0x2e, 0xf0, 0xf4, + 0x66, 0x0a, 0x73, 0xd7, 0x52, 0xf8, 0x4a, 0x8e, 0x99, 0x6a, 0xaa, 0x43, 0x19, 0x8b, 0x32, 0x85, + 0xd2, 0x7b, 0x30, 0xed, 0xd4, 0x6a, 0x98, 0x76, 0x6a, 0xc5, 0x41, 0x84, 0xc6, 0xba, 0xf9, 0x7c, + 0x50, 0x7e, 0x32, 0x22, 0x2a, 0xdc, 0xf5, 0x59, 0x77, 0x42, 0x78, 0x02, 0xcc, 0x5b, 0xb4, 0x71, + 0x6f, 0x2b, 0x8d, 0xe7, 0x38, 0x6a, 0x8d, 0x9f, 0xb5, 0xe7, 0x35, 0x3c, 0x88, 0x56, 0x6e, 0x04, + 0xee, 0x59, 0x15, 0x7d, 0x76, 0xbb, 0x39, 0xe5, 0x71, 0x09, 0x5c, 0xc5, 0x29, 0x14, 0x42, 0x52, + 0xe5, 0x3d, 0xb4, 0x59, 0x61, 0xa5, 0xf1, 0x2d, 0x56, 0x6b, 0xfc, 0xb8, 0x49, 0x99, 0x25, 0x41, + 0xf4, 0x28, 0xa7, 0x3c, 0x02, 0xae, 0xf6, 0x1b, 0x01, 0x9d, 0x39, 0xee, 0xa6, 0x99, 0x81, 0x30, + 0x26, 0xbe, 0x99, 0x34, 0x3b, 0x8d, 0x04, 0xa5, 0x18, 0xe4, 0xc0, 0x95, 0xb7, 0x64, 0x73, 0x06, + 0x95, 0xc6, 0x77, 0xfa, 0x6a, 0x8d, 0x9f, 0x37, 0x99, 0x77, 0xb9, 0x82, 0xe8, 0x49, 0x46, 0xe4, + 0xfb, 0x09, 0x1d, 0x42, 0x79, 0xf0, 0x8f, 0x21, 0xea, 0xae, 0x9a, 0x79, 0x8b, 0x52, 0x24, 0x20, + 0x25, 0x19, 0x31, 0xb0, 0xb3, 0x7b, 0xcb, 0x76, 0x82, 0xd7, 0x95, 0xc6, 0xad, 0xbc, 0xd6, 0xf8, + 0xe9, 0xb4, 0xed, 0x2c, 0x0d, 0x22, 0x94, 0x53, 0x3e, 0x9c, 0xaa, 0xa6, 0xfc, 0xee, 0xd2, 0x8f, + 0x73, 0xdc, 0xf9, 0x73, 0x8e, 0x9d, 0xfe, 0xe0, 0xe2, 0xca, 0x77, 0x2e, 0xaf, 0x7c, 0xe7, 0xf7, + 0x95, 0xef, 0x7c, 0xbf, 0xf6, 0x3b, 0x97, 0xd7, 0x7e, 0xe7, 0xe7, 0xb5, 0xdf, 0xf9, 0xb2, 0xf3, + 0xdf, 0xcb, 0x93, 0x40, 0x77, 0x26, 0x0b, 0xc6, 0xfe, 0xb1, 0x1b, 0x26, 0x3c, 0x09, 0xcd, 0x2a, + 0xb2, 0x8f, 0x70, 0xb4, 0x68, 0xf9, 0xcb, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x6c, 0xa1, 0x71, + 0xd8, 0x9e, 0x04, 0x00, 0x00, } func (this *Params) Equal(that interface{}) bool { @@ -204,6 +215,9 @@ func (this *Params) Equal(that interface{}) bool { if this.GasAllowancePerSettlement != that1.GasAllowancePerSettlement { return false } + if this.MinProcessableRent != that1.MinProcessableRent { + return false + } return true } func (m *Params) Marshal() (dAtA []byte, err error) { @@ -226,6 +240,11 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.MinProcessableRent != 0 { + i = encodeVarintParams(dAtA, i, uint64(m.MinProcessableRent)) + i-- + dAtA[i] = 0x48 + } if m.GasAllowancePerSettlement != 0 { i = encodeVarintParams(dAtA, i, uint64(m.GasAllowancePerSettlement)) i-- @@ -314,6 +333,9 @@ func (m *Params) Size() (n int) { if m.GasAllowancePerSettlement != 0 { n += 1 + sovParams(uint64(m.GasAllowancePerSettlement)) } + if m.MinProcessableRent != 0 { + n += 1 + sovParams(uint64(m.MinProcessableRent)) + } return n } @@ -519,6 +541,25 @@ func (m *Params) Unmarshal(dAtA []byte) error { break } } + case 9: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field MinProcessableRent", wireType) + } + m.MinProcessableRent = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowParams + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.MinProcessableRent |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipParams(dAtA[iNdEx:])