chash fixes

Author: hoffmabc

api/jsonapi.go

@@ -3371,7 +3371,7 @@ func (i *jsonAPIHandler) POSTBumpFee(w http.ResponseWriter, r *http.Request) {
 	}
 	var wal wallet.Wallet
 	for _, w := range i.node.Multiwallet {
-		_, err := w.GetTransaction(*txHash)
+		_, err := w.GetTransaction(txHash.String())
 		if err == nil {
 			wal = w
 			break
@@ -3381,7 +3381,7 @@ func (i *jsonAPIHandler) POSTBumpFee(w http.ResponseWriter, r *http.Request) {
 		ErrorResponse(w, http.StatusBadRequest, "transaction not found in any wallet")
 		return
 	}
-	newTxid, err := wal.BumpFee(*txHash)
+	newTxid, err := wal.BumpFee(txHash.String())
 	if err != nil {
 		if err == spvwallet.BumpFeeAlreadyConfirmedError {
 			ErrorResponse(w, http.StatusBadRequest, err.Error())
@@ -3405,7 +3405,7 @@ func (i *jsonAPIHandler) POSTBumpFee(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	if err := i.node.Datastore.TxMetadata().Put(repo.Metadata{
-		Txid:       newTxid.String(),
+		Txid:       newTxid,
 		Address:    "",
 		Memo:       fmt.Sprintf("Fee bump of %s", txid),
 		OrderId:    "",
@@ -3429,7 +3429,7 @@ func (i *jsonAPIHandler) POSTBumpFee(w http.ResponseWriter, r *http.Request) {
 		ErrorResponse(w, http.StatusInternalServerError, err.Error())
 		return
 	}
-	txn, err := wal.GetTransaction(*newTxid)
+	txn, err := wal.GetTransaction(newTxid)
 	if err != nil {
 		ErrorResponse(w, http.StatusInternalServerError, err.Error())
 		return
@@ -3439,7 +3439,7 @@ func (i *jsonAPIHandler) POSTBumpFee(w http.ResponseWriter, r *http.Request) {
 
 	t := repo.NewAPITime(txn.Timestamp)
 	resp := &response{
-		Txid:               newTxid.String(),
+		Txid:               newTxid,
 		ConfirmedBalance:   &repo.CurrencyValue{Currency: defn, Amount: &confirmed.Value},
 		UnconfirmedBalance: &repo.CurrencyValue{Currency: defn, Amount: &unconfirmed.Value},
 		Amount:             amt0,

core/disputes.go

@@ -176,7 +176,7 @@ func (n *OpenBazaarNode) verifyEscrowFundsAreDisputeable(contract *pb.RicardianC
 			log.Errorf("Nil NewHashFromStr(%s)", r.Txid)
 			return false
 		}
-		actualConfirmations, _, err := wal.GetConfirmations(*hash)
+		actualConfirmations, _, err := wal.GetConfirmations(hash.String())
 		if err != nil {
 			log.Errorf("Failed GetConfirmations(%s): %s", hash.String(), err.Error())
 			return false

core/refunds.go

@@ -102,7 +102,7 @@ func (n *OpenBazaarNode) RefundOrder(contract *pb.RicardianContract, records []*
 			return err
 		}
 		txinfo := new(pb.Refund_TransactionInfo)
-		txinfo.Txid = txid.String()
+		txinfo.Txid = txid
 		txinfo.BigValue = outValue.String()
 		txinfo.ValueCurrency = contract.BuyerOrder.Payment.AmountCurrency
 		refundMsg.RefundTransaction = txinfo

core/spend.go

@@ -115,7 +115,7 @@ func (n *OpenBazaarNode) Spend(args *SpendRequest) (*SpendResponse, error) {
 		}
 	}
 
-	txn, err := wal.GetTransaction(*txid)
+	txn, err := wal.GetTransaction(txid)
 	if err != nil {
 		log.Errorf("get txn failed : %v", err.Error())
 		return nil, fmt.Errorf("failed retrieving new wallet balance: %s", err)
@@ -146,7 +146,7 @@ func (n *OpenBazaarNode) Spend(args *SpendRequest) (*SpendResponse, error) {
 	}
 
 	if err := n.Datastore.TxMetadata().Put(repo.Metadata{
-		Txid:       txid.String(),
+		Txid:       txid,
 		Address:    toAddress,
 		Memo:       memo,
 		OrderId:    args.OrderID,
@@ -163,7 +163,7 @@ func (n *OpenBazaarNode) Spend(args *SpendRequest) (*SpendResponse, error) {
 	}
 
 	return &SpendResponse{
-		Txid:               txid.String(),
+		Txid:               txid,
 		ConfirmedBalance:   confirmed.Value.String(),
 		UnconfirmedBalance: unconfirmed.Value.String(),
 		Currency:           &defn,

core/utils.go

@@ -52,7 +52,7 @@ func (n *OpenBazaarNode) BuildTransactionRecords(contract *pb.RicardianContract,
 			if err != nil {
 				return paymentRecords, nil, err
 			}
-			confirmations, height, err := wal.GetConfirmations(*ch)
+			confirmations, height, err := wal.GetConfirmations(ch.String())
 			if err != nil {
 				return paymentRecords, nil, err
 			}
@@ -93,7 +93,7 @@ func (n *OpenBazaarNode) BuildTransactionRecords(contract *pb.RicardianContract,
 			if err != nil {
 				return paymentRecords, refundRecord, err
 			}
-			confirmations, height, err := wal.GetConfirmations(*ch)
+			confirmations, height, err := wal.GetConfirmations(ch.String())
 			if err != nil {
 				return paymentRecords, refundRecord, nil
 			}

net/service/handlers.go

@@ -1979,7 +1979,7 @@ func (service *OpenBazaarService) handleOrderPayment(peer peer.ID, pmes *pb.Mess
 	}
 
 	log.Debugf("retrieving %s transaction %s", paymentDetails.Coin, chash.String())
-	txn, err := wal.GetTransaction(*chash)
+	txn, err := wal.GetTransaction(chash.String())
 	if err != nil {
 		return nil, err
 	}