Merge pull request #144 from invariant-labs/add-execute-methods

add execute methods and create pool and position script

contracts/scripts/invariant_tx.ral

@@ -67,3 +67,26 @@ TxScript Swap(invariant: Invariant, poolKey: PoolKey, xToY: Bool, amount: TokenA
     let _ = invariant.swap{callerAddress!() -> swappedToken: swappedAmount}(poolKey, xToY, amount, byAmountIn, sqrtPriceLimit)
 }
 
+TxScript CreatePoolAndPosition(
+    invariant: Invariant,
+    poolKey: PoolKey,
+    initSqrtPrice: SqrtPrice,
+    initTick: I256, 
+    lowerTick: I256,
+    upperTick: I256,
+    liquidityDelta: Liquidity,
+    slippageLimitLower: SqrtPrice,
+    slippageLimitUpper: SqrtPrice
+) {
+    invariant.createPool{callerAddress!() -> ALPH: 5 * mapEntryDeposit!() }(poolKey.tokenX, poolKey.tokenY, poolKey.feeTier, initSqrtPrice, initTick)
+
+    let amountX = tokenRemaining!(callerAddress!(), poolKey.tokenX)
+    let amountY = tokenRemaining!(callerAddress!(), poolKey.tokenY)
+    if(poolKey.tokenX == ALPH) {
+        invariant.createPosition{callerAddress!() -> ALPH: amountX, poolKey.tokenY: amountY}
+            (poolKey, lowerTick, upperTick, liquidityDelta, slippageLimitLower, slippageLimitUpper)    
+    } else {
+        invariant.createPosition{callerAddress!() -> poolKey.tokenX: amountX, poolKey.tokenY: amountY, ALPH: mapEntryDeposit!() * 6}
+            (poolKey, lowerTick, upperTick, liquidityDelta, slippageLimitLower, slippageLimitUpper)
+    }
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@invariant-labs/alph-sdk",
-  "version": "0.0.13",
+  "version": "0.0.17",
   "collaborators": [
     "Invariant Labs"
   ],

src/consts.ts

@@ -15,6 +15,7 @@ import {
   FeeGrowth,
   FixedPoint,
   Liquidity,
+  Options,
   Percentage,
   Price,
   SqrtPrice,
@@ -91,3 +92,7 @@ export const SOL_ID = {
   [Network.Testnet]: 'c925472266dbd7f2e01313ad787cfb12b7f4be6776e9a3b02daed9dde7706200',
   [Network.Mainnet]: ''
 }
+
+export const CONFIRMATIONS = 1
+export const REQUEST_INTERVAL = 1000
+export const DEFAULT_OPTIONS: Options = { waitForTxConfirmation: true }

src/fungible-token.ts

@@ -6,13 +6,14 @@ import {
   SignerProvider,
   stringToHex,
   TransactionBuilder,
+  waitForTxConfirmation,
   web3
 } from '@alephium/web3'
 import { Network } from './network'
 import { Airdrop, TokenFaucet, Withdraw } from '../artifacts/ts'
 import { balanceOf, signAndSend, waitTxConfirmed } from './utils'
-import { MAX_U256 } from './consts'
-import { TokenAmount } from './types'
+import { CONFIRMATIONS, DEFAULT_OPTIONS, MAX_U256, REQUEST_INTERVAL } from './consts'
+import { Options, TokenAmount } from './types'
 
 export type TokenMetaData = {
   symbol: string
@@ -59,25 +60,22 @@ export class FungibleToken {
     return new FungibleToken()
   }
 
-  async mintTx(signer: SignerProvider, value: TokenAmount, tokenId: string) {
-    const builder = TransactionBuilder.from(web3.getCurrentNodeProvider())
-    const bytecode = Withdraw.script.buildByteCodeToDeploy({
-      token: tokenId,
-      amount: value
+  async mint(
+    signer: SignerProvider,
+    value: TokenAmount,
+    tokenId: string,
+    options: Options = DEFAULT_OPTIONS
+  ) {
+    const result = await Withdraw.execute(signer, {
+      initialFields: { token: tokenId, amount: value },
+      attoAlphAmount: DUST_AMOUNT
     })
 
-    const { address, publicKey } = await signer.getSelectedAccount()
-
-    const unsignedTxBuild = await builder.buildExecuteScriptTx(
-      { signerAddress: address, bytecode, attoAlphAmount: DUST_AMOUNT },
-      publicKey
-    )
-    return unsignedTxBuild
-  }
+    if (options.waitForTxConfirmation) {
+      await waitForTxConfirmation(result.txId, CONFIRMATIONS, REQUEST_INTERVAL)
+    }
 
-  async mint(signer: SignerProvider, value: TokenAmount, tokenId: string) {
-    const tx = await this.mintTx(signer, value, tokenId)
-    return await signAndSend(signer, tx)
+    return result.txId
   }
 
   async getAllBalances(tokens: string[], owner: Address): Promise<Map<string, TokenAmount>> {
@@ -122,52 +120,32 @@ export class FungibleToken {
     return BigInt((await nodeProvider.fetchFungibleTokenMetaData(tokenId)).decimals)
   }
 
-  async airdropTx(
+  async airdrop(
     signer: SignerProvider,
     valueOne: TokenAmount,
     tokenOneId: string,
     valueTwo: TokenAmount,
     tokenTwoId: string,
     valueThree: TokenAmount,
-    tokenThreeId: string
+    tokenThreeId: string,
+    options: Options = DEFAULT_OPTIONS
   ) {
-    const builder = TransactionBuilder.from(web3.getCurrentNodeProvider())
-    const bytecode = Airdrop.script.buildByteCodeToDeploy({
-      tokenOne: tokenOneId,
-      amountOne: valueOne,
-      tokenTwo: tokenTwoId,
-      amountTwo: valueTwo,
-      tokenThree: tokenThreeId,
-      amountThree: valueThree
+    const result = await Airdrop.execute(signer, {
+      initialFields: {
+        tokenOne: tokenOneId,
+        amountOne: valueOne,
+        tokenTwo: tokenTwoId,
+        amountTwo: valueTwo,
+        tokenThree: tokenThreeId,
+        amountThree: valueThree
+      },
+      attoAlphAmount: DUST_AMOUNT * 3n
     })
 
-    const { address, publicKey } = await signer.getSelectedAccount()
-
-    const unsignedTxBuild = await builder.buildExecuteScriptTx(
-      { signerAddress: address, bytecode, attoAlphAmount: DUST_AMOUNT * 3n },
-      publicKey
-    )
-    return unsignedTxBuild
-  }
+    if (options.waitForTxConfirmation) {
+      await waitForTxConfirmation(result.txId, CONFIRMATIONS, REQUEST_INTERVAL)
+    }
 
-  async airdrop(
-    signer: SignerProvider,
-    valueOne: TokenAmount,
-    tokenOneId: string,
-    valueTwo: TokenAmount,
-    tokenTwoId: string,
-    valueThree: TokenAmount,
-    tokenThreeId: string
-  ) {
-    const tx = await this.airdropTx(
-      signer,
-      valueOne,
-      tokenOneId,
-      valueTwo,
-      tokenTwoId,
-      valueThree,
-      tokenThreeId
-    )
-    return await signAndSend(signer, tx)
+    return result.txId
   }
 }