Skip to content

Commit

Permalink
Merge pull request #274 from CityOfZion/CU-86a5zqypd
Browse files Browse the repository at this point in the history
CU-86a5zqypd - NEON3 - Update BS Lib Version to Support Legacy Ledger
  • Loading branch information
thiagocbalducci authored Dec 20, 2024
2 parents 8477154 + 12fbb29 commit 06fe8cc
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 8 deletions.
24 changes: 19 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@cityofzion/bs-asteroid-sdk": "0.9.0",
"@cityofzion/bs-electron": "0.1.26",
"@cityofzion/bs-ethereum": "2.7.10",
"@cityofzion/bs-neo-legacy": "1.6.7",
"@cityofzion/bs-neo-legacy": "1.7.0",
"@cityofzion/bs-neo3": "1.8.9",
"@cityofzion/bs-swap": "0.3.2",
"@cityofzion/neon-core": "5.6.0",
Expand Down
2 changes: 1 addition & 1 deletion src/main/bsAggregator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export let bsAggregator: BSAggregator<TBlockchainServiceKey>
export function exposeBsAggregatorToRenderer() {
bsAggregator = new BSAggregator<TBlockchainServiceKey>([
new BSNeo3('neo3', undefined, getHardwareWalletTransport),
new BSNeoLegacy('neoLegacy'),
new BSNeoLegacy('neoLegacy', undefined, getHardwareWalletTransport),
new BSEthereum('ethereum', undefined, getHardwareWalletTransport),
new BSEthereum('neox', undefined, getHardwareWalletTransport),
])
Expand Down
4 changes: 4 additions & 0 deletions src/main/hardwareWallet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ const connectHardwareWallet = async () => {
}
}

if (transporters.some(transport => transport.blockchain === 'neoLegacy')) {
transporters = transporters.filter(transport => transport.blockchain === 'neoLegacy')
}

if (!transporters.length) {
transport.close()
throw new Error('Transport is open but it was not possible to identify the blockchain')
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/src/assets/release-notes.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"tag_name": "Version v3.3.0",
"published_at": "24 Dec 2024",
"body": "<li>• Cross-chain Swap Feature Implementation</li><li>• Offline Sync Compatibility with Neon Wallet Mobile by using Neon Backups</li><li>• Enhancement to Skins Feature</li><li>• Help Feature Initial Implementation</li><li>• Minor bugfixes</li>",
"body": "<li>• Cross-chain Swap Feature Implementation</li><li>• Offline Sync Compatibility with Neon Wallet Mobile by using Neon Backups</li><li>• Enhancement to Skins Feature</li><li>• Help Feature Initial Implementation</li><li>• Minor bugfixes</li><li>• Support to Neo Legacy Ledger</li>",
"html_url": "https://github.com/CityOfZion/neon-wallet-desktop/releases/tag/v3.3.0"
},
{
Expand Down

0 comments on commit 06fe8cc

Please sign in to comment.