Merge remote-tracking branch 'origin/eth_txn_prefix' into mobile-ethe…

…reum
OpenBazaar · Nov 4, 2019 · 0bd534a · 0bd534a
2 parents 59b83f0 + 33d3824
commit 0bd534a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/net/service/handlers.go b/net/service/handlers.go
@@ -1132,7 +1132,7 @@ func (service *OpenBazaarService) handleOrderCompletion(p peer.ID, pmes *pb.Mess
 		outValue := big.NewInt(0)
 		for _, r := range records {
 			if !r.Spent && r.Value.Cmp(big.NewInt(0)) > 0 {
-				outpointHash, err := hex.DecodeString(ut.NormalizeAddress(r.Txid))
+				outpointHash, err := hex.DecodeString(r.Txid)
 				if err != nil {
 					return nil, err
 				}

diff --git a/vendor/github.com/OpenBazaar/go-ethwallet/util/util.go b/vendor/github.com/OpenBazaar/go-ethwallet/util/util.go
diff --git a/vendor/github.com/OpenBazaar/go-ethwallet/wallet/wallet.go b/vendor/github.com/OpenBazaar/go-ethwallet/wallet/wallet.go