Skip to content

Commit e9dead4

Browse files
committed
handle both
1 parent 9402f1a commit e9dead4

File tree

6 files changed

+487
-605
lines changed

6 files changed

+487
-605
lines changed

api/cosmos/evm/vm/v1/query.pulsar.go

Lines changed: 362 additions & 427 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

proto/cosmos/evm/vm/v1/query.proto

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,6 @@ message QueryPrecompileRequest {
126126
message QueryPrecompileResponse {
127127
// is_precompile indicates if the address is a precompile contract
128128
bool is_precompile = 1;
129-
// is_static indicates if it's a static precompile (true) or dynamic precompile (false)
130-
bool is_static = 2;
131129
}
132130

133131
// QueryAccountRequest is the request type for the Query/Account RPC method.

rpc/backend/call_tx.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -391,15 +391,15 @@ func (b *Backend) DoCall(
391391
// this makes sure resources are cleaned up.
392392
defer cancel()
393393

394-
var isDynamic bool
394+
var isPrecompile bool
395395
if args.To != nil {
396396
precompileReq := &evmtypes.QueryPrecompileRequest{Address: args.To.Hex()}
397397
if res, err := b.QueryClient.Precompile(ctx, precompileReq); err == nil {
398-
isDynamic = res.IsPrecompile && !res.IsStatic
398+
isPrecompile = res.IsPrecompile
399399
}
400400
}
401401

402-
evmOverrides, cosmosOverrides, err := rpctypes.ParseOverrides(overrides, isDynamic)
402+
evmOverrides, cosmosOverrides, err := rpctypes.ParseOverrides(overrides, isPrecompile)
403403
if err != nil {
404404
return nil, fmt.Errorf("failed to parse overrides: %w", err)
405405
}

rpc/types/types.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,13 +192,13 @@ type TraceConfig struct {
192192
}
193193

194194
// ParseOverrides attempts to parse overrides as StateOverride
195-
// If isDynamicPrecompile is true, it will handle aligned cosmos override format for the target dynamic precompile
196-
func ParseOverrides(overrides *json.RawMessage, isDynamicPrecompile bool) (*StateOverride, []evmtypes.StoreStateDiff, error) {
195+
// If isPrecompile is true, it will handle aligned cosmos override format for the target precompile
196+
func ParseOverrides(overrides *json.RawMessage, isPrecompile bool) (*StateOverride, []evmtypes.StoreStateDiff, error) {
197197
if overrides == nil {
198198
return nil, nil, nil
199199
}
200200

201-
if isDynamicPrecompile {
201+
if isPrecompile {
202202
var rawOverrides map[string]interface{}
203203
if err := json.Unmarshal(*overrides, &rawOverrides); err == nil {
204204
for _, encodedData := range rawOverrides {

x/vm/keeper/grpc_query.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -892,16 +892,8 @@ func (k Keeper) Precompile(c context.Context, req *types.QueryPrecompileRequest)
892892
return nil, status.Error(codes.Internal, err.Error())
893893
}
894894

895-
isStatic := false
896-
if found {
897-
params := k.GetParams(ctx)
898-
_, staticFound, _ := k.GetStaticPrecompileInstance(&params, address)
899-
isStatic = staticFound
900-
}
901-
902895
return &types.QueryPrecompileResponse{
903896
IsPrecompile: found,
904-
IsStatic: isStatic,
905897
}, nil
906898
}
907899

0 commit comments

Comments
 (0)