Commit 604cfc0
committed
merge: sync fork master with upstream keepkey/master
Brings in the 16 upstream commits the fork lacked: the 7.14.1 release,
DylibTransport for in-process libkkemu testing, the EIP-1559 chunked-data
regression test, message-signing bindings and the Copilot review workflow.
Three conflicts, resolved on their merits:
device-protocol -> b22fd8530 (the freshly-synced FORK master), NOT
upstream's d637b782. The two pins are diverged and upstream's is missing
messages-hive.proto and messages-near.proto, which this fork's own tests
import; b22fd8530 verifiably contains BOTH pins and all four protos.
client.py -> kept the fork file, dropped only the duplicated
solana_sign_offchain_message. Taking upstream's file wholesale looked
tempting and would have silently deleted five fork-only methods
(hive_get_public_key/_keys, hive_sign_account_create/_update,
hive_sign_tx). Verified after resolution: no method from EITHER side is
missing, exactly one solana_sign_offchain_message remains, file parses.
transport_dylib.py -> upstream's memset init, which replaces unpacking a
FLASH_SIZE-element list as varargs. Same result, no argument-count risk.4 files changed
Lines changed: 33 additions & 12 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
Submodule device-protocol updated 13 files
- .github/workflows/copilot-review.yml+19
- messages-hive.options+46
- messages-hive.proto+159
- messages-near.proto+60
- messages-solana.proto+2-3
- messages-thorchain.proto+1
- messages-tron.proto+1
- messages-zcash.options+7-5
- messages-zcash.proto+68-36
- messages.proto+21-1
- package-lock.json+74-39
- package.json+4-4
- yarn.lock+47-29
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1639 | 1639 | | |
1640 | 1640 | | |
1641 | 1641 | | |
1642 | | - | |
| 1642 | + | |
1643 | 1643 | | |
1644 | | - | |
1645 | | - | |
1646 | | - | |
1647 | | - | |
1648 | | - | |
1649 | | - | |
1650 | | - | |
1651 | | - | |
1652 | | - | |
| 1644 | + | |
| 1645 | + | |
| 1646 | + | |
| 1647 | + | |
| 1648 | + | |
| 1649 | + | |
| 1650 | + | |
| 1651 | + | |
| 1652 | + | |
| 1653 | + | |
1653 | 1654 | | |
1654 | 1655 | | |
1655 | 1656 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
96 | 96 | | |
97 | 97 | | |
98 | 98 | | |
99 | | - | |
| 99 | + | |
| 100 | + | |
100 | 101 | | |
101 | 102 | | |
102 | 103 | | |
| |||
0 commit comments