Add crosschain swap and checks

Author: alavarello

packages/lib-ts/src/intents/Intent.ts

@@ -7,7 +7,7 @@ import { SvmAccountMeta } from '../types/svm/SvmAccountMeta'
 
 import { EvmCall, EvmCallData } from './Call/EvmCall'
 import { SvmCall, SvmInstruction } from './Call/SvmCall'
-import { Operation, OperationBuilder, OperationEvent } from './Operation'
+import { Operation, OperationBuilder, OperationEvent, OperationType } from './Operation'
 import { Swap, SwapTokenIn, SwapTokenOut } from './Swap'
 import { Transfer, TransferData } from './Transfer'
 
@@ -333,8 +333,18 @@ export class Intent {
     this.operations = operations || []
     if (this.operations.length === 0) throw new Error('Operation list cannot be empty')
 
-    this.maxFees = maxFees ? maxFees.map((fee: TokenAmount) => MaxFee.fromTokenAmount(fee)) : []
     const defaultChainId = this.operations[0].chainId
+    for (let i = 0; i < this.operations.length; i++) {
+      const operation = this.operations[i]
+
+      if (operation.chainId !== defaultChainId) throw new Error('All operations must have the same chainId')
+
+      if (operation.opType === OperationType.CrossChainSwap) {
+        if (this.operations.length > 1) throw new Error('Cross-chain swap must be the only operation in an intent')
+      }
+    }
+
+    this.maxFees = maxFees ? maxFees.map((fee: TokenAmount) => MaxFee.fromTokenAmount(fee)) : []
     this.settler = settler ? settler.toString() : context.findSettler(defaultChainId).toString()
     this.feePayer = feePayer ? feePayer.toString() : context.user.toString()
     this.deadline = deadline ? deadline.toString() : (context.timestamp / 1000 + DEFAULT_DEADLINE).toString()

packages/lib-ts/src/intents/Operation.ts

@@ -6,6 +6,7 @@ export enum OperationType {
   Swap,
   Transfer,
   EvmCall,
+  CrossChainSwap,
   SvmCall,
 }
 

packages/lib-ts/src/intents/Swap.ts

@@ -392,20 +392,6 @@ export class SwapTokenOut {
  */
 @json
 export class Swap extends Operation {
-  /**
-   * Creates a simple single-chain swap intent.
-   * @param chainId - The blockchain network identifier
-   * @param tokenIn - The input token
-   * @param amountIn - The amount to swap from
-   * @param tokenOut - The output token
-   * @param minAmountOut - The minimum amount to receive
-   * @param settler - The settler address (optional)
-   * @param recipient - The recipient address (optional)
-   * @param deadline - The deadline timestamp (optional)
-   * @param nonce - The nonce for replay protection (optional)
-   * @returns A new Swap instance
-   */
-
   /**
    * Creates a new Swap intent.
    * @param sourceChain - The source blockchain network identifier
@@ -426,7 +412,8 @@ export class Swap extends Operation {
     user: Address | null = null,
     events: OperationEvent[] | null = null
   ) {
-    super(OperationType.Swap, sourceChain, user, events)
+    const opType = sourceChain == destinationChain ? OperationType.Swap : OperationType.CrossChainSwap
+    super(opType, sourceChain, user, events)
     if (tokensIn.length === 0) throw new Error('TokenIn list cannot be empty')
     if (tokensOut.length === 0) throw new Error('TokenOut list cannot be empty')
   }

packages/lib-ts/tests/intents/Intent.spec.ts

@@ -2,7 +2,7 @@ import { JSON } from 'json-as'
 
 import { SerializableSettler } from '../../src/context'
 import { NULL_ADDRESS } from '../../src/helpers'
-import { EvmCallBuilder, IntentBuilder } from '../../src/intents'
+import { EvmCallBuilder, IntentBuilder, SwapBuilder } from '../../src/intents'
 import { TokenAmount } from '../../src/tokens'
 import { Address, BigInt, Bytes } from '../../src/types'
 import { randomERC20Token, randomSettler, setContext } from '../helpers'
@@ -123,4 +123,38 @@ describe('IntentBuilder', () => {
       }).toThrow('Operation list cannot be empty')
     })
   })
+
+  describe('when operations have different chainIds', () => {
+    it('throws an error', () => {
+      const settler = randomSettler(chainId)
+      setContext(0, 1, '0x0000000000000000000000000000000000000002', [settler], 'trigger-call')
+
+      expect(() => {
+        new IntentBuilder()
+          .addOperationBuilder(EvmCallBuilder.forChain(1).addCall(Address.fromString(targetAddressStr)))
+          .addOperationBuilder(EvmCallBuilder.forChain(10).addCall(Address.fromString(targetAddressStr)))
+          .build()
+      }).toThrow('All operations must have the same chainId')
+    })
+  })
+
+  describe('when a cross-chain swap is combined with another operation', () => {
+    it('throws an error', () => {
+      const settler = randomSettler(chainId)
+      setContext(0, 1, '0x0000000000000000000000000000000000000002', [settler], 'trigger-call')
+
+      expect(() => {
+        const tokenIn = randomERC20Token(1)
+        const tokenOut = randomERC20Token(10)
+        new IntentBuilder()
+          .addOperationBuilder(
+            SwapBuilder.forChains(1, 10)
+              .addTokenInFromStringDecimal(tokenIn, '1')
+              .addTokenOutFromStringDecimal(tokenOut, '1', Address.fromString(targetAddressStr))
+          )
+          .addOperationBuilder(EvmCallBuilder.forChain(1).addCall(Address.fromString(targetAddressStr)))
+          .build()
+      }).toThrow('Cross-chain swap must be the only operation in an intent')
+    })
+  })
 })

packages/lib-ts/tests/intents/SvmCall.spec.ts

@@ -36,7 +36,7 @@ describe('SvmCall', () => {
       expect(svmCall.events.length).toBe(0)
 
       expect(JSON.stringify(svmCall)).toBe(
-        `{"opType":3,"chainId":${ChainId.SOLANA_MAINNET},"user":"${user}","events":[],"instructions":[{"programId":"${programId.toBase58String()}","accountsMeta":[{"pubkey":"${accountsMeta[0].pubkey}","isWritable":${accountsMeta[0].isWritable},"isSigner":${accountsMeta[0].isSigner}}],"data":"${data.toHexString()}"}]}`
+        `{"opType":4,"chainId":${ChainId.SOLANA_MAINNET},"user":"${user}","events":[],"instructions":[{"programId":"${programId.toBase58String()}","accountsMeta":[{"pubkey":"${accountsMeta[0].pubkey}","isWritable":${accountsMeta[0].isWritable},"isSigner":${accountsMeta[0].isSigner}}],"data":"${data.toHexString()}"}]}`
       )
     })
 
@@ -69,7 +69,7 @@ describe('SvmCall', () => {
       expect(svmCall.events[0].data).toBe('0x64617461')
 
       expect(JSON.stringify(svmCall)).toBe(
-        `{"opType":3,"chainId":${ChainId.SOLANA_MAINNET},"user":"${user}","events":[{"topic":"0x746f706963","data":"0x64617461"}],"instructions":[{"programId":"${programId.toBase58String()}","accountsMeta":[{"pubkey":"${accountsMeta[0].pubkey}","isWritable":${accountsMeta[0].isWritable},"isSigner":${accountsMeta[0].isSigner}}],"data":"${data.toHexString()}"}]}`
+        `{"opType":4,"chainId":${ChainId.SOLANA_MAINNET},"user":"${user}","events":[{"topic":"0x746f706963","data":"0x64617461"}],"instructions":[{"programId":"${programId.toBase58String()}","accountsMeta":[{"pubkey":"${accountsMeta[0].pubkey}","isWritable":${accountsMeta[0].isWritable},"isSigner":${accountsMeta[0].isSigner}}],"data":"${data.toHexString()}"}]}`
       )
     })
   })
@@ -107,7 +107,7 @@ describe('SvmCall', () => {
       expect(svmCall.events.length).toBe(0)
 
       expect(JSON.stringify(svmCall)).toBe(
-        `{"opType":3,"chainId":${ChainId.SOLANA_MAINNET},"user":"${user}","events":[],"instructions":[{"programId":"${programId1.toBase58String()}","accountsMeta":[{"pubkey":"${accountsMeta1[0].pubkey}","isWritable":${accountsMeta1[0].isWritable},"isSigner":${accountsMeta1[0].isSigner}}],"data":"${data1.toHexString()}"},{"programId":"${programId2.toBase58String()}","accountsMeta":[{"pubkey":"${accountsMeta2[0].pubkey}","isWritable":${accountsMeta2[0].isWritable},"isSigner":${accountsMeta2[0].isSigner}}],"data":"${data2.toHexString()}"}]}`
+        `{"opType":4,"chainId":${ChainId.SOLANA_MAINNET},"user":"${user}","events":[],"instructions":[{"programId":"${programId1.toBase58String()}","accountsMeta":[{"pubkey":"${accountsMeta1[0].pubkey}","isWritable":${accountsMeta1[0].isWritable},"isSigner":${accountsMeta1[0].isSigner}}],"data":"${data1.toHexString()}"},{"programId":"${programId2.toBase58String()}","accountsMeta":[{"pubkey":"${accountsMeta2[0].pubkey}","isWritable":${accountsMeta2[0].isWritable},"isSigner":${accountsMeta2[0].isSigner}}],"data":"${data2.toHexString()}"}]}`
       )
     })
   })

packages/lib-ts/tests/intents/Swap.spec.ts

@@ -56,7 +56,7 @@ describe('Swap', () => {
     setContext(1, 1, user.toString(), [settler], 'trigger-456')
 
     const swap = new Swap(chainId, [tokenIn], [tokenOut], destinationChain, randomUser, [])
-    expect(swap.opType).toBe(OperationType.Swap)
+    expect(swap.opType).toBe(OperationType.CrossChainSwap)
     expect(swap.user).toBe(randomUser.toString())
 
     expect(swap.sourceChain).toBe(chainId)
@@ -73,7 +73,7 @@ describe('Swap', () => {
     expect(swap.events.length).toBe(0)
 
     expect(JSON.stringify(swap)).toBe(
-      `{"opType":0,"chainId":${chainId},"user":"${randomUser}","events":[],"sourceChain":${chainId},"tokensIn":[{"token":"${tokenIn.token}","amount":"${tokenIn.amount}"}],"tokensOut":[{"token":"${tokenOut.token}","minAmount":"${tokenOut.minAmount}","recipient":"${tokenOut.recipient}"}],"destinationChain":${destinationChain}}`
+      `{"opType":3,"chainId":${chainId},"user":"${randomUser}","events":[],"sourceChain":${chainId},"tokensIn":[{"token":"${tokenIn.token}","amount":"${tokenIn.amount}"}],"tokensOut":[{"token":"${tokenOut.token}","minAmount":"${tokenOut.minAmount}","recipient":"${tokenOut.recipient}"}],"destinationChain":${destinationChain}}`
     )
   })
 
@@ -115,7 +115,7 @@ describe('SwapBuilder', () => {
     builder.addTokenOutFromTokenAmount(tokenOutAmount, recipientAddress)
 
     const swap = builder.build()
-    expect(swap.opType).toBe(OperationType.Swap)
+    expect(swap.opType).toBe(OperationType.CrossChainSwap)
     expect(swap.sourceChain).toBe(sourceChain)
     expect(swap.destinationChain).toBe(destinationChain)
     expect(swap.tokensIn[0].token).toBe(tokenInAddress.toString())

packages/test-ts/src/utils.ts

@@ -30,7 +30,7 @@ export function toIntents(intentsJson: string) {
     return {
       ...intent,
       operations: intent.operations.map((operation: Operation) => {
-        if (operation.opType == OpType.Swap) {
+        if (operation.opType == OpType.Swap || operation.opType == OpType.CrossChainSwap) {
           const swap = operation as SwapOperation
           return {
             ...swap,