Merge pull request #134 from renproject/fix/validation

Minor validation fixes

Author: jazg

chain/bitcoin/address.go

@@ -91,6 +91,13 @@ func NewAddressDecoder(params *chaincfg.Params) AddressDecoder {
 
 // DecodeAddress implements the address.Decoder interface
 func (decoder AddressDecoder) DecodeAddress(addr address.Address) (address.RawAddress, error) {
+	// The btcutil package assumes the address being decoded only contains
+	// valid ASCII characters between 0-255.
+	for _, c := range addr {
+		if c > 255 {
+			return nil, fmt.Errorf("invalid address: bad character %v", c)
+		}
+	}
 	decodedAddr, err := btcutil.DecodeAddress(string(addr), decoder.params)
 	if err != nil {
 		return nil, fmt.Errorf("decode address: %v", err)

chain/bitcoin/address_test.go

@@ -1 +1,22 @@
 package bitcoin_test
+
+import (
+	"github.com/btcsuite/btcd/chaincfg"
+	"github.com/renproject/multichain/api/address"
+	"github.com/renproject/multichain/chain/bitcoin"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Bitcoin", func() {
+	Context("when decoding address with invalid characters", func() {
+		It("should not panic", func() {
+			decoder := bitcoin.NewAddressDecoder(&chaincfg.MainNetParams)
+			Expect(func() {
+				_, err := decoder.DecodeAddress(address.Address(rune(256)))
+				Expect(err).To(HaveOccurred())
+			}).ToNot(Panic())
+		})
+	})
+})

chain/evm/client.go

@@ -67,25 +67,26 @@ func (client *Client) Tx(ctx context.Context, txID pack.Bytes) (account.Tx, pack
 		Signer: types.NewEIP155Signer(chainID),
 	}
 	if pending {
-		return &pendingTx, 0, nil
+		// Transaction has not been included in a block yet.
+		return nil, 0, fmt.Errorf("tx %v is pending", txID)
 	}
 
 	receipt, err := client.EthClient.TransactionReceipt(ctx, common.BytesToHash(txID))
 	if err != nil {
 		return nil, pack.NewU64(0), fmt.Errorf("fetching recipt for tx %v : %v", txID, err)
 	}
 
-	// if no receipt, tx has 0 confirmations
 	if receipt == nil {
+		// Transaction has 0 confirmations.
 		return &pendingTx, 0, nil
 	}
 
-	// reverted tx
 	if receipt.Status == 0 {
+		// Transaction has been reverted.
 		return nil, pack.NewU64(0), fmt.Errorf("tx %v reverted, reciept status 0", txID)
 	}
 
-	// tx confirmed
+	// Transaction has been confirmed.
 	confirmedTx := Tx{
 		tx,
 		types.LatestSignerForChainID(chainID),