@imtbl/sdk 0.1.9-alpha → 0.1.9-alpha.2

package/dist/orderbook.d.ts

@@ -33,7 +33,7 @@ declare class Orderbook {
      * the unsigned approval transaction, the typed order message for signing and
      * the order components that can be submitted to `createListing` with a signature.
      */
-    prepareListing({ offerer, listingItem, considerationItem, orderExpiry, }: PrepareListingParams): Promise<PrepareListingResponse>;
+    prepareListing({ makerAddress, sell, buy, orderExpiry, }: PrepareListingParams): Promise<PrepareListingResponse>;
     /**
      * Create an order
      * @param {CreateListingParams} createListingParams - create an order with the given params.
@@ -48,7 +48,7 @@ declare class Orderbook {
      * @param {string} fulfillerAddress - The address of the account fulfilling the order.
      * @return {FulfillOrderResponse} Approval and fulfilment transactions.
      */
-    fulfillOrder(listingId: string, fulfillerAddress: string): Promise<FulfillOrderResponse>;
+    fulfillOrder(listingId: string, takerAddress: string): Promise<FulfillOrderResponse>;
     /**
      * Get an unsigned cancel order transaction. Orders can only be cancelled by
      * the account that created them.

package/dist/orderbook.js

@@ -912,7 +912,7 @@ class ImmutableApiClient {
             ...listOrderParams,
         });
     }
-    async createListing({ orderHash, orderComponents, offerer, orderSignature, }) {
+    async createListing({ orderHash, orderComponents, orderSignature, }) {
         if (orderComponents.offer.length !== 1) {
             throw new Error('Only one item can be listed at a time');
         }
@@ -930,7 +930,7 @@ class ImmutableApiClient {
             chainName: this.chainName,
             requestBody: {
                 order_hash: orderHash,
-                account_address: offerer,
+                account_address: orderComponents.offerer,
                 buy: [
                     {
                         item_type: Number(orderComponents.consideration[0].itemType)
@@ -1961,10 +1961,10 @@ class Orderbook {
      * the unsigned approval transaction, the typed order message for signing and
      * the order components that can be submitted to `createListing` with a signature.
      */
-    async prepareListing({ offerer, listingItem, considerationItem, orderExpiry, }) {
-        const erc721 = new ERC721Factory(listingItem.contractAddress, this.config.provider).create();
-        const royaltyInfo = await erc721.royaltyInfo(listingItem.tokenId, considerationItem.amount);
-        return this.seaport.prepareSeaportOrder(offerer, listingItem, considerationItem, royaltyInfo, 
+    async prepareListing({ makerAddress, sell, buy, orderExpiry, }) {
+        const erc721 = new ERC721Factory(sell.contractAddress, this.config.provider).create();
+        const royaltyInfo = await erc721.royaltyInfo(sell.tokenId, buy.amount);
+        return this.seaport.prepareSeaportOrder(makerAddress, sell, buy, royaltyInfo, 
         // Default order start to now
         new Date(), 
         // Default order expiry to 2 years from now
@@ -1986,12 +1986,12 @@ class Orderbook {
      * @param {string} fulfillerAddress - The address of the account fulfilling the order.
      * @return {FulfillOrderResponse} Approval and fulfilment transactions.
      */
-    async fulfillOrder(listingId, fulfillerAddress) {
+    async fulfillOrder(listingId, takerAddress) {
         const orderResult = await this.apiClient.getListing(listingId);
         if (orderResult.result.status !== OrderStatus.ACTIVE) {
             throw new Error(`Cannot fulfil order that is not active. Current status: ${orderResult.result.status}`);
         }
-        return this.seaport.fulfilOrder(orderResult.result, fulfillerAddress);
+        return this.seaport.fulfilOrder(orderResult.result, takerAddress);
     }
     /**
      * Get an unsigned cancel order transaction. Orders can only be cancelled by

package/dist/passport.d.ts

@@ -10506,4 +10506,4 @@ declare class Passport {
     getAccessToken(): Promise<string | undefined>;
 }
 
-export { Passport, PassportError, PassportModuleConfiguration };
+export { Networks, Passport, PassportError, PassportModuleConfiguration, PassportOverrides, UserProfile };

package/dist/passport.js

@@ -21,7 +21,7 @@ const createImmutableXConfiguration = ({ basePath, chainID, coreContractAddress,
     chainID,
     coreContractAddress,
     registrationContractAddress,
-    sdkVersion: 'ts-immutable-sdk-0.1.9-alpha',
+    sdkVersion: 'ts-immutable-sdk-0.1.9-alpha.2',
 });
 /**
  * Sets `sdkVersion` at the time of build
@@ -4283,7 +4283,7 @@ class AuthManager {
     }
     static mapOidcUserToDomainModel = (oidcUser) => {
         const passport = oidcUser.profile?.passport;
-        return {
+        const user = {
             expired: oidcUser.expired,
             idToken: oidcUser.id_token,
             accessToken: oidcUser.access_token,
@@ -4293,10 +4293,21 @@ class AuthManager {
                 email: oidcUser.profile.email,
                 nickname: oidcUser.profile.nickname,
             },
-            etherKey: passport?.ether_key || '',
-            starkKey: passport?.stark_key || '',
-            userAdminKey: passport?.user_admin_key || '',
         };
+        if (passport?.imx_eth_address) {
+            user.imx = {
+                ethAddress: passport?.imx_eth_address,
+                starkAddress: passport?.imx_stark_address,
+                userAdminAddress: passport?.imx_user_admin_address,
+            };
+        }
+        if (passport?.zkevm_eth_address) {
+            user.zkEvm = {
+                ethAddress: passport?.zkevm_eth_address,
+                userAdminAddress: passport?.zkevm_user_admin_address,
+            };
+        }
+        return user;
     };
     async login() {
         return withPassportError(async () => {
@@ -4364,7 +4375,7 @@ const getStarkSigner = async (signer) => withPassportError(async () => {
 
 async function exchangeTransfer({ user, starkSigner, request, exchangesApi, }) {
     return withPassportError(async () => {
-        const ethAddress = user.etherKey;
+        const { ethAddress } = user.imx;
         const transferAmount = request.amount;
         const signableResult = await exchangesApi.getExchangeSignableTransfer({
             id: request.transactionID,
@@ -4562,7 +4573,7 @@ class ConfirmationScreen {
 const ERC721$1 = 'ERC721';
 async function createOrder({ starkSigner, user, request, ordersApi, confirmationScreen, }) {
     return withPassportError(async () => {
-        const ethAddress = user.etherKey;
+        const { ethAddress } = user.imx;
         const amountSell = request.sell.type === ERC721$1 ? '1' : request.sell.amount;
         const amountBuy = request.buy.type === ERC721$1 ? '1' : request.buy.amount;
         const getSignableOrderRequestV3 = {
@@ -4678,7 +4689,7 @@ async function registerPassport({ ethSigner, starkSigner, usersApi }, authorizat
 
 async function createTrade({ request, tradesApi, user, starkSigner, confirmationScreen, }) {
     return withPassportError(async () => {
-        const ethAddress = user.etherKey;
+        const { ethAddress } = user.imx;
         const getSignableTradeRequest = {
             expiration_timestamp: request.expiration_timestamp,
             fees: request.fees,
@@ -4788,7 +4799,7 @@ async function transfer({ request, transfersApi, starkSigner, user, imxPublicApi
     return withPassportError(async () => {
         const transferAmount = request.type === ERC721 ? '1' : request.amount;
         const getSignableTransferRequest = {
-            sender: user.etherKey,
+            sender: user.imx.ethAddress,
             token: convertToSignableToken(request),
             amount: transferAmount,
             receiver: request.receiver,
@@ -4834,7 +4845,7 @@ async function transfer({ request, transfersApi, starkSigner, user, imxPublicApi
 }
 async function batchNftTransfer({ user, starkSigner, request, transfersApi, confirmationScreen, }) {
     return withPassportError(async () => {
-        const ethAddress = user.etherKey;
+        const { ethAddress } = user.imx;
         const signableRequests = request.map((nftTransfer) => ({
             amount: '1',
             token: convertToSignableToken({
@@ -4986,7 +4997,7 @@ class PassportImxProvider {
         throw new PassportError('Operation not supported', PassportErrorType.OPERATION_NOT_SUPPORTED_ERROR);
     }
     getAddress() {
-        return Promise.resolve(this.user.etherKey);
+        return Promise.resolve(this.user.imx.ethAddress);
     }
 }
 
@@ -5022,10 +5033,10 @@ class PassportImxProviderFactory {
         const web3Provider = new Web3Provider(magicRpcProvider);
         const ethSigner = web3Provider.getSigner();
         const starkSigner = await getStarkSigner(ethSigner);
-        if (!user.etherKey) {
-            const userWithEtherKey = await this.registerStarkEx(ethSigner, starkSigner, user.accessToken);
+        if (!user.imx?.ethAddress) {
+            const userImx = await this.registerStarkEx(ethSigner, starkSigner, user.accessToken);
             return new PassportImxProvider({
-                user: userWithEtherKey,
+                user: userImx,
                 starkSigner,
                 immutableXClient: this.immutableXClient,
                 imxPublicApiDomain: this.config.imxPublicApiDomain,
@@ -5050,7 +5061,7 @@ class PassportImxProviderFactory {
             // User metadata is updated asynchronously. Poll userinfo endpoint until it is updated.
             const updatedUser = await retryWithDelay(async () => {
                 const user = await this.authManager.loginSilent();
-                const metadataExists = !!user?.etherKey && !!user?.starkKey && !!user?.userAdminKey;
+                const metadataExists = !!user?.imx;
                 if (metadataExists) {
                     return user;
                 }
@@ -5188,4 +5199,4 @@ class Passport {
     }
 }
 
-export { Passport, PassportError };
+export { Networks, Passport, PassportError };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@imtbl/sdk",
   "description": "Immutable Unified SDK",
-  "version": "0.1.9-alpha",
+  "version": "0.1.9-alpha.2",
   "author": "Immutable",
   "bugs": "https://github.com/immutable/ts-immutable-sdk/issues",
   "dependencies": {