fix(repo): sc wallet (#2623)

proofzero · Aug 18, 2023 · 3671c90 · 3671c90
1 parent e2dfab0
commit 3671c90
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/packages/galaxy-client/index.ts b/packages/galaxy-client/index.ts
@@ -62,7 +62,7 @@ export type MutationDisconnectAccountArgs = {
 
 export type MutationRegisterSessionKeyArgs = {
   sessionPublicKey: Scalars['String'];
-  smartContractWalletAccount: Scalars['String'];
+  smartContractWalletAddress: Scalars['String'];
 };
 
 

diff --git a/platform/account/src/jsonrpc/methods/registerWalletSessionKey.ts b/platform/account/src/jsonrpc/methods/registerWalletSessionKey.ts
@@ -14,7 +14,7 @@ import { generateSmartWalletAccountUrn } from '../../utils'
 
 export const RegisterSessionKeyInput = z.object({
   sessionPublicKey: z.string(),
-  smartContractWalletAccount: z.string(),
+  smartContractWalletAddress: z.string(),
   paymaster: PaymasterSchema,
 })
 
@@ -34,10 +34,10 @@ export const registerSessionKeyMethod = async ({
   // This method is being called only from galaxy
   // All authorization checks are done in galaxy
 
-  const { paymaster, smartContractWalletAccount, sessionPublicKey } = input
+  const { paymaster, smartContractWalletAddress, sessionPublicKey } = input
 
   const { baseAccountURN } = await generateSmartWalletAccountUrn(
-    smartContractWalletAccount,
+    smartContractWalletAddress,
     '' // empty string because we only care about base urn
   )
 

diff --git a/platform/galaxy/src/schema/resolvers/account.ts b/platform/galaxy/src/schema/resolvers/account.ts
@@ -124,10 +124,10 @@ const accountResolvers: Resolvers = {
       _parent: any,
       {
         sessionPublicKey,
-        smartContractWalletAccount,
+        smartContractWalletAddress,
       }: {
         sessionPublicKey: string
-        smartContractWalletAccount: string
+        smartContractWalletAddress: string
       },
       { env, jwt, traceSpan, identityURN, clientId, apiKey }: ResolverContext
     ) => {
@@ -147,7 +147,7 @@ const accountResolvers: Resolvers = {
         !userInfo ||
         !userInfo.erc_4337.some(
           (scWallet: { nickname: string; address: string }) =>
-            scWallet.address === smartContractWalletAccount
+            scWallet.address === smartContractWalletAddress
         )
       ) {
         throw new GraphQLError('Invalid smart contract wallet address.')
@@ -156,7 +156,7 @@ const accountResolvers: Resolvers = {
       try {
         const sessionKey = await coreClient.account.registerSessionKey.mutate({
           paymaster,
-          smartContractWalletAccount,
+          smartContractWalletAddress,
           sessionPublicKey,
         })
 
@@ -166,7 +166,7 @@ const accountResolvers: Resolvers = {
 
         const smartWalletSessionKeys = appData?.smartWalletSessionKeys || []
         const { baseAccountURN } = generateSmartWalletAccountUrn(
-          smartContractWalletAccount,
+          smartContractWalletAddress,
           '' // empty string because we only need a base urn
         )
 

diff --git a/platform/galaxy/src/schema/types/account.ts b/platform/galaxy/src/schema/types/account.ts
@@ -25,7 +25,7 @@ export default /* GraphQL */ `
     ): Boolean
     registerSessionKey(
       sessionPublicKey: String!
-      smartContractWalletAccount: String!
+      smartContractWalletAddress: String!
     ): String!
   }
 `