Merge branch 'WIN-3293-sui-create-broadcastable-mpc-tx' into WIN-3296…

…-sui-recover-consolidations
BitGo · Aug 19, 2024 · fb3f37b · fb3f37b
2 parents f70bd18 + 6a52e83
commit fb3f37b
Show file tree

Hide file tree

Showing 13 changed files with 527 additions and 334 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
     env:
       NEXT_VERSION: "${{ inputs.next-version }}"
     outputs:
-      dmg_filename: "Wallet Recovery Wizard-${{ inputs.next-version }}.dmg"
+      dmg_filename: "Wallet Recovery Wizard-${{ inputs.next-version }}-arm64.dmg"
       exe_filename: "Wallet Recovery Wizard-Setup-${{ inputs.next-version }}.exe"
       deb_filename: "Wallet Recovery Wizard-Linux-${{ inputs.next-version }}.deb"
     steps:
@@ -56,7 +56,7 @@ jobs:
 
   mac-build:
     name: Create Mac release
-    runs-on: macos-12
+    runs-on: macos-14
     needs:
       - get-current-state
     env:

diff --git a/electron/main/index.ts b/electron/main/index.ts
@@ -1,4 +1,5 @@
 import { TrxConsolidationRecoveryOptions } from '../types';
+import EthereumCommon from '@ethereumjs/common';
 
 process.env.DIST_ELECTRON = join(__dirname, '../..');
 process.env.DIST = join(process.env.DIST_ELECTRON, '../dist');
@@ -28,7 +29,7 @@ import { Dash } from '@bitgo/sdk-coin-dash';
 import { Doge, Tdoge } from '@bitgo/sdk-coin-doge';
 import { Dot, Tdot } from '@bitgo/sdk-coin-dot';
 import { Eos, Teos } from '@bitgo/sdk-coin-eos';
-import { Erc20Token, Eth, Hteth } from '@bitgo/sdk-coin-eth';
+import { AbstractEthLikeNewCoins, Erc20Token, Eth, Hteth } from '@bitgo/sdk-coin-eth';
 import { Ethw } from '@bitgo/sdk-coin-ethw';
 import { Ltc } from '@bitgo/sdk-coin-ltc';
 import { Near, TNear } from '@bitgo/sdk-coin-near';
@@ -53,6 +54,7 @@ import * as ecc from 'tiny-secp256k1';
 import { Hbar, Thbar } from '@bitgo/sdk-coin-hbar';
 import { Algo, Talgo } from '@bitgo/sdk-coin-algo';
 import { Sui, Tsui } from '@bitgo-beta/sdk-coin-sui';
+import { EthLikeCoin, TethLikeCoin } from '@bitgo/sdk-coin-ethlike';
 
 const bip32 = BIP32Factory(ecc);
 
@@ -140,6 +142,9 @@ sdk.register('algo', Algo.createInstance);
 sdk.register('talgo', Talgo.createInstance);
 sdk.register('sui', Sui.createInstance);
 sdk.register('tsui', Tsui.createInstance);
+sdk.register('baseeth', EthLikeCoin.createInstance);
+sdk.register('tbaseeth', TethLikeCoin.createInstance);
+
 Erc20Token.createTokenConstructors().forEach(({ name, coinConstructor }) => {
   sdk.register(name, coinConstructor);
 });
@@ -292,7 +297,12 @@ async function createWindow() {
   );
 
   ipcMain.handle('recover', async (event, coin, parameters) => {
-    const baseCoin = sdk.coin(coin) as AbstractUtxoCoin;
+    const baseCoin = sdk.coin(coin) as AbstractEthLikeNewCoins;
+    if (parameters.ethCommonParams) {
+      parameters.common = EthereumCommon.custom({
+        ...parameters.ethCommonParams
+      });
+    }
     return await baseCoin.recover(parameters);
   });
 

diff --git a/electron/preload/index.ts b/electron/preload/index.ts
@@ -37,6 +37,9 @@ import {
   SuiRecoveryConsolidationRecoveryOptions,
 } from '../types';
 
+import type * as EthLikeCommon from '@ethereumjs/common';
+import { EvmCcrNonBitgoCoinConfigType } from '../../src/helpers/config';
+
 type User = { username: string };
 
 type Commands = {
@@ -102,6 +105,8 @@ type Commands = {
       };
       tokenContractAddress?: string;
       startingScanIndex?: number;
+      common?: EthLikeCommon.default;
+      ethCommonParams?: EvmCcrNonBitgoCoinConfigType | undefined;
     }
   ): Promise<BackupKeyRecoveryTransansaction | FormattedOfflineVaultTxInfo>;
   wrongChainRecover(