From fd34430f081175cb56306ed8d5c40313f5190b41 Mon Sep 17 00:00:00 2001 From: zano build machine Date: Tue, 7 Sep 2021 10:50:20 +0300 Subject: [PATCH 1/9] === build number: 124 -> 125 === --- src/version.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h.in b/src/version.h.in index cfee72bd..af5e45d6 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -8,6 +8,6 @@ #define PROJECT_REVISION "1" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 124 +#define PROJECT_VERSION_BUILD_NO 125 #define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO) #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]" From f08430eead3a062d6c2cfc4ccb57daec2ffb66a0 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Thu, 9 Sep 2021 13:12:47 +0300 Subject: [PATCH 2/9] Zano 1.2.0 --- src/version.h.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/version.h.in b/src/version.h.in index 0b5627f2..558bc518 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -3,8 +3,8 @@ #define BUILD_COMMIT_ID "@VERSION@" -#define PROJECT_MAJOR_VERSION "1" -#define PROJECT_MINOR_VERSION "2" +#define PROJECT_MAJOR_VERSION "2" +#define PROJECT_MINOR_VERSION "0" #define PROJECT_REVISION "1" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION From 7b5bea04a72df7237e62ee1fdebc5eae18f67270 Mon Sep 17 00:00:00 2001 From: zano build machine Date: Thu, 9 Sep 2021 13:13:33 +0300 Subject: [PATCH 3/9] === build number: 128 -> 129 === --- src/version.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h.in b/src/version.h.in index 558bc518..543bfcd1 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -8,6 +8,6 @@ #define PROJECT_REVISION "1" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 128 +#define PROJECT_VERSION_BUILD_NO 129 #define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO) #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]" From d2db10b5f7e23a6a7cd455073fde03c82f370d18 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Thu, 9 Sep 2021 16:45:02 +0300 Subject: [PATCH 4/9] Zano 1.3.0 --- src/version.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h.in b/src/version.h.in index 543bfcd1..26829468 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -3,7 +3,7 @@ #define BUILD_COMMIT_ID "@VERSION@" -#define PROJECT_MAJOR_VERSION "2" +#define PROJECT_MAJOR_VERSION "3" #define PROJECT_MINOR_VERSION "0" #define PROJECT_REVISION "1" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION From 7f23a39827960f1e6aa0a62da0d4adfc1473020f Mon Sep 17 00:00:00 2001 From: zano build machine Date: Thu, 9 Sep 2021 16:46:14 +0300 Subject: [PATCH 5/9] === build number: 129 -> 130 === --- src/version.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h.in b/src/version.h.in index 26829468..26a5faa7 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -8,6 +8,6 @@ #define PROJECT_REVISION "1" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 129 +#define PROJECT_VERSION_BUILD_NO 130 #define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO) #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]" From 8b5f4fa467d667dd4be1f20e333eaf040ea53855 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Thu, 9 Sep 2021 18:53:44 +0300 Subject: [PATCH 6/9] Zano 1.3.0 fix --- src/version.h.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/version.h.in b/src/version.h.in index 26a5faa7..3837e2b1 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -3,9 +3,9 @@ #define BUILD_COMMIT_ID "@VERSION@" -#define PROJECT_MAJOR_VERSION "3" -#define PROJECT_MINOR_VERSION "0" -#define PROJECT_REVISION "1" +#define PROJECT_MAJOR_VERSION "1" +#define PROJECT_MINOR_VERSION "3" +#define PROJECT_REVISION "0" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION #define PROJECT_VERSION_BUILD_NO 130 From 6f6eefa0779f4b7a3e0b026755be3172900045b0 Mon Sep 17 00:00:00 2001 From: zano build machine Date: Thu, 9 Sep 2021 18:54:15 +0300 Subject: [PATCH 7/9] === build number: 130 -> 131 === --- src/version.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h.in b/src/version.h.in index 3837e2b1..d9ebf5b6 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -8,6 +8,6 @@ #define PROJECT_REVISION "0" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 130 +#define PROJECT_VERSION_BUILD_NO 131 #define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO) #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]" From c10674ce19c4c7576c5e9c61e530498dfb9c4f54 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Sat, 11 Sep 2021 10:28:34 +0300 Subject: [PATCH 8/9] explicitly removed sender address from wrap tx --- src/wallet/wallet_rpc_server.cpp | 2 +- src/wallet/wallets_manager.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp index 159427c6..9152c66a 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -367,7 +367,7 @@ namespace tools attachments.push_back(comment); } - if (req.push_payer ) + if (req.push_payer && !wrap) { currency::create_and_add_tx_payer_to_container_from_address(extra, m_wallet.get_account().get_keys().account_address, m_wallet.get_top_block_height(), m_wallet.get_core_runtime_config()); } diff --git a/src/wallet/wallets_manager.cpp b/src/wallet/wallets_manager.cpp index e49ff164..6155b4b0 100644 --- a/src/wallet/wallets_manager.cpp +++ b/src/wallet/wallets_manager.cpp @@ -1350,6 +1350,7 @@ std::string wallets_manager::transfer(size_t wallet_id, const view::transfer_par sa.body = d.address; extra.push_back(sa); + currency::account_public_address acc = AUTO_VAL_INIT(acc); currency::get_account_address_from_str(acc, BC_WRAP_SERVICE_CUSTODY_WALLET); de.addr.front() = acc; @@ -1404,7 +1405,7 @@ std::string wallets_manager::transfer(size_t wallet_id, const view::transfer_par tc.comment = tp.comment; extra.push_back(tc); } - if (tp.push_payer) + if (tp.push_payer && !wrap) { currency::create_and_add_tx_payer_to_container_from_address(extra, w->get()->get_account().get_keys().account_address, w->get()->get_top_block_height(), w->get()->get_core_runtime_config()); } From 207f133c4dd0d3143b34fbff1a58266d569ae1a3 Mon Sep 17 00:00:00 2001 From: zano build machine Date: Sat, 11 Sep 2021 10:31:09 +0300 Subject: [PATCH 9/9] === build number: 131 -> 132 === --- src/version.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h.in b/src/version.h.in index d9ebf5b6..0aadd22e 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -8,6 +8,6 @@ #define PROJECT_REVISION "0" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 131 +#define PROJECT_VERSION_BUILD_NO 132 #define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO) #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]"