09:49:13 <meon>  /quit
11:55:49 <br-m> <rbrunner7> In a branch that I want to commit I have now about 20 single commits of mine that I want to squash into 1, as a preparation for making a PR. However, I have my commits mixed with a lot of commits that I merged in from master. How do I squash?
11:59:00 <tobtoht> I would rebase on master first
12:02:14 <br-m> <rbrunner7> Yeah, maybe that was my mistake when I updated, I merged master in, instead of rebasing - if I understand you correctly. But I hope there must be a simple way out of my "mixed commits" problem.
12:03:34 <br-m> <rbrunner7> Well, I probably could cherry-pick them one by one, starting with master, if nothing else helps ...
12:03:42 <tobtoht> interactive rebase (git rebase -i) and reorder?
12:04:20 <br-m> <rbrunner7> I was playing with that, but did not understand how I can give that the right hint where to start with the commits.
12:06:47 <tobtoht> git merge-base master <your_branch> to find the first commit in common
12:09:38 <tobtoht> hm not sure actually if that works in this case if you merged master into your branch
12:11:11 <plowsof> (pls make a backup somewhere)
12:11:49 <tobtoht> there is always git reflog ;)
12:12:40 <plowsof> maybe i should say dont do what i do and reset --hard on the wrong branch - reflog could help here also? never heard of that
12:14:41 <tobtoht> "reflog could help here also?" <- yes, unless your changes were never committed. commit first, then you can mess around.
12:15:16 <plowsof> ohh thank you
12:24:22 <br-m> <rbrunner7> Don't worry, I made a backup first :)
13:02:41 <br-m> <ofrnxmr:xmr.mx> If the most recent "commit" is the merge commit, then git reset --hard HEAD~1 will drop it. Interactive rebase wont show the merge commit
13:03:35 <br-m> <ofrnxmr:xmr.mx> after which you do a git rebase master
13:04:25 <br-m> <ofrnxmr:xmr.mx> Of course, its safest to do something like git checkout -b fixmerge first
13:36:26 <br-m> <rbrunner7> Thanks for the info everybody. I decided to play it safe and basically cherry-picked everything in.
13:55:39 <br-m> <tobtoht> I'm looking forward to reviewing this. Would be great to have this in the v0.19 release.
15:04:25 <br-m> <r4v3r23> is this polyseed? :) > <@rbrunner7> In a branch that I want to commit I have now about 20 single commits of mine that I want to squash into 1, as a preparation for making a PR. However, I have my commits mixed with a lot of commits that I merged in from master. How do I squash?
15:15:58 <br-m> <rbrunner7> https://github.com/monero-project/monero/pull/10765
15:41:24 <selsta> .merge+ 10766 10740 10744 10745 10746
15:41:24 <xmr-pr> Added
15:45:21 <br-m> <jpk68:matrix.org> rbrunner7: Thank you so much for your work on this :))
15:51:46 <br-m> <r4v3r23> @rbrunner7: YES
15:51:49 <br-m> <rbrunner7> Welcome. It was kind of a low-hanging fruit, if you compare with the mountains of code that it takes to implement FCMP++ and Carrot.
15:52:39 <br-m> <r4v3r23> @rbrunner7: well done, its very much appreciated
15:53:23 <br-m> <jpk68:matrix.org> And it supports seed encryption? That's nice
15:53:32 <br-m> <rbrunner7> Yes, for restore.
15:56:25 <br-m> <rbrunner7> https://github.com/rbrunner7/monero/blob/73266667cd9486d090159fc5504d25f71c5e726e/src/cryptonote_basic/cryptonote_format_utils.cpp#L1674
15:56:45 <br-m> <rbrunner7> That's the comment about the restore capabilities.
15:57:15 <br-m> <r4v3r23> this will land in v0.19 right? still needs review etc
15:58:09 <br-m> <rbrunner7> I will try to do my part.
16:00:15 <br-m> <ofrnxmr:xmr.mx> Yes
16:00:53 <br-m> <ofrnxmr:xmr.mx> :D lolol #optimism
16:01:33 <tobtoht> merge queue cleared
16:36:58 <br-m> <jpk68:matrix.org> Regarding the Polyseed PR: would it be helpful to also print the seed's embedded restore height with the legacy_seed command?
16:40:55 <br-m> <jpk68:matrix.org> It might also look a bit more consistent if "English" was not capitalized here:
16:41:00 <br-m> <jpk68:matrix.org> https://mrelay.p2pool.observer/m/matrix.org/koXhIkHqwMaxijPKsfLHMwVp.png (clipboard.png)
16:41:49 <br-m> <jpk68:matrix.org> Hopefully this is an alright place to leave a few "review comments" ;)
16:47:22 <br-m> <ofrnxmr> Of course. This is the dev channel :P
16:48:50 <br-m> <jpk68:matrix.org> It also seems that when a Polyseed wallet created with the CLI is opened in Feather (with the keys file, not restored from the seed), it recognizes it as legacy wallet and will only show the 25-word seed
16:49:07 <br-m> <jpk68:matrix.org> However, Feather does have the embedded creation date from the Polyseed (which I assume is just in the file itself)
16:49:20 <br-m> <jpk68:matrix.org> I have no idea if this is something on Feather's end or what
16:49:47 <br-m> <ofrnxmr> I think feather stores the polyseed in an attribute
16:50:52 <br-m> <ofrnxmr> (from what i read of discussion / questions from @rbrunner7:monero.social )
16:51:30 <br-m> <jpk68:matrix.org> Does Feather only support English Polyseeds? I can't seem to restore a Czech one in Feather
16:53:07 <br-m> <ofrnxmr:xmr.mx> creating a new wallet in feather doesnt seem to give me option of languages
16:53:21 <br-m> <rbrunner7> I think so, can't remember to see any language selector anywhere in Feather
16:55:47 <br-m> <rbrunner7> @ofrnxmr:monero.social: https://github.com/rbrunner7/monero/blob/73266667cd9486d090159fc5504d25f71c5e726e/src/simplewallet/simplewallet.cpp#L5083
16:58:35 <br-m> <rbrunner7> Hmm, well, you would need a language selector only when creating new wallets, restore would in theory be not much of a problem?
17:00:16 <br-m> <jpk68:matrix.org> But my point is that it can't restore non-English Polyseed wallets created by the CLI, it seems
17:01:33 <br-m> <rbrunner7> Yup, just tried, a Spanish Polyseed failed with an "unknow word" error
17:01:46 <br-m> <jpk68:matrix.org> I also found another weird edge case, I think. I made a wallet with a Spanish Polyseed in Cake Wallet, restored from the Polyseed in the CLI wallet, used the legacy_seed command to get the legacy seed, restored it from the legacy seed in Feather, and then tried to open that wallet file with the CLI wallet. It seems to fail unconditionally with this:
17:01:46 <br-m> <jpk68:matrix.org> Error: failed to load wallet: Wrong number of words in the phrase
17:02:07 <br-m> <jpk68:matrix.org> Error: You may want to remove the file [path] and try again
17:02:08 <br-m> <rbrunner7> Which is a bit strange because the Polyseed lib offers code to recognize seeds in all supported languages, does not take much to profit from that
17:03:24 <br-m> <rbrunner7> @jpk68:matrix.org: So no less than 3 wallet apps are in play here?
17:03:42 <br-m> <jpk68:matrix.org> Yes, haha
17:04:25 <br-m> <rbrunner7> Can you easily check whether at least the address is correctly the same in all places?
17:05:19 <br-m> <jpk68:matrix.org> Sure, will do
17:06:03 <br-m> <rbrunner7> The legacy seed route should in principle be the easiest one ...
17:08:47 <br-m> <jpk68:matrix.org> @rbrunner7: Yes, in all cases where it can be successfully restored, the address is the same
17:09:42 <br-m> <rbrunner7> Ok, thanks. Just saw that Feather does offer language selection for legacy seeds.
17:14:39 <br-m> <rbrunner7> Could reproduce the bug. The CLI wallet as-is simply does not like wallet files from Feather restored with any legacy seed. Will debug.
17:39:21 <br-m> <rbrunner7> @jpk68:matrix.org: Corrected.
17:39:34 <br-m> <jpk68:matrix.org> Thanks :)
21:02:33 <selsta> In monero-gui we currently print restore height and wallet creation date so that users can write it down during wallet creation. With Polyseed, is it still useful to print wallet creation date?
21:04:05 <br-m> <ofrnxmr:xmr.mx> yea
21:04:20 <br-m> <ofrnxmr:xmr.mx> you can restore a polyseed with a custom restore height
21:04:52 <br-m> <ofrnxmr:xmr.mx> well, actually, during creation, i dont think its needed
21:05:05 <br-m> <jpk68:matrix.org> How does that relate to printing the date when the wallet is created
21:05:06 <br-m> <jpk68:matrix.org> Yeah, that
21:05:07 <br-m> <ofrnxmr:xmr.mx> but should still be displayed on the wallet info page
21:05:39 <br-m> <jpk68:matrix.org> My bad :P
21:06:05 <br-m> <ofrnxmr:xmr.mx> no, my bad. i didnt read the question before pressing send with a half baked answer
21:06:32 <br-m> <jpk68:matrix.org> I have no idea what that emoji is supposed to mean
21:06:37 <br-m> <ofrnxmr:xmr.mx> coffee
21:52:09 <selsta> ofrnxmr: could you clarify if you mean wallet creation date should be displayed or also restore height?
21:53:49 <selsta> i'm talking about the wizard wallet creation page (where you see the seed for the first time)
21:53:50 <br-m> <r4v3r23> selsta has there been talk of ever supporting coin control in wallet2
21:54:07 <br-m> <r4v3r23> most wallets support it today, and use some version of feathers code i believe
21:55:03 <br-m> <ofrnxmr:xmr.mx> yeah, for creation, i dont think you need to display date or height for polyseed. just the seed should be fine imo
22:08:57 <selsta> r4v3r23: not aware of any coin control related talk, i'd have to look how feather implemented it
22:20:29 <br-m> <ofrnxmr:xmr.mx> http://git.anonero5wmhraxqsvzq2ncgptq6gq45qoto6fnkfwughfl4gbt44swad.onion/ANONERO/monero/commit/ff011ed153b27e94a64aa879a5a90c99bf741f88
22:20:30 <br-m> <ofrnxmr:xmr.mx> https://codeberg.org/Monfluo/monero/commit/5f9436735f35333e9d58cb8f0f1bfea6798365fb
22:21:48 <br-m> <ofrnxmr:xmr.mx> didnt look at how feather did it though
22:51:12 <br-m> <tobtoht> that's my code lol
22:51:25 <br-m> <tobtoht> #define FEATHER_COINS_INFO_H
22:56:12 <br-m> <ofrnxmr:xmr.mx> https://github.com/MrCyjaneK/monero_c/blob/991a0d0c97bce6ae8671dc763dd03876dfa9ea8a/patches/monero/0008-coin-control.patch
22:56:12 <br-m> <ofrnxmr:xmr.mx> properly attributed here
22:57:52 <br-m> <tobtoht> feather doesn't use this implementation anymore, but nice to see that it lives on
23:03:09 <br-m> <jpk68:matrix.org> It's pretty cool how so much code in this project/ecosystem is like, patched-together and written by probably hundreds of people over several decades
23:03:57 <br-m> <jpk68:matrix.org> Standing on the shoulders of giants :))
23:04:44 <br-m> <ofrnxmr:xmr.mx> @tobtoht: thats due to feather using wallet2 directly now?
23:05:09 <br-m> <tobtoht> yeah
23:58:27 <selsta> .merge+ 10743 10742
23:58:27 <xmr-pr> Added