enable support for erc7715 permission with multi-key signer(Passkey and EOA)

advanced/wallets/react-wallet-v2/package.json

@@ -10,6 +10,7 @@
     "prettier:write": "prettier --write '**/*.{js,ts,jsx,tsx}'"
   },
   "dependencies": {
+    "@biconomy/permission-context-builder": "^1.0.9",
     "@cosmjs/amino": "0.32.3",
     "@cosmjs/encoding": "0.32.3",
     "@cosmjs/proto-signing": "0.32.3",
@@ -40,14 +41,14 @@
     "@zerodev/session-key": "5.4.0",
     "@zerodev/weighted-ecdsa-validator": "5.3.0",
     "borsh": "^1.0.0",
-    "bs58": "5.0.0",
+    "bs58": "6.0.0",
     "cosmos-wallet": "1.2.0",
     "ethers": "5.7.2",
     "framer-motion": "6.5.1",
     "graphql": "^16.8.2",
     "near-api-js": "^0.45.0",
     "next": "12.1.5",
-    "permissionless": "0.1.39",
+    "permissionless": "0.1.43",
     "react": "17.0.2",
     "react-code-blocks": "0.1.5",
     "react-dom": "17.0.2",
@@ -56,7 +57,8 @@
     "solana-wallet": "^1.0.2",
     "tronweb": "^4.4.0",
     "valtio": "1.13.2",
-    "viem": "2.16.2"
+    "viem": "2.17.8",
+    "webauthn-p256": "0.0.2"
   },
   "devDependencies": {
     "@types/node": "17.0.35",
@@ -69,4 +71,4 @@
     "prettier": "2.6.2",
     "typescript": "5.2.2"
   }
-}
+}

advanced/wallets/react-wallet-v2/src/data/ERC7579ModuleData.ts

@@ -1,5 +1,6 @@
-//Note: ES6 syntax dont work for this package
+import { smartSessionAddress } from '@biconomy/permission-context-builder'
 import { ModuleType } from '@rhinestone/module-sdk'
