Skip to content
This repository has been archived by the owner on Jul 22, 2022. It is now read-only.

Commit

Permalink
License updated and payment ID capital fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Captain committed Aug 5, 2018
1 parent 87a37a9 commit 054d30b
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion gui.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2017-2018 DERO Project. All rights reserved.
// Use of this source code in any form is governed by RESEARCH license.
// Use of this source code in any form is governed by GPL 3 license.
// license can be found in the LICENSE file.
// GPG: 0F39 E425 8C65 3947 702A 8234 08B2 0360 A03A 9DE8
//
Expand Down
2 changes: 1 addition & 1 deletion main.qml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// Copyright 2017-2018 DERO Project. All rights reserved.
// Use of this source code in any form is governed by RESEARCH license.
// Use of this source code in any form is governed by GPL 3 license.
// license can be found in the LICENSE file.
// GPG: 0F39 E425 8C65 3947 702A 8234 08B2 0360 A03A 9DE8
//
Expand Down
2 changes: 1 addition & 1 deletion mainwallet.qml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2017-2018 DERO Project. All rights reserved.
// Use of this source code in any form is governed by RESEARCH license.
// Use of this source code in any form is governed by GPL 3 license.
// license can be found in the LICENSE file.
// GPG: 0F39 E425 8C65 3947 702A 8234 08B2 0360 A03A 9DE8
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
Expand Down
4 changes: 2 additions & 2 deletions version.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2017-2018 DERO Project. All rights reserved.
// Use of this source code in any form is governed by RESEARCH license.
// Use of this source code in any form is governed by GPL 3 license.
// license can be found in the LICENSE file.
// GPG: 0F39 E425 8C65 3947 702A 8234 08B2 0360 A03A 9DE8
//
Expand All @@ -20,4 +20,4 @@ import "github.com/blang/semver"

// right now it has to be manually changed
// do we need to include git commitsha??
var Version = semver.MustParse("0.0.2-1.alpha.atlantis+31072018")
var Version = semver.MustParse("0.0.3-1.alpha.atlantis+04082018")
8 changes: 4 additions & 4 deletions walletapi_wrapper.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2017-2018 DERO Project. All rights reserved.
// Use of this source code in any form is governed by RESEARCH license.
// Use of this source code in any form is governed by GPL 3 license.
// license can be found in the LICENSE file.
// GPG: 0F39 E425 8C65 3947 702A 8234 08B2 0360 A03A 9DE8
//
Expand Down Expand Up @@ -140,10 +140,10 @@ func (t *CtxObject) genintegratedaddress() {
global_object.SetWallet_address(addr.String())

global_object.SetIntegrated_32_address(i32.String())
global_object.SetIntegrated_32_address_paymentid(fmt.Sprintf("%X", i32.PaymentID))
global_object.SetIntegrated_32_address_paymentid(fmt.Sprintf("%x", i32.PaymentID))

global_object.SetIntegrated_8_address(i8.String())
global_object.SetIntegrated_8_address_paymentid(fmt.Sprintf("%X", i8.PaymentID))
global_object.SetIntegrated_8_address_paymentid(fmt.Sprintf("%x", i8.PaymentID))
}
}

Expand Down Expand Up @@ -417,7 +417,7 @@ func (t *CtxObject) build_tx(destination, amount_str, paymentid string) {
lpayid := strings.TrimSpace(paymentid)

// if integrated address, payment id should be ignored
if fmt.Sprintf("%X", addr.PaymentID) == lpayid {
if fmt.Sprintf("%x", addr.PaymentID) == strings.ToLower(lpayid) {
lpayid = ""
}

Expand Down

0 comments on commit 054d30b

Please sign in to comment.