[DO NOT MERGE] Merge with Monero 2-306 #276

LenyKholodov · 2019-04-08T14:28:05Z

No description provided.

EDDragonWolf · 2019-04-10T06:30:56Z

src/wallet/wallet2.cpp

+    boost::filesystem::path dir = tools::get_default_data_dir();
+    // remove .bitmonero, replace with .shared-ringdb
+    dir = dir.remove_filename();
+    dir /= ".shared-ringdb";


Please, check, look like for us it should be .graft

EDDragonWolf · 2019-04-10T06:33:03Z

src/wallet/wallet2.cpp

 {
-  // ceiling to the nearest integer


We can leave this comment from monero after our line 233

EDDragonWolf · 2019-04-10T09:02:46Z

src/wallet/wallet2.cpp

+
+uint8_t get_bulletproof_fork()
+{
+  return 8;


It should be another for graft and maybe better is use the constant from config file

EDDragonWolf · 2019-04-10T10:04:27Z

src/wallet/wallet2.cpp

+  //r = ::serialization::dump_binary(keys_file_data, buf);
+  //r = r && epee::file_io_utils::save_string_to_file(keys_file_name, buf); //and never touch wallet_keys_file again, only read
+  //CHECK_AND_ASSERT_MES(r, false, "failed to generate wallet keys file " << keys_file_name);
+  //lock_keys_file();


Are we need this commented code?

EDDragonWolf · 2019-04-10T10:19:15Z

src/wallet/wallet2.cpp

+  bool use_dyn_fee = use_fork_rules(HF_VERSION_DYNAMIC_FEE, -720 * 1);
+  if (!use_dyn_fee)
+    return FEE_PER_KB;
+  */


Is this is monero code?

EDDragonWolf · 2019-04-10T10:20:49Z

src/wallet/wallet2.cpp

+//------------------------------------------------------------------------------------------------------------------------------
+uint64_t wallet2::get_min_ring_size() const
+{
+  if (use_fork_rules(8, 10))


We need to check it. Look like HF is wrong.

EDDragonWolf · 2019-04-10T10:21:26Z

src/wallet/wallet2.cpp

+//------------------------------------------------------------------------------------------------------------------------------
+uint64_t wallet2::get_max_ring_size() const
+{
+  if (use_fork_rules(8, 10))


We need to check it. Look like HF is wrong.

EDDragonWolf · 2019-04-10T10:59:08Z

src/wallet/wallet2.cpp

+//  // time of v2 fork
+//  const time_t fork_time = m_nettype == TESTNET ? 1448285909 : m_nettype == STAGENET ? 1520937818 : 1458748658;
+//  // v2 fork block
+//  const uint64_t fork_block = m_nettype == TESTNET ? 624634 : m_nettype == STAGENET ? 32000 : 1009827;


Some strange code. Please, check it

jagerman · 2019-04-10T19:59:30Z

README.md

@@ -1,21 +1,63 @@
 # Graft Network

+<<<<<<< HEAD


The readme has multiple overlapping layers of merge conflict markers committed.

jagerman · 2019-04-10T20:01:59Z

src/version.h.in

@@ -1,4 +1,4 @@
 #define GRAFT_VERSION_TAG "@VERSIONTAG@"


This file should not exist anymore and isn't being used.

jagerman · 2019-04-10T20:04:58Z

src/cryptonote_config.h

@@ -151,13 +165,16 @@ namespace config

  uint64_t const CRYPTONOTE_PUBLIC_ADDRESS_BASE58_PREFIX = 90; // 'G'
  uint64_t const CRYPTONOTE_PUBLIC_INTEGRATED_ADDRESS_BASE58_PREFIX = 91;
+  // TODO: subaddress prefix


jagerman · 2019-04-10T20:08:04Z

src/version.cpp.in

+#define DEF_GRAFT_VERSION_TAG "@VERSIONTAG@"
+#define DEF_GRAFT_VERSION "1.1.0-master"
+#define DEF_GRAFT_RELEASE_NAME "Vega"
+#define DEF_GRAFT_VERSION_FULL DEF_GRAFT_VERSION "-" DEF_GRAFT_VERSION_TAG


There seems to be no point in having these as definitions.

(Also they are very wrong values)

jagerman · 2019-04-10T20:37:19Z

This PR is effectively destroying most of the GraftNetwork history by adding a commit that undoes several months of GraftNetwork changes (including deleting whole files) in a single commit then reimports those changes in another commit, bring those files and changes back to life. As a result git blame becomes totally useless before it has fundamentally broken the commit history.

It needs to be properly rebased against master, not having master merged into it in history-destroying commits.

LenyKholodov · 2019-04-11T21:19:15Z

This PR is effectively destroying most of the GraftNetwork history by adding a commit that undoes several months of GraftNetwork changes (including deleting whole files) in a single commit then reimports those changes in another commit, bring those files and changes back to life. As a result git blame becomes totally useless before it has fundamentally broken the commit history.

It needs to be properly rebased against master, not having master merged into it in history-destroying commits.

This PR won't be merged. This is temporary branch to fix all issues after merge. Actual PR with merge will be done later with changes after this first pass of merging.

…rge-monero-2-306-master-pass1

…graft-project/GraftNetwork into feature/merge-monero-2-306-master-pass1

This reverts commit 2542518.

…hub.com/graft-project/GraftNetwork into feature/merge-monero-2-306-master-pass1

Merge with master

d04b3ae

LenyKholodov requested review from mbg033, EDDragonWolf and bitkis April 8, 2019 14:28

EDDragonWolf suggested changes Apr 10, 2019

View reviewed changes

jagerman reviewed Apr 10, 2019

View reviewed changes

Compilation fixes after merge

13ffaf7

LenyKholodov changed the title ~~Merge with Monero 2-306~~ [DO NOT MERGE] Merge with Monero 2-306 Apr 11, 2019

LenyKholodov and others added 17 commits April 13, 2019 13:14

Remove explicit zmq dependency

a91c603

Fix crash at startup

80a38c4

Temporary disable stake transactions

2542518

Resolved supernode conflicts

0959705

Fix for bc sync

0bab5f2

Merge branch 'feature/merge-monero-2-306-bc-sync-fix' into feature/me…

6012226

…rge-monero-2-306-master-pass1

Fix for bc sync

6515945

Merge branch 'feature/merge-monero-2-306-master-pass1' of github.com:…

4e06af6

…graft-project/GraftNetwork into feature/merge-monero-2-306-master-pass1

Fixed HF versions for Monero v0.13 features

0a4554a

Add HF 14

88c54e2

Revert "Temporary disable stake transactions"

13732c3

This reverts commit 2542518.

Serialization fixes

aa31879

fix: GENESIS_TX for testnet

48d4b80

fix: bulletproof fork 8->14

9e29b21

Merge branch 'feature/merge-monero-2-306-master-pass1' of https://git…

7402bf9

…hub.com/graft-project/GraftNetwork into feature/merge-monero-2-306-master-pass1

Fixed supernode RPC

9973006

Manual wallet2 & simplewallet merge

db06f87

LenyKholodov force-pushed the feature/merge-monero-2-306-master-pass1 branch from 6171c0e to db06f87 Compare April 25, 2019 06:49

mbg033 added 3 commits April 25, 2019 19:16

wallet: fixed max tx size

aaa9fa2

fixed: tx size validation for Graft

6cf4b4a

hf14 internal test

9b42ee5

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[DO NOT MERGE] Merge with Monero 2-306 #276

[DO NOT MERGE] Merge with Monero 2-306 #276

LenyKholodov commented Apr 8, 2019

EDDragonWolf Apr 10, 2019

EDDragonWolf Apr 10, 2019

EDDragonWolf Apr 10, 2019

EDDragonWolf Apr 10, 2019

EDDragonWolf Apr 10, 2019

EDDragonWolf Apr 10, 2019

EDDragonWolf Apr 10, 2019

EDDragonWolf Apr 10, 2019

jagerman Apr 10, 2019

jagerman Apr 10, 2019

jagerman Apr 10, 2019

jagerman Apr 10, 2019

jagerman Apr 11, 2019

jagerman commented Apr 10, 2019

LenyKholodov commented Apr 11, 2019

[DO NOT MERGE] Merge with Monero 2-306 #276

Are you sure you want to change the base?

[DO NOT MERGE] Merge with Monero 2-306 #276

Conversation

LenyKholodov commented Apr 8, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jagerman commented Apr 10, 2019

LenyKholodov commented Apr 11, 2019