[00:33:32] https://github.com/NAVCoin/navcoin-core/pull/337 [01:30:31] https://github.com/aguycalled/navcoin-core/pull/46 @aguycalled [03:34:21] @aguycalled we've merged most waiting PR's we're currently working on merging branches that are dependent on cold staking into your cold staking branch [03:34:31] and also marcus has submitted some fixes to the quorum update [03:35:17] if you're able to review those two PR's when you wake up that would be great. If you're happy with them and all the travis CI stuff is passing, then we can merge them into master and output an RC for people to test [03:35:50] the basic plan would be to release the RC as soon as possible, then when we're comfortable there are no hotfixes required, we cut the release early / mid next week [03:57:39] also, that test that you fixed somewhere is failing on both those branches. The versionbit one. we're not quite sure where the fix went? [03:58:26] @aguycalled I've also added draft release notes to both your cold-staking branch and your cfund-gui branch. [04:01:57] Needing your review: https://github.com/aguycalled/navcoin-core/pull/46 [04:02:22] and this (since we've merged a bunch of fixes in) https://github.com/NAVCoin/navcoin-core/pull/249 [04:04:57] since updating the quorum some of the CFund tests are failing, but we're waiting to get marcus's PR approved on your repo before fixing the tests [04:05:20] or if you want to have a look at fixing them so we can get the RC out, feel free [07:21:37] @prole [07:21:49] merged marcus pr [07:24:01] just to be sure, should i merge coldstaking into master? [07:24:06] Nice, let's see what Travis says, but I think this change breaks some other unit tests [07:24:24] is everything correctly tested already merged there? [07:25:32] what about header spam branch? [07:25:43] I think so, from what I understand the only unit tests failing on that PR is the version bit test which you fixed previously. I'm not sure why it's breaking again. Can you check the test you fixed and re-apply the fix if it got lost in the merge [07:25:59] Header spam is merged [07:26:05] To master [07:26:33] Only cold staking and quorum update is outstanding [07:26:50] But everything is ready once the CI tests pass afaik [07:27:09] ok ill have a look [07:27:40] 👍 [07:35:01] quorum tests pass now [07:47:40] Okay nice [07:49:00] @mc290 I thought you said there were other CF tests that would break on the quorum branch? [07:49:21] If not, we can merge I guess? [07:51:05] Then it's just a double check of our cold staking merges and fixing the tests on that branch [07:51:07] https://travis-ci.org/NAVCoin/navcoin-core/jobs/464783301 [07:51:29] Then we're ready to merge these last two to master and start smoke testing everything [07:55:36] test fix was in the ignore-headers-sync branch [07:55:58] I thought so I couldn't figure out what it was tough [07:56:16] i cant find the branch [08:08:19] @prole maybe my merge fixed it? [08:13:27] @aguycalled I closed the PR https://github.com/NAVCoin/navcoin-core/pull/329 [08:13:40] The branch is on Matt's fork.i believe [08:14:29] If Travis passes, let's merge the quorum fix and smoke test when the RC is ready [08:23:31] the reason why the version bit fails is the same as why it was failing in ignoreheaderssync [08:23:50] its weird this has been suddenly introduced [08:24:54] it was ur master merge which introduced it @Matt (Dev) [08:25:32] 🤔 [08:25:40] https://cdn.discordapp.com/attachments/416000318149754881/520516230507921408/image.png [08:25:52] this one [08:25:53] Interesting [08:25:56] the one with the red x [08:26:09] Do you know what the actual issue is [08:27:42] the nodes from the test unit cant sync to each other [08:27:53] what were u exactly merging there? [08:28:22] how did u merge? pr on git and immediately approve? or console git merge? [08:28:31] Console [08:31:09] what did you want to merge? [08:31:19] i already merged mastee yesterday [08:31:41] the commit which makes travis fail looks enpty [08:43:35] Today we merged in a few things to master [08:44:00] Like the header fix [08:46:06] look at the commit history of master [08:46:22] travis got broken after some commits tonight [08:48:17] https://github.com/NAVCoin/navcoin-core/pull/338 [08:49:33] @prole this was merged with travis failing [08:51:22] could you maybe roll back the merges you did a few hours ago? i dont really know what they are about @prole @Matt (Dev) [08:52:03] I'm on a train atm but I can look when I'm home [08:52:34] it should not have been merged without travis passing [08:53:00] i could do it but i fear the changes you wanted to really apply get lost if the branches are deleted [08:53:17] and im not sure what you wanted to merge [08:53:52] that pr i linked last for example, has some commits from beginning of november [08:54:27] Travis is failing on the version bit test and we didn't know why [08:55:07] probably something got merged wrong [08:55:16] Mm [08:55:17] master cant have failing code [08:55:34] those commits have to be rolled back asap [08:55:38] The idea was it would be fixed today/tomorrow [08:55:46] I'll look at it when I get home [09:10:42] reject-version-bit test passes locally on cold-staking branch [09:26:25] ok test is passing now in travis [09:36:53] Cool [09:36:57] Just got home [09:38:20] What was the problem [09:43:52] @aguycalled is there anything you need me to do [09:44:23] all good [09:45:45] https://github.com/NAVCoin/navcoin-core/pull/333 [09:45:51] has this been tested @Matt (Dev) ? [09:46:24] ill merge coldstaking whenever i have approvals [09:46:39] I think Marcus said everything was working after he put his fixes in [09:47:18] but did he test the soft fork? [09:47:24] Afaik it's been manually tested but not unit tests written [09:48:03] The softfork must have been tested or he wouldn't have been able to do the changed quorum percents [09:48:13] unless there was no softfork [09:48:16] @mc290 [09:48:43] Are you going to merge the voting GUI as a seperate PR to master after cold staking? [09:48:50] yes [09:49:17] it just depends on coldstaking because the gui was changed there [09:49:31] cool [09:49:41] Did you tweak the release notes for cold staking [09:50:37] doing now [09:50:54] ok [09:51:08] let me know when you have a pr up [10:06:54] https://github.com/NAVCoin/navcoin-core/pull/339 [10:06:58] @Matt (Dev) [10:09:34] approved [10:40:30] there are a few new prs [10:40:32] @Matt (Dev) [10:40:37] ok [10:43:21] whats the stuff you changed in chainparamsseeds.h [10:55:50] the hard coded nodes [10:58:06] approved [18:05:04] there are two pr pending [18:05:16] reject-version-bit.py | False | 70 s coldstaking_spending.py | False | 13 s [18:05:25] still getting those tests failing [18:08:24] cant get why, because they pass locally [18:08:50] @Matt (Dev) @mc290 @A-B [18:09:25] Any new signal it's is should be aware of for the release? [18:16:48] https://github.com/NAVCoin/navcoin-core/blob/master/doc/release-notes/release-notes-4.5.0.md [18:16:50] @prodpeak [18:20:18] Great thanks. I'll make sure they're listed [19:36:15] I manually tested the softfork for reduced quorum [19:36:42] only on regtest, and it works [19:38:30] haven't tested it on the other networks yet... [19:43:37] should be fine [19:43:39] its just those tests [19:51:57] reject-version-bit.py works locally for me [19:55:58] its weird because they fail randomly [19:56:10] nondeterministic >< [20:28:23] the tests should be deterministic to be accurate [20:31:19] That's what we we're going for