-
luigi1111w
typo
-
luigi1111w
it will live in infamy forever
-
luigi1111w
.merges
-
xmr-pr
6745 6793 6816 6819
-
moneromooo
But did you sign it and the sig somehow got stripped, or did you not sign it ?
-
luigi1111w
it would appear I did not sign it
-
luigi1111w
I don't know what I was doing when I merged that...
-
luigi1111w
should I push it?
-
moneromooo
You can push an empty signed commit on top if you've checked it's really what you pushed and not an attacker's commit.
-
moneromooo
git commit may require --allow-empty
-
luigi1111
it is. will another normal signed merge work instead?
-
sarang
-
sarang
FYI
-
moneromooo
luigi1111w: Yes. Sorry, this got me a bit paranoid. Another signed merge is fine as long as you push on something you know you pushed.
-
sarang
Any thoughts on pushing the fork height for this?
-
dEBRUYNE
I wonder if Trezor cannot do an intermediate firmware upgrade with simply the Monero related changes
-
sarang
Would have to ask on the GitHub issue or elsewhere
-
dEBRUYNE
Will leave a comment there
-
sarang
Fork height is merged, correct?
-
sarang
I need to respond to the Trezor team
-
moneromooo
It is.
-
sarang
Unless there are compelling arguments for delaying according their expected release date of November 4
-
moneromooo
Technically, we could delay v14 by a month. Isthmus might not like it though, since it would rat out who uses a trezor :)
-
sarang
lol
-
sarang
Well, I can respond and let them know the height has been set
-
sarang
-
TheCharlatan
dEBRUYNE they only do monthly updates. It's the same for their security fixes as well. It should fit into their normal update schedule though, right?
-
dEBRUYNE
If they do once a month, it should be included in the October update imo
-
sarang
-
moneromooo
They had been OK with this earlier, no ?
-
sarang
I had spoken to grydz_, the Trezor developer working on the app
-
sarang
I can't speak to how they run their processes internally
-
sarang
But I had communicated the timeline to him
-
sarang
Er, sorry, ph4r05, not grydz_
-
sarang
(grydz_ works on the ledger side of things)
-
sarang
Anyway, I'll assume the October 17 height will remain in effect unless I hear otherwise
-
moneromooo
Any opinion on 6820 ? There's a vote against.
-
moneromooo
(if there's not a clear majority to ok it, I'll close)
-
sech1
"to whichever daemon will accept that difficulty without having
-
sech1
to calculate the hash, saving some work." <--- daemons have different difficulty?
-
moneromooo
Yes.
-
moneromooo
(merge mining, not both daemons on the same chain)
-
sech1
I'm doubtful. Having "free for all" second parameter kills future possibility to standardize it.
-
moneromooo
OK. I guess I could actually parse it and test the field vs current diff if present, though it'll be expected to pass every time.
-
moneromooo
I'll close it then, since it's 2-0 so far.
-
selsta
we kinda have to merge, branch and tag today if we want to release binaries in 2 days
-
selsta
luigi1111w: ^ :)
-
luigi1111w
ok
-
luigi1111w
.merges
-
xmr-pr
6745 6793 6816 6819
-
luigi1111w
just this queue then tag?
-
dEBRUYNE
Branch first :-P
-
selsta
if we find any more remaining bugs we can put out a point release before HF
-
sarang
So to confirm: not changing the fork height for the Trezor schedule?
-
sarang
I want to be able to tell them something definitively
-
selsta
I’d rather not.
-
selsta
If others want to ok.
-
selsta
it does sound like they can manage to release early