Merge pull request #687 from bob-collective/refactor/gateway-v4

refactor: improve sdk for v4

Author: gregdhill

sdk/examples/gateway.ts

@@ -1,11 +1,21 @@
 import { Network, XverseConnector } from '@gobob/sats-wagmi';
-import { Address, createPublicClient, createWalletClient, http, PublicClient, Transport, zeroAddress } from 'viem';
+import {
+    Address,
+    createPublicClient,
+    createWalletClient,
+    encodeAbiParameters,
+    encodeFunctionData,
+    http,
+    parseAbi,
+    parseAbiParameters,
+    PublicClient,
+    Transport,
+    zeroAddress,
+} from 'viem';
 import { bob } from 'viem/chains';
 
 import { GatewaySDK } from '../src/gateway';
 
-const BOB_TBTC_V2_TOKEN_ADDRESS = '0xBBa2eF945D523C4e2608C9E1214C2Cc64D4fc2e2';
-
 export async function swapBtcForToken(evmAddress: Address) {
     const publicClient = createPublicClient({
         chain: bob,
@@ -20,15 +30,15 @@ export async function swapBtcForToken(evmAddress: Address) {
     });
     const btcSigner = new XverseConnector(Network.mainnet);
 
-    const gatewaySDK = new GatewaySDK('bob'); // or "mainnet"
+    const gatewaySDK = new GatewaySDK(bob.id);
 
     const quote = await gatewaySDK.getQuote({
         fromChain: 'bitcoin',
         fromToken: 'BTC',
         fromUserAddress: 'bc1qafk4yhqvj4wep57m62dgrmutldusqde8adh20d',
         toChain: 'bob',
         toUserAddress: evmAddress,
-        toToken: BOB_TBTC_V2_TOKEN_ADDRESS, // or "tBTC"
+        toToken: 'wBTC',
         amount: 10000000, // 0.1 BTC
         gasRefill: 10000, // 0.0001 BTC,
     });
@@ -39,11 +49,11 @@ export async function swapBtcForToken(evmAddress: Address) {
         btcSigner,
     });
 
-    console.log(`Success! Txid = ${onrampTx}`);
+    console.log(`Onramp success! Txid = ${onrampTx}`);
 
     const offrampQuote = await gatewaySDK.getQuote({
         fromChain: 'bob',
-        fromToken: BOB_TBTC_V2_TOKEN_ADDRESS, // or "tBTC"
+        fromToken: 'wBTC',
         toChain: 'bitcoin',
         toUserAddress: 'bc1qafk4yhqvj4wep57m62dgrmutldusqde8adh20d',
         toToken: 'BTC',
@@ -55,5 +65,86 @@ export async function swapBtcForToken(evmAddress: Address) {
         publicClient: publicClient as PublicClient<Transport>,
     });
 
-    console.log(`Success! Txid = ${offrampTx}`);
+    console.log(`Offramp success! Txid = ${offrampTx}`);
+}
+
+function generateMessageForMulticallHandler(
+    userAddress: Address,
+    aaveAddress: Address,
+    depositAmount: bigint,
+    depositCurrency: Address,
+    aaveReferralCode: number
+) {
+    const approveFunction = 'function approve(address spender, uint256 value)';
+    const depositFunction = 'function deposit(address asset, uint256 amount, address onBehalfOf, uint16 referralCode)';
+
+    const erc20Interface = parseAbi([approveFunction]);
+    const aaveInterface = parseAbi([depositFunction]);
+
+    const approveCalldata = encodeFunctionData({
+        abi: erc20Interface,
+        functionName: 'approve',
+        args: [aaveAddress, depositAmount],
+    });
+    const depositCalldata = encodeFunctionData({
+        abi: aaveInterface,
+        functionName: 'deposit',
+        args: [depositCurrency, depositAmount, userAddress, aaveReferralCode],
+    });
+
+    return encodeAbiParameters(
+        parseAbiParameters('((address target, bytes callData, uint256 value)[], address fallbackRecipient)'),
+        [
+            [
+                [
+                    { target: depositCurrency, callData: approveCalldata, value: 0n },
+                    { target: aaveAddress, callData: depositCalldata, value: 0n },
+                ],
+                userAddress,
+            ],
+        ]
+    );
+}
+
+export async function onrampAndDeposit(evmAddress: Address) {
+    const publicClient = createPublicClient({
+        chain: bob,
+        transport: http(),
+    });
+
+    const walletClient = createWalletClient({
+        chain: bob,
+        transport: http(),
+        account: evmAddress,
+    });
+
+    const btcSigner = new XverseConnector(Network.mainnet);
+
+    const gatewaySDK = new GatewaySDK(bob.id);
+
+    const quote = await gatewaySDK.getQuote({
+        fromChain: 'bitcoin',
+        fromToken: 'BTC',
+        fromUserAddress: 'bc1qafk4yhqvj4wep57m62dgrmutldusqde8adh20d',
+        toChain: 'bob',
+        toUserAddress: evmAddress,
+        toToken: 'wBTC',
+        amount: 10000000, // 0.1 BTC
+        gasRefill: 10000, // 0.0001 BTC,
+        message: generateMessageForMulticallHandler(
+            evmAddress,
+            '0x35B3F1BFe7cbE1e95A3DC2Ad054eB6f0D4c879b6', // Avalon pool
+            10000000n,
+            '0xd6890176e8d912142AC489e8B5D8D93F8dE74D60', // WBTC-AToken-BOB
+            0
+        ),
+    });
+
+    const onrampTx = await gatewaySDK.executeQuote(quote, {
+        walletClient,
+        publicClient: publicClient as PublicClient<Transport>,
+        btcSigner,
+    });
+
+    console.log(`Onramp success! Txid = ${onrampTx}`);
 }

sdk/package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@gobob/bob-sdk",
-    "version": "3.3.4-alpha5",
+    "version": "4.0.0",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "scripts": {
@@ -47,8 +47,7 @@
         "@scure/btc-signer": "^1.6.0",
         "bitcoin-address-validation": "^3.0.0",
         "bitcoinjs-lib": "^6.1.7",
-        "ethers": "^6.14.4",
         "viem": "^2.31.0",
         "global": "^4.4.0"
     }
-}
+}