Merge pull request #2068 from fxfactorial/picks-for-s3

Picks for s3

internal/hmyapi/harmony.go

@@ -52,6 +52,7 @@ type NodeMetadata struct {
 	ChainID      string `json:"chainid"`
 	IsLeader     bool   `json:"is-leader"`
 	ShardID      uint32 `json:"shard-id"`
+	Role         string `json:"role"`
 }
 
 // GetNodeMetadata produces a NodeMetadata record, data is from the answering RPC node
@@ -64,6 +65,7 @@ func (s *PublicHarmonyAPI) GetNodeMetadata() NodeMetadata {
 		s.b.ChainConfig().ChainID.String(),
 		s.b.IsLeader(),
 		s.b.GetShardID(),
+		cfg.Role().String(),
 	}
 }
 

internal/hmyapi/transactionpool.go

@@ -270,28 +270,14 @@ func (s *PublicTransactionPoolAPI) GetTransactionReceipt(ctx context.Context, ha
 }
 
 // PendingTransactions returns the transactions that are in the transaction pool
-// and have a from address that is one of the accounts this node manages.
 func (s *PublicTransactionPoolAPI) PendingTransactions() ([]*RPCTransaction, error) {
 	pending, err := s.b.GetPoolTransactions()
 	if err != nil {
 		return nil, err
 	}
-	accounts := make(map[common.Address]struct{})
-	for _, wallet := range s.b.AccountManager().Wallets() {
-		for _, account := range wallet.Accounts() {
-			accounts[account.Address] = struct{}{}
-		}
-	}
-	transactions := make([]*RPCTransaction, 0, len(pending))
-	for _, tx := range pending {
-		var signer types.Signer = types.HomesteadSigner{}
-		if tx.Protected() {
-			signer = types.NewEIP155Signer(tx.ChainID())
-		}
-		from, _ := types.Sender(signer, tx)
-		if _, exists := accounts[from]; exists {
-			transactions = append(transactions, newRPCPendingTransaction(tx))
-		}
+	transactions := make([]*RPCTransaction, len(pending))
+	for i := range pending {
+		transactions[i] = newRPCPendingTransaction(pending[i])
 	}
 	return transactions, nil
 }