Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

Commit 4e7a7cf

Browse files
authored
Merge pull request #1838 from OpenBazaar/eth_txn_prefix
(ob-desktop #1825) Use ethereum transaction hash as is
2 parents 122457c + 51e3c0b commit 4e7a7cf

File tree

8 files changed

+71
-27
lines changed

8 files changed

+71
-27
lines changed

core/spend.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ func (n *OpenBazaarNode) Spend(args *SpendRequest) (*SpendResponse, error) {
115115

116116
txn, err := wal.GetTransaction(*txid)
117117
if err != nil {
118+
log.Errorf("get txn failed : %v", err.Error())
118119
return nil, fmt.Errorf("failed retrieving new wallet balance: %s", err)
119120
}
120121

net/service/handlers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1132,7 +1132,7 @@ func (service *OpenBazaarService) handleOrderCompletion(p peer.ID, pmes *pb.Mess
11321132
outValue := big.NewInt(0)
11331133
for _, r := range records {
11341134
if !r.Spent && r.Value.Cmp(big.NewInt(0)) > 0 {
1135-
outpointHash, err := hex.DecodeString(ut.NormalizeAddress(r.Txid))
1135+
outpointHash, err := hex.DecodeString(r.Txid)
11361136
if err != nil {
11371137
return nil, err
11381138
}

openbazaar-qa

74 MB
Binary file not shown.

vendor/github.com/OpenBazaar/go-ethwallet/util/util.go

Lines changed: 28 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/OpenBazaar/go-ethwallet/wallet/account.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/OpenBazaar/go-ethwallet/wallet/erc20_wallet.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/OpenBazaar/go-ethwallet/wallet/service.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/OpenBazaar/go-ethwallet/wallet/wallet.go

Lines changed: 41 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)