Revert "Attempt to resolve @pmikolajczyk41 and @ganeshvanahalli concerns"

This reverts commit 94cbe8d.

Author: KolbyML

arbitrum/apibackend.go

@@ -150,14 +150,9 @@ func createRegisterAPIBackend(backend *Backend, filterConfig filters.Config, fal
 		archiveClientsManager: archiveClientsManager,
 	}
 	filterSystem := filters.NewFilterSystem(backend.apiBackend, filterConfig)
-	apis := backend.apiBackend.GetAPIs(filterSystem)
-	transactionAPI := ethapi.GetTransactionAPI(backend.apiBackend)
-	apis = append(apis, rpc.API{
-		Namespace: "eth",
-		Service:   transactionAPI,
-	})
+	apis, receiptFetcher := backend.apiBackend.GetAPIs(filterSystem)
 	backend.stack.RegisterAPIs(apis)
-	return filterSystem, transactionAPI, nil
+	return filterSystem, receiptFetcher, nil
 }
 
 func (a *APIBackend) SetSyncBackend(sync SyncProgressBackend) error {
@@ -168,8 +163,8 @@ func (a *APIBackend) SetSyncBackend(sync SyncProgressBackend) error {
 	return nil
 }
 
-func (a *APIBackend) GetAPIs(filterSystem *filters.FilterSystem) []rpc.API {
-	apis := ethapi.GetAPIs(a)
+func (a *APIBackend) GetAPIs(filterSystem *filters.FilterSystem) ([]rpc.API, ReceiptFetcher) {
+	apis, transactionAPI := ethapi.GetAPIs(a)
 
 	apis = append(apis, rpc.API{
 		Namespace: "eth",
@@ -201,7 +196,7 @@ func (a *APIBackend) GetAPIs(filterSystem *filters.FilterSystem) []rpc.API {
 
 	apis = append(apis, tracers.APIs(a)...)
 
-	return apis
+	return apis, transactionAPI
 }
 
 func (a *APIBackend) BlockChain() *core.BlockChain {

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{
@@ -404,9 +404,6 @@ func (s *Ethereum) APIs() []rpc.API {
 		}, {
 			Namespace: "eth",
 			Service:   downloader.NewDownloaderAPI(s.handler.downloader, s.blockchain, s.eventMux),
-		}, {
-			Namespace: "eth",
-			Service:   ethapi.GetTransactionAPI(s.APIBackend),
 		}, {
 			Namespace: "admin",
 			Service:   NewAdminAPI(s),

internal/ethapi/backend.go

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