Merge pull request #196 from argentlabs/fix/starknetjs-version

fix: starknetjs version for WalletAccount

Author: bluecco

.github/workflows/release.yml

@@ -4,8 +4,7 @@ on:
     branches:
       - develop
       - main
-      - beta-braavos-mobile
-      - beta-ww-sdk
+      - beta-wallet-account
       - hotfix\/v[0-9]+.[0-9]+.[0-9]+
 
 jobs:

.releaserc

@@ -10,11 +10,7 @@
       "prerelease": true
     },
     {
-      "name": "beta-braavos-mobile",
-      "prerelease": true
-    },
-    {
-      "name": "beta-ww-sdk",
+      "name": "beta-wallet-account",
       "prerelease": true
     }
   ],

package.json

@@ -67,7 +67,7 @@
   "dependencies": {
     "@starknet-io/get-starknet": "^4.0.6",
     "@starknet-io/get-starknet-core": "^4.0.6",
-    "@starknet-io/types-js": "^0.7.7",
+    "@starknet-io/types-js": "^0.7.10",
     "@trpc/client": "^10.38.1",
     "@trpc/server": "^10.38.1",
     "@walletconnect/sign-client": "^2.11.0",
@@ -117,7 +117,7 @@
     "zod": "^3.20.6"
   },
   "peerDependencies": {
-    "starknet": "^6.11.0"
+    "starknet": "^6.21.1"
   },
   "gitHead": "b16688a8638cc138938e74e1a39d004760165d75"
 }

pnpm-lock.yaml

@@ -7,10 +7,10 @@ import {
   type StarknetWindowObject,
 } from "@starknet-io/types-js"
 import {
-  Account,
-  AccountInterface,
   constants,
-  ProviderInterface,
+  WalletAccount,
+  type AccountInterface,
+  type ProviderInterface,
   type ProviderOptions,
 } from "starknet"
 import {
@@ -136,7 +136,7 @@ export class ArgentMobileBaseConnector extends Connector {
       params: { silent_mode: true },
     })
 
-    return new Account(provider, accounts[0], "")
+    return new WalletAccount(provider, this._wallet, undefined, accounts[0])
   }
 
   async chainId(): Promise<bigint> {

src/connectors/argentMobile/index.ts

@@ -6,9 +6,9 @@ import {
   type StarknetWindowObject,
 } from "@starknet-io/types-js"
 import {
-  Account,
-  AccountInterface,
-  ProviderInterface,
+  WalletAccount,
+  type AccountInterface,
+  type ProviderInterface,
   type ProviderOptions,
 } from "starknet"
 import {
@@ -144,7 +144,7 @@ export class InjectedConnector extends Connector {
       params: { silent_mode: true },
     })
 
-    return new Account(provider, accounts[0], "")
+    return new WalletAccount(provider, this._wallet, undefined, accounts[0])
   }
 
   async connect(_args: ConnectArgs = {}): Promise<ConnectorData> {

src/connectors/injected/index.ts

@@ -1,14 +1,15 @@
 import {
   Permission,
+  type AccountChangeEventHandler,
   type RequestFnCall,
   type RpcMessage,
   type RpcTypeToMessageMap,
-  type AccountChangeEventHandler,
   type StarknetWindowObject,
   type TypedData,
 } from "@starknet-io/types-js"
+import type { TRPCClientError } from "@trpc/client"
 import {
-  Account,
+  WalletAccount,
   type AccountInterface,
   type ProviderInterface,
   type ProviderOptions,
@@ -27,15 +28,14 @@ import {
   type ConnectorIcons,
 } from "../connector"
 import { DEFAULT_WEBWALLET_ICON, DEFAULT_WEBWALLET_URL } from "./constants"
+import { ConnectAndSignSessionError } from "./errors"
 import { openWebwallet } from "./helpers/openWebwallet"
 import { setPopupOptions } from "./helpers/trpc"
 import {
   type Theme,
   type WebWalletStarknetWindowObject,
 } from "./starknetWindowObject/argentStarknetWindowObject"
 import type { ApprovalRequest } from "./starknetWindowObject/types"
-import type { TRPCClientError } from "@trpc/client"
-import { ConnectAndSignSessionError } from "./errors"
 
 let _wallet: StarknetWindowObject | null = null
 let _address: string | null = null
@@ -239,7 +239,7 @@ export class WebWalletConnector extends Connector {
       throw new ConnectorNotConnectedError()
     }
 
-    return new Account(provider, _address, "")
+    return new WalletAccount(provider, this._wallet, undefined, _address)
   }
 
   async chainId(): Promise<bigint> {
@@ -290,5 +290,5 @@ export class WebWalletConnector extends Connector {
   }
 }
 
-export type { WebWalletStarknetWindowObject, ApprovalRequest }
 export { ConnectAndSignSessionError }
+export type { ApprovalRequest, WebWalletStarknetWindowObject }