(BIDS-2550) using distinct contract update bt key

Author: remoterami

db/bigtable_eth1.go

@@ -1190,7 +1190,7 @@ func (bigtable *Bigtable) TransformContract(blk *types.Eth1Block, cache *freecac
 					utils.LogError(err, "error generating bigtable isContract timestamp", 0)
 				} else {
 					mutWrite.Set(ACCOUNT_METADATA_FAMILY, ACCOUNT_IS_CONTRACT, ts, b)
-					contractUpdateWrites.Keys = append(contractUpdateWrites.Keys, fmt.Sprintf("%s:%x", bigtable.chainId, address))
+					contractUpdateWrites.Keys = append(contractUpdateWrites.Keys, fmt.Sprintf("%s:S:%x", bigtable.chainId, address))
 					contractUpdateWrites.Muts = append(contractUpdateWrites.Muts, mutWrite)
 				}
 			}
@@ -3661,15 +3661,15 @@ func (bigtable *Bigtable) getAddressIsContractHistories(histories map[string][]i
 
 	keys := make([]string, 0, len(histories))
 	for address := range histories {
-		keys = append(keys, fmt.Sprintf("%s:%s", bigtable.chainId, address))
+		keys = append(keys, fmt.Sprintf("%s:S:%s", bigtable.chainId, address))
 	}
 
 	ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(time.Second*30))
 	defer cancel()
 
 	filter := gcp_bigtable.ChainFilters(gcp_bigtable.FamilyFilter(ACCOUNT_METADATA_FAMILY), gcp_bigtable.ColumnFilter(ACCOUNT_IS_CONTRACT))
 
-	keyPrefix := fmt.Sprintf("%s:", bigtable.chainId)
+	keyPrefix := fmt.Sprintf("%s:S:", bigtable.chainId)
 	err := bigtable.tableMetadata.ReadRows(ctx, gcp_bigtable.RowList(keys), func(row gcp_bigtable.Row) bool {
 		// results are returned in reverse order, so highest ts is first
 		address := strings.TrimPrefix(row.Key(), keyPrefix)
@@ -4087,7 +4087,7 @@ func (bigtable *Bigtable) DeleteBlock(blockNumber uint64, blockHash []byte) erro
 	ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(time.Second*30))
 	defer cancel()
 
-	err = bigtable.tableMetadata.ReadRows(ctx, gcp_bigtable.PrefixRange(bigtable.chainId), func(row gcp_bigtable.Row) bool {
+	err = bigtable.tableMetadata.ReadRows(ctx, gcp_bigtable.PrefixRange(fmt.Sprintf("%s:S:", bigtable.chainId)), func(row gcp_bigtable.Row) bool {
 		mutDelete := gcp_bigtable.NewMutation()
 		mutDelete.DeleteTimestampRange(ACCOUNT_METADATA_FAMILY, ACCOUNT_IS_CONTRACT, starttime, endtime)