Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor/esm build and deprecating packages #526

Open
wants to merge 6 commits into
base: dev
Choose a base branch
from
Open

refactor/esm build and deprecating packages #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ad2fe29
refactor: clean up, deprecate, reduce bundle
bangjelkoski Dec 6, 2024
de460fb
Merge branch 'dev' into refactor/esm-build-and-deprecating-packages
bangjelkoski Dec 6, 2024
199c9e4
refactor: completed esm
bangjelkoski Dec 7, 2024
49c97a5
chore: merge conflicts
bangjelkoski Dec 7, 2024
195f210
refactor: minor
bangjelkoski Dec 7, 2024
0cff99e
fix: import
bangjelkoski Dec 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
0 packages/test-utils/.npmignore → deprecated/packages/wallet-ts/.npmignore
View file
Open in desktop
File renamed without changes.
0 packages/wallet-ts/CHANGELOG.md → deprecated/packages/wallet-ts/CHANGELOG.md
View file
Open in desktop
File renamed without changes.
0 packages/test-utils/LICENSE → deprecated/packages/wallet-ts/LICENSE
View file
Open in desktop
File renamed without changes.
0 packages/wallet-ts/README.md → deprecated/packages/wallet-ts/README.md
View file
Open in desktop
File renamed without changes.
0 packages/test-utils/jest.config.js → deprecated/packages/wallet-ts/jest.config.js
View file
Open in desktop
File renamed without changes.
0 packages/wallet-ts/package.json → deprecated/packages/wallet-ts/package.json
View file
Open in desktop
File renamed without changes.
0 ...llet-ts/src/broadcaster/MsgBroadcaster.ts → ...llet-ts/src/broadcaster/MsgBroadcaster.ts
View file
Open in desktop
File renamed without changes.
0 ...let-ts/src/broadcaster/Web3Broadcaster.ts → ...let-ts/src/broadcaster/Web3Broadcaster.ts
View file
Open in desktop
File renamed without changes.
0 packages/wallet-ts/src/broadcaster/helper.ts → ...kages/wallet-ts/src/broadcaster/helper.ts
View file
Open in desktop
File renamed without changes.
0 packages/wallet-ts/src/broadcaster/index.ts → ...ckages/wallet-ts/src/broadcaster/index.ts
View file
Open in desktop
File renamed without changes.
0 packages/wallet-ts/src/broadcaster/types.ts → ...ckages/wallet-ts/src/broadcaster/types.ts
View file
Open in desktop
File renamed without changes.
0 packages/wallet-ts/src/exports.ts → deprecated/packages/wallet-ts/src/exports.ts
View file
Open in desktop
File renamed without changes.
0 packages/wallet-ts/src/index.ts → deprecated/packages/wallet-ts/src/index.ts
View file
Open in desktop
File renamed without changes.
0 ...s-wallet-strategy/CosmosWalletStrategy.ts → ...s-wallet-strategy/CosmosWalletStrategy.ts
View file
Open in desktop
File renamed without changes.
0 ...trategies/cosmos-wallet-strategy/index.ts → ...trategies/cosmos-wallet-strategy/index.ts
View file
Open in desktop
File renamed without changes.
0 ...allet-strategy/strategies/Cosmostation.ts → ...allet-strategy/strategies/Cosmostation.ts
View file
Open in desktop
File renamed without changes.
0 ...osmos-wallet-strategy/strategies/Keplr.ts → ...osmos-wallet-strategy/strategies/Keplr.ts
View file
Open in desktop
File renamed without changes.
0 ...cosmos-wallet-strategy/strategies/Leap.ts → ...cosmos-wallet-strategy/strategies/Leap.ts
View file
Open in desktop
File renamed without changes.
0 ...osmos-wallet-strategy/strategies/Ninji.ts → ...osmos-wallet-strategy/strategies/Ninji.ts
View file
Open in desktop
File renamed without changes.
0 packages/wallet-ts/src/strategies/index.ts → ...ackages/wallet-ts/src/strategies/index.ts
View file
Open in desktop
File renamed without changes.
0 ...s/wallet-ts/src/strategies/types/index.ts → ...s/wallet-ts/src/strategies/types/index.ts
View file
Open in desktop
File renamed without changes.
0 ...allet-ts/src/strategies/types/strategy.ts → ...allet-ts/src/strategies/types/strategy.ts
View file
Open in desktop
File renamed without changes.
0 ...ategies/wallet-strategy/WalletStrategy.ts → ...ategies/wallet-strategy/WalletStrategy.ts
View file
Open in desktop
File renamed without changes.
0 ...c/strategies/wallet-strategy/constants.ts → ...c/strategies/wallet-strategy/constants.ts
View file
Open in desktop
File renamed without changes.
0 ...s/src/strategies/wallet-strategy/index.ts → ...s/src/strategies/wallet-strategy/index.ts
View file
Open in desktop
File renamed without changes.
0 ...tegies/wallet-strategy/strategies/Base.ts → ...tegies/wallet-strategy/strategies/Base.ts
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions ...allet-strategy/strategies/BitGet/index.ts → ...allet-strategy/strategies/BitGet/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export default class BitGet extends BaseConcreteStrategy implements ConcreteWall
try {
return await ethereum.request({
method: 'eth_requestAccounts',
})
}) as string[]
} catch (e: unknown) {
throw new BitGetException(new Error((e as any).message), {
code: UnspecifiedErrorCode,
Expand Down Expand Up @@ -93,7 +93,7 @@ export default class BitGet extends BaseConcreteStrategy implements ConcreteWall
return await ethereum.request({
method: 'eth_sendTransaction',
params: [transaction],
})
}) as string
} catch (e: unknown) {
throw new BitGetException(new Error((e as any).message), {
code: UnspecifiedErrorCode,
Expand Down Expand Up @@ -149,7 +149,7 @@ export default class BitGet extends BaseConcreteStrategy implements ConcreteWall
return await ethereum.request({
method: 'eth_signTypedData_v4',
params: [address, eip712json],
})
}) as string
} catch (e: unknown) {
throw new BitGetException(new Error((e as any).message), {
code: UnspecifiedErrorCode,
Expand Down Expand Up @@ -204,7 +204,7 @@ export default class BitGet extends BaseConcreteStrategy implements ConcreteWall
params: [toUtf8(data), signer],
})

return signature
return signature as string
} catch (e: unknown) {
throw new BitGetException(new Error((e as any).message), {
code: UnspecifiedErrorCode,
Expand All @@ -218,7 +218,7 @@ export default class BitGet extends BaseConcreteStrategy implements ConcreteWall
const ethereum = await this.getEthereum()

try {
return ethereum.request({ method: 'eth_chainId' })
return ethereum.request({ method: 'eth_chainId' }) as Promise<string>
} catch (e: unknown) {
throw new BitGetException(new Error((e as any).message), {
code: UnspecifiedErrorCode,
Expand All @@ -236,7 +236,7 @@ export default class BitGet extends BaseConcreteStrategy implements ConcreteWall
const receipt = await ethereum.request({
method: 'eth_getTransactionReceipt',
params: [txHash],
})
}) as string

if (!receipt) {
await sleep(interval)
Expand Down Expand Up @@ -275,7 +275,7 @@ export default class BitGet extends BaseConcreteStrategy implements ConcreteWall
}

async onAccountChange(
callback: (account: AccountAddress) => void,
callback: (account: AccountAddress | string[]) => void,
): Promise<void> {
const ethereum = await this.getEthereum()

Expand Down
0 ...allet-strategy/strategies/BitGet/utils.ts → ...allet-strategy/strategies/BitGet/utils.ts
View file
Open in desktop
File renamed without changes.
0 ...allet-strategy/strategies/Cosmostation.ts → ...allet-strategy/strategies/Cosmostation.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...egies/wallet-strategy/strategies/Keplr.ts → ...egies/wallet-strategy/strategies/Keplr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ export default class Keplr extends BaseConcreteStrategy implements ConcreteWalle
}

async onAccountChange(
callback: (account: AccountAddress) => void,
callback: (account: AccountAddress | string[]) => void,
): Promise<void> {
const listener = async () => {
const [account] = await this.getAddresses()
Expand Down
2 changes: 1 addition & 1 deletion ...tegies/wallet-strategy/strategies/Leap.ts → ...tegies/wallet-strategy/strategies/Leap.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ export default class Leap extends BaseConcreteStrategy implements ConcreteWallet
}

async onAccountChange(
callback: (account: AccountAddress) => void,
callback: (account: AccountAddress | string[]) => void,
bangjelkoski marked this conversation as resolved.
Show resolved Hide resolved
): Promise<void> {
const listener = async () => {
const [account] = await this.getAddresses()
Expand Down
2 changes: 1 addition & 1 deletion ...wallet-strategy/strategies/Ledger/Base.ts → ...wallet-strategy/strategies/Ledger/Base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ export default class LedgerBase
const ledger = await this.ledger.getInstance()
const { derivationPath } = await this.getWalletForAddress(options.address)
const ledgerService = await import(
'@ledgerhq/hw-app-eth/lib/services/ledger/index.js'
'@ledgerhq/hw-app-eth/lib-es/services/ledger/index.js'
)
const resolution = await ledgerService.default.resolveTransaction(
encodedMessageHex,
Expand Down
0 ...trategy/strategies/Ledger/LedgerLegacy.ts → ...trategy/strategies/Ledger/LedgerLegacy.ts
View file
Open in desktop
File renamed without changes.
0 ...-strategy/strategies/Ledger/LedgerLive.ts → ...-strategy/strategies/Ledger/LedgerLive.ts
View file
Open in desktop
File renamed without changes.
0 ...gy/strategies/Ledger/hw/AccountManager.ts → ...gy/strategies/Ledger/hw/AccountManager.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...et-strategy/strategies/Ledger/hw/index.ts → ...et-strategy/strategies/Ledger/hw/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import TransportWebHID from '@ledgerhq/hw-transport-webhid'
import TransportWebUSB from '@ledgerhq/hw-transport-webusb'
import type EthereumApp from '@ledgerhq/hw-app-eth'
import type Transport from '@ledgerhq/hw-transport'
import EthereumApp from '@ledgerhq/hw-app-eth'
import Transport from '@ledgerhq/hw-transport'
bangjelkoski marked this conversation as resolved.
Show resolved Hide resolved
import { LedgerException } from '@injectivelabs/exceptions'
import AccountManager from './AccountManager.js'

Expand Down
0 ...allet-strategy/strategies/Ledger/utils.ts → ...allet-strategy/strategies/Ledger/utils.ts
View file
Open in desktop
File renamed without changes.
0 ...ategies/LedgerCosmos/hw/AccountManager.ts → ...ategies/LedgerCosmos/hw/AccountManager.ts
View file
Open in desktop
File renamed without changes.
0 ...ategy/strategies/LedgerCosmos/hw/index.ts → ...ategy/strategies/LedgerCosmos/hw/index.ts
View file
Open in desktop
File renamed without changes.
0 ...strategy/strategies/LedgerCosmos/index.ts → ...strategy/strategies/LedgerCosmos/index.ts
View file
Open in desktop
File renamed without changes.
0 ...egies/wallet-strategy/strategies/Magic.ts → ...egies/wallet-strategy/strategies/Magic.ts
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions ...let-strategy/strategies/Metamask/index.ts → ...let-strategy/strategies/Metamask/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export default class Metamask
try {
return await ethereum.request({
method: 'eth_requestAccounts',
})
}) as string[]
} catch (e: unknown) {
throw new MetamaskException(new Error((e as any).message), {
code: UnspecifiedErrorCode,
Expand Down Expand Up @@ -96,7 +96,7 @@ export default class Metamask
return await ethereum.request({
method: 'eth_sendTransaction',
params: [transaction],
})
}) as string
} catch (e: unknown) {
throw new MetamaskException(new Error((e as any).message), {
code: UnspecifiedErrorCode,
Expand Down Expand Up @@ -152,7 +152,7 @@ export default class Metamask
return await ethereum.request({
method: 'eth_signTypedData_v4',
params: [address, eip712json],
})
}) as string
} catch (e: unknown) {
throw new MetamaskException(new Error((e as any).message), {
code: UnspecifiedErrorCode,
Expand Down Expand Up @@ -207,7 +207,7 @@ export default class Metamask
params: [toUtf8(data), signer],
})

return signature
return signature as string
} catch (e: unknown) {
throw new MetamaskException(new Error((e as any).message), {
code: UnspecifiedErrorCode,
Expand All @@ -221,7 +221,7 @@ export default class Metamask
const ethereum = await this.getEthereum()

try {
return ethereum.request({ method: 'eth_chainId' })
return ethereum.request({ method: 'eth_chainId' }) as Promise<string>
} catch (e: unknown) {
throw new MetamaskException(new Error((e as any).message), {
code: UnspecifiedErrorCode,
Expand All @@ -239,7 +239,7 @@ export default class Metamask
const receipt = await ethereum.request({
method: 'eth_getTransactionReceipt',
params: [txHash],
})
}) as string

if (!receipt) {
await sleep(interval)
Expand Down Expand Up @@ -278,7 +278,7 @@ export default class Metamask
}

async onAccountChange(
callback: (account: AccountAddress) => void,
callback: (account: AccountAddress | string[]) => void,
): Promise<void> {
const ethereum = await this.getEthereum()

Expand Down
0 ...let-strategy/strategies/Metamask/utils.ts → ...let-strategy/strategies/Metamask/utils.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...egies/wallet-strategy/strategies/Ninji.ts → ...egies/wallet-strategy/strategies/Ninji.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ export default class Ninji extends BaseConcreteStrategy implements ConcreteWalle
}

async onAccountChange(
callback: (account: AccountAddress) => void,
callback: (account: AccountAddress | string[]) => void,
): Promise<void> {
const listener = async () => {
const [account] = await this.getAddresses()
Expand Down
27 changes: 15 additions & 12 deletions ...s/wallet-strategy/strategies/Okx/index.ts → ...s/wallet-strategy/strategies/Okx/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ import {
} from '../../../../types/enums.js'
import { getOkxWalletProvider } from './utils.js'

export default class OkxWallet extends BaseConcreteStrategy implements ConcreteWalletStrategy {
export default class OkxWallet
extends BaseConcreteStrategy
implements ConcreteWalletStrategy
{
constructor(args: EthereumWalletStrategyArgs) {
super(args)
}
Expand Down Expand Up @@ -62,9 +65,9 @@ export default class OkxWallet extends BaseConcreteStrategy implements ConcreteW
const ethereum = await this.getEthereum()

try {
return await ethereum.request({
return (await ethereum.request({
method: 'eth_requestAccounts',
})
})) as string[]
} catch (e: unknown) {
throw new OkxWalletException(new Error((e as any).message), {
code: UnspecifiedErrorCode,
Expand All @@ -90,10 +93,10 @@ export default class OkxWallet extends BaseConcreteStrategy implements ConcreteW
const ethereum = await this.getEthereum()

try {
return await ethereum.request({
return (await ethereum.request({
method: 'eth_sendTransaction',
params: [transaction],
})
})) as string
} catch (e: unknown) {
throw new OkxWalletException(new Error((e as any).message), {
code: UnspecifiedErrorCode,
Expand Down Expand Up @@ -146,10 +149,10 @@ export default class OkxWallet extends BaseConcreteStrategy implements ConcreteW
const ethereum = await this.getEthereum()

try {
return await ethereum.request({
return (await ethereum.request({
method: 'eth_signTypedData_v4',
params: [address, eip712json],
})
})) as string
} catch (e: unknown) {
throw new OkxWalletException(new Error((e as any).message), {
code: UnspecifiedErrorCode,
Expand Down Expand Up @@ -204,7 +207,7 @@ export default class OkxWallet extends BaseConcreteStrategy implements ConcreteW
params: [toUtf8(data), signer],
})

return signature
return signature as string
} catch (e: unknown) {
throw new OkxWalletException(new Error((e as any).message), {
code: UnspecifiedErrorCode,
Expand All @@ -218,7 +221,7 @@ export default class OkxWallet extends BaseConcreteStrategy implements ConcreteW
const ethereum = await this.getEthereum()

try {
return ethereum.request({ method: 'eth_chainId' })
return ethereum.request({ method: 'eth_chainId' }) as Promise<string>
} catch (e: unknown) {
throw new OkxWalletException(new Error((e as any).message), {
code: UnspecifiedErrorCode,
Expand All @@ -233,10 +236,10 @@ export default class OkxWallet extends BaseConcreteStrategy implements ConcreteW

const interval = 1000
const transactionReceiptRetry = async () => {
const receipt = await ethereum.request({
const receipt = (await ethereum.request({
method: 'eth_getTransactionReceipt',
params: [txHash],
})
})) as string

if (!receipt) {
await sleep(interval)
Expand Down Expand Up @@ -275,7 +278,7 @@ export default class OkxWallet extends BaseConcreteStrategy implements ConcreteW
}

async onAccountChange(
callback: (account: AccountAddress) => void,
callback: (account: AccountAddress | string[]) => void,
): Promise<void> {
const ethereum = await this.getEthereum()

Expand Down
0 ...s/wallet-strategy/strategies/Okx/utils.ts → ...s/wallet-strategy/strategies/Okx/utils.ts
View file
Open in desktop
File renamed without changes.
27 changes: 15 additions & 12 deletions ...llet-strategy/strategies/Phantom/index.ts → ...llet-strategy/strategies/Phantom/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ import {
} from '../../../../types/enums.js'
import { getPhantomProvider } from './utils.js'

export default class Phantom extends BaseConcreteStrategy implements ConcreteWalletStrategy {
export default class Phantom
extends BaseConcreteStrategy
implements ConcreteWalletStrategy
{
constructor(args: EthereumWalletStrategyArgs) {
super(args)
}
Expand Down Expand Up @@ -64,9 +67,9 @@ export default class Phantom extends BaseConcreteStrategy implements ConcreteWal
const ethereum = await this.getEthereum()

try {
return await ethereum.request({
return (await ethereum.request({
method: 'eth_requestAccounts',
})
})) as string[]
} catch (e: unknown) {
throw new MetamaskException(new Error((e as any).message), {
code: UnspecifiedErrorCode,
Expand All @@ -92,10 +95,10 @@ export default class Phantom extends BaseConcreteStrategy implements ConcreteWal
const ethereum = await this.getEthereum()

try {
return await ethereum.request({
return (await ethereum.request({
method: 'eth_sendTransaction',
params: [transaction],
})
})) as string
} catch (e: unknown) {
throw new MetamaskException(new Error((e as any).message), {
code: UnspecifiedErrorCode,
Expand Down Expand Up @@ -148,10 +151,10 @@ export default class Phantom extends BaseConcreteStrategy implements ConcreteWal
const ethereum = await this.getEthereum()

try {
return await ethereum.request({
return (await ethereum.request({
method: 'eth_signTypedData_v4',
params: [address, eip712json],
})
})) as string
} catch (e: unknown) {
throw new MetamaskException(new Error((e as any).message), {
code: UnspecifiedErrorCode,
Expand Down Expand Up @@ -206,7 +209,7 @@ export default class Phantom extends BaseConcreteStrategy implements ConcreteWal
params: [toUtf8(data), signer],
})

return signature
return signature as string
} catch (e: unknown) {
throw new MetamaskException(new Error((e as any).message), {
code: UnspecifiedErrorCode,
Expand All @@ -220,7 +223,7 @@ export default class Phantom extends BaseConcreteStrategy implements ConcreteWal
const ethereum = await this.getEthereum()

try {
return ethereum.request({ method: 'eth_chainId' })
return ethereum.request({ method: 'eth_chainId' }) as Promise<string>
} catch (e: unknown) {
throw new MetamaskException(new Error((e as any).message), {
code: UnspecifiedErrorCode,
Expand All @@ -235,10 +238,10 @@ export default class Phantom extends BaseConcreteStrategy implements ConcreteWal

const interval = 1000
const transactionReceiptRetry = async () => {
const receipt = await ethereum.request({
const receipt = (await ethereum.request({
method: 'eth_getTransactionReceipt',
params: [txHash],
})
})) as string

if (!receipt) {
await sleep(interval)
Expand Down Expand Up @@ -277,7 +280,7 @@ export default class Phantom extends BaseConcreteStrategy implements ConcreteWal
}

async onAccountChange(
callback: (account: AccountAddress) => void,
callback: (account: AccountAddress | string[]) => void,
): Promise<void> {
const ethereum = await this.getEthereum()

Expand Down
0 ...llet-strategy/strategies/Phantom/utils.ts → ...llet-strategy/strategies/Phantom/utils.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../wallet-strategy/strategies/PrivateKey.ts → .../wallet-strategy/strategies/PrivateKey.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ export default class PrivateKey
}

async onAccountChange(
_callback: (account: AccountAddress) => void,
_callback: (account: AccountAddress | string[]) => void,
): Promise<void> {
//
}
Expand Down
0 ...egies/wallet-strategy/strategies/Torus.ts → ...egies/wallet-strategy/strategies/Torus.ts
View file
Open in desktop
File renamed without changes.
0 ...gy/strategies/Trezor/hw/AccountManager.ts → ...gy/strategies/Trezor/hw/AccountManager.ts
View file
Open in desktop
File renamed without changes.
0 ...et-strategy/strategies/Trezor/hw/index.ts → ...et-strategy/strategies/Trezor/hw/index.ts
View file
Open in desktop
File renamed without changes.
0 ...allet-strategy/strategies/Trezor/index.ts → ...allet-strategy/strategies/Trezor/index.ts
View file
Open in desktop
File renamed without changes.
0 ...allet-strategy/strategies/Trezor/utils.ts → ...allet-strategy/strategies/Trezor/utils.ts
View file
Open in desktop
File renamed without changes.
Loading