Skip to content

Commit 7d0505a

Browse files
Merge pull request #496 from BitGo/WP-2604/gg18-recovery
fix: DI openSSLBytes
2 parents c085651 + 9137e62 commit 7d0505a

File tree

3 files changed

+32
-17
lines changed

3 files changed

+32
-17
lines changed

electron/main/index.ts

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@ import { Dash } from '@bitgo/sdk-coin-dash';
2929
import { Doge, Tdoge } from '@bitgo/sdk-coin-doge';
3030
import { Dot, Tdot } from '@bitgo/sdk-coin-dot';
3131
import { Eos, Teos } from '@bitgo/sdk-coin-eos';
32-
import { AbstractEthLikeNewCoins, Erc20Token, Eth, Hteth } from '@bitgo/sdk-coin-eth';
32+
import {
33+
AbstractEthLikeNewCoins,
34+
Erc20Token,
35+
Eth,
36+
Hteth,
37+
} from '@bitgo/sdk-coin-eth';
3338
import { Ethw } from '@bitgo/sdk-coin-ethw';
3439
import { Etc, Tetc } from '@bitgo/sdk-coin-etc';
3540
import { Ltc } from '@bitgo/sdk-coin-ltc';
@@ -56,6 +61,7 @@ import { Hbar, Thbar } from '@bitgo/sdk-coin-hbar';
5661
import { Algo, Talgo } from '@bitgo/sdk-coin-algo';
5762
import { EthLikeCoin, TethLikeCoin } from '@bitgo/sdk-coin-ethlike';
5863
import { Sui, Tsui } from '@bitgo/sdk-coin-sui';
64+
import { loadWebAssembly } from '@bitgo/sdk-opensslbytes';
5965

6066
const bip32 = BIP32Factory(ecc);
6167

@@ -303,10 +309,17 @@ async function createWindow() {
303309
const baseCoin = sdk.coin(coin) as AbstractEthLikeNewCoins;
304310
if (parameters.ethCommonParams) {
305311
parameters.common = EthereumCommon.custom({
306-
...parameters.ethCommonParams
312+
...parameters.ethCommonParams,
307313
});
308314
}
309-
return await baseCoin.recover(parameters);
315+
const openSSLBytes = loadWebAssembly().buffer;
316+
return await baseCoin.recover(
317+
{
318+
...parameters,
319+
openSSLBytes,
320+
},
321+
openSSLBytes
322+
);
310323
});
311324

312325
ipcMain.handle('broadcastTransaction', async (event, coin, parameters) => {
@@ -455,22 +468,17 @@ async function createWindow() {
455468
return response;
456469
});
457470

458-
ipcMain.handle(
459-
'sweepV1',
460-
async (event, coin, parameters) => {
461-
switch (coin) {
462-
case 'btc':
463-
case 'tbtc': {
464-
const coinInstance = sdk.coin(coin) as AbstractUtxoCoin;
465-
return await coinInstance.sweepV1(parameters);
466-
}
467-
default:
468-
return new Error(
469-
`Coin: ${coin} does not support v1 wallets sweep`
470-
);
471+
ipcMain.handle('sweepV1', async (event, coin, parameters) => {
472+
switch (coin) {
473+
case 'btc':
474+
case 'tbtc': {
475+
const coinInstance = sdk.coin(coin) as AbstractUtxoCoin;
476+
return await coinInstance.sweepV1(parameters);
471477
}
478+
default:
479+
return new Error(`Coin: ${coin} does not support v1 wallets sweep`);
472480
}
473-
);
481+
});
474482
}
475483

476484
void app.whenReady().then(createWindow);

package-lock.json

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"dependencies": {
1212
"@bitgo/abstract-cosmos": "11.0.3",
1313
"@bitgo/abstract-utxo": "8.14.0",
14+
"@bitgo/sdk-opensslbytes": "^2.0.0",
1415
"@bitgo/sdk-api": "1.53.3",
1516
"@bitgo/sdk-coin-ada": "4.2.12",
1617
"@bitgo/sdk-coin-algo": "2.1.32",

0 commit comments

Comments
 (0)