update

common/model/user_operation.go

@@ -3,10 +3,17 @@ package model
 import (
  "encoding/hex"
  "github.com/ethereum/go-ethereum/common"
+ "github.com/go-playground/validator/v10"
  "github.com/mitchellh/mapstructure"
  "golang.org/x/xerrors"
  "math/big"
  "reflect"
+ "sync"
+)
+
+var (
+ validate = validator.New()
+ onlyOnce = sync.Once{}
 )
 
 // UserOperation entrypoint v0.0.6
@@ -58,10 +65,36 @@ func NewUserOp(userOp *map[string]any) (*UserOperation, error) {
  if err := decoder.Decode(userOp); err != nil {
  return nil, xerrors.Errorf("data [%w] convert failed: [%w]", userOp, err)
  }
+ onlyOnce.Do(func() {
+ validate.RegisterCustomTypeFunc(validateAddressType, common.Address{})
+ validate.RegisterCustomTypeFunc(validateBigIntType, big.Int{})
+ })
+ err = validate.Struct(result)
+ if err != nil {
+ return nil, err
+ }
 
  return &result, nil
 }
 
+func validateAddressType(field reflect.Value) interface{} {
+ value, ok := field.Interface().(common.Address)
+ if !ok || value == common.HexToAddress("0x") {
+ return nil
+ }
+
+ return field
+}
+
+func validateBigIntType(field reflect.Value) interface{} {
+ value, ok := field.Interface().(big.Int)
+ if !ok || value.Cmp(big.NewInt(0)) == -1 {
+ return nil
+ }
+
+ return field
+}
+
 func exactFieldMatch(mapKey, fieldName string) bool {
  return mapKey == fieldName
 }

common/utils/util_test.go

@@ -31,10 +31,11 @@ func TestSignUserOp(t *testing.T) {
  }
  signByte, err := SignUserOp("1d8a58126e87e53edc7b24d58d1328230641de8c4242c135492bf5560e0ff421", userOp)
  assert.NoError(t, err)
+ len := len(signByte)
+ fmt.Printf("signByte len: %d\n", len)
  fmt.Printf("signByte: %x\n", signByte)
  singature := hex.EncodeToString(signByte)
  fmt.Printf("singature: %s\n", singature)
-
 }
 func TestNewUserOp(t *testing.T) {
  userOp, newErr := model.NewUserOp(GenerateMockUserOperation())

docs/docs.go

@@ -191,12 +191,14 @@ const docTemplate = `{
  "enum": [
  "ethereum",
  "sepolia",
- "arbitrum"
+ "arbitrum",
+ "arb-sepolia"
  ],
  "x-enum-varnames": [
  "Ethereum",
  "Sepolia",
- "Arbitrum"
+ "Arbitrum",
+ "ArbTest"
  ]
  }
  },

docs/swagger.json

@@ -180,12 +180,14 @@
  "enum": [
  "ethereum",
  "sepolia",
- "arbitrum"
+ "arbitrum",
+ "arb-sepolia"
  ],
  "x-enum-varnames": [
  "Ethereum",
  "Sepolia",
- "Arbitrum"
+ "Arbitrum",
+ "ArbTest"
  ]
  }
  },

docs/swagger.yaml

@@ -24,11 +24,13 @@ definitions:
  - ethereum
  - sepolia
  - arbitrum
+ - arb-sepolia
  type: string
  x-enum-varnames:
  - Ethereum
  - Sepolia
  - Arbitrum
+ - ArbTest
 info:
  contact:
  name: AAStar Support