@lifi/sdk 3.7.10-beta.1 → 3.8.0-alpha.0

package/src/core/EVM/EVMStepExecutor.ts

@@ -45,7 +45,7 @@ import { encodeNativePermitData } from './permits/encodeNativePermitData.js'
 import { encodePermit2Data } from './permits/encodePermit2Data.js'
 import { signPermit2Message } from './permits/signPermit2Message.js'
 import { switchChain } from './switchChain.js'
-import { isRelayerStep } from './typeguards.js'
+import { isGaslessStep, isRelayerStep } from './typeguards.js'
 import type { Call, TransactionMethodType } from './types.js'
 import { convertExtendedChain, getMaxPriorityFeePerGas } from './utils.js'
 import {
@@ -198,6 +198,37 @@ export class EVMStepExecutor extends BaseStepExecutor {
     )
   }
 
+  private getUpdatedStep = async (
+    step: LiFiStepExtended,
+    signedNativePermitTypedData?: SignedTypedData
+  ): Promise<LiFiStep> => {
+    const { execution, ...stepBase } = step
+    if (isRelayerStep(step) && isGaslessStep(step)) {
+      const updatedRelayedStep = await getRelayerQuote({
+        fromChain: stepBase.action.fromChainId,
+        fromToken: stepBase.action.fromToken.address,
+        fromAddress: stepBase.action.fromAddress!,
+        fromAmount: stepBase.action.fromAmount,
+        toChain: stepBase.action.toChainId,
+        toToken: stepBase.action.toToken.address,
+        slippage: stepBase.action.slippage,
+        toAddress: stepBase.action.toAddress,
+        allowBridges: [stepBase.tool],
+      })
+      return {
+        ...updatedRelayedStep,
+        id: stepBase.id,
+      }
+    }
+
+    const params =
+      isRelayerStep(step) && !isGaslessStep(step) && signedNativePermitTypedData
+        ? { ...stepBase, typedData: [signedNativePermitTypedData] }
+        : stepBase
+
+    return getStepTransaction(params)
+  }
+
   executeStep = async (
     step: LiFiStepExtended,
     // Explicitly set to true if the wallet rejected the upgrade to 7702 account, based on the EIP-5792 capabilities
@@ -360,28 +391,14 @@ export class EVMStepExecutor extends BaseStepExecutor {
       await checkBalance(this.client.account!.address, step)
 
       // Create new transaction request
-      if (!step.transactionRequest) {
-        const { execution, ...stepBase } = step
-        let updatedStep: LiFiStep
-        if (isRelayerTransaction) {
-          const updatedRelayedStep = await getRelayerQuote({
-            fromChain: stepBase.action.fromChainId,
-            fromToken: stepBase.action.fromToken.address,
-            fromAddress: stepBase.action.fromAddress!,
-            fromAmount: stepBase.action.fromAmount,
-            toChain: stepBase.action.toChainId,
-            toToken: stepBase.action.toToken.address,
-            slippage: stepBase.action.slippage,
-            toAddress: stepBase.action.toAddress,
-            allowBridges: [stepBase.tool],
-          })
-          updatedStep = {
-            ...updatedRelayedStep,
-            id: stepBase.id,
-          }
-        } else {
-          updatedStep = await getStepTransaction(stepBase)
-        }
+      if (
+        !step.transactionRequest ||
+        !step.typedData?.some((p) => p.primaryType !== 'Permit')
+      ) {
+        const updatedStep = await this.getUpdatedStep(
+          step,
+          signedNativePermitTypedData
+        )
         const comparedStep = await stepComparison(
           this.statusManager,
           step,
@@ -395,38 +412,47 @@ export class EVMStepExecutor extends BaseStepExecutor {
         })
       }
 
-      if (!step.transactionRequest) {
+      if (
+        !step.transactionRequest ||
+        !step.typedData?.some((p) => p.primaryType !== 'Permit')
+      ) {
         throw new TransactionError(
           LiFiErrorCode.TransactionUnprepared,
           'Unable to prepare transaction.'
         )
       }
 
-      let transactionRequest: TransactionParameters = {
-        to: step.transactionRequest.to,
-        from: step.transactionRequest.from,
-        data: step.transactionRequest.data,
-        value: step.transactionRequest.value
-          ? BigInt(step.transactionRequest.value)
-          : undefined,
-        gas: step.transactionRequest.gasLimit
-          ? BigInt(step.transactionRequest.gasLimit)
-          : undefined,
-        // gasPrice: step.transactionRequest.gasPrice
-        //   ? BigInt(step.transactionRequest.gasPrice as string)
-        //   : undefined,
-        // maxFeePerGas: step.transactionRequest.maxFeePerGas
-        //   ? BigInt(step.transactionRequest.maxFeePerGas as string)
-        //   : undefined,
-        maxPriorityFeePerGas:
-          this.client.account?.type === 'local'
-            ? await getMaxPriorityFeePerGas(this.client)
-            : step.transactionRequest.maxPriorityFeePerGas
-              ? BigInt(step.transactionRequest.maxPriorityFeePerGas)
-              : undefined,
+      let transactionRequest: TransactionParameters | undefined
+      if (step.transactionRequest) {
+        transactionRequest = {
+          to: step.transactionRequest.to,
+          from: step.transactionRequest.from,
+          data: step.transactionRequest.data,
+          value: step.transactionRequest.value
+            ? BigInt(step.transactionRequest.value)
+            : undefined,
+          gas: step.transactionRequest.gasLimit
+            ? BigInt(step.transactionRequest.gasLimit)
+            : undefined,
+          // gasPrice: step.transactionRequest.gasPrice
+          //   ? BigInt(step.transactionRequest.gasPrice as string)
+          //   : undefined,
+          // maxFeePerGas: step.transactionRequest.maxFeePerGas
+          //   ? BigInt(step.transactionRequest.maxFeePerGas as string)
+          //   : undefined,
+          maxPriorityFeePerGas:
+            this.client.account?.type === 'local'
+              ? await getMaxPriorityFeePerGas(this.client)
+              : step.transactionRequest.maxPriorityFeePerGas
+                ? BigInt(step.transactionRequest.maxPriorityFeePerGas)
+                : undefined,
+        }
       }
 
-      if (this.executionOptions?.updateTransactionRequestHook) {
+      if (
+        this.executionOptions?.updateTransactionRequestHook &&
+        transactionRequest
+      ) {
         const customizedTransactionRequest: TransactionParameters =
           await this.executionOptions.updateTransactionRequestHook({
             requestType: 'transaction',
@@ -458,7 +484,7 @@ export class EVMStepExecutor extends BaseStepExecutor {
       let txHash: Hash
       let txType: TransactionMethodType = 'standard'
 
-      if (batchingSupported) {
+      if (batchingSupported && transactionRequest) {
         const transferCall: Call = {
           chainId: fromChain.id,
           data: transactionRequest.data as Hex,
@@ -480,9 +506,7 @@ export class EVMStepExecutor extends BaseStepExecutor {
         txType = 'batched'
       } else if (isRelayerTransaction) {
         const relayerTypedData = step.typedData.find(
-          (p) =>
-            p.primaryType === 'PermitWitnessTransferFrom' ||
-            p.primaryType === 'Order'
+          (p) => p.primaryType !== 'Permit'
         )
 
         if (!relayerTypedData) {
@@ -531,6 +555,12 @@ export class EVMStepExecutor extends BaseStepExecutor {
         txHash = relayedTransaction.taskId as Hash
         txType = 'relayed'
       } else {
+        if (!transactionRequest) {
+          throw new TransactionError(
+            LiFiErrorCode.TransactionUnprepared,
+            'Unable to prepare transaction. Transaction request is not found.'
+          )
+        }
         if (signedNativePermitTypedData) {
           transactionRequest.data = encodeNativePermitData(
             step.action.fromToken.address as Address,

package/src/core/EVM/isBatchingSupported.ts

@@ -9,9 +9,11 @@ import type { EVMProvider } from './types.js'
 export async function isBatchingSupported({
   client,
   chainId,
+  skipReady = false,
 }: {
   client?: Client
   chainId: number
+  skipReady?: boolean
 }): Promise<boolean> {
   const _client =
     client ??
@@ -31,7 +33,7 @@ export async function isBatchingSupported({
     return (
       capabilities?.atomicBatch?.supported ||
       capabilities?.atomic?.status === 'supported' ||
-      capabilities?.atomic?.status === 'ready' ||
+      (!skipReady && capabilities?.atomic?.status === 'ready') ||
       false
     )
   } catch {

package/src/index.ts

@@ -15,6 +15,8 @@ export { isEVM } from './core/EVM/types.js'
 export { isBatchingSupported } from './core/EVM/isBatchingSupported.js'
 export { isExtendedChain, convertExtendedChain } from './core/EVM/utils.js'
 export { isRelayerStep, isGaslessStep } from './core/EVM/typeguards.js'
+export { checkPermitSupport } from './core/EVM/checkPermitSupport.js'
+export { getNativePermit } from './core/EVM/permits/getNativePermit.js'
 export type { EVMProvider, EVMProviderOptions } from './core/EVM/types.js'
 export { StatusManager } from './core/StatusManager.js'
 export {

package/src/services/api.ts

@@ -22,6 +22,7 @@ import {
   type RequestOptions,
   type RoutesRequest,
   type RoutesResponse,
+  type SignedLiFiStep,
   type StatusResponse,
   type Token,
   type TokensRequest,
@@ -203,7 +204,7 @@ export const getContractCallsQuote = async (
  * @throws {LiFiError} Throws a LiFiError if request fails.
  */
 export const getStepTransaction = async (
-  step: LiFiStep,
+  step: LiFiStep | SignedLiFiStep,
   options?: RequestOptions
 ): Promise<LiFiStep> => {
   if (!isStep(step)) {

package/src/typeguards.ts

@@ -72,7 +72,7 @@ const isEstimate = (estimate: Estimate): estimate is Estimate => {
     toAmount !== '' &&
     typeof toAmountMin === 'string' &&
     toAmountMin !== '' &&
-    typeof approvalAddress === 'string'
+    (typeof approvalAddress === 'string' || approvalAddress === null)
   )
 }
 

package/src/version.ts

@@ -1,2 +1,2 @@
 export const name = '@lifi/sdk'
-export const version = '3.7.10-beta.1'
+export const version = '3.8.0-alpha.0'

package/LICENSE.md

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.