Try to resolve concerns

Author: KolbyML

arbitrum/apibackend.go

@@ -150,7 +150,18 @@ func createRegisterAPIBackend(backend *Backend, filterConfig filters.Config, fal
 		archiveClientsManager: archiveClientsManager,
 	}
 	filterSystem := filters.NewFilterSystem(backend.apiBackend, filterConfig)
-	apis, receiptFetcher := backend.apiBackend.GetAPIs(filterSystem)
+	apis := backend.apiBackend.GetAPIs(filterSystem)
+	var receiptFetcher ReceiptFetcher
+	for _, api := range apis {
+		var ok bool
+		receiptFetcher, ok = api.Service.(ReceiptFetcher)
+		if ok {
+			break
+		}
+	}
+	if receiptFetcher == nil {
+		return nil, nil, errors.New("no receipt fetcher found in APIs")
+	}
 	backend.stack.RegisterAPIs(apis)
 	return filterSystem, receiptFetcher, nil
 }
@@ -163,8 +174,8 @@ func (a *APIBackend) SetSyncBackend(sync SyncProgressBackend) error {
 	return nil
 }
 
-func (a *APIBackend) GetAPIs(filterSystem *filters.FilterSystem) ([]rpc.API, ReceiptFetcher) {
-	apis, transactionAPI := ethapi.GetAPIs(a)
+func (a *APIBackend) GetAPIs(filterSystem *filters.FilterSystem) []rpc.API {
+	apis := ethapi.GetAPIs(a)
 
 	apis = append(apis, rpc.API{
 		Namespace: "eth",
@@ -196,7 +207,7 @@ func (a *APIBackend) GetAPIs(filterSystem *filters.FilterSystem) ([]rpc.API, Rec
 
 	apis = append(apis, tracers.APIs(a)...)
 
-	return apis, transactionAPI
+	return apis
 }
 
 func (a *APIBackend) BlockChain() *core.BlockChain {

common/types.go

@@ -495,11 +495,14 @@ type BlockMetadata []byte
 // starting from the second byte, (N)th bit would represent if (N)th tx is timeboosted or not, 1 means yes and 0 means no
 // blockMetadata[index / 8 + 1] & (1 << (index % 8)) != 0; where index = (N - 1), implies whether (N)th tx in a block is timeboosted
 // note that number of txs in a block will always lag behind (len(blockMetadata) - 1) * 8 but it wont lag more than a value of 7
-func (b BlockMetadata) IsTxTimeboosted(txIndex uint64) (bool, error) {
+func (b BlockMetadata) IsTxTimeboosted(txIndex int) (bool, error) {
 	if len(b) == 0 {
 		return false, errors.New("blockMetadata is not set")
 	}
-	maxTxCount := (uint64(len(b)) - 1) * 8
+	if txIndex < 0 {
+		return false, fmt.Errorf("invalid transaction index- %d, should be positive", txIndex)
+	}
+	maxTxCount := (len(b) - 1) * 8
 	if txIndex >= maxTxCount {
 		return false, nil
 	}

eth/backend.go

@@ -394,7 +394,7 @@ func makeExtraData(extra []byte) []byte {
 // APIs return the collection of RPC services the ethereum package offers.
 // NOTE, some of these services probably need to be moved to somewhere else.
 func (s *Ethereum) APIs() []rpc.API {
-	apis, _ := ethapi.GetAPIs(s.APIBackend)
+	apis := ethapi.GetAPIs(s.APIBackend)
 
 	// Append all the local APIs and return
 	return append(apis, []rpc.API{

eth/filters/api.go

@@ -370,7 +370,7 @@ func (api *FilterAPI) TransactionReceipts(ctx context.Context, filter *Transacti
 							receiptWithTx.Receipt.BlockNumber.Uint64(),
 							signer,
 							receiptWithTx.Transaction,
-							uint64(receiptWithTx.Receipt.TransactionIndex),
+							int(receiptWithTx.Receipt.TransactionIndex),
 							api.events.backend.ChainConfig(),
 							header,
 							blockMetadata,

internal/ethapi/api.go

@@ -657,7 +657,7 @@ func (api *BlockChainAPI) GetBlockReceipts(ctx context.Context, blockNrOrHash rp
 		if err != nil {
 			return nil, err
 		}
-		result[i] = MarshalReceipt(receipt, block.Hash(), block.NumberU64(), signer, txs[i], uint64(i), api.b.ChainConfig(), header, blockMetadata)
+		result[i] = MarshalReceipt(receipt, block.Hash(), block.NumberU64(), signer, txs[i], i, api.b.ChainConfig(), header, blockMetadata)
 	}
 	return result, nil
 }
@@ -1758,11 +1758,11 @@ func (api *TransactionAPI) GetTransactionReceipt(ctx context.Context, hash commo
 	if err != nil {
 		return nil, err
 	}
-	return MarshalReceipt(receipt, blockHash, blockNumber, signer, tx, index, api.b.ChainConfig(), header, blockMetadata), nil
+	return MarshalReceipt(receipt, blockHash, blockNumber, signer, tx, int(index), api.b.ChainConfig(), header, blockMetadata), nil
 }
 
 // MarshalReceipt marshals a transaction receipt into a JSON object.
-func MarshalReceipt(receipt *types.Receipt, blockHash common.Hash, blockNumber uint64, signer types.Signer, tx *types.Transaction, txIndex uint64, chainConfig *params.ChainConfig, header *types.Header, blockMetadata common.BlockMetadata) map[string]interface{} {
+func MarshalReceipt(receipt *types.Receipt, blockHash common.Hash, blockNumber uint64, signer types.Signer, tx *types.Transaction, txIndex int, chainConfig *params.ChainConfig, header *types.Header, blockMetadata common.BlockMetadata) map[string]interface{} {
 	from, _ := types.Sender(signer, tx)
 
 	fields := map[string]interface{}{
@@ -2062,7 +2062,7 @@ func (api *TransactionAPI) SendRawTransactionSync(ctx context.Context, input hex
 							rs[i].BlockNumber.Uint64(),
 							signer,
 							txs[i],
-							uint64(rs[i].TransactionIndex),
+							int(rs[i].TransactionIndex),
 							api.b.ChainConfig(),
 							header,
 							blockMetadata,

internal/ethapi/backend.go

@@ -108,9 +108,8 @@ type Backend interface {
 	NewMatcherBackend() filtermaps.MatcherBackend
 }
 
-func GetAPIs(apiBackend Backend) ([]rpc.API, *TransactionAPI) {
+func GetAPIs(apiBackend Backend) []rpc.API {
 	nonceLock := new(AddrLocker)
-	transactionAPI := NewTransactionAPI(apiBackend, nonceLock)
 	return []rpc.API{
 		{
 			Namespace: "eth",
@@ -120,7 +119,7 @@ func GetAPIs(apiBackend Backend) ([]rpc.API, *TransactionAPI) {
 			Service:   NewBlockChainAPI(apiBackend),
 		}, {
 			Namespace: "eth",
-			Service:   transactionAPI,
+			Service:   NewTransactionAPI(apiBackend, nonceLock),
 		}, {
 			Namespace: "txpool",
 			Service:   NewTxPoolAPI(apiBackend),
@@ -131,5 +130,5 @@ func GetAPIs(apiBackend Backend) ([]rpc.API, *TransactionAPI) {
 			Namespace: "eth",
 			Service:   NewEthereumAccountAPI(apiBackend.AccountManager()),
 		},
-	}, transactionAPI
+	}
 }