From 054d30ba4aa934efd0a7aead8b59793f5dd8ec88 Mon Sep 17 00:00:00 2001 From: Captain Date: Sun, 5 Aug 2018 06:36:43 +0200 Subject: [PATCH] License updated and payment ID capital fix --- gui.go | 2 +- main.qml | 2 +- mainwallet.qml | 2 +- version.go | 4 ++-- walletapi_wrapper.go | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gui.go b/gui.go index 5be893f..8618e8c 100644 --- a/gui.go +++ b/gui.go @@ -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 // diff --git a/main.qml b/main.qml index bd7766f..562318e 100644 --- a/main.qml +++ b/main.qml @@ -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 // diff --git a/mainwallet.qml b/mainwallet.qml index 2405e4e..8033d5c 100644 --- a/mainwallet.qml +++ b/mainwallet.qml @@ -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 diff --git a/version.go b/version.go index b1faa86..112d221 100644 --- a/version.go +++ b/version.go @@ -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 // @@ -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") diff --git a/walletapi_wrapper.go b/walletapi_wrapper.go index fa3d7bb..a1744d4 100644 --- a/walletapi_wrapper.go +++ b/walletapi_wrapper.go @@ -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 // @@ -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)) } } @@ -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 = "" }