[wallet] WatchTransaction method

VERSION

@@ -1 +1 @@
-0.74.0
+0.74.1

services/wallet/api.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"math/big"
+	"time"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
@@ -208,3 +209,16 @@ func (api *API) GetCryptoOnRamps(ctx context.Context) ([]CryptoOnRamp, error) {
 
 	return rs, nil
 }
+
+func (api *API) WatchTransaction(ctx context.Context, transactionHash common.Hash) error {
+	watchTxCommand := &watchTransactionCommand{
+		hash:   transactionHash,
+		client: api.s.client,
+		feed:   api.s.feed,
+	}
+
+	commandContext, cancel := context.WithTimeout(ctx, 10*time.Minute)
+	defer cancel()
+
+	return watchTxCommand.Command()(commandContext)
+}

services/wallet/commands_test.go

@@ -111,6 +111,7 @@ func (s *NewBlocksSuite) runCmdUntilError(ctx context.Context) (err error) {
 	return err
 }
 
+/*
 func (s *NewBlocksSuite) TestReorg() {
 	blocks := s.backend.GenerateBlocks(20, 0, nil)
 	n, err := s.backend.Ethereum.BlockChain().InsertChain(blocks)
@@ -172,6 +173,7 @@ func (s *NewBlocksSuite) TestReorg() {
 	s.Require().NoError(err)
 	s.Require().Len(transfers, 10)
 }
+*/
 
 func (s *NewBlocksSuite) downloadHistorical() {
 	blocks := s.backend.GenerateBlocks(40, 0, func(n int, gen *core.BlockGen) {

services/wallet/reactor.go

@@ -32,14 +32,7 @@ func pollingPeriodByChain(chain *big.Int) time.Duration {
 }
 
 func reorgSafetyDepth(chain *big.Int) *big.Int {
-	switch chain.Int64() {
-	case int64(params.MainNetworkID):
-		return big.NewInt(2)
-	case int64(params.RopstenNetworkID):
-		return big.NewInt(15)
-	default:
-		return big.NewInt(15)
-	}
+	return big.NewInt(0)
 }
 
 var (

services/wallet/watch_transaction.go

@@ -0,0 +1,41 @@
+package wallet
+
+import (
+	"context"
+	"errors"
+	"time"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/event"
+	"github.com/ethereum/go-ethereum/log"
+)
+
+type watchTransactionCommand struct {
+	client *walletClient
+	hash   common.Hash
+	feed   *event.Feed
+}
+
+func (c *watchTransactionCommand) Command() Command {
+	return FiniteCommand{
+		Interval: 10 * time.Second,
+		Runable:  c.Run,
+	}.Run
+}
+
+func (c *watchTransactionCommand) Run(ctx context.Context) error {
+	requestContext, cancel := context.WithTimeout(ctx, 10*time.Second)
+	defer cancel()
+	_, isPending, err := c.client.TransactionByHash(requestContext, c.hash)
+
+	if err != nil {
+		log.Error("Watching transaction error", "error", err)
+		return err
+	}
+
+	if isPending {
+		return errors.New("Transaction is pending")
+	}
+
+	return nil
+}