Skip to content

Commit

Permalink
Merge branch 'refs/heads/develop' into beta
Browse files Browse the repository at this point in the history
# Conflicts:
#	package.json
#	pnpm-lock.yaml
#	src/connectors/argent/argentMobile/index.ts
#	src/connectors/braavosMobile/index.ts
#	src/connectors/injected/index.ts
#	src/main.ts
#	src/modal/ConnectorButton.svelte
#	src/modal/Modal.svelte
#	src/types/modal.ts
  • Loading branch information
Cussone committed Jan 14, 2025
2 parents 4e35feb + c594273 commit 591796f
Show file tree
Hide file tree
Showing 18 changed files with 60 additions and 50 deletions.
1 change: 1 addition & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
},
"plugins": ["@typescript-eslint", "prettier"],
"rules": {
"@typescript-eslint/consistent-type-imports": "error",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-extra-semi": "off",
"@typescript-eslint/no-unused-vars": [
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,16 +106,16 @@
"trpc-browser": "^1.3.2"
},
"devDependencies": {
"@commitlint/cli": "^17.7.1",
"@commitlint/config-conventional": "^17.7.0",
"@commitlint/cli": "^19.0.0",
"@commitlint/config-conventional": "^19.0.0",
"@semantic-release/git": "^10.0.1",
"@sveltejs/vite-plugin-svelte": "^2.2.0",
"@tsconfig/svelte": "^5.0.0",
"@types/async-retry": "^1.4.5",
"@types/lodash-es": "^4.17.8",
"@types/node": "^20.5.7",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^8.8.1",
"@typescript-eslint/eslint-plugin": "^8.0.0",
"@walletconnect/ethereum-provider": "^2.11.0",
"@walletconnect/jsonrpc-provider": "^1.0.13",
"@walletconnect/signer-connection": "^2.11.0",
Expand All @@ -126,21 +126,21 @@
"eslint-config-next": "^13.4.19",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-svelte": "^2.44.1",
"husky": "^8.0.3",
"lint-staged": "^14.0.1",
"husky": "^9.0.0",
"lint-staged": "^15.0.0",
"postcss": "^8.4.21",
"postcss-load-config": "^4.0.1",
"postcss-load-config": "^6.0.0",
"prettier": "^3.0.3",
"prettier-plugin-import-sort": "^0.0.7",
"semantic-release": "^21.1.1",
"semantic-release": "^24.0.0",
"svelte": "^4.0.0",
"svelte-check": "^3.5.1",
"svelte-eslint-parser": "^0.41.1",
"svelte-preprocess": "^5.0.4",
"svelte-preprocess": "^6.0.0",
"tailwindcss": "^3.1.6",
"tslib": "^2.4.0",
"typescript": "^5.1.6",
"vite": "^4.3.8",
"vite": "^5.0.0",
"vite-plugin-dts": "^3.0.0",
"vitest": "^1.6.0",
"ws": "^8.8.1",
Expand Down
16 changes: 8 additions & 8 deletions src/connectors/argent/argentMobile/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ import sn from "@starknet-io/get-starknet-core"
import { type AccountChangeEventHandler } from "@starknet-io/get-starknet-core"
import {
Permission,
RequestFnCall,
RpcMessage,
RpcTypeToMessageMap,
type RequestFnCall,
type RpcMessage,
type RpcTypeToMessageMap,
type StarknetWindowObject,
} from "@starknet-io/types-js"
import {
Account,
AccountInterface,
ProviderInterface,
ProviderOptions,
constants,
ProviderInterface,
type ProviderOptions,
} from "starknet"
import {
ConnectorNotConnectedError,
Expand All @@ -24,12 +24,12 @@ import { removeStarknetLastConnectedWallet } from "../../../helpers/lastConnecte
import { getRandomPublicRPCNode } from "../../../helpers/publicRcpNodes"
import { resetWalletConnect } from "../../../helpers/resetWalletConnect"
import {
ConnectArgs,
Connector,
type ConnectArgs,
type ConnectorData,
type ConnectorIcons,
} from "../../connector"
import { InjectedConnectorOptions } from "../../injected"
} from "../connector"
import { type InjectedConnectorOptions } from "../../injected"
import { DEFAULT_ARGENT_MOBILE_ICON, DEFAULT_PROJECT_ID } from "./constants"
import { isInArgentMobileAppBrowser } from "../helpers"
import type { StarknetAdapter } from "./modal/starknet/adapter"
Expand Down
7 changes: 3 additions & 4 deletions src/connectors/argent/argentMobile/modal/adapter.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
import { EventEmitter } from "events"

import type { JsonRpcProvider } from "@walletconnect/jsonrpc-provider"
import type SignClient from "@walletconnect/sign-client"
import type { SignerConnectionClientOpts } from "@walletconnect/signer-connection"
import {
SIGNER_EVENTS,
SignerConnection,
} from "@walletconnect/signer-connection"
import type { SignerConnectionClientOpts } from "@walletconnect/signer-connection"
import type { ProposalTypes, SessionTypes } from "@walletconnect/types"
import {
getAccountsFromNamespaces,
getChainsFromNamespaces,
} from "@walletconnect/utils"
import { EventEmitter } from "events"

import type { EthereumRpcConfig } from "./starknet/adapter"
import { ProviderInterface } from "starknet"
import type { EthereumRpcConfig } from "./starknet/adapter"

export interface NamespaceAdapterOptions {
client: SignClient
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {
import type {
AddInvokeTransactionParameters,
RequestFn,
TypedData,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import type {
Signature,
SignerInterface,
} from "starknet"
import { TypedData } from "@starknet-io/types-js"
import type { TypedData } from "@starknet-io/types-js"
import type { IStarknetRpc } from "./starknet.model"

export class StarknetRemoteSigner implements SignerInterface {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type {
InvokeFunctionResponse,
Signature,
} from "starknet"
import { TypedData } from "@starknet-io/types-js"
import type { TypedData } from "@starknet-io/types-js"

// see https://github.com/WalletConnect/walletconnect-docs/pull/288/files
export interface IStarknetRpc {
Expand Down
15 changes: 10 additions & 5 deletions src/connectors/braavosMobile/index.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
import { type AccountChangeEventHandler } from "@starknet-io/get-starknet-core"
import {
import type {
RequestFnCall,
RpcMessage,
RpcTypeToMessageMap,
type StarknetWindowObject,
StarknetWindowObject,
} from "@starknet-io/types-js"
import { AccountInterface, ProviderInterface, ProviderOptions } from "starknet"
import {
ConnectArgs,
AccountInterface,
ProviderInterface,
type ProviderOptions,
} from "starknet"
import {
Connector,
type ConnectArgs,
type ConnectorData,
type ConnectorIcons,
} from "../connector"
import { InjectedConnectorOptions } from "../injected"
import { Braavos } from "../injected/braavos"
import { isInBraavosMobileAppBrowser } from "./helpers/inAppBrowser"
import { type InjectedConnectorOptions } from "../injected"
import { BRAAVOS_MOBILE_APP_ICON } from "./constants"
import { isInBraavosMobileAppBrowser } from "./helpers/inAppBrowser"

export class BraavosMobileBaseConnector extends Connector {
private _wallet: StarknetWindowObject | null = null
Expand Down
6 changes: 5 additions & 1 deletion src/connectors/connector.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import EventEmitter from "eventemitter3"
import { AccountInterface, ProviderInterface, ProviderOptions } from "starknet"
import {
AccountInterface,
ProviderInterface,
type ProviderOptions,
} from "starknet"
import type {
RequestFnCall,
RpcMessage,
Expand Down
10 changes: 5 additions & 5 deletions src/connectors/injected/index.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import {
Permission,
RequestFnCall,
RpcMessage,
RpcTypeToMessageMap,
type RequestFnCall,
type RpcMessage,
type RpcTypeToMessageMap,
type StarknetWindowObject,
} from "@starknet-io/types-js"
import {
Account,
AccountInterface,
ProviderInterface,
ProviderOptions,
type ProviderOptions,
} from "starknet"
import {
ConnectorNotConnectedError,
Expand All @@ -18,8 +18,8 @@ import {
} from "../../errors"
import { removeStarknetLastConnectedWallet } from "../../helpers/lastConnected"
import {
ConnectArgs,
Connector,
type ConnectArgs,
type ConnectorData,
type ConnectorIcons,
} from "../connector"
Expand Down
10 changes: 5 additions & 5 deletions src/connectors/webwallet/index.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import {
Permission,
RequestFnCall,
RpcMessage,
RpcTypeToMessageMap,
type RequestFnCall,
type RpcMessage,
type RpcTypeToMessageMap,
type AccountChangeEventHandler,
type StarknetWindowObject,
} from "@starknet-io/types-js"
import {
Account,
AccountInterface,
ProviderInterface,
ProviderOptions,
type ProviderOptions,
} from "starknet"
import {
ConnectorNotConnectedError,
Expand All @@ -20,8 +20,8 @@ import {
import { getStarknetChainId } from "../../helpers/getStarknetChainId"
import { removeStarknetLastConnectedWallet } from "../../helpers/lastConnected"
import {
ConnectArgs,
Connector,
type ConnectArgs,
type ConnectorData,
type ConnectorIcons,
} from "../connector"
Expand Down
2 changes: 1 addition & 1 deletion src/helpers/getStarknetChainId.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { constants } from "starknet"
import { ChainId } from "@starknet-io/types-js"
import type { ChainId } from "@starknet-io/types-js"

export const getStarknetChainId = (
chainId: ChainId,
Expand Down
2 changes: 1 addition & 1 deletion src/helpers/mapModalWallets.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { WalletProvider } from "@starknet-io/get-starknet-core"
import type { WalletProvider } from "@starknet-io/get-starknet-core"
import { isString } from "lodash-es"
import type { StarknetWindowObject } from "@starknet-io/types-js"
import {
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/useStarknetkitConnectModal.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { connect } from "../main"
import { ConnectOptionsWithConnectors, ModalResult } from "../types/modal"
import type { ConnectOptionsWithConnectors, ModalResult } from "../types/modal"

type UseStarknetkitConnectors = {
starknetkitConnectModal: () => Promise<ModalResult>
Expand Down
6 changes: 3 additions & 3 deletions src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import {
ModalResult,
ModalWallet,
} from "./types/modal"
import { DEFAULT_WEBWALLET_URL } from "./connectors/webwallet/constants"

import {
Connector,
ConnectorData,
StarknetkitConnector,
StarknetkitCompoundConnector,
type ConnectorData,
} from "./connectors"
import { DEFAULT_WEBWALLET_URL } from "./connectors/webwallet/constants"

import { ArgentMobileBaseConnector } from "./connectors/argent/argentMobile"
import { defaultConnectors } from "./helpers/defaultConnectors"
import { getStoreVersionFromBrowser } from "./helpers/getStoreVersionFromBrowser"
Expand Down
2 changes: 1 addition & 1 deletion src/modal/Modal.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import { onMount } from "svelte"
import { Callback, Layout, ModalWallet, Theme } from "../types/modal"
import { type Callback, Layout, type ModalWallet, type Theme } from "../types/modal"
import Header from "./components/Header.svelte"
import WalletList from "./layouts/WalletList.svelte"
Expand Down
5 changes: 3 additions & 2 deletions src/types/modal.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import type { GetWalletOptions } from "@starknet-io/get-starknet-core"
import { StarknetWindowObject } from "@starknet-io/types-js"
import type { ArgentMobileConnectorOptions } from "../connectors/argent/argentMobile"
import {
import type { StarknetWindowObject } from "@starknet-io/types-js"
import type { ArgentMobileConnectorOptions } from "../connectors/argentMobile"
import type {
Connector,
ConnectorData,
ConnectorIcons,
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"allowJs": true,
"checkJs": true,
"declaration": true,
"verbatimModuleSyntax": false
"verbatimModuleSyntax": true
},
"include": ["src"],
"exclude": ["node_modules"]
Expand Down

0 comments on commit 591796f

Please sign in to comment.