update call login on server

cmd/main.go

@@ -41,11 +41,11 @@ func main() {
 }
 
 func runGasSender(cfg *config.Config) *gassender.GasSender {
-	gs, err := gassender.NewGasSender(cfg.GasSender.RPC, cfg.GasSender.PrivateKey)
+	gs, err := gassender.NewGasSender(cfg.GasSender.RPC, cfg.GasSender.PrivateKey, cfg.GasSender.UserContract)
 	if err != nil {
 		panic(err)
 	}
 	gs.Run()
-	// gs.SendAONGas("0x0000000077024042e797Ae28A163C27E389CC5b2", 1)
+	// gs.AonLogin(common.HexToAddress("aaaa"), "1", "1")
 	return gs
 }

config/config.go

@@ -29,8 +29,9 @@ type ServerConfig struct {
 }
 
 type GasSenderConfig struct {
-	PrivateKey string `toml:"private_key"`
-	RPC        string `toml:"rpc"`
+	PrivateKey   string `toml:"private_key"`
+	UserContract string `toml:"user_contract"`
+	RPC          string `toml:"rpc"`
 }
 
 type TGBotConfig struct {

gassender/gassender.go

@@ -4,11 +4,12 @@ import (
 	"context"
 	"crypto/ecdsa"
 	"math/big"
+	"sdk_api/contract/aonUser"
 	"time"
 
 	"github.com/ethereum/go-ethereum"
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethclient"
 	log "github.com/sirupsen/logrus"
@@ -19,21 +20,23 @@ type GasSender struct {
 	client     *ethclient.Client
 	taskCh     chan *gasTask
 	chainId    *big.Int
+	nonce      uint64
+	aonUser    *aonUser.AonUser
 }
 
 type gasTask struct {
-	dest  common.Address
-	value *big.Int
+	user    common.Address
+	userId  string
+	inviter string
+	nonce   uint64
 }
 
-func NewGasSender(rpc, privateKey string) (*GasSender, error) {
+func NewGasSender(rpc, privateKey, aonUserContract string) (*GasSender, error) {
 	ecdsaKey, err := crypto.HexToECDSA(common.Bytes2Hex(common.FromHex(privateKey)))
 	if err != nil {
 		return nil, err
 	}
 
-	log.WithField("address", crypto.PubkeyToAddress(ecdsaKey.PublicKey)).Info("aon gas sender address")
-
 	client, err := ethclient.Dial(rpc)
 	if err != nil {
 		return nil, err
@@ -44,11 +47,29 @@ func NewGasSender(rpc, privateKey string) (*GasSender, error) {
 		return nil, err
 	}
 
+	nonce, err := client.NonceAt(context.Background(), crypto.PubkeyToAddress(ecdsaKey.PublicKey), nil)
+	if err != nil {
+		return nil, err
+	}
+
+	ca, err := aonUser.NewAonUser(common.HexToAddress(aonUserContract), client)
+	if err != nil {
+		return nil, err
+	}
+
+	log.WithFields(log.Fields{
+		"caller":       crypto.PubkeyToAddress(ecdsaKey.PublicKey),
+		"userContract": common.HexToAddress(aonUserContract),
+		"nonce":        nonce,
+	}).Info("init gas sender")
+
 	return &GasSender{
 		privateKey: ecdsaKey,
 		client:     client,
-		taskCh:     make(chan *gasTask, 32),
+		taskCh:     make(chan *gasTask, 64),
 		chainId:    chainId,
+		nonce:      nonce,
+		aonUser:    ca,
 	}, nil
 
 }
@@ -58,53 +79,54 @@ func (gs *GasSender) Run() {
 		for {
 			select {
 			case task := <-gs.taskCh:
-				gs.sendTx(task)
+				task.nonce = gs.nonce
+				gs.nonce++
+				go gs.sendTx(task)
 			}
 		}
 	}()
 }
 
-func (gs *GasSender) SendAONGas(dest string, amount int) {
-	addr := common.HexToAddress(dest)
-	value := new(big.Int).Mul(big.NewInt(int64(amount)), big.NewInt(1000000000000000000))
+// func (gs *GasSender) SendAONGas(dest string, amount int) {
+// 	addr := common.HexToAddress(dest)
+// 	value := new(big.Int).Mul(big.NewInt(int64(amount)), big.NewInt(1000000000000000000))
+// 	gs.taskCh <- &gasTask{
+// 		dest:  addr,
+// 		value: value,
+// 	}
+// }
+
+func (gs *GasSender) AonLogin(user common.Address, userId, inviter string) {
 	gs.taskCh <- &gasTask{
-		dest:  addr,
-		value: value,
+		user:    user,
+		userId:  userId,
+		inviter: inviter,
 	}
 }
 
 func (gs *GasSender) sendTx(task *gasTask) {
 	log.WithFields(log.Fields{
-		"address": task.dest,
-		"value":   task.value,
-	}).Info("new send gas task")
-	nonce, err := gs.client.NonceAt(context.Background(), crypto.PubkeyToAddress(gs.privateKey.PublicKey), nil)
-	if err != nil {
-		log.WithError(err).Error("get nonce failed")
-		return
-	}
+		"address":   task.user.Hex(),
+		"userId":    task.userId,
+		"inviterId": task.inviter,
+		"nonce":     task.nonce,
+	}).Info("new login task")
 
-	tx := &types.LegacyTx{
-		Nonce:    nonce,
-		GasPrice: big.NewInt(1000000000),
-		Gas:      21000,
-		To:       &task.dest,
-		Value:    task.value,
-	}
-
-	signer := types.NewEIP155Signer(gs.chainId)
-	signedTx, err := types.SignNewTx(gs.privateKey, signer, tx)
+	opts, err := bind.NewKeyedTransactorWithChainID(gs.privateKey, gs.chainId)
 	if err != nil {
-		log.WithError(err).Error("sign tx failed")
+		log.WithError(err).Error("create transactor failed")
 		return
 	}
 
-	err = gs.client.SendTransaction(context.Background(), signedTx)
+	opts.GasPrice = big.NewInt(1000000000)
+	opts.GasLimit = 2000000
+	opts.Nonce = big.NewInt(int64(task.nonce))
+
+	signedTx, err := gs.aonUser.LoginByServer(opts, task.user, task.userId, task.inviter)
 	if err != nil {
 		log.WithError(err).Error("send tx failed")
 		return
 	}
-
 	txLog := log.WithField("txHash", signedTx.Hash().Hex())
 	txLog.Info("tx broadcasted")
 	for i := 0; i < 5; i++ {

go.mod

@@ -31,6 +31,7 @@ require (
 	github.com/deckarep/golang-set/v2 v2.1.0 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
 	github.com/ethereum/c-kzg-4844/bindings/go v0.0.0-20230126171313-363c7d7593b4 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect

go.sum

@@ -20,6 +20,8 @@ github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc
 github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4=
 github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM=
 github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
+github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk=
+github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y=
@@ -107,6 +109,8 @@ github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
+github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -247,6 +251,7 @@ golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

model/api/api.go

@@ -4,6 +4,10 @@ type CheckUserRequest struct {
 	InitData  string `json:"initData"`
 	Platform  string `json:"platform"`
 	VisitorID string `json:"visitorId"`
+	Keystore  string `json:"keystore"`
+	Signature string `json:"signature"`
+	UserId    string `json:"userId"`
+	InviterId string `json:"inviter_id"`
 }
 
 type CheckUserResponse struct {

server/router.go

@@ -6,8 +6,7 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-
-func initRouter(e *gin.Engine)  {
+func initRouter(e *gin.Engine) {
 
 	e.Use(middleware.PrintRequestResponseBodyMiddleware())
 	v1 := e.Group("/api/v1")
@@ -15,8 +14,7 @@ func initRouter(e *gin.Engine)  {
 	{
 		user := v1.Group("/user")
 		user.POST("/check", checkUser)
-		user.POST("/create", middleware.JWTMiddleware, createUser)
+		// user.POST("/create", middleware.JWTMiddleware, createUser)
 	}
 
-
 }

server/user.go

@@ -17,9 +17,10 @@ import (
 func checkUser(c *gin.Context) {
 	req := &apiModel.CheckUserRequest{}
 	if err := c.ShouldBindJSON(req); err != nil {
-		withError(constant.InvalidParam)
+		c.JSON(200, withError(constant.InvalidParam))
 		return
 	}
+	var platformId string
 	switch req.Platform {
 	case constant.PlatformTelegram:
 		var ok bool
@@ -35,46 +36,62 @@ func checkUser(c *gin.Context) {
 			c.JSON(200, withError("invalid initData"))
 			return
 		}
-		dbId := fmt.Sprintf("%s:%s", botId, userId)
-		ok, uid, keystore, err := srv.CheckUser(constant.PlatformTelegram, dbId)
-		if err != nil {
-			c.JSON(200, withError(constant.InternalError))
+		platformId = fmt.Sprintf("%s:%s", botId, userId)
+	case constant.PlatformFingerprint:
+		if len(req.VisitorID) <= 10 {
+			c.JSON(200, withError(constant.InvalidParam))
 			return
 		}
+		platformId = req.VisitorID
+	default:
+		c.JSON(200, withError(constant.UnsupportedPlatform))
+		return
+	}
+	// 检查签名是否为keystore中的地址
+	address := gjson.Get(req.Keystore, "address").String()
+	binSignature, err := hexutil.Decode(req.Signature)
+	if err != nil || len(binSignature) < 65 {
+		c.JSON(200, withError("invalid signature"))
+		return
+	}
+	binSignature[64] -= 27
+	ecdsaPub, err := crypto.SigToPub(accounts.TextHash([]byte(req.Keystore)), binSignature)
+	if err != nil {
+		c.JSON(200, withError("invalid signature"))
+		return
+	}
+	addr := crypto.PubkeyToAddress(*ecdsaPub)
+	if strings.ToLower(addr.Hex()[2:]) != address {
+		c.JSON(200, withError("invalid signature"))
+		return
+	}
 
-		token := util.GenerateJWT(uid, constant.PlatformTelegram, dbId)
-
-		resp := &apiModel.CheckUserResponse{
-			IsNewUser: !ok,
-			Keystore:  keystore,
-			Token:     token,
-		}
-		c.JSON(200, withSuccess(resp))
+	isExistKeystore, uid, keystore, err := srv.CheckUser(req.Platform, platformId)
+	if err != nil {
+		c.JSON(200, withError(constant.InternalError))
 		return
+	}
 
-	case constant.PlatformFingerprint:
-		userId := req.VisitorID
+	token := util.GenerateJWT(uid, req.Platform, platformId)
+
+	resp := &apiModel.CheckUserResponse{
+		IsNewUser: !isExistKeystore,
+		Keystore:  keystore,
+		Token:     token,
+	}
 
-		ok, uid, keystore, err := srv.CheckUser(constant.PlatformFingerprint, userId)
+	if !isExistKeystore {
+		_, err = srv.SetKeystore(uid, address, req.Keystore)
 		if err != nil {
 			c.JSON(200, withError(constant.InternalError))
 			return
 		}
 
-		token := util.GenerateJWT(uid, constant.PlatformFingerprint, userId)
-
-		resp := &apiModel.CheckUserResponse{
-			IsNewUser: !ok,
-			Keystore:  keystore,
-			Token:     token,
-		}
-
-		c.JSON(200, withSuccess(resp))
-
-	default:
-		c.JSON(200, withError(constant.UnsupportedPlatform))
-		return
+		resp.Keystore = req.Keystore
 	}
+	srv.AONServerLogin(address, req.UserId, req.InviterId)
+	c.JSON(200, withSuccess(resp))
+	return
 }
 
 func createUser(c *gin.Context) {
@@ -86,6 +103,7 @@ func createUser(c *gin.Context) {
 
 	uid := c.GetString("jwt-uid")
 
+	// 检查签名是否为keystore中的地址
 	address := gjson.Get(req.Keystore, "address").String()
 	binSignature, err := hexutil.Decode(req.Signature)
 	if err != nil || len(binSignature) < 65 {

service/user.go

@@ -3,6 +3,7 @@ package service
 import (
 	dbModel "sdk_api/model/db"
 
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/google/uuid"
 	log "github.com/sirupsen/logrus"
 )
@@ -45,7 +46,9 @@ func (s *Service) SetKeystore(uid, address, keystore string) (ok bool, err error
 		log.WithError(err).Error("set keystore failed")
 		return
 	}
-	s.gs.SendAONGas(address, 1)
-
 	return true, nil
 }
+
+func (s *Service) AONServerLogin(address, userId, inviter string) {
+	s.gs.AonLogin(common.HexToAddress(address), userId, inviter)
+}