disable special addres

Author: dustinxie

api/coreservice.go

@@ -82,7 +82,7 @@ type (
 	// CoreService provides api interface for user to interact with blockchain data
 	CoreService interface {
 		// Account returns the metadata of an account
-		Account(addr address.Address) (*iotextypes.AccountMeta, *iotextypes.BlockIdentifier, error)
+		Account(string) (*iotextypes.AccountMeta, *iotextypes.BlockIdentifier, error)
 		// ChainMeta returns blockchain metadata
 		ChainMeta() (*iotextypes.ChainMeta, string, error)
 		// ServerMeta gets the server metadata
@@ -306,14 +306,17 @@ func newCoreService(
 }
 
 // Account returns the metadata of an account
-func (core *coreService) Account(addr address.Address) (*iotextypes.AccountMeta, *iotextypes.BlockIdentifier, error) {
+func (core *coreService) Account(addrStr string) (*iotextypes.AccountMeta, *iotextypes.BlockIdentifier, error) {
 	ctx, span := tracer.NewSpan(context.Background(), "coreService.Account")
 	defer span.End()
-	addrStr := addr.String()
 	if addrStr == address.RewardingPoolAddr || addrStr == address.StakingBucketPoolAddr {
 		return core.getProtocolAccount(ctx, addrStr)
 	}
 	span.AddEvent("accountutil.AccountStateWithHeight")
+	addr, err := address.FromString(addrStr)
+	if err != nil {
+		return nil, nil, status.Error(codes.FailedPrecondition, err.Error())
+	}
 	ctx = genesis.WithGenesisContext(ctx, core.bc.Genesis())
 	state, tipHeight, err := accountutil.AccountStateWithHeight(ctx, core.sf, addr)
 	if err != nil {
@@ -1068,7 +1071,6 @@ func (core *coreService) ActionsByAddress(addr address.Address, start uint64, co
 	if count > core.cfg.RangeQueryLimit {
 		return nil, status.Error(codes.InvalidArgument, "range exceeds the limit")
 	}
-
 	actions, err := core.indexer.GetActionsByAddress(hash.BytesToHash160(addr.Bytes()), start, count)
 	if err != nil {
 		if errors.Cause(err) == db.ErrBucketNotExist || errors.Cause(err) == db.ErrNotExist {

api/grpcserver.go

@@ -159,11 +159,7 @@ func (svr *gRPCHandler) SuggestGasPrice(ctx context.Context, in *iotexapi.Sugges
 func (svr *gRPCHandler) GetAccount(ctx context.Context, in *iotexapi.GetAccountRequest) (*iotexapi.GetAccountResponse, error) {
 	span := tracer.SpanFromContext(ctx)
 	defer span.End()
-	addr, err := address.FromString(in.Address)
-	if err != nil {
-		return nil, err
-	}
-	accountMeta, blockIdentifier, err := svr.coreService.Account(addr)
+	accountMeta, blockIdentifier, err := svr.coreService.Account(in.Address)
 	if err != nil {
 		return nil, err
 	}

api/web3server.go

@@ -408,11 +408,7 @@ func (svr *web3Handler) getBalance(in *gjson.Result) (interface{}, error) {
 	if !addr.Exists() {
 		return nil, errInvalidFormat
 	}
-	ioAddr, err := ethAddrToIoAddr(addr.String())
-	if err != nil {
-		return nil, err
-	}
-	accountMeta, _, err := svr.coreService.Account(ioAddr)
+	accountMeta, _, err := svr.coreService.Account(addr.String())
 	if err != nil {
 		return nil, err
 	}
@@ -607,11 +603,7 @@ func (svr *web3Handler) getCode(in *gjson.Result) (interface{}, error) {
 	if !addr.Exists() {
 		return nil, errInvalidFormat
 	}
-	ioAddr, err := ethAddrToIoAddr(addr.String())
-	if err != nil {
-		return nil, err
-	}
-	accountMeta, _, err := svr.coreService.Account(ioAddr)
+	accountMeta, _, err := svr.coreService.Account(addr.String())
 	if err != nil {
 		return nil, err
 	}

api/web3server_utils.go

@@ -193,11 +193,7 @@ func (svr *web3Handler) checkContractAddr(to string) (bool, error) {
 	if to == "" {
 		return true, nil
 	}
-	ioAddr, err := address.FromString(to)
-	if err != nil {
-		return false, err
-	}
-	accountMeta, _, err := svr.coreService.Account(ioAddr)
+	accountMeta, _, err := svr.coreService.Account(to)
 	if err != nil {
 		return false, err
 	}

go.mod

@@ -24,7 +24,7 @@ require (
 	github.com/iotexproject/go-fsm v1.0.0
 	github.com/iotexproject/go-p2p v0.3.7-0.20240327085559-423bb9cc8f5f
 	github.com/iotexproject/go-pkgs v0.1.13
-	github.com/iotexproject/iotex-address v0.2.8
+	github.com/iotexproject/iotex-address v0.2.9-0.20241020230354-523f3f51b5f9
 	github.com/iotexproject/iotex-antenna-go/v2 v2.5.1
 	github.com/iotexproject/iotex-election v0.3.5-0.20210611041425-20ddf674363d
 	github.com/iotexproject/iotex-proto v0.6.4

go.sum

@@ -1178,8 +1178,8 @@ github.com/iotexproject/go-pkgs v0.1.13 h1:bK48DVenkfYkC4TRoqL77RLFRBE1MUfscCW49
 github.com/iotexproject/go-pkgs v0.1.13/go.mod h1:t5X9kQ1VL5H+L+DC5GmohXnFKlcxaTcRnIBBuydcsTQ=
 github.com/iotexproject/iotex-address v0.2.4/go.mod h1:K78yPSMB4K7gF/iQ7djT1amph0RBrP3rSkFfH7gNG70=
 github.com/iotexproject/iotex-address v0.2.7/go.mod h1:K78yPSMB4K7gF/iQ7djT1amph0RBrP3rSkFfH7gNG70=
-github.com/iotexproject/iotex-address v0.2.8 h1:jaTR5pZe/ljiYW4OqHl9NKPs0h1o91Gi6FILOTaBCXw=
-github.com/iotexproject/iotex-address v0.2.8/go.mod h1:K78yPSMB4K7gF/iQ7djT1amph0RBrP3rSkFfH7gNG70=
+github.com/iotexproject/iotex-address v0.2.9-0.20241020230354-523f3f51b5f9 h1:WeEbCkm4t2I3RxsRZXzHUkDGE1VlGvDUIMR3S3nJFLw=
+github.com/iotexproject/iotex-address v0.2.9-0.20241020230354-523f3f51b5f9/go.mod h1:LEpPNy+jJbMKaQ6XLEPBUkoyyllHgW9js1YdixMQL9k=
 github.com/iotexproject/iotex-antenna-go/v2 v2.5.1-0.20210604061028-2c2056a5bfdb/go.mod h1:NqFzRL8RtA3xfXGpYbs0IY71HDiD6Dh2hD9iYngKLIU=
 github.com/iotexproject/iotex-antenna-go/v2 v2.5.1 h1:Z7X0qXxc/4hSSE3koBaFRpLAdiD6MlCxKbn7iAdI+xQ=
 github.com/iotexproject/iotex-antenna-go/v2 v2.5.1/go.mod h1:8pDZcM45M0gY6jm3PoM20rzoD2Z0vg3Hg64RS4c3qx0=