Merge remote-tracking branch 'origin/dutch_auction' into dev

dotbitHQ · Nov 21, 2023 · 6b4dae3 · 6b4dae3
2 parents fa0ff47 + 0f73222
commit 6b4dae3
Showing 1 changed file with 2 additions and 14 deletions.
diff --git a/block_parser/action_account_cell.go b/block_parser/action_account_cell.go
@@ -257,23 +257,11 @@ func (b *BlockParser) ActionBidExpiredAccountAuction(req FuncTransactionHandleRe
 		BlockNumber:    req.BlockNumber,
 		AccountId:      accountId,
 		Account:        account,
-		Action:         common.DasActionTransferAccount,
+		Action:         common.DasActionBidExpiredAccountAuction,
 		ServiceType:    dao.ServiceTypeRegister,
 		ChainType:      oldHex.ChainType,
 		Address:        oldHex.AddressHex,
-		Capacity:       0,
-		Outpoint:       common.OutPoint2String(req.TxHash, uint(builder.Index)),
-		BlockTimestamp: req.BlockTimestamp,
-	})
-	transactionInfos = append(transactionInfos, dao.TableTransactionInfo{
-		BlockNumber:    req.BlockNumber,
-		AccountId:      accountId,
-		Account:        account,
-		Action:         common.DasActionTransferAccount,
-		ServiceType:    dao.ServiceTypeRegister,
-		ChainType:      oHex.ChainType,
-		Address:        oHex.AddressHex,
-		Capacity:       0,
+		Capacity:       res.Transaction.Outputs[req.Tx.Inputs[builder.Index].PreviousOutput.Index].Capacity,
 		Outpoint:       common.OutPoint2String(req.TxHash, uint(builder.Index)),
 		BlockTimestamp: req.BlockTimestamp,
 	})