00:34:08 <luigi1111w> typo
00:34:40 <luigi1111w> it will live in infamy forever
00:35:53 <luigi1111w> .merges
00:35:53 -xmr-pr- 6745 6793 6816 6819
00:39:26 <moneromooo> But did you sign it and the sig somehow got stripped, or did you not sign it ?
02:03:48 <luigi1111w> it would appear I did not sign it
02:03:56 <luigi1111w> I don't know what I was doing when I merged that...
02:11:10 <luigi1111w> should I push it?
02:12:09 <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.
02:12:20 <moneromooo> git commit may require --allow-empty
06:17:19 <luigi1111> it is. will another normal signed merge work instead?
10:38:46 <sarang> https://github.com/trezor/trezor-firmware/pull/1246#issuecomment-692529799
10:38:50 <sarang> FYI
10:55:36 <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.
11:01:44 <sarang> Any thoughts on pushing the fork height for this?
11:02:55 <dEBRUYNE> I wonder if Trezor cannot do an intermediate firmware upgrade with simply the Monero related changes
11:08:49 <sarang> Would have to ask on the GitHub issue or elsewhere
11:12:55 <dEBRUYNE> Will leave a comment there
12:57:47 <sarang> Fork height is merged, correct?
12:57:50 <sarang> I need to respond to the Trezor team
12:57:56 <moneromooo> It is.
12:58:14 <sarang> Unless there are compelling arguments for delaying according their expected release date of November 4
12:58:59 <moneromooo> Technically, we could delay v14 by a month. Isthmus might not like it though, since it would rat out who uses a trezor :)
12:59:18 <sarang> lol
12:59:42 <sarang> Well, I can respond and let them know the height has been set
13:01:46 <sarang> https://github.com/trezor/trezor-firmware/pull/1246#issuecomment-692698661
13:03:38 <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?
13:44:11 <dEBRUYNE> If they do once a month, it should be included in the October update imo
14:08:08 <sarang> Trezor update: https://github.com/trezor/trezor-firmware/pull/1246#issuecomment-692735918
14:10:09 <moneromooo> They had been OK with this earlier, no ?
14:10:31 <sarang> I had spoken to grydz_, the Trezor developer working on the app
14:10:39 <sarang> I can't speak to how they run their processes internally
14:10:51 <sarang> But I had communicated the timeline to him
14:11:57 <sarang> Er, sorry, ph4r05, not grydz_
14:12:08 <sarang> (grydz_ works on the ledger side of things)
14:25:06 <sarang> Anyway, I'll assume the October 17 height will remain in effect unless I hear otherwise
17:19:26 <moneromooo> Any opinion on 6820 ? There's a vote against.
17:23:49 <moneromooo> (if there's not a clear majority to ok it, I'll close)
17:26:14 <sech1> "to whichever daemon will accept that difficulty without having
17:26:14 <sech1> to calculate the hash, saving some work." <--- daemons have different difficulty?
17:26:55 <moneromooo> Yes.
17:39:33 <moneromooo> (merge mining, not both daemons on the same chain)
17:52:48 <sech1> I'm doubtful. Having "free for all" second parameter kills future possibility to standardize it.
17:54:05 <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.
17:54:24 <moneromooo> I'll close it then, since it's 2-0 so far.
21:37:27 <selsta> we kinda have to merge, branch and tag today if we want to release binaries in 2 days
21:38:33 <selsta> luigi1111w: ^ :)
22:30:23 <luigi1111w> ok
22:30:26 <luigi1111w> .merges
22:30:26 -xmr-pr- 6745 6793 6816 6819
22:30:34 <luigi1111w> just this queue then tag?
22:31:20 <dEBRUYNE> Branch first :-P
22:52:42 <selsta> if we find any more remaining bugs we can put out a point release before HF
22:53:16 <sarang> So to confirm: not changing the fork height for the Trezor schedule?
22:53:26 <sarang> I want to be able to tell them something definitively
22:54:11 <selsta> I’d rather not.
22:54:15 <selsta> If others want to ok.
22:57:56 <selsta> it does sound like they can manage to release early