Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions core/order.go
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ func prepareModeratedOrderContract(data *PurchaseData, n *OpenBazaarNode, contra
payment.Chaincode = hex.EncodeToString(chaincode)
contract.BuyerOrder.RefundFee = wal.GetFeePerByte(wallet.NORMAL)

err = wal.AddWatchedAddress(addr)
err = wal.AddWatchedAddresses(addr)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -308,7 +308,7 @@ func processOnlineDirectOrder(resp *pb.Message, n *OpenBazaarNode, wal wallet.Wa
if err != nil {
return "", "", 0, false, err
}
err = wal.AddWatchedAddress(addr)
err = wal.AddWatchedAddresses(addr)
if err != nil {
return "", "", 0, false, err
}
Expand Down Expand Up @@ -356,7 +356,7 @@ func processOfflineDirectOrder(n *OpenBazaarNode, wal wallet.Wallet, contract *p
payment.RedeemScript = hex.EncodeToString(redeemScript)
payment.Chaincode = hex.EncodeToString(chaincode)

err = wal.AddWatchedAddress(addr)
err = wal.AddWatchedAddresses(addr)
if err != nil {
return "", "", 0, false, err
}
Expand Down
6 changes: 3 additions & 3 deletions net/service/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ func (service *OpenBazaarService) handleOrder(peer peer.ID, pmes *pb.Message, op
if err != nil {
return errorResponse(err.Error()), err
}
wal.AddWatchedAddress(addr)
wal.AddWatchedAddresses(addr)
service.node.Datastore.Sales().Put(orderId, *contract, pb.OrderState_AWAITING_PAYMENT, false)
log.Debugf("Received direct ORDER message from %s", peer.Pretty())
return nil, nil
Expand All @@ -395,7 +395,7 @@ func (service *OpenBazaarService) handleOrder(peer peer.ID, pmes *pb.Message, op
if err != nil {
return errorResponse(err.Error()), err
}
wal.AddWatchedAddress(addr)
wal.AddWatchedAddresses(addr)
contract, err = service.node.NewOrderConfirmation(contract, false, false)
if err != nil {
return errorResponse("Error building order confirmation"), errors.New("error building order confirmation")
Expand Down Expand Up @@ -427,7 +427,7 @@ func (service *OpenBazaarService) handleOrder(peer peer.ID, pmes *pb.Message, op
log.Error(err)
return errorResponse(err.Error()), err
}
wal.AddWatchedAddress(addr)
wal.AddWatchedAddresses(addr)
log.Debugf("Received offline moderated ORDER message from %s", peer.Pretty())
service.node.Datastore.Sales().Put(orderId, *contract, pb.OrderState_AWAITING_PAYMENT, false)
return nil, nil
Expand Down
10 changes: 0 additions & 10 deletions vendor/github.com/OpenBazaar/bitcoind-wallet/wallet.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/OpenBazaar/go-ethwallet/wallet/wallet.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 13 additions & 9 deletions vendor/github.com/OpenBazaar/multiwallet/bitcoin/wallet.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 14 additions & 10 deletions vendor/github.com/OpenBazaar/multiwallet/bitcoincash/wallet.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 10 additions & 7 deletions vendor/github.com/OpenBazaar/multiwallet/client/pool.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 14 additions & 10 deletions vendor/github.com/OpenBazaar/multiwallet/litecoin/wallet.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/OpenBazaar/multiwallet/model/interfaces.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 14 additions & 10 deletions vendor/github.com/OpenBazaar/multiwallet/zcash/wallet.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 13 additions & 7 deletions vendor/github.com/OpenBazaar/spvwallet/wallet.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/OpenBazaar/wallet-interface/wallet.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 0 additions & 10 deletions vendor/github.com/OpenBazaar/zcashd-wallet/wallet.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading