[index] Add TxNumber in ActionIndex (#4451)

api/coreservice.go

@@ -1123,6 +1123,9 @@ func (core *coreService) ActionByActionHash(h hash.Hash256) (*action.SealedEnvel
 	if err != nil {
 		return nil, nil, 0, errors.Wrap(ErrNotFound, err.Error())
 	}
+	if actIndex.TxNumber() > 0 {
+		return blk.Actions[actIndex.TxNumber()-1], blk, actIndex.TxNumber() - 1, nil
+	}
 	selp, index, err := blk.ActionByHash(h)
 	if err != nil {
 		return nil, nil, 0, errors.Wrap(ErrNotFound, err.Error())

blockindex/actionindex.go

@@ -16,13 +16,22 @@ import (
 // ActionIndex change private to public for mock Indexer
 type ActionIndex struct {
 	blkHeight uint64
+	// txNumber is the %-th of action in a block
+	// txNumber starts from 1
+	// 0 means no txNumber for backward compatibility
+	txNumber uint32
 }
 
 // Height returns the block height of action
 func (a *ActionIndex) BlockHeight() uint64 {
 	return a.blkHeight
 }
 
+// TxNumber returns the transaction number of action
+func (a *ActionIndex) TxNumber() uint32 {
+	return a.txNumber
+}
+
 // Serialize into byte stream
 func (a *ActionIndex) Serialize() []byte {
 	return byteutil.Must(proto.Marshal(a.toProto()))
@@ -41,6 +50,7 @@ func (a *ActionIndex) Deserialize(buf []byte) error {
 func (a *ActionIndex) toProto() *indexpb.ActionIndex {
 	return &indexpb.ActionIndex{
 		BlkHeight: a.blkHeight,
+		TxNumber:  a.txNumber,
 	}
 }
 
@@ -50,5 +60,6 @@ func (a *ActionIndex) fromProto(pbIndex *indexpb.ActionIndex) error {
 		return errors.New("empty protobuf")
 	}
 	a.blkHeight = pbIndex.BlkHeight
+	a.txNumber = pbIndex.TxNumber
 	return nil
 }

blockindex/index_test.go

@@ -12,8 +12,8 @@ func TestActionIndex(t *testing.T) {
 	require := require.New(t)
 
 	ad := []*ActionIndex{
-		{1048000},
-		{1048001},
+		{1048000, 0},
+		{1048001, 0},
 	}
 
 	for i := range ad {

blockindex/indexer.go

@@ -322,20 +322,19 @@ func (x *blockIndexer) putBlock(ctx context.Context, blk *block.Block) error {
 	}
 
 	// store height of the block, so getReceiptByActionHash() can use height to directly pull receipts
-	ad := (&ActionIndex{
-		blkHeight: blk.Height()}).Serialize()
 	if err := x.tac.UseBatch(x.batch); err != nil {
 		return err
 	}
 	// index actions in the block
 	fCtx := protocol.MustGetFeatureCtx(protocol.WithFeatureCtx(protocol.WithBlockCtx(ctx, protocol.BlockCtx{
 		BlockHeight: blk.Height(),
 	})))
-	for _, selp := range blk.Actions {
+	for idx, selp := range blk.Actions {
 		actHash, err := selp.Hash()
 		if err != nil {
 			return err
 		}
+		ad := (&ActionIndex{blkHeight: blk.Height(), txNumber: uint32(idx + 1)}).Serialize()
 		x.batch.Put(_actionToBlockHashNS, actHash[_hashOffset:], ad, fmt.Sprintf("failed to put action hash %x", actHash))
 		// add to total account index
 		if err := x.tac.Add(actHash[:], true); err != nil {

blockindex/indexpb/index.proto

@@ -7,6 +7,7 @@
 //      protoc --go_out=plugins=grpc:. *.proto
 syntax = "proto3";
 package indexpb;
+option go_package = "github.com/iotexproject/iotex-core/blockindex/indexpb";
 
 message BlockIndex {
     uint32 numAction = 1;
@@ -16,4 +17,5 @@ message BlockIndex {
 
 message ActionIndex {
     uint64 blkHeight = 1;
+    uint32 txNumber = 2;
 }