Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/late-cobras-turn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@mimicprotocol/test-ts": patch
"@mimicprotocol/lib-ts": patch
"@mimicprotocol/cli": patch
---

Refactor intents to have operations and bump to runner version v0.0.2
17 changes: 15 additions & 2 deletions packages/cli/tests/fixtures/functions/function.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
import { Address, BigInt, Bytes, ERC20Token, EvmCallBuilder, NULL_ADDRESS, TokenAmount } from '@mimicprotocol/lib-ts'
import {
Address,
BigInt,
Bytes,
ERC20Token,
EvmCallBuilder,
IntentBuilder,
NULL_ADDRESS,
TokenAmount,
} from '@mimicprotocol/lib-ts'

/* eslint-disable @typescript-eslint/no-namespace */
declare namespace input {
Expand All @@ -16,5 +25,9 @@ export default function main(): void {
const maxFeeAmount = BigInt.fromI32(input.firstStaticNumber).times(BigInt.fromI32(input.secondStaticNumber))
const maxFee = TokenAmount.fromBigInt(maxFeeToken, maxFeeAmount)

EvmCallBuilder.forChain(chainId).addCall(target, data).addSettler(settler).addMaxFee(maxFee).build().send()
new IntentBuilder()
.addSettler(settler)
.addMaxFee(maxFee)
.addOperationBuilder(EvmCallBuilder.forChain(chainId).addCall(target, data))
.send()
}
7 changes: 6 additions & 1 deletion packages/cli/tests/fixtures/functions/invalid-function.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
BlockchainToken,
Bytes,
EvmCallBuilder,
IntentBuilder,
NULL_ADDRESS,
TokenAmount,
} from '@mimicprotocol/lib-ts'
Expand All @@ -17,5 +18,9 @@ export default function main(): void {
const maxFeeAmount = BigInt.zero().plus(BigInt.fromI32(undeclaredVariable))
const maxFee = TokenAmount.fromBigInt(maxFeeToken, maxFeeAmount)

EvmCallBuilder.forChain(chainId).addCall(target, data).addSettler(settler).addMaxFee(maxFee).build().send()
new IntentBuilder()
.addSettler(settler)
.addMaxFee(maxFee)
.addOperationBuilder(EvmCallBuilder.forChain(chainId).addCall(target, data))
.send()
}
2 changes: 1 addition & 1 deletion packages/integration/tests/001-init-intent/expected.log
Original file line number Diff line number Diff line change
@@ -1 +1 @@
_evmCall: {"op":2,"settler":"0x6b175474e89094c44da98b954eedeac495271d0f","user":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","deadline":"1438223473","nonce":"0xabcd","maxFees":[{"token":"0x0000000000000000000000000000000000000000","amount":"10"}],"events":[],"chainId":1,"calls":[{"target":"0x0000000000000000000000000000000000000000","data":"0x","value":"5"}]}
_sendIntent: {"settler":"0x6b175474e89094c44da98b954eedeac495271d0f","feePayer":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","deadline":"1438223473","nonce":"0xabcd","maxFees":[{"token":"0x0000000000000000000000000000000000000000","amount":"10"}],"operations":[{"opType":2,"chainId":1,"user":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","events":[],"calls":[{"target":"0x0000000000000000000000000000000000000000","data":"0x","value":"5"}]}]}
4 changes: 2 additions & 2 deletions packages/integration/tests/001-init-intent/src/function.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
Bytes,
ChainId,
ERC20Token,
EvmCallBuilder,
IntentBuilder,
NULL_ADDRESS,
TokenAmount,
} from '@mimicprotocol/lib-ts'
Expand All @@ -16,5 +16,5 @@ export default function main(): void {
const value = BigInt.fromI32(5)
const fee = TokenAmount.fromI32(ERC20Token.fromString(NULL_ADDRESS, chainId), 10)

EvmCallBuilder.forChain(chainId).addCall(target, data, value).addMaxFee(fee).build().send()
new IntentBuilder().addMaxFee(fee).addEvmCallOperation(chainId, target, data, value).send()
}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
_evmCall: {"op":2,"settler":"0x6b175474e89094c44da98b954eedeac495271d0f","user":"0xa000000000000000000000000000000000000001","deadline":"1438223473","nonce":"0xabcd","maxFees":[{"token":"0xa000000000000000000000000000000000000003","amount":"10"}],"events":[],"chainId":1,"calls":[{"target":"0xa000000000000000000000000000000000000002","data":"0xabcdef0123456789","value":"1000000000000000000"}]}
_sendIntent: {"settler":"0x6b175474e89094c44da98b954eedeac495271d0f","feePayer":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","deadline":"1438223473","nonce":"0xabcd","maxFees":[{"token":"0xa000000000000000000000000000000000000003","amount":"10"}],"operations":[{"opType":2,"chainId":1,"user":"0xa000000000000000000000000000000000000001","events":[],"calls":[{"target":"0xa000000000000000000000000000000000000002","data":"0xabcdef0123456789","value":"1000000000000000000"}]}]}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,5 @@ export default function main(): void {
EvmCallBuilder.forChain(inputs.chainId)
.addCall(inputs.target, inputs.data, inputs.value)
.addUser(inputs.user)
.addMaxFee(maxFee)
.build()
.send()
.send(maxFee)
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
_evmCall: {"op":2,"settler":"0x6b175474e89094c44da98b954eedeac495271d0f","user":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","deadline":"1438223473","nonce":"0xabcd","maxFees":[{"token":"0x0000000000000000000000000000000000000000","amount":"10"}],"events":[],"chainId":1,"calls":[{"target":"0x0000000000000000000000000000000000000000","data":"0x","value":"0"}]}
_evmCall: {"op":2,"settler":"0x6b175474e89094c44da98b954eedeac495271d0f","user":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","deadline":"1438223473","nonce":"0xabcd","maxFees":[{"token":"0x0000000000000000000000000000000000000000","amount":"9"}],"events":[],"chainId":1,"calls":[{"target":"0x0000000000000000000000000000000000000000","data":"0x","value":"0"}]}
_evmCall: {"op":2,"settler":"0x6b175474e89094c44da98b954eedeac495271d0f","user":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","deadline":"1438223473","nonce":"0xabcd","maxFees":[{"token":"0x0000000000000000000000000000000000000000","amount":"8"}],"events":[],"chainId":1,"calls":[{"target":"0x0000000000000000000000000000000000000000","data":"0x","value":"0"}]}
_sendIntent: {"settler":"0x6b175474e89094c44da98b954eedeac495271d0f","feePayer":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","deadline":"1438223473","nonce":"0xabcd","maxFees":[{"token":"0x0000000000000000000000000000000000000000","amount":"10"}],"operations":[{"opType":2,"chainId":1,"user":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","events":[],"calls":[{"target":"0x0000000000000000000000000000000000000000","data":"0x","value":"0"}]}]}
_sendIntent: {"settler":"0x6b175474e89094c44da98b954eedeac495271d0f","feePayer":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","deadline":"1438223473","nonce":"0xabcd","maxFees":[{"token":"0x0000000000000000000000000000000000000000","amount":"9"}],"operations":[{"opType":2,"chainId":1,"user":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","events":[],"calls":[{"target":"0x0000000000000000000000000000000000000000","data":"0x","value":"0"}]}]}
_sendIntent: {"settler":"0x6b175474e89094c44da98b954eedeac495271d0f","feePayer":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","deadline":"1438223473","nonce":"0xabcd","maxFees":[{"token":"0x0000000000000000000000000000000000000000","amount":"8"}],"operations":[{"opType":2,"chainId":1,"user":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","events":[],"calls":[{"target":"0x0000000000000000000000000000000000000000","data":"0x","value":"0"}]}]}
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ export default function main(): void {
const data = Bytes.empty()

const fee1 = TokenAmount.fromI32(token, 10)
EvmCallBuilder.forChain(inputs.chainId).addCall(target, data).addMaxFee(fee1).build().send()
EvmCallBuilder.forChain(inputs.chainId).addCall(target, data).send(fee1)

const fee2 = fee1.minus(TokenAmount.fromI32(token, 1))
EvmCallBuilder.forChain(inputs.chainId).addCall(target, data).addMaxFee(fee2).build().send()
EvmCallBuilder.forChain(inputs.chainId).addCall(target, data).send(fee2)

const fee3 = fee1.minus(TokenAmount.fromI32(token, 2))
EvmCallBuilder.forChain(inputs.chainId).addCall(target, data).addMaxFee(fee3).build().send()
EvmCallBuilder.forChain(inputs.chainId).addCall(target, data).send(fee3)
}
7 changes: 4 additions & 3 deletions packages/integration/tests/004-three-intents/expected.log
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
_evmCall: {"op":2,"settler":"0x6b175474e89094c44da98b954eedeac495271d0f","user":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","deadline":"1438223473","nonce":"0xabcd","maxFees":[{"token":"0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48","amount":"10000000"}],"events":[],"chainId":1,"calls":[{"target":"0x0000000000000000000000000000000000000001","data":"0x","value":"0"},{"target":"0x0000000000000000000000000000000000000001","data":"0x7b000000","value":"0"}]}
_swap: {"op":0,"settler":"0x6b175474e89094c44da98b954eedeac495271d0f","user":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","deadline":"1438223473","nonce":"0xabcd","maxFees":[],"events":[],"sourceChain":1,"tokensIn":[{"token":"0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48","amount":"100000000"}],"tokensOut":[{"token":"0x2260fac5e5542a773aa44fbcfedf7c193bc2c599","minAmount":"9500000000","recipient":"0x0000000000000000000000000000000000000001"}],"destinationChain":1}
_transfer: {"op":1,"settler":"0x6b175474e89094c44da98b954eedeac495271d0f","user":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","deadline":"1438223473","nonce":"0xabcd","maxFees":[{"token":"0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48","amount":"10000000"}],"events":[],"chainId":1,"transfers":[{"token":"0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48","amount":"100000000","recipient":"0x0000000000000000000000000000000000000001"}]}
_sendIntent: {"settler":"0x6b175474e89094c44da98b954eedeac495271d0f","feePayer":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","deadline":"1438223473","nonce":"0xabcd","maxFees":[{"token":"0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48","amount":"10000000"}],"operations":[{"opType":2,"chainId":1,"user":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","events":[],"calls":[{"target":"0x0000000000000000000000000000000000000001","data":"0x","value":"0"},{"target":"0x0000000000000000000000000000000000000001","data":"0x7b000000","value":"0"}]}]}
_sendIntent: {"settler":"0x6b175474e89094c44da98b954eedeac495271d0f","feePayer":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","deadline":"1438223473","nonce":"0xabcd","maxFees":[],"operations":[{"opType":0,"chainId":1,"user":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","events":[],"sourceChain":1,"tokensIn":[{"token":"0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48","amount":"100000000"}],"tokensOut":[{"token":"0x2260fac5e5542a773aa44fbcfedf7c193bc2c599","minAmount":"9500000000","recipient":"0x0000000000000000000000000000000000000001"}],"destinationChain":1}]}
_sendIntent: {"settler":"0x6b175474e89094c44da98b954eedeac495271d0f","feePayer":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","deadline":"1438223473","nonce":"0xabcd","maxFees":[{"token":"0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48","amount":"10000000"}],"operations":[{"opType":1,"chainId":1,"user":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","events":[],"transfers":[{"token":"0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48","amount":"100000000","recipient":"0x0000000000000000000000000000000000000001"}]}]}
_sendIntent: {"settler":"0x6b175474e89094c44da98b954eedeac495271d0f","feePayer":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","deadline":"1438223473","nonce":"0xabcd","maxFees":[{"token":"0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48","amount":"10000000"}],"operations":[{"opType":2,"chainId":1,"user":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","events":[],"calls":[{"target":"0x0000000000000000000000000000000000000001","data":"0x","value":"0"},{"target":"0x0000000000000000000000000000000000000001","data":"0x7b000000","value":"0"}]},{"opType":0,"chainId":1,"user":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","events":[],"sourceChain":1,"tokensIn":[{"token":"0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48","amount":"100000000"}],"tokensOut":[{"token":"0x2260fac5e5542a773aa44fbcfedf7c193bc2c599","minAmount":"9500000000","recipient":"0x0000000000000000000000000000000000000001"}],"destinationChain":1},{"opType":1,"chainId":1,"user":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","events":[],"transfers":[{"token":"0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48","amount":"100000000","recipient":"0x0000000000000000000000000000000000000001"}]}]}
19 changes: 10 additions & 9 deletions packages/integration/tests/004-three-intents/src/function.ts
Comment thread
alavarello marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
Bytes,
ERC20Token,
EvmCallBuilder,
IntentBuilder,
SwapBuilder,
TokenAmount,
TransferBuilder,
Expand All @@ -22,26 +23,26 @@ export default function main(): void {
const bytes = Bytes.fromI32(123)
const callFee = TokenAmount.fromI32(USDC, 10)

EvmCallBuilder.forChain(chainId).addCall(target).addCall(target, bytes).addMaxFee(callFee).build().send()
const evmcall = EvmCallBuilder.forChain(chainId).addCall(target).addCall(target, bytes)
evmcall.send(callFee)

// Normal swap
const minAmountOut = BigInt.fromI32(inputs.amount).times(BigInt.fromI32(inputs.slippage)).div(BigInt.fromI32(100))
const tokenIn = TokenAmount.fromI32(USDC, inputs.amount)
const tokenOut = TokenAmount.fromStringDecimal(WBTC, minAmountOut.toString())

SwapBuilder.forChains(chainId, chainId)
const swap = SwapBuilder.forChains(chainId, chainId)
.addTokenInFromTokenAmount(tokenIn)
.addTokenOutFromTokenAmount(tokenOut, target)
.build()
.send()
swap.send()

// Normal Transfer
const tokenAmount = TokenAmount.fromI32(USDC, inputs.amount)
const transferFee = TokenAmount.fromI32(USDC, 10)

TransferBuilder.forChain(chainId)
.addTransferFromTokenAmount(tokenAmount, target)
.addMaxFee(transferFee)
.build()
.send()
const transfer = TransferBuilder.forChain(chainId).addTransferFromTokenAmount(tokenAmount, target)
transfer.send(transferFee)

// Same operations grouped in a single intent
new IntentBuilder().addMaxFee(callFee).addOperationsBuilders([evmcall, swap, transfer]).send()
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
_encode: [{"abiType":"address","value":"0x7f5c764cbc14f9669b88837ca1490cca17c31607"},{"abiType":"uint256","value":"100000000"},{"abiType":"address","value":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0"}]
_evmCall: {"op":2,"settler":"0xdcf1d9d12a0488dfb70a8696f44d6d3bc303963d","user":"0x047be3bb46f9416732fe39a05134f20235c19334","deadline":"1438223473","nonce":"0xabcd","maxFees":[{"token":"0x94b008aa00579c1307b0ef2c499ad98a8ce58e58","amount":"100000"}],"events":[],"chainId":10,"calls":[{"target":"0x794a61358d6845594f94dc1db02a252b5b4814ad","data":"0x69328dec00","value":"0"}]}
_evmCall: {"op":2,"settler":"0xdcf1d9d12a0488dfb70a8696f44d6d3bc303963d","user":"0x047be3bb46f9416732fe39a05134f20235c19334","deadline":"1438223473","nonce":"0xabcd","maxFees":[{"token":"0x94b008aa00579c1307b0ef2c499ad98a8ce58e58","amount":"100000"}],"events":[],"chainId":10,"calls":[{"target":"0x4200000000000000000000000000000000000006","data":"0xd0e30db0","value":"10"}]}
_sendIntent: {"settler":"0xdcf1d9d12a0488dfb70a8696f44d6d3bc303963d","feePayer":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","deadline":"1438223473","nonce":"0xabcd","maxFees":[{"token":"0x94b008aa00579c1307b0ef2c499ad98a8ce58e58","amount":"100000"}],"operations":[{"opType":2,"chainId":10,"user":"0x047be3bb46f9416732fe39a05134f20235c19334","events":[],"calls":[{"target":"0x794a61358d6845594f94dc1db02a252b5b4814ad","data":"0x69328dec00","value":"0"}]}]}
_sendIntent: {"settler":"0xdcf1d9d12a0488dfb70a8696f44d6d3bc303963d","feePayer":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","deadline":"1438223473","nonce":"0xabcd","maxFees":[{"token":"0x94b008aa00579c1307b0ef2c499ad98a8ce58e58","amount":"100000"}],"operations":[{"opType":2,"chainId":10,"user":"0x047be3bb46f9416732fe39a05134f20235c19334","events":[],"calls":[{"target":"0x4200000000000000000000000000000000000006","data":"0xd0e30db0","value":"10"}]}]}
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,7 @@ export default function main(): void {

const aaveContract = new AAVE(Address.fromString('0x794a61358d6845594f94dc1db02a252b5b4814ad'), chainId)

aaveContract
.withdraw(USDCe.address, userTokens[0].amount, context.user)
.addMaxFee(feeUsdt)
.addUser(inputs.smartAccount)
.build()
.send()

weth.deposit(BigInt.fromI32(10)).addMaxFee(feeUsdt).addUser(inputs.smartAccount).build().send()
aaveContract.withdraw(USDCe.address, userTokens[0].amount, context.user).addUser(inputs.smartAccount).send(feeUsdt)

weth.deposit(BigInt.fromI32(10)).addUser(inputs.smartAccount).send(feeUsdt)
}
6 changes: 3 additions & 3 deletions packages/integration/tests/009-solana-intents/expected.log
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
_transfer: {"op":1,"settler":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA","user":"HV1KXxWFaSeriyFvXyx48FqG9BoFbfinB8njCJonqP7K","deadline":"1438223473","nonce":"0xabcd","maxFees":[{"token":"So11111111111111111111111111111111111111112","amount":"1"}],"events":[],"chainId":507424,"transfers":[{"token":"So11111111111111111111111111111111111111112","amount":"4000000000000","recipient":"HV1KXxWFaSeriyFvXyx48FqG9BoFbfinB8njCJonqP7K"}]}
_swap: {"op":0,"settler":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA","user":"HV1KXxWFaSeriyFvXyx48FqG9BoFbfinB8njCJonqP7K","deadline":"1438223473","nonce":"0xabcd","maxFees":[],"events":[],"sourceChain":507424,"tokensIn":[{"token":"So11111111111111111111111111111111111111112","amount":"1000000000000"}],"tokensOut":[{"token":"So11111111111111111111111111111111111111112","minAmount":"2000","recipient":"HV1KXxWFaSeriyFvXyx48FqG9BoFbfinB8njCJonqP7K"}],"destinationChain":507424}
_svmCall: {"op":3,"settler":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA","user":"HV1KXxWFaSeriyFvXyx48FqG9BoFbfinB8njCJonqP7K","deadline":"1438223473","nonce":"0xabcd","maxFees":[{"token":"So11111111111111111111111111111111111111112","amount":"1"}],"events":[],"chainId":507424,"instructions":[{"programId":"TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb","accountsMeta":[{"pubkey":"HV1KXxWFaSeriyFvXyx48FqG9BoFbfinB8njCJonqP7K","isWritable":false,"isSigner":true},{"pubkey":"So11111111111111111111111111111111111111112","isWritable":true,"isSigner":false}],"data":"0xabcd"}]}
_sendIntent: {"settler":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA","feePayer":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","deadline":"1438223473","nonce":"0xabcd","maxFees":[{"token":"So11111111111111111111111111111111111111112","amount":"1"}],"operations":[{"opType":1,"chainId":507424,"user":"HV1KXxWFaSeriyFvXyx48FqG9BoFbfinB8njCJonqP7K","events":[],"transfers":[{"token":"So11111111111111111111111111111111111111112","amount":"4000000000000","recipient":"HV1KXxWFaSeriyFvXyx48FqG9BoFbfinB8njCJonqP7K"}]}]}
_sendIntent: {"settler":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA","feePayer":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","deadline":"1438223473","nonce":"0xabcd","maxFees":[],"operations":[{"opType":0,"chainId":507424,"user":"HV1KXxWFaSeriyFvXyx48FqG9BoFbfinB8njCJonqP7K","events":[],"sourceChain":507424,"tokensIn":[{"token":"So11111111111111111111111111111111111111112","amount":"1000000000000"}],"tokensOut":[{"token":"So11111111111111111111111111111111111111112","minAmount":"2000","recipient":"HV1KXxWFaSeriyFvXyx48FqG9BoFbfinB8njCJonqP7K"}],"destinationChain":507424}]}
_sendIntent: {"settler":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA","feePayer":"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0","deadline":"1438223473","nonce":"0xabcd","maxFees":[{"token":"So11111111111111111111111111111111111111112","amount":"1"}],"operations":[{"opType":4,"chainId":507424,"user":"HV1KXxWFaSeriyFvXyx48FqG9BoFbfinB8njCJonqP7K","events":[],"instructions":[{"programId":"TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb","accountsMeta":[{"pubkey":"HV1KXxWFaSeriyFvXyx48FqG9BoFbfinB8njCJonqP7K","isWritable":false,"isSigner":true},{"pubkey":"So11111111111111111111111111111111111111112","isWritable":true,"isSigner":false}],"data":"0xabcd"}]}]}
9 changes: 2 additions & 7 deletions packages/integration/tests/009-solana-intents/src/function.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,14 @@ export default function main(): void {
TransferBuilder.forChain(ChainId.SOLANA_MAINNET)
.addTransferFromI32(splToken, 4000, solanaUser)
.addUser(solanaUser)
.addMaxFee(new TokenAmount(splToken, BigInt.fromI32(1)))
.build()
.send()
.send(new TokenAmount(splToken, BigInt.fromI32(1)))

// Swap

SwapBuilder.forChain(ChainId.SOLANA_MAINNET)
.addTokenInFromStringDecimal(splToken, '1000')
.addTokenOutFromTokenAmount(new TokenAmount(splToken, BigInt.fromI32(2000)), solanaUser)
.addUser(solanaUser)
.build()
.send()

// Call
Expand All @@ -50,7 +47,5 @@ export default function main(): void {
SvmCallBuilder.forChain()
.addInstruction(ix)
.addUser(solanaUser)
.addMaxFee(new TokenAmount(splToken, BigInt.fromI32(1)))
.build()
.send()
.send(new TokenAmount(splToken, BigInt.fromI32(1)))
}
Loading
Loading