Added inboundetxs to database for uncles and use it in the case of sw…

…itch

core/rawdb/accessors_chain.go

@@ -1347,3 +1347,36 @@ func DeleteBadHashesList(db ethdb.KeyValueWriter) {
 		log.Fatal("Failed to delete badHashesList", "err", err)
 	}
 }
+
+// WriteInboundEtxs stores the inbound etxs for a given dom block hashes
+func WriteInboundEtxs(db ethdb.KeyValueWriter, hash common.Hash, inboundEtxs types.Transactions) {
+	data, err := rlp.EncodeToBytes(inboundEtxs)
+	if err != nil {
+		log.Fatal("Failed to RLP encode inbound etxs", "err", err)
+	}
+	if err := db.Put(inboundEtxsKey(hash), data); err != nil {
+		log.Fatal("Failed to store badHashesList", "err", err)
+	}
+}
+
+// ReadInboundEtxs reads the inbound etxs from the database
+func ReadInboundEtxs(db ethdb.Reader, hash common.Hash) types.Transactions {
+	// Try to look up the data in leveldb.
+	data, _ := db.Get(inboundEtxsKey(hash))
+	if len(data) == 0 {
+		return nil
+	}
+	inboundEtxs := types.Transactions{}
+	if err := rlp.Decode(bytes.NewReader(data), &inboundEtxs); err != nil {
+		log.Error("Invalid inbound etxs on read", "hash", hash, "err", err)
+		return nil
+	}
+	return inboundEtxs
+}
+
+// DeleteInboundEtxs deletes the inbound etxs from the database
+func DeleteInboundEtxs(db ethdb.KeyValueWriter, hash common.Hash) {
+	if err := db.Delete(inboundEtxsKey(hash)); err != nil {
+		log.Fatal("Failed to delete inbound etxs", "err", err)
+	}
+}

core/rawdb/schema.go

@@ -95,6 +95,7 @@ var (
 	phBodyPrefix        = []byte("pc")    // phBodyPrefix + hash -> []common.Hash + Td
 	terminiPrefix       = []byte("tk")    //terminiPrefix + hash -> []common.Hash
 	badHashesListPrefix = []byte("bh")
+	inboundEtxsPrefix   = []byte("ie") // inboundEtxsPrefix + hash -> types.Transactions
 
 	blockBodyPrefix         = []byte("b")  // blockBodyPrefix + num (uint64 big endian) + hash -> block body
 	blockReceiptsPrefix     = []byte("r")  // blockReceiptsPrefix + num (uint64 big endian) + hash -> block receipts
@@ -303,3 +304,7 @@ func manifestKey(hash common.Hash) []byte {
 func bloomKey(hash common.Hash) []byte {
 	return append(bloomPrefix, hash.Bytes()...)
 }
+
+func inboundEtxsKey(hash common.Hash) []byte {
+	return append(inboundEtxsPrefix, hash.Bytes()...)
+}

core/slice.go

@@ -260,6 +260,12 @@ func (sl *Slice) Append(header *types.Header, domPendingHeader *types.Header, do
 
 		subReorg = sl.miningStrategy(bestPh, block)
 
+		if order < nodeCtx {
+			// Store the inbound etxs for dom blocks that did not get picked and use
+			// it in the future if dom switch happens
+			rawdb.WriteInboundEtxs(batch, block.Hash(), newInboundEtxs.FilterToLocation(common.NodeLocation))
+		}
+
 		// Upate the local pending header
 		pendingHeaderWithTermini, err = sl.generateSlicePendingHeader(block, newTermini, domPendingHeader, domOrigin, false)
 		if err != nil {