-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: perform eth_sendTransaction via EVM module (#51)
- Loading branch information
Showing
67 changed files
with
1,021 additions
and
4,624 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
src/background/connections/middlewares/ActiveNetworkMiddleware.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| import { NetworkService } from '@src/background/services/network/NetworkService'; | ||
| import { ActiveNetworkMiddleware } from './ActiveNetworkMiddleware'; | ||
| import { RpcMethod } from '@avalabs/vm-module-types'; | ||
| import getTargetNetworkForTx from '@src/background/services/wallet/handlers/eth_sendTransaction/utils/getTargetNetworkForTx'; | ||
|
|
||
| jest.mock( | ||
| '@src/background/services/wallet/handlers/eth_sendTransaction/utils/getTargetNetworkForTx' | ||
| ); | ||
|
|
||
| describe('src/background/connections/middlewares/ActiveNetworkMiddleware', () => { | ||
| const networkService = { | ||
| getNetwork: jest.fn(), | ||
| } as unknown as NetworkService; | ||
|
|
||
| beforeEach(() => { | ||
| jest.resetAllMocks(); | ||
| }); | ||
|
|
||
| it('errors out for cross-environment EVM transaction attempts', async () => { | ||
| const call = ActiveNetworkMiddleware(networkService); | ||
|
|
||
| const next = jest.fn(); | ||
| const onError = jest.fn(); | ||
| const error = new Error('Cross-env error'); | ||
|
|
||
| jest.mocked(getTargetNetworkForTx).mockRejectedValueOnce(error); | ||
|
|
||
| await call( | ||
| { | ||
| request: { | ||
| params: { | ||
| scope: 'eip155:43114', // C-Chain Mainnet | ||
| request: { | ||
| method: RpcMethod.ETH_SEND_TRANSACTION, | ||
| params: [ | ||
| { | ||
| chainId: '0xa869', // C-Chain Fuji (43113) | ||
| }, | ||
| ], | ||
| }, | ||
| }, | ||
| }, | ||
| } as any, | ||
| next, | ||
| onError | ||
| ); | ||
|
|
||
| expect(next).not.toHaveBeenCalled(); | ||
| expect(onError).toHaveBeenCalledWith(error); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
src/background/services/actions/handlers/updateTxData.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| import { ExtensionRequest } from '@src/background/connections/extensionConnection/models'; | ||
| import { UpdateActionTxDataHandler } from './updateTxData'; | ||
| import { matchingPayload } from '@src/tests/test-utils'; | ||
| import { SendErrorMessage } from '@src/utils/send/models'; | ||
|
|
||
| describe('src/background/services/actions/handlers/updateTxData', () => { | ||
| const actionsService = { | ||
| getActions: jest.fn(), | ||
| updateTx: jest.fn(), | ||
| }; | ||
|
|
||
| const handleRequest = async (request) => { | ||
| const handler = new UpdateActionTxDataHandler(actionsService as any); | ||
|
|
||
| return handler.handle(request); | ||
| }; | ||
|
|
||
| const getRequest = (params) => ({ | ||
| request: { | ||
| id: '1234', | ||
| method: ExtensionRequest.ACTION_UPDATE_TX_DATA, | ||
| params, | ||
| }, | ||
| }); | ||
|
|
||
| beforeEach(() => { | ||
| jest.resetAllMocks(); | ||
| }); | ||
|
|
||
| it('remaps BTC tx transaction error to insufficient balance for fee', async () => { | ||
| jest.mocked(actionsService.getActions).mockResolvedValue({ | ||
| id: {}, | ||
| }); | ||
| jest | ||
| .mocked(actionsService.updateTx) | ||
| .mockRejectedValueOnce({ message: 'Unable to create transaction' }); | ||
|
|
||
| expect(await handleRequest(getRequest(['id', { feeRate: 5 }]))).toEqual( | ||
| matchingPayload({ error: SendErrorMessage.INSUFFICIENT_BALANCE_FOR_FEE }) | ||
| ); | ||
| }); | ||
|
|
||
| it('validates the request to update exists', async () => { | ||
| expect(await handleRequest(getRequest(['id', { feeRate: 5 }]))).toEqual( | ||
| matchingPayload({ error: 'no pending requests found' }) | ||
| ); | ||
| }); | ||
|
|
||
| it('calls ActionsService.updateTx()', async () => { | ||
| jest.mocked(actionsService.getActions).mockResolvedValue({ | ||
| id: {}, | ||
| }); | ||
|
|
||
| await handleRequest(getRequest(['id', { feeRate: 5 }])); | ||
| expect(actionsService.updateTx).toHaveBeenCalledWith('id', { feeRate: 5 }); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| import { injectable } from 'tsyringe'; | ||
| import { EvmTxUpdateFn, BtcTxUpdateFn } from '@avalabs/vm-module-types'; | ||
|
|
||
| import { SendErrorMessage } from '@src/utils/send/models'; | ||
| import { ExtensionRequest } from '@src/background/connections/extensionConnection/models'; | ||
| import { ExtensionRequestHandler } from '@src/background/connections/models'; | ||
|
|
||
| import { ActionsService } from '../ActionsService'; | ||
|
|
||
| type HandlerType = ExtensionRequestHandler< | ||
| ExtensionRequest.ACTION_UPDATE_TX_DATA, | ||
| null, | ||
| [ | ||
| id: string, | ||
| newData: Parameters<EvmTxUpdateFn>[0] | Parameters<BtcTxUpdateFn>[0] | ||
| ] | ||
| >; | ||
|
|
||
| @injectable() | ||
| export class UpdateActionTxDataHandler implements HandlerType { | ||
| method = ExtensionRequest.ACTION_UPDATE_TX_DATA as const; | ||
|
|
||
| constructor(private actionsService: ActionsService) {} | ||
| handle: HandlerType['handle'] = async ({ request }) => { | ||
| const [id, newData] = request.params; | ||
|
|
||
| if (!id) { | ||
| return { | ||
| ...request, | ||
| error: 'no request id in params', | ||
| }; | ||
| } | ||
|
|
||
| const actions = await this.actionsService.getActions(); | ||
|
|
||
| if (!actions) { | ||
| return { ...request, error: 'no pending requests found' }; | ||
| } | ||
|
|
||
| const action = actions[id]; | ||
|
|
||
| if (!action) { | ||
| return { ...request, error: 'no request found with that id' }; | ||
| } | ||
|
|
||
| try { | ||
| await this.actionsService.updateTx(id, newData); | ||
| return { ...request, result: null }; | ||
| } catch (err: any) { | ||
| if (err?.message === 'Unable to create transaction') { | ||
| return { | ||
| ...request, | ||
| error: SendErrorMessage.INSUFFICIENT_BALANCE_FOR_FEE, | ||
| }; | ||
| } | ||
|
|
||
| return { ...request, error: err }; | ||
| } | ||
| }; | ||
| } |
Oops, something went wrong.