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

delete contract query limit config #20

Merged
merged 2 commits into from
May 24, 2024
Merged

delete contract query limit config #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1fca43
delete contract query limit config
sh-cha May 23, 2024
4d33e2e
default 3,000,000
sh-cha May 23, 2024
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
1 change: 1 addition & 0 deletions cmd/minitiad/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ func initAppConfig() (string, interface{}) {
//
// In simapp, we set the min gas prices to 0.
srvCfg.MinGasPrices = fmt.Sprintf("0%s", types.BaseDenom)
srvCfg.QueryGasLimit = 3000000

// Enable API and unsafe CORS (CORS allowed from any host)
srvCfg.API.Enable = true
Expand Down
13 changes: 0 additions & 13 deletions x/evm/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,43 +7,35 @@ import (
servertypes "github.com/cosmos/cosmos-sdk/server/types"
)

// DefaultContractQueryGasLimit - default max query gas for external query
const DefaultContractQueryGasLimit = uint64(3_000_000)

// DefaultContractSimulationGasLimit - default max simulation gas
const DefaultContractSimulationGasLimit = uint64(3_000_000)

const (
flagContractSimulationGasLimit = "evm.contract-simulation-gas-limit"
flagContractQueryGasLimit = "evm.contract-query-gas-limit"
)

// EVMConfig is the extra config required for evm
type EVMConfig struct {
ContractSimulationGasLimit uint64 `mapstructure:"contract-simulation-gas-limit"`
ContractQueryGasLimit uint64 `mapstructure:"contract-query-gas-limit"`
}

// DefaultEVMConfig returns the default settings for EVMConfig
func DefaultEVMConfig() EVMConfig {
return EVMConfig{
ContractSimulationGasLimit: DefaultContractSimulationGasLimit,
ContractQueryGasLimit: DefaultContractQueryGasLimit,
}
}

// GetConfig load config values from the app options
func GetConfig(appOpts servertypes.AppOptions) EVMConfig {
return EVMConfig{
ContractSimulationGasLimit: cast.ToUint64(appOpts.Get(flagContractSimulationGasLimit)),
ContractQueryGasLimit: cast.ToUint64(appOpts.Get(flagContractQueryGasLimit)),
}
}

// AddConfigFlags implements servertypes.EVMConfigFlags interface.
func AddConfigFlags(startCmd *cobra.Command) {
startCmd.Flags().Uint64(flagContractSimulationGasLimit, DefaultContractSimulationGasLimit, "Set the max simulation gas for evm contract execution")
startCmd.Flags().Uint64(flagContractQueryGasLimit, DefaultContractQueryGasLimit, "Set the max gas that can be spent on executing a query with a Move contract")
}

// DefaultConfigTemplate default config template for evm
Expand All @@ -56,9 +48,4 @@ const DefaultConfigTemplate = `

# The maximum gas amount can be used in a tx simulation call.
contract-simulation-gas-limit = "{{ .EVMConfig.ContractSimulationGasLimit }}"

# The maximum gas amount can be spent for contract query.
# The contract query will invoke contract execution vm,
# so we need to restrict the max usage to prevent DoS attack
contract-query-gas-limit = "{{ .EVMConfig.ContractQueryGasLimit }}"
`
4 changes: 0 additions & 4 deletions x/evm/keeper/keeper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,6 @@ func NewKeeper(
evmConfig.ContractSimulationGasLimit = evmconfig.DefaultContractSimulationGasLimit
}

if evmConfig.ContractQueryGasLimit == 0 {
evmConfig.ContractQueryGasLimit = evmconfig.DefaultContractQueryGasLimit
}

k := &Keeper{
ac: ac,
cdc: cdc,
Expand Down
2 changes: 0 additions & 2 deletions x/evm/keeper/query_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"strings"

errorsmod "cosmossdk.io/errors"
storetypes "cosmossdk.io/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/ethereum/go-ethereum/common"
Expand Down Expand Up @@ -34,7 +33,6 @@ func (qs *queryServerImpl) Call(ctx context.Context, req *types.QueryCallRequest
}()

sdkCtx := sdk.UnwrapSDKContext(ctx)
sdkCtx = sdkCtx.WithGasMeter(storetypes.NewGasMeter(qs.config.ContractQueryGasLimit))

sender, err := qs.ac.StringToBytes(req.Sender)
if err != nil {
Expand Down
Loading