fix multiple same addresses save in db (#130)

ipfs-force-community · Jul 16, 2021 · 8108838 · 8108838
1 parent b9951ca
commit 8108838
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 45 deletions.
diff --git a/models/address_test.go b/models/address_test.go
@@ -71,7 +71,7 @@ func TestAddress(t *testing.T) {
 		t.Run("SaveAddress", func(t *testing.T) {
 			assert.NoError(t, addressRepo.SaveAddress(ctx, addrInfo))
 			assert.NoError(t, addressRepo.SaveAddress(ctx, addrInfo2))
-			assert.NoError(t, addressRepo.SaveAddress(ctx, addrInfo3))
+			assert.Error(t, addressRepo.SaveAddress(ctx, addrInfo3))
 		})
 
 		checkField := func(t *testing.T, expect, actual *types.Address) {
@@ -170,7 +170,7 @@ func TestAddress(t *testing.T) {
 		t.Run("ListAddress", func(t *testing.T) {
 			rs, err := addressRepo.ListAddress(ctx)
 			assert.NoError(t, err)
-			assert.LessOrEqual(t, 2, len(rs))
+			assert.LessOrEqual(t, 1, len(rs))
 		})
 	}
 

diff --git a/models/mysql/address.go b/models/mysql/address.go
@@ -14,7 +14,7 @@ import (
 
 type mysqlAddress struct {
 	ID                types.UUID  `gorm:"column:id;type:varchar(256);primary_key"`
-	Addr              string      `gorm:"column:addr;type:varchar(256);NOT NULL"` // 主键
+	Addr              string      `gorm:"column:addr;type:varchar(256);uniqueIndex;NOT NULL"`
 	Nonce             uint64      `gorm:"column:nonce;type:bigint unsigned;index;NOT NULL"`
 	Weight            int64       `gorm:"column:weight;type:bigint;index;NOT NULL"`
 	SelMsgNum         uint64      `gorm:"column:sel_msg_num;type:bigint unsigned;NOT NULL"`
@@ -34,15 +34,16 @@ func (s mysqlAddress) TableName() string {
 
 func FromAddress(addr *types.Address) *mysqlAddress {
 	mysqlAddr := &mysqlAddress{
-		ID:        addr.ID,
-		Addr:      addr.Addr.String(),
-		Nonce:     addr.Nonce,
-		Weight:    addr.Weight,
-		SelMsgNum: addr.SelMsgNum,
-		State:     addr.State,
-		IsDeleted: addr.IsDeleted,
-		CreatedAt: addr.CreatedAt,
-		UpdatedAt: addr.UpdatedAt,
+		ID:                addr.ID,
+		Addr:              addr.Addr.String(),
+		Nonce:             addr.Nonce,
+		Weight:            addr.Weight,
+		SelMsgNum:         addr.SelMsgNum,
+		State:             addr.State,
+		GasOverEstimation: addr.GasOverEstimation,
+		IsDeleted:         addr.IsDeleted,
+		CreatedAt:         addr.CreatedAt,
+		UpdatedAt:         addr.UpdatedAt,
 	}
 
 	if !addr.MaxFee.Nil() {
@@ -61,17 +62,18 @@ func (s mysqlAddress) Address() (*types.Address, error) {
 		return nil, err
 	}
 	return &types.Address{
-		ID:        s.ID,
-		Addr:      addr,
-		Nonce:     s.Nonce,
-		Weight:    s.Weight,
-		SelMsgNum: s.SelMsgNum,
-		State:     s.State,
-		MaxFee:    big.Int{Int: s.MaxFee.Int},
-		MaxFeeCap: big.Int{Int: s.MaxFeeCap.Int},
-		IsDeleted: s.IsDeleted,
-		CreatedAt: s.CreatedAt,
-		UpdatedAt: s.UpdatedAt,
+		ID:                s.ID,
+		Addr:              addr,
+		Nonce:             s.Nonce,
+		Weight:            s.Weight,
+		SelMsgNum:         s.SelMsgNum,
+		State:             s.State,
+		MaxFee:            big.Int{Int: s.MaxFee.Int},
+		MaxFeeCap:         big.Int{Int: s.MaxFeeCap.Int},
+		GasOverEstimation: s.GasOverEstimation,
+		IsDeleted:         s.IsDeleted,
+		CreatedAt:         s.CreatedAt,
+		UpdatedAt:         s.UpdatedAt,
 	}, nil
 }
 

diff --git a/models/sqlite/address.go b/models/sqlite/address.go
@@ -16,7 +16,7 @@ import (
 
 type sqliteAddress struct {
 	ID                types.UUID  `gorm:"column:id;type:varchar(256);primary_key"`
-	Addr              string      `gorm:"column:addr;type:varchar(256);NOT NULL"` // 主键
+	Addr              string      `gorm:"column:addr;type:varchar(256);uniqueIndex;NOT NULL"`
 	Nonce             uint64      `gorm:"column:nonce;type:unsigned bigint;index;NOT NULL"`
 	Weight            int64       `gorm:"column:weight;type:bigint;index;NOT NULL"`
 	SelMsgNum         uint64      `gorm:"column:sel_msg_num;type:unsigned bigint;NOT NULL"`

diff --git a/service/message_selector.go b/service/message_selector.go
@@ -432,7 +432,7 @@ func (messageSelector *MessageSelector) addrSelectMsgNum(addrList []*types.Addre
 	}
 	selMsgNum := make(map[address.Address]uint64)
 	for _, addr := range addrList {
-		if num, ok := selMsgNum[addr.Addr]; ok && (num < addr.SelMsgNum || addr.SelMsgNum < defSelMsgNum) {
+		if num, ok := selMsgNum[addr.Addr]; ok && addr.SelMsgNum > 0 && num < addr.SelMsgNum {
 			selMsgNum[addr.Addr] = addr.SelMsgNum
 		} else if !ok {
 			if addr.SelMsgNum == 0 {

diff --git a/service/message_service.go b/service/message_service.go
@@ -128,35 +128,36 @@ func (ms *MessageService) pushMessage(ctx context.Context, msg *types.Message) e
 	if err != nil {
 		return err
 	}
-	if has {
-		saveAddr := func() error {
-			_, err = ms.addressService.SaveAddress(ctx, &types.Address{
+	if !has {
+		return xerrors.Errorf("wallet(%s) address %s not exists", msg.WalletName, msg.From)
+	}
+	var addrInfo *types.Address
+	if err := ms.repo.Transaction(func(txRepo repo.TxRepo) error {
+		addrInfo, err = ms.addressService.GetAddress(ctx, msg.From)
+		if err == nil {
+			return nil
+		}
+		if xerrors.Is(err, gorm.ErrRecordNotFound) {
+			if err = ms.repo.AddressRepo().SaveAddress(ctx, &types.Address{
 				ID:        types.NewUUID(),
 				Addr:      msg.From,
 				Nonce:     0,
 				State:     types.Alive,
 				IsDeleted: repo.NotDeleted,
 				CreatedAt: time.Now(),
 				UpdatedAt: time.Now(),
-			})
-			return err
-		}
-		addrInfo, err := ms.addressService.GetAddress(ctx, msg.From)
-		if err != nil {
-			if xerrors.Is(err, gorm.ErrRecordNotFound) {
-				if err := saveAddr(); err != nil {
-					return xerrors.Errorf("save address %s failed %v", msg.From.String(), err)
-				}
-				ms.log.Infof("add new address %s", msg.From.String())
-			} else {
-				return err
+			}); err != nil {
+				return xerrors.Errorf("save address %s failed %v", msg.From.String(), err)
 			}
-		} else if addrInfo.State == types.Forbiden {
-			ms.log.Errorf("address(%s) is forbidden", msg.From.String())
-			return xerrors.Errorf("address(%s) is forbidden", msg.From.String())
+			ms.log.Infof("add new address %s", msg.From.String())
 		}
-	} else {
-		return xerrors.Errorf("wallet(%s) address %s not exists", msg.WalletName, msg.From)
+		return err
+	}); err != nil {
+		return err
+	}
+	if addrInfo != nil && addrInfo.State == types.Forbiden {
+		ms.log.Errorf("address(%s) is forbidden", msg.From.String())
+		return xerrors.Errorf("address(%s) is forbidden", msg.From.String())
 	}
 
 	msg.Nonce = 0