Merge pull request #90 from okto-hq/fee-payer

feat: add fee payer address to user operation transactions and …

Author: akathecoder

.changeset/brown-kids-heal.md

@@ -0,0 +1,7 @@
+---
+"@okto_web3/react-native-sdk": minor
+"@okto_web3/core-js-sdk": minor
+"@okto_web3/react-sdk": minor
+---
+
+update job manager abi

packages/core-js/src/userop/abi.ts

@@ -11,7 +11,11 @@ export const INTENT_ABI = [
         type: 'address',
       },
       {
-        name: '_jobCreatorId',
+        name: '_userSWA',
+        type: 'address',
+      },
+      {
+        name: '_feePayerAddress',
         type: 'address',
       },
       {

packages/core-js/src/userop/nftCollectionCreation.ts

@@ -1,6 +1,6 @@
 import type OktoClient from '@/core/index.js';
 import { getChains } from '@/explorer/chain.js';
-import type { UserOp } from '@/types/core.js';
+import type { Address, UserOp } from '@/types/core.js';
 import { Constants } from '@/utils/index.js';
 import { generateUUID, nonceToBigInt } from '@/utils/nonce.js';
 import {
@@ -32,11 +32,17 @@ import { BaseError } from '@/errors/index.js';
 async function nftCollectionCreation(
   oc: OktoClient,
   data: NFTCollectionCreationIntentParams,
+  feePayerAddress?: Address,
 ): Promise<UserOp> {
   if (!oc.isLoggedIn()) {
     throw new BaseError('User not logged in');
   }
   validateSchema(NFTCollectionCreationSchema, data);
+
+  if (!feePayerAddress) {
+    feePayerAddress = Constants.FEE_PAYER_ADDRESS;
+  }
+
   const nonce = generateUUID();
 
   const jobParametersAbiType =
@@ -67,6 +73,7 @@ async function nftCollectionCreation(
           toHex(nonceToBigInt(nonce), { size: 32 }),
           oc.clientSWA,
           oc.userSWA,
+          feePayerAddress,
           encodeAbiParameters(
             parseAbiParameters('(bool gsnEnabled, bool sponsorshipEnabled)'),
             [

packages/core-js/src/userop/nftTransfer.ts

@@ -1,7 +1,7 @@
 import GatewayClientRepository from '@/api/gateway.js';
 import type OktoClient from '@/core/index.js';
 import { getChains } from '@/explorer/chain.js';
-import type { UserOp } from '@/types/core.js';
+import type { Address, UserOp } from '@/types/core.js';
 import { Constants } from '@/utils/index.js';
 import { generateUUID, nonceToBigInt } from '@/utils/nonce.js';
 import {
@@ -33,6 +33,7 @@ import {
 export async function nftTransfer(
   oc: OktoClient,
   data: NFTTransferIntentParams,
+  feePayerAddress?: Address,
 ): Promise<UserOp> {
   if (!oc.isLoggedIn()) {
     throw new BaseError('User not logged in');
@@ -46,8 +47,11 @@ export async function nftTransfer(
     );
   }
 
-  const nonce = generateUUID();
+  if (!feePayerAddress) {
+    feePayerAddress = Constants.FEE_PAYER_ADDRESS;
+  }
 
+  const nonce = generateUUID();
   const jobParametersAbiType =
     '(string caip2Id, string nftId, string recipientWalletAddress, string collectionAddress, string nftType, uint amount)';
   const gsnDataAbiType = `(bool isRequired, string[] requiredNetworks, ${jobParametersAbiType}[] tokens)`;
@@ -74,6 +78,7 @@ export async function nftTransfer(
           toHex(nonceToBigInt(nonce), { size: 32 }),
           oc.clientSWA,
           oc.userSWA,
+          feePayerAddress,
           encodeAbiParameters(
             parseAbiParameters('(bool gsnEnabled, bool sponsorshipEnabled)'),
             [

packages/core-js/src/userop/rawTransaction.ts

@@ -2,7 +2,7 @@ import GatewayClientRepository from '@/api/gateway.js';
 import type OktoClient from '@/core/index.js';
 import { BaseError } from '@/errors/base.js';
 import { getChains } from '@/explorer/chain.js';
-import type { UserOp } from '@/types/core.js';
+import type { Address, UserOp } from '@/types/core.js';
 import { Constants } from '@/utils/index.js';
 import { generateUUID, nonceToBigInt } from '@/utils/nonce.js';
 import {
@@ -26,12 +26,18 @@ import {
 export async function evmRawTransaction(
   oc: OktoClient,
   data: RawTransactionIntentParams,
+  feePayerAddress?: Address,
 ): Promise<UserOp> {
   if (!oc.isLoggedIn()) {
     throw new BaseError('User not logged in');
   }
+
   validateSchema(RawTransactionIntentParamsSchema, data);
 
+  if (!feePayerAddress) {
+    feePayerAddress = Constants.FEE_PAYER_ADDRESS;
+  }
+
   const transaction: EVMRawTransaction = {
     from: data.transaction.from,
     to: data.transaction.to,
@@ -78,6 +84,7 @@ export async function evmRawTransaction(
           toHex(nonceToBigInt(nonce), { size: 32 }),
           oc.clientSWA,
           oc.userSWA,
+          feePayerAddress,
           encodeAbiParameters(
             parseAbiParameters('(bool gsnEnabled, bool sponsorshipEnabled)'),
             [

packages/core-js/src/userop/tokenTransfer.ts

@@ -2,7 +2,7 @@ import GatewayClientRepository from '@/api/gateway.js';
 import type OktoClient from '@/core/index.js';
 import { BaseError } from '@/errors/base.js';
 import { getChains } from '@/explorer/chain.js';
-import type { UserOp } from '@/types/core.js';
+import type { Address, UserOp } from '@/types/core.js';
 import { Constants } from '@/utils/index.js';
 import { generateUUID, nonceToBigInt } from '@/utils/nonce.js';
 import {
@@ -29,9 +29,11 @@ import {
  * @param data - The parameters for transferring the token (caip2Id, recipientWalletAddress, tokenAddress, amount).
  * @returns The User Operation (UserOp) for the token transfer.
  */
+// TODO: Implement a destructured param instead before V1 release
 export async function tokenTransfer(
   oc: OktoClient,
   data: TokenTransferIntentParams,
+  feePayerAddress?: Address,
 ): Promise<UserOp> {
   if (!oc.isLoggedIn()) {
     throw new BaseError('User not logged in');
@@ -42,6 +44,10 @@ export async function tokenTransfer(
     throw new BaseError('Recipient address cannot be same as the user address');
   }
 
+  if (!feePayerAddress) {
+    feePayerAddress = Constants.FEE_PAYER_ADDRESS;
+  }
+
   const nonce = generateUUID();
 
   const jobParametersAbiType =
@@ -72,6 +78,7 @@ export async function tokenTransfer(
           toHex(nonceToBigInt(nonce), { size: 32 }),
           oc.clientSWA,
           oc.userSWA,
+          feePayerAddress,
           encodeAbiParameters(
             parseAbiParameters('(bool gsnEnabled, bool sponsorshipEnabled)'),
             [

packages/core-js/src/utils/constants.ts

@@ -9,6 +9,9 @@ export class Constants {
 
   static readonly USEROP_VALUE = BigInt(0);
 
+  static readonly FEE_PAYER_ADDRESS =
+    '0x0000000000000000000000000000000000000000';
+
   static readonly GAS_LIMITS = {
     CALL_GAS_LIMIT: BigInt(300_000),
     VERIFICATION_GAS_LIMIT: BigInt(200_000),
@@ -28,11 +31,11 @@ export class Constants {
 
   static readonly ENV_CONFIG = {
     STAGING: {
-      PAYMASTER_ADDRESS: '0x0871051BfF8C7041c985dEddFA8eF63d23AD3Fa0' as Hex,
-      JOB_MANAGER_ADDRESS: '0xED3D17cae886e008D325Ad7c34F3bdE030B80c2E' as Hex,
+      PAYMASTER_ADDRESS: '0xdAa292E9B9a6B287c84d636F3b65f4A5Dc787e3f' as Hex,
+      JOB_MANAGER_ADDRESS: '0xb5e77f7Ff1ab31Fc1bE99F484DB62f01a6b93D4d' as Hex,
       ENTRYPOINT_CONTRACT_ADDRESS:
-        '0x8D29ECb381CA4874767Ef3744F6df37748B12715' as Hex,
-      CHAIN_ID: 24879,
+        '0xec3F5f7a3f0e43e61D8711A90B8c8Fc59B9a88ba' as Hex,
+      CHAIN_ID: 124736089,
     },
     SANDBOX: {
       PAYMASTER_ADDRESS: '0x5408fAa7F005c46B85d82060c532b820F534437c' as Hex,