Skip to content

Commit 8385aea

Browse files
authored
refactor: migrate bridge logic to frontend (#4)
1 parent b865c93 commit 8385aea

File tree

65 files changed

+3819
-3819
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+3819
-3819
lines changed

package.json

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -213,15 +213,7 @@
213213
},
214214
"lavamoat": {
215215
"allowScripts": {
216-
"@avalabs/bridge-sdk>@avalabs/wallets-sdk>@ledgerhq/hw-app-btc>bitcoinjs-lib>bip32>tiny-secp256k1": false,
217216
"@ethereumjs/common>ethereumjs-util>ethereum-cryptography>keccak": false,
218-
"@avalabs/bridge-sdk>@avalabs/wallets-sdk>web3": false,
219-
"@avalabs/bridge-sdk>@avalabs/wallets-sdk>web3>web3-bzz": false,
220-
"@avalabs/bridge-sdk>@avalabs/wallets-sdk>web3>web3-core>web3-core-requestmanager>web3-providers-ws>websocket>bufferutil": false,
221-
"@avalabs/bridge-sdk>@avalabs/wallets-sdk>web3>web3-core>web3-core-requestmanager>web3-providers-ws>websocket>es5-ext": false,
222-
"@avalabs/bridge-sdk>@avalabs/wallets-sdk>web3>web3-core>web3-core-requestmanager>web3-providers-ws>websocket>utf-8-validate": false,
223-
"@avalabs/bridge-sdk>@avalabs/wallets-sdk>web3>web3-shh": false,
224-
"@avalabs/bridge-sdk>@avalabs/wallets-sdk>hdkey>secp256k1": false,
225217
"@lavamoat/preinstall-always-fail": false,
226218
"@types/web3>web3": false,
227219
"@types/web3>web3>web3-bzz": false,
@@ -240,7 +232,6 @@
240232
"web3>web3-bzz": false,
241233
"web3>web3-shh": false,
242234
"yarn": false,
243-
"@avalabs/bridge-sdk>@avalabs/wallets-sdk>@avalabs/hw-app-avalanche>@ledgerhq/hw-app-eth>@ledgerhq/domain-service>eip55>keccak": false,
244235
"@avalabs/vm-module-types": false,
245236
"@avalabs/vm-module-types>@avalabs/wallets-sdk>@avalabs/hw-app-avalanche>@ledgerhq/hw-app-eth>@ledgerhq/domain-service>eip55>keccak": false,
246237
"@avalabs/vm-module-types>@avalabs/wallets-sdk>@ledgerhq/hw-app-btc>bitcoinjs-lib>bip32>tiny-secp256k1": false,

src/background/connections/extensionConnection/models.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ export enum ExtensionRequest {
149149
UNIFIED_BRIDGE_GET_FEE = 'unified_bridge_get_fee',
150150
UNIFIED_BRIDGE_ESTIMATE_GAS = 'unified_bridge_estimate_gas',
151151
UNIFIED_BRIDGE_TRANSFER_ASSET = 'unified_bridge_transfer_asset',
152+
UNIFIED_BRIDGE_TRACK_TRANSFER = 'unified_bridge_track_transfer',
152153
UNIFIED_BRIDGE_GET_STATE = 'unified_bridge_get_state',
153154
UNIFIED_BRIDGE_GET_ASSETS = 'unified_bridge_get_assets',
154155

src/background/connections/extensionConnection/registry.ts

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import { BridgeGetConfigHandler } from '@src/background/services/bridge/handlers
2121
import { BridgeGetStateHandler } from '@src/background/services/bridge/handlers/getBridgeState';
2222
import { BridgeRemoveTransactionHandler } from '@src/background/services/bridge/handlers/removeBridgeTransaction';
2323
import { BridgeSetIsDevEnvHandler } from '@src/background/services/bridge/handlers/setIsDevEnv';
24-
import { BridgeTransferAssetHandler } from '@src/background/services/bridge/handlers/transferAsset';
2524
import { ContactsUpdatedEvents } from '@src/background/services/contacts/events/contactsUpdatedEvent';
2625
import { CreateContactHandler } from '@src/background/services/contacts/handlers/createContact';
2726
import { GetContactsHandler } from '@src/background/services/contacts/handlers/getContacts';
@@ -75,7 +74,6 @@ import { RemoveFavoriteNetworkHandler } from '@src/background/services/network/h
7574
import { GetNetworksStateHandler } from '@src/background/services/network/handlers/getNetworkState';
7675
import { GetFeatureFlagsHandler } from '@src/background/services/featureFlags/handlers/getFeatureFlags';
7776
import { FeatureFlagsUpdatedEvent } from '@src/background/services/featureFlags/events/featureFlagsUpdatedEvent';
78-
import { GetEthMaxTransferAmountHandler } from '@src/background/services/bridge/handlers/getEthMaxTransferAmount';
7977
import { CloseLedgerTransportHandler } from '@src/background/services/ledger/handlers/closeOpenTransporters';
8078
import { LedgerCloseTransportEvent } from '@src/background/services/ledger/events/ledgerCloseTransport';
8179
import { GetAvaxBalanceHandler } from '@src/background/services/balances/handlers/getAvaxBalance';
@@ -107,14 +105,10 @@ import { GetRecoveryPhraseExportStateHandler } from '@src/background/services/se
107105
import { InitRecoveryPhraseExportHandler } from '@src/background/services/seedless/handlers/initRecoveryPhraseExport';
108106
import { CompleteRecoveryPhraseExportHandler } from '@src/background/services/seedless/handlers/completeRecoveryPhraseExport';
109107
import { CancelRecoveryPhraseExportHandler } from '@src/background/services/seedless/handlers/cancelRecoveryPhraseExport';
110-
import { UnifiedBridgeTransferAsset } from '@src/background/services/unifiedBridge/handlers/unifiedBridgeTransferAsset';
111-
import { UnifiedBridgeGetFee } from '@src/background/services/unifiedBridge/handlers/unifiedBridgeGetFee';
112108
import { UnifiedBridgeGetState } from '@src/background/services/unifiedBridge/handlers/unifiedBridgeGetState';
113-
import { UnifiedBridgeGetAssets } from '@src/background/services/unifiedBridge/handlers/unifiedBridgeGetAssets';
114109
import { UnifiedBridgeEvents } from '@src/background/services/unifiedBridge/events/unifiedBridgeEvents';
115110
import { GetPrivateKeyHandler } from '@src/background/services/accounts/handlers/getPrivateKey';
116111
import { EstimateGasForBridgeTxHandler } from '@src/background/services/bridge/handlers/estimateGasForBridgeTx';
117-
import { UnifiedBridgeEstimateGas } from '@src/background/services/unifiedBridge/handlers/unifiedBridgeEstimateGas';
118112
import { ImportSeedPhraseHandler } from '@src/background/services/wallet/handlers/importSeedPhrase';
119113
import { ImportLedgerHandler } from '@src/background/services/wallet/handlers/importLedger';
120114
import { GetRecoveryMethodsHandler } from '@src/background/services/seedless/handlers/getRecoveryMethods';
@@ -134,6 +128,7 @@ import { SetActiveNetworkHandler } from '@src/background/services/network/handle
134128
import { StartBalancesPollingHandler } from '@src/background/services/balances/handlers/startBalancesPolling';
135129
import { StopBalancesPollingHandler } from '@src/background/services/balances/handlers/stopBalancesPolling';
136130
import { BalancesUpdatedEvents } from '@src/background/services/balances/events/balancesUpdatedEvent';
131+
import { UnifiedBridgeTrackTransfer } from '@src/background/services/unifiedBridge/handlers/unifiedBridgeTrackTransfer';
137132

138133
/**
139134
* TODO: GENERATE THIS FILE AS PART OF THE BUILD PROCESS
@@ -171,11 +166,6 @@ import { BalancesUpdatedEvents } from '@src/background/services/balances/events/
171166
token: 'ExtensionRequestHandler',
172167
useToken: BridgeRemoveTransactionHandler,
173168
},
174-
{ token: 'ExtensionRequestHandler', useToken: BridgeTransferAssetHandler },
175-
{
176-
token: 'ExtensionRequestHandler',
177-
useToken: GetEthMaxTransferAmountHandler,
178-
},
179169
{ token: 'ExtensionRequestHandler', useToken: CreateContactHandler },
180170
{ token: 'ExtensionRequestHandler', useToken: GetContactsHandler },
181171
{ token: 'ExtensionRequestHandler', useToken: UpdateContactHandler },
@@ -318,20 +308,12 @@ import { BalancesUpdatedEvents } from '@src/background/services/balances/events/
318308
},
319309
{
320310
token: 'ExtensionRequestHandler',
321-
useToken: UnifiedBridgeTransferAsset,
322-
},
323-
{
324-
token: 'ExtensionRequestHandler',
325-
useToken: UnifiedBridgeGetFee,
311+
useToken: UnifiedBridgeTrackTransfer,
326312
},
327313
{
328314
token: 'ExtensionRequestHandler',
329315
useToken: UnifiedBridgeGetState,
330316
},
331-
{
332-
token: 'ExtensionRequestHandler',
333-
useToken: UnifiedBridgeGetAssets,
334-
},
335317
{
336318
token: 'ExtensionRequestHandler',
337319
useToken: GetPrivateKeyHandler,
@@ -340,10 +322,6 @@ import { BalancesUpdatedEvents } from '@src/background/services/balances/events/
340322
token: 'ExtensionRequestHandler',
341323
useToken: EstimateGasForBridgeTxHandler,
342324
},
343-
{
344-
token: 'ExtensionRequestHandler',
345-
useToken: UnifiedBridgeEstimateGas,
346-
},
347325
{
348326
token: 'ExtensionRequestHandler',
349327
useToken: ImportSeedPhraseHandler,

src/background/services/balances/handlers/getNftBalances.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ export class GetNftBalancesHandler implements HandlerType {
3232
[TokenType.ERC1155]: undefined,
3333
};
3434
}
35+
if (!scope) {
36+
return {
37+
...request,
38+
error: 'No request scope provided',
39+
};
40+
}
3541
const currentNetwork = await this.networkService.getNetwork(scope);
3642

3743
if (!currentNetwork) {

src/background/services/blockaid/BlockaidService.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,11 @@ export class BlockaidService {
137137
from: tx.from,
138138
to: tx.to,
139139
data: tx.data,
140-
value: tx.value,
140+
// BigInt cannot be JSON-stringified
141+
value:
142+
typeof tx.value === 'bigint'
143+
? `0x${tx.value.toString(16)}`
144+
: tx.value,
141145
},
142146
metadata: { domain },
143147
});

0 commit comments

Comments
 (0)