Merge pull request #104 from argentlabs/fix/snjs-argent-mobile

fix: update argent mobile rpc methods
argentlabs · Jul 3, 2024 · 07dd240 · 07dd240
2 parents a03939d + 5ad6ec4
commit 07dd240
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/src/connectors/argentMobile/modal/starknet/account.ts b/src/connectors/argentMobile/modal/starknet/account.ts
@@ -37,7 +37,7 @@ export class StarknetRemoteAccount extends Account implements AccountInterface {
         ? transactionsDetail
         : abisOrDetails
 
-    return await this.wallet.starknet_requestAddInvokeTransaction({
+    return await this.wallet.wallet_requestAddInvokeTransaction({
       accountAddress: this.address,
       executionRequest: { calls, invocationDetails: details },
     })

diff --git a/src/connectors/argentMobile/modal/starknet/adapter.ts b/src/connectors/argentMobile/modal/starknet/adapter.ts
@@ -53,6 +53,9 @@ export class StarknetAdapter
     "starknet_supportedSpecs",
     "starknet_signTypedData",
     "starknet_requestAddInvokeTransaction",
+    "wallet_supportedSpecs",
+    "wallet_signTypedData",
+    "wallet_requestAddInvokeTransaction",
   ]
   public events = ["chainChanged", "accountsChanged"]
 
@@ -103,6 +106,9 @@ export class StarknetAdapter
       starknet_addInvokeTransaction: this.handleAddInvokeTransaction,
       starknet_signTypedData: this.handleSignTypedData,
       starknet_supportedSpecs: this.handleSupportedSpecs,
+      wallet_addInvokeTransaction: this.handleAddInvokeTransaction,
+      wallet_signTypedData: this.handleSignTypedData,
+      wallet_supportedSpecs: this.handleSupportedSpecs,
     })
   }
 
@@ -123,7 +129,19 @@ export class StarknetAdapter
       throw new Error("No session")
     }
 
-    const requestToCall = this.handleRequest[call.type]
+    let type = call.type as string
+
+    // temporarily for backwards compatibility
+    if (
+      type === "wallet_addInvokeTransaction" ||
+      type === "wallet_supportedSpecs" ||
+      type === "wallet_signTypedData"
+    ) {
+      type = type.replace("wallet_", "starknet_") as string
+    }
+
+    const requestToCall = this.handleRequest[type]
+
     if (requestToCall) {
       return requestToCall(call.params)
     }

diff --git a/src/connectors/argentMobile/modal/starknet/signer.ts b/src/connectors/argentMobile/modal/starknet/signer.ts
@@ -21,7 +21,7 @@ export class StarknetRemoteSigner implements SignerInterface {
     typedData: TypedData,
     accountAddress: string,
   ): Promise<Signature> {
-    const { signature } = await this.wallet.starknet_signTypedData({
+    const { signature } = await this.wallet.wallet_signTypedData({
       accountAddress,
       typedData,
     })

diff --git a/src/connectors/argentMobile/modal/starknet/starknet.model.ts b/src/connectors/argentMobile/modal/starknet/starknet.model.ts
@@ -9,11 +9,11 @@ import { TypedData } from "starknet-types"
 
 // see https://github.com/WalletConnect/walletconnect-docs/pull/288/files
 export interface IStarknetRpc {
-  starknet_signTypedData(params: {
+  wallet_signTypedData(params: {
     accountAddress: string
     typedData: TypedData
   }): Promise<{ signature: Signature }>
-  starknet_requestAddInvokeTransaction(params: {
+  wallet_requestAddInvokeTransaction(params: {
     accountAddress: string
     executionRequest: {
       calls: Call[]