docco bump

3rdIteration · Dec 24, 2024 · bf11495 · bf11495
1 parent c9d7b99
commit bf11495
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 16 deletions.
diff --git a/btcrecover/btcrpass.py b/btcrecover/btcrpass.py
@@ -2942,6 +2942,9 @@ def load_from_filename(cls, wallet_filename):
 
         self._encrypted_block = self._encrypted_wallet[:32]
 
+        if ";" in wallet_json["payload"]:
+            exit("\n**ERROR**\nFound RSA-encrypted Dogechain wallet payload, this means it wasn't downloaded in a way that supports password recovery or decryption... You cannot decrypt this wallet and will need to download it correctly or request your encrypted wallet from dogechain)")
+
         return self
 
     @classmethod

diff --git a/btcrecover/test/test-wallets/dogechain.wallet.aes.json.2024-encrypted.2022-01 b/btcrecover/test/test-wallets/dogechain.wallet.aes.json.2024-encrypted.2022-01
@@ -0,0 +1,7 @@
+{
+  "guid": "52500558-b3fa-4318-b6a3-3c55835c6575",
+  "payload": "Dw5gN5A0eMzK0aFzkn+sIymgcy5ncpGt7wSyJLFbCJvTJnbA0rNRPWz6LQRZeaoqOFugYjXqlj/HMjOGTlAmUWjZSbOCkngzQBwZe1jKY0iVWIKI7SCHE7yI6YQN0bV9HoAo4zl+nDxYC/EN+ue11OqWOYZNhDxwyn/poyRd7bcigeuvcjam292+pglc2koAmOJeuOg0m+NvdvS7Mw07mAGCyLVrxLmj5efDtIHWrdrGWv5SgmTUUr1pUEOJG5Ps;LzZwl72onfBNml5KA22HBJMEJwyfSUWxOyXlA36kWJA6FAdVYadYX7Ln3+Xe9BG2662d6lLI+b3SAK9njFtGe0O0DOnS+HIyVCBvPAkMsj874dNB2J9bJfpm5/kuh58EFkZoJXpXywscBlPHu7TlbTieb8B1g/SPpkLrXvQL22XM6NVI927wB1s081KFjcT8IBdMmMZIp/qVtlkyoqKfQBwqtmGb1sOYsa0r2n8aBcI+RFP6O7Md6LCMfZeRYIlU;RHpIRAm+DoUA1oribmXhxJ44LiXL+BpOdanK/P3jFfs+FVPagu//ItCgfUMlmHgt5x7Qhlu7JZMWJU3WdQOeixdxbpI1EEseAdOtRG/sIwv2Vf4vo16effuZuQm/MO8xBngeKE56splt6A39FHQUG4v3YtlDb1w6yVphyDBrhIFxUsdJyCxjzWappyE00FDdG+OOnkRKtBGRtN/yF1UIaUvs699ssM88FnUNK4xGc0WmPpJpL8ToLKIKTmD9c6VJ;U63oZYYqy9EvT85dOAuIR0TaQmRACJvzETyH3laoUXLGv9ktjYd9WdXJX/7G9gQnmzwCd1J65/GsitvbI9Ch0OHeCW3iIZqjVGGg4sU91RWR3BVgl4d5XLNxmHrUVHkOrEXMmJRgrF9oWXeYSsmNMQiCk5StgJppBE9WMc6x//tDPMVWMOWICmM6E1Qn+zlIrjtizPIWjGdckTgaKw7a415Yi1yFyh211ueMczycIvshhEKFGJO6f0UuwLej11Rv;su0DZr+7yKjxsF0guCzmBUERevBP18gRrJQclCExf86CuM5KrBXZAijCy8J53g8eITNCiCFQORMD5gDRHcfbypJ/hGSh0VBdCcxJ8CQCc3K8Ok+BJ0le7XsxL23oC1XoU/ORNZjN7yg7O21Ez+RArDGItEfdHHjMpox9rNyRHyjOExDFyz55Zb3rAF8PrTUL2dnOmo0BF8uvW45sZzxJdFztFwg/FyeycFRbwhQ0i/TfzW679dVvQkdOpiG31c4X",
+  "salt": "Gc55/tevRG/ODxUN0ENiRg==",
+  "pbkdf2_iterations": 5000,
+  "cipher": "AES-CBC"
+}
diff --git a/docs/Images/download_dogechain_wallet.png b/docs/Images/download_dogechain_wallet.png
diff --git a/docs/TUTORIAL.md b/docs/TUTORIAL.md
@@ -322,22 +322,6 @@ Downloading these kinds of wallet files id done via your browser, through the "D
 
 Basically you need to attempt to log in to your wallet (even with the wrong password) and save the wallet file that is downloaded as part of this process.
 
-Once you are at the dogechain.info wallet login page, with the developer tools open in your browser, you will need to do the following steps:
-
-1) Select the Network tab
-
-2) Enter your Wallet ID
-
-3) Enter a placeholder password (you can enter anything)
-
-4) Click Log In (It will say that it failed to decrypt the wallet, but this is normal)
-
-5) Select "Responses"
-
-6) Select the API items. (This may look slightly different if you have 2fa enabled, you may need to complete the 2fa at this step too)
-
-7) Once you have a response that looks like wallet data, copy it and paste it in to a text file. This is your wallet file...
-
 ![Download Dodgechain Wallet](download_dogechain_wallet.png)
 
 ### Downloading block.io wallet files ###