+//Note: ES6 syntax dont work for this package
 const {
   MULTI_FACTOR_VALIDATOR_ADDRESS,
   OWNABLE_VALIDATOR_ADDRESS,
@@ -8,7 +9,6 @@ const {
   SCHEDULED_TRANSFERS_EXECUTER_ADDRESS
 } = require('@rhinestone/module-sdk') as typeof import('@rhinestone/module-sdk')
 
-export const PERMISSION_VALIDATOR_ADDRESS = '0x6671AD9ED29E2d7a894E80bf48b7Bf03Ee64A0f4'
 export type ModuleView =
   | 'PermissionValidatorActions'
   | 'OwnableValidatorActions'
@@ -31,7 +31,7 @@ export const supportedModules: Module[] = [
     name: 'Permission Validator',
     type: 'validator',
     url: '/permission-validator',
-    moduleAddress: PERMISSION_VALIDATOR_ADDRESS,
+    moduleAddress: smartSessionAddress,
     description: `The Permission Validator module is a module that allows DApp to request permissions from a wallet in order to execute transactions on users's behalf that is scoped with permissions`,
     moduleData: '0x'
   },

advanced/wallets/react-wallet-v2/src/lib/smart-accounts/KernelSmartAccountLib.ts

@@ -1,22 +1,13 @@
 import {
   Address,
-  concat,
-  concatHex,
   createPublicClient,
-  getTypesForEIP712Domain,
-  hashTypedData,
   Hex,
   http,
-  keccak256,
   PrivateKeyAccount,
   PublicClient,
-  toFunctionSelector,
   Transport,
-  TypedDataDefinition,
-  validateTypedData,
   WalletGrantPermissionsParameters,
-  WalletGrantPermissionsReturnType,
-  zeroAddress
+  WalletGrantPermissionsReturnType
 } from 'viem'
 import { privateKeyToAccount, publicKeyToAddress, signMessage } from 'viem/accounts'
 import { EIP155Wallet } from '../EIP155Lib'
@@ -40,20 +31,10 @@ import {
 } from 'permissionless'
 import { Chain } from '@/consts/smartAccounts'
 import { EntryPoint } from 'permissionless/types/entrypoint'
-import {
-  PERMISSION_VALIDATOR_ADDRESS,
-  SECP256K1_SIGNATURE_VALIDATOR_ADDRESS
-} from '@/utils/permissionValidatorUtils/constants'
-import {
-  getPermissionScopeData,
-  PermissionContext,
-  SingleSignerPermission
-} from '@/utils/permissionValidatorUtils'
 import { KERNEL_V2_4, KERNEL_V3_1 } from '@zerodev/sdk/constants'
 import { KERNEL_V2_VERSION_TYPE, KERNEL_V3_VERSION_TYPE } from '@zerodev/sdk/types'
 import { decodeDIDToSecp256k1PublicKey } from '@/utils/HelperUtil'
 import { KeySigner } from 'viem/_types/experimental/erc7715/types/signer'
-import { AccountExecuteAbi } from '@/utils/ERC7579AccountUtils'
 
 type DonutPurchasePermissionData = {
   target: string
@@ -398,104 +379,6 @@ export class KernelSmartAccountLib implements EIP155Wallet {
     return currentNonce
   }
 
-  async issuePermissionContext(
-    targetAddress: Address,
-    approvedPermissions: any
-  ): Promise<PermissionContext> {
-    if (!this.client || !this.client.account) {
-      throw new Error('Client not initialized')
-    }
-    // this permission have dummy policy set to zeroAddress for now,
-    // bc current version of PermissionValidator_v1 module don't consider checking policy
-    const permissions: SingleSignerPermission[] = [
-      {
-        validUntil: 0,
-        validAfter: 0,
-        signatureValidationAlgorithm: SECP256K1_SIGNATURE_VALIDATOR_ADDRESS,
-        signer: targetAddress,
-        policy: zeroAddress,
-        policyData: '0x'
-      }
-    ]
-
-    const permittedScopeData = getPermissionScopeData(permissions, this.chain)
-    // the smart account sign over the permittedScope and targetAddress
-    const permittedScopeSignature: Hex = await signMessage({
-      privateKey: this.getPrivateKey() as `0x${string}`,
-      message: { raw: concatHex([keccak256(permittedScopeData), targetAddress]) }
-    })
-
-    const nonce = await this.getCurrentNonce()
-    const validatorAddress = PERMISSION_VALIDATOR_ADDRESS
-    const validatorInitData = '0x'
-    const hookAddress = zeroAddress
-    const hookData = '0x'
-    const selectorData = toFunctionSelector(AccountExecuteAbi[0])
-
-    const validatorPluginEnableTypeData = {
-      domain: {
-        name: 'Kernel',
-        version: '0.3.0-beta',
-        chainId: this.chain.id,
-        verifyingContract: this.client.account.address
-      },
-      types: {
-        Enable: [
-          { name: 'validationId', type: 'bytes21' },
-          { name: 'nonce', type: 'uint32' },
-          { name: 'hook', type: 'address' },
-          { name: 'validatorData', type: 'bytes' },
-          { name: 'hookData', type: 'bytes' },
-          { name: 'selectorData', type: 'bytes' }
-        ]
-      },
-      message: {
-        validationId: concat([
-          '0x01', // indicate secondary type
-          validatorAddress
-        ]),
-        nonce: nonce,
-        hook: hookAddress,
-        validatorData: validatorInitData as `0x${string}`,
-        hookData: hookData as `0x${string}`,
-        selectorData: selectorData
-      },
-      primaryType: 'Enable' as 'Enable'
-    }
-
-    const types = {
-      EIP712Domain: getTypesForEIP712Domain({
-        domain: validatorPluginEnableTypeData.domain
-      }),
-      ...validatorPluginEnableTypeData.types
-    }
-
-    // Need to do a runtime validation check on addresses, byte ranges, integer ranges, etc
-    // as we can't statically check this with TypeScript.
-    validateTypedData({
-      domain: validatorPluginEnableTypeData.domain,
-      message: validatorPluginEnableTypeData.message,
-      primaryType: validatorPluginEnableTypeData.primaryType,
-      types: types
-    } as TypedDataDefinition)
-
-    const typedHash = hashTypedData(validatorPluginEnableTypeData)
-
-    let enableSig = await this.validator!.signMessage({
-      message: { raw: typedHash }
-    })
-
-    return {
-      accountType: 'KernelV3',
-      accountAddress: this.client.account.address,
-      permissionValidatorAddress: validatorAddress,
-      permissions: permissions,
-      permittedScopeData: permittedScopeData,
-      permittedScopeSignature: permittedScopeSignature,
-      enableSig: enableSig
-    }
-  }
-
   getAccount() {
     if (!this.client?.account) {
       throw new Error('Client not initialized')