Chore: Refactor intents with operations and add dynamic call (#222)

Co-authored-by: lgalende <63872655+lgalende@users.noreply.github.com>
Co-authored-by: lgalende <lau@mimic.fi>

Author: alavarello

.changeset/late-cobras-turn.md

@@ -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.1.0

.changeset/spicy-areas-switch.md

@@ -0,0 +1,7 @@
+---
+"@mimicprotocol/test-ts": minor
+"@mimicprotocol/lib-ts": minor
+"@mimicprotocol/cli": minor
+---
+
+Add operations and dynamic call operation

packages/cli/tests/fixtures/functions/function.ts

@@ -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 {
@@ -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()
 }

packages/cli/tests/fixtures/functions/invalid-function.ts

@@ -4,6 +4,7 @@ import {
   BlockchainToken,
   Bytes,
   EvmCallBuilder,
+  IntentBuilder,
   NULL_ADDRESS,
   TokenAmount,
 } from '@mimicprotocol/lib-ts'
@@ -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()
 }

packages/integration/tests/001-init-intent/expected.log

@@ -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"}]}]}

packages/integration/tests/001-init-intent/src/function.ts

@@ -4,7 +4,7 @@ import {
   Bytes,
   ChainId,
   ERC20Token,
-  EvmCallBuilder,
+  IntentBuilder,
   NULL_ADDRESS,
   TokenAmount,
 } from '@mimicprotocol/lib-ts'
@@ -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()
 }

packages/integration/tests/002-evm-call-intent/expected.log

@@ -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"}]}]}

packages/integration/tests/002-evm-call-intent/src/function.ts

@@ -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)
 }

packages/integration/tests/003-multiple-evm-call-intents/expected.log

@@ -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"}]}]}

packages/integration/tests/003-multiple-evm-call-intents/src/function.ts

@@ -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)
 }