diff --git a/.changeset/tame-eels-repair.md b/.changeset/tame-eels-repair.md new file mode 100644 index 00000000000..cdc15944b57 --- /dev/null +++ b/.changeset/tame-eels-repair.md @@ -0,0 +1,5 @@ +--- +"@fuel-ts/account": patch +--- + +remove unused connectors types diff --git a/packages/account/src/connectors/fuel-connector.ts b/packages/account/src/connectors/fuel-connector.ts index ec43bd6f0e6..16776fe5139 100644 --- a/packages/account/src/connectors/fuel-connector.ts +++ b/packages/account/src/connectors/fuel-connector.ts @@ -2,6 +2,7 @@ import { EventEmitter } from 'events'; import type { TransactionRequestLike } from '../providers'; +import type { Asset } from '../providers/assets/types'; import { FuelConnectorEventTypes } from './types'; import type { @@ -11,7 +12,6 @@ import type { Network, FuelEventArg, Version, - Asset, } from './types'; /** diff --git a/packages/account/src/connectors/types/asset.ts b/packages/account/src/connectors/types/asset.ts deleted file mode 100644 index 406cb0e4416..00000000000 --- a/packages/account/src/connectors/types/asset.ts +++ /dev/null @@ -1 +0,0 @@ -export type { Asset, Fuel as AssetFuel, Ethereum as AssetEthereum } from '@fuels/assets'; diff --git a/packages/account/src/connectors/types/constants.ts b/packages/account/src/connectors/types/constants.ts deleted file mode 100644 index ebd1a8666f1..00000000000 --- a/packages/account/src/connectors/types/constants.ts +++ /dev/null @@ -1,6 +0,0 @@ -export const CONNECTOR_SCRIPT = 'FuelConnectorScript'; -export const CONTENT_SCRIPT_NAME = 'FuelContentScript'; -export const BACKGROUND_SCRIPT_NAME = 'FuelBackgroundScript'; -export const POPUP_SCRIPT_NAME = 'FuelPopUpScript'; -export const VAULT_SCRIPT_NAME = 'FuelVaultScript'; -export const EVENT_MESSAGE = 'message'; diff --git a/packages/account/src/connectors/types/data-type.ts b/packages/account/src/connectors/types/data-type.ts index 128380c1d9e..2c022111ae7 100644 --- a/packages/account/src/connectors/types/data-type.ts +++ b/packages/account/src/connectors/types/data-type.ts @@ -34,12 +34,3 @@ export type Network = { * Read more at: https://docs.fuel.network/docs/specs/abi/json-abi-format/ */ export type FuelABI = JsonAbi; - -export enum MessageTypes { - ping = 'ping', - uiEvent = 'uiEvent', - event = 'event', - request = 'request', - response = 'response', - removeConnection = 'removeConnection', -} diff --git a/packages/account/src/connectors/types/events.ts b/packages/account/src/connectors/types/events.ts index 4a3b72cdb8c..52255357d13 100644 --- a/packages/account/src/connectors/types/events.ts +++ b/packages/account/src/connectors/types/events.ts @@ -1,11 +1,8 @@ -import type { Asset } from '@fuels/assets'; -import type { JSONRPCRequest, JSONRPCResponse } from 'json-rpc-2.0'; - +import type { Asset } from '../../providers/assets/types'; import type { FuelConnector } from '../fuel-connector'; import type { FuelConnectorEventTypes } from './connector-types'; -import type { MessageTypes, Network } from './data-type'; -import type { MessageSender } from './message'; +import type { Network } from './data-type'; /** ** * ======================================================================================== @@ -21,45 +18,6 @@ export type FuelEventArg = Extract< { type: T } >['data']; -/** ** - * ======================================================================================== - * Events - * ======================================================================================== - */ - -export type BaseEvent = { - readonly target: string; - readonly connectorName?: string; - readonly id?: string; - readonly sender?: MessageSender; -} & T; - -export type UIEventMessage = BaseEvent<{ - readonly type: MessageTypes.uiEvent; - readonly ready: boolean; - readonly session: string; -}>; - -export type RequestMessage = BaseEvent<{ - readonly type: MessageTypes.request; - readonly request: JSONRPCRequest; -}>; - -export type ResponseMessage = BaseEvent<{ - readonly type: MessageTypes.response; - readonly response: JSONRPCResponse; -}>; - -export type EventMessageEvents = Array<{ - event: string; - params: Array; -}>; - -export type EventMessage = BaseEvent<{ - readonly type: MessageTypes.event; - readonly events: T; -}>; - /** * Event trigger when the accounts available to the * connection changes. diff --git a/packages/account/src/connectors/types/index.ts b/packages/account/src/connectors/types/index.ts index b9cce13ba36..e010f9d183b 100644 --- a/packages/account/src/connectors/types/index.ts +++ b/packages/account/src/connectors/types/index.ts @@ -4,5 +4,3 @@ export * from './data-type'; export * from './events'; export * from './local-storage'; export * from './target-object'; -export * from './message'; -export * from './asset'; diff --git a/packages/account/src/connectors/types/message.ts b/packages/account/src/connectors/types/message.ts deleted file mode 100644 index b2816eed521..00000000000 --- a/packages/account/src/connectors/types/message.ts +++ /dev/null @@ -1,16 +0,0 @@ -import type { UIEventMessage, RequestMessage, ResponseMessage, EventMessage } from './events'; - -export interface MessageSender { - id?: string | undefined; - origin?: string | undefined; - tab?: { - id?: number | undefined; - index?: number | undefined; - windowId?: number | undefined; - url?: string | undefined; - title?: string | undefined; - favIconUrl?: string | undefined; - }; -} - -export type CommunicationMessage = UIEventMessage | RequestMessage | ResponseMessage | EventMessage; diff --git a/packages/account/test/fixtures/mocked-connector.ts b/packages/account/test/fixtures/mocked-connector.ts index d7698699e1e..db52e51f9f3 100644 --- a/packages/account/test/fixtures/mocked-connector.ts +++ b/packages/account/test/fixtures/mocked-connector.ts @@ -5,7 +5,6 @@ import { setTimeout } from 'timers/promises'; import type { TransactionRequestLike, WalletUnlocked, - Asset, FuelABI, ConnectorMetadata, Network, @@ -13,6 +12,7 @@ import type { import { FUEL_NETWORK_URL } from '../../src/configs'; import { FuelConnector } from '../../src/connectors/fuel-connector'; import { FuelConnectorEventTypes } from '../../src/connectors/types'; +import type { Asset } from '../../src/providers/assets/types'; import { generateAccounts } from './generate-accounts';