/quit

<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?

I would rebase on master first

<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.

<rbrunner7> Well, I probably could cherry-pick them one by one, starting with master, if nothing else helps ...

interactive rebase (git rebase -i) and reorder?

<rbrunner7> I was playing with that, but did not understand how I can give that the right hint where to start with the commits.

git merge-base master <your_branch> to find the first commit in common

hm not sure actually if that works in this case if you merged master into your branch

(pls make a backup somewhere)

there is always git reflog ;)

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

"reflog could help here also?" <- yes, unless your changes were never committed. commit first, then you can mess around.

ohh thank you

<rbrunner7> Don't worry, I made a backup first :)

<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

<ofrnxmr:xmr.mx> after which you do a git rebase master

<ofrnxmr:xmr.mx> Of course, its safest to do something like git checkout -b fixmerge first

<rbrunner7> Thanks for the info everybody. I decided to play it safe and basically cherry-picked everything in.

<tobtoht> I'm looking forward to reviewing this. Would be great to have this in the v0.19 release.

<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?

<rbrunner7> monero-project/monero #10765

.merge+ 10766 10740 10744 10745 10746

Added

<jpk68:matrix.org> rbrunner7: Thank you so much for your work on this :))

<r4v3r23> @rbrunner7: YES

<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.

<r4v3r23> @rbrunner7: well done, its very much appreciated

<jpk68:matrix.org> And it supports seed encryption? That's nice

<rbrunner7> Yes, for restore.

<rbrunner7> github.com/rbrunner7/monero/blob/73…c/cryptonote_format_utils.cpp#L1674

<rbrunner7> That's the comment about the restore capabilities.

<r4v3r23> this will land in v0.19 right? still needs review etc

<rbrunner7> I will try to do my part.

<ofrnxmr:xmr.mx> Yes

<ofrnxmr:xmr.mx> :D lolol #optimism

merge queue cleared

<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?

<jpk68:matrix.org> It might also look a bit more consistent if "English" was not capitalized here:

<jpk68:matrix.org> mrelay.p2pool.observer/m/matrix.org/koXhIkHqwMaxijPKsfLHMwVp.png (clipboard.png)

<jpk68:matrix.org> Hopefully this is an alright place to leave a few "review comments" ;)

<ofrnxmr> Of course. This is the dev channel :P

<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

<jpk68:matrix.org> However, Feather does have the embedded creation date from the Polyseed (which I assume is just in the file itself)

<jpk68:matrix.org> I have no idea if this is something on Feather's end or what

<ofrnxmr> I think feather stores the polyseed in an attribute

<ofrnxmr> (from what i read of discussion / questions from @rbrunner7:monero.social )

<jpk68:matrix.org> Does Feather only support English Polyseeds? I can't seem to restore a Czech one in Feather

<ofrnxmr:xmr.mx> creating a new wallet in feather doesnt seem to give me option of languages

<rbrunner7> I think so, can't remember to see any language selector anywhere in Feather

<rbrunner7> @ofrnxmr:monero.social: github.com/rbrunner7/monero/blob/73…simplewallet/simplewallet.cpp#L5083

<rbrunner7> Hmm, well, you would need a language selector only when creating new wallets, restore would in theory be not much of a problem?

<jpk68:matrix.org> But my point is that it can't restore non-English Polyseed wallets created by the CLI, it seems

<rbrunner7> Yup, just tried, a Spanish Polyseed failed with an "unknow word" error

<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:

<jpk68:matrix.org> Error: failed to load wallet: Wrong number of words in the phrase

<jpk68:matrix.org> Error: You may want to remove the file [path] and try again

<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

<rbrunner7> @jpk68:matrix.org: So no less than 3 wallet apps are in play here?

<jpk68:matrix.org> Yes, haha

<rbrunner7> Can you easily check whether at least the address is correctly the same in all places?

<jpk68:matrix.org> Sure, will do

<rbrunner7> The legacy seed route should in principle be the easiest one ...

<jpk68:matrix.org> @rbrunner7: Yes, in all cases where it can be successfully restored, the address is the same

<rbrunner7> Ok, thanks. Just saw that Feather does offer language selection for legacy seeds.

<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.

<rbrunner7> @jpk68:matrix.org: Corrected.

<jpk68:matrix.org> Thanks :)

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?

<ofrnxmr:xmr.mx> yea

<ofrnxmr:xmr.mx> you can restore a polyseed with a custom restore height

<ofrnxmr:xmr.mx> well, actually, during creation, i dont think its needed

<jpk68:matrix.org> How does that relate to printing the date when the wallet is created

<jpk68:matrix.org> Yeah, that

<ofrnxmr:xmr.mx> but should still be displayed on the wallet info page

<jpk68:matrix.org> My bad :P

<ofrnxmr:xmr.mx> no, my bad. i didnt read the question before pressing send with a half baked answer

<jpk68:matrix.org> I have no idea what that emoji is supposed to mean

<ofrnxmr:xmr.mx> coffee

ofrnxmr: could you clarify if you mean wallet creation date should be displayed or also restore height?

i'm talking about the wizard wallet creation page (where you see the seed for the first time)

<r4v3r23> selsta has there been talk of ever supporting coin control in wallet2

<r4v3r23> most wallets support it today, and use some version of feathers code i believe

<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

r4v3r23: not aware of any coin control related talk, i'd have to look how feather implemented it

<ofrnxmr:xmr.mx> git.anonero5wmhraxqsvzq2ncgptq6gq45…ed153b27e94a64aa879a5a90c99bf741f88

<ofrnxmr:xmr.mx> codeberg.org/Monfluo/monero/commit/…6735f35333e9d58cb8f0f1bfea6798365fb

<ofrnxmr:xmr.mx> didnt look at how feather did it though

<tobtoht> that's my code lol

<tobtoht> #define FEATHER_COINS_INFO_H

<ofrnxmr:xmr.mx> github.com/MrCyjaneK/monero_c/blob/…ches/monero/0008-coin-control.patch

<ofrnxmr:xmr.mx> properly attributed here

<tobtoht> feather doesn't use this implementation anymore, but nice to see that it lives on

<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

<jpk68:matrix.org> Standing on the shoulders of giants :))

<ofrnxmr:xmr.mx> @tobtoht: thats due to feather using wallet2 directly now?

<tobtoht> yeah

.merge+ 10743 10742

Added