Merge pull request #37 from argentlabs/fix/EFO-network

Fix/efo network

Author: bluecco

README.md

@@ -227,6 +227,7 @@ const { contractAddress, entrypoint, calldata } =
     sessionKey,
     calls: [transferCallData],
     argentSessionServiceUrl: ARGENT_SESSION_SERVICE_BASE_URL
+    network // values "mainnet" | "sepolia", default to "mainnet"
   })
 
 const { signature, outsideExecutionTypedData } =
@@ -235,5 +236,6 @@ const { signature, outsideExecutionTypedData } =
     sessionKey,
     calls: [transferCallData],
     argentSessionServiceUrl: ARGENT_SESSION_SERVICE_BASE_URL
+    network // values "mainnet" | "sepolia", default to "mainnet"
   })
 ```

src/SessionAccount.types.ts

@@ -5,6 +5,7 @@ import {
   ProviderInterface,
 } from "starknet"
 import { Session } from "./session.types"
+import { Network } from "./outsideExecution.types"
 
 export interface GetAccountWithSessionSignerParams {
   provider: ProviderInterface
@@ -20,4 +21,5 @@ export interface GetSessionSignatureForTransactionParams {
   accountAddress: string
   invocationSignerDetails: InvocationsSignerDetails
   cacheAuthorisation: boolean
+  network?: Network
 }

src/argentBackendUtils.ts

@@ -22,6 +22,7 @@ import {
   SessionKey,
 } from "./session.types"
 import { getSessionTypedData } from "./utils"
+import { Network } from "./outsideExecution.types"
 
 interface ArgentSignTxAndSessionParams {
   sessionKey: SessionKey
@@ -154,6 +155,7 @@ interface ArgentSignSessionEFOParams {
   sessionSignature: bigint[]
   cacheAuthorisation: boolean
   chainId: constants.StarknetChainId
+  network?: Network
 }
 
 export const argentSignSessionEFO = async ({
@@ -166,6 +168,7 @@ export const argentSignSessionEFO = async ({
   sessionSignature,
   cacheAuthorisation,
   chainId,
+  network = "mainnet",
 }: ArgentSignSessionEFOParams): Promise<ArgentServiceSignatureResponse> => {
   const sessionMessageHash = typedData.getMessageHash(
     getSessionTypedData(sessionTokenToSign, chainId),
@@ -193,6 +196,7 @@ export const argentSignSessionEFO = async ({
     accountAddress,
     chain: "starknet",
     message: currentTypedData,
+    network,
   }
 
   const body = {

src/outsideExecution.ts

@@ -129,6 +129,7 @@ export const createOutsideExecutionCall = async ({
   calls,
   outsideExecutionParams,
   argentSessionServiceUrl = ARGENT_SESSION_SERVICE_BASE_URL,
+  network = "mainnet",
 }: CreateOutsideExecutionCallParams): Promise<Call> => {
   const { caller, execute_after, execute_before, nonce, version } =
     outsideExecutionParams || {}
@@ -154,6 +155,7 @@ export const createOutsideExecutionCall = async ({
     outsideExecutionTypedData,
     cacheAuthorisation,
     calls,
+    network,
   })
 
   return {
@@ -173,6 +175,7 @@ export const createOutsideExecutionCall = async ({
  * @param {Array<Call>} params.calls - The array of calls to be executed.
  * @param {OutsideExecutionParams} params.outsideExecutionParams - The parameters for the outside execution.
  * @param {string} [params.argentSessionServiceUrl=ARGENT_SESSION_SERVICE_BASE_URL] - The URL of the Argent session service.
+ * @param {string} params.network - The network on which the execution is taking place.
  *
  * @returns {Promise<{ outsideExecutionTypedData: OutsideExecutionTypedData, signature: string }>} The typed data for the outside execution and the signature.
  */
@@ -183,6 +186,7 @@ export const createOutsideExecutionTypedData = async ({
   calls,
   outsideExecutionParams,
   argentSessionServiceUrl = ARGENT_SESSION_SERVICE_BASE_URL,
+  network = "mainnet",
 }: CreateOutsideExecutionTypedData) => {
   const { caller, execute_after, execute_before, nonce, version } =
     outsideExecutionParams || {}
@@ -208,6 +212,7 @@ export const createOutsideExecutionTypedData = async ({
     outsideExecutionTypedData,
     session,
     sessionKey,
+    network,
   })
 
   return {
@@ -249,6 +254,7 @@ export const buildOutsideExecutionTypedData = ({
  * @param {string} [params.argentSessionServiceUrl=ARGENT_SESSION_SERVICE_BASE_URL] - The URL of the Argent session service.
  * @param {boolean} [params.cacheAuthorisation=false] - Flag indicating whether to cache the authorisation.
  * @param {Array<Call>} params.calls - The array of calls to be executed.
+ * @param {string} params.network - The network on which the execution is taking place.
  *
  * @returns {Promise<ArraySignatureType>} The signature.
  */
@@ -259,6 +265,7 @@ export const signOutsideExecution = async ({
   argentSessionServiceUrl = ARGENT_SESSION_SERVICE_BASE_URL,
   cacheAuthorisation = false,
   calls,
+  network = "mainnet",
 }: SignOutsideExecutionParams): Promise<ArraySignatureType> => {
   const sessionRequest: OffChainSession = {
     expires_at: session.expiresAt,
@@ -295,6 +302,7 @@ export const signOutsideExecution = async ({
     sessionSignature,
     cacheAuthorisation,
     chainId: session.chainId,
+    network,
   })
 
   const sessionToken = await compileSessionTokenHelper(

src/outsideExecution.types.ts

@@ -1,4 +1,4 @@
-import { Session, SessionKey } from "dist/sessionTypes"
+import { Session, SessionKey } from "./session.types"
 import {
   ArraySignatureType,
   BigNumberish,
@@ -8,6 +8,8 @@ import {
   TypedData,
 } from "starknet"
 
+export type Network = "mainnet" | "sepolia"
+
 export interface OutsideExecution {
   caller: string
   nonce: num.BigNumberish
@@ -42,6 +44,7 @@ export interface CreateOutsideExecutionCallParams {
   cacheAuthorisation?: boolean
   calls: Call[]
   outsideExecutionParams?: OutsideExecutionParams
+  network?: Network
 }
 
 export interface BuildOutsideExecutionTypedDataParams {
@@ -57,6 +60,7 @@ export interface CreateOutsideExecutionTypedData {
   cacheAuthorisation?: boolean
   calls: Call[]
   outsideExecutionParams?: OutsideExecutionParams
+  network?: Network
 }
 
 export interface SignOutsideExecutionParams {
@@ -66,4 +70,5 @@ export interface SignOutsideExecutionParams {
   outsideExecutionTypedData: TypedData
   cacheAuthorisation?: boolean
   calls: Call[]
+  network?: Network
 }