fix address of xfer instruction, fix get decimals to return bigint

wormhole-foundation · Oct 17, 2023 · 28b6b4e · 28b6b4e
1 parent d60b7cf
commit 28b6b4e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/core/base/src/utils/amount.ts b/core/base/src/utils/amount.ts
@@ -28,6 +28,7 @@ export function normalizeAmount(
 
   // combine whole and partial without decimals
   const amt = BigInt(whole + partial);
+
   // adjust number of decimals to account for decimals accounted for
   // when we remove the decimal place for amt
   decimals -= BigInt(partial.length);

diff --git a/examples/src/helpers/signers.ts b/examples/src/helpers/signers.ts
@@ -9,7 +9,7 @@ import {
   TxClient,
   createTransaction,
 } from "@injectivelabs/sdk-ts";
-import { Keypair } from "@solana/web3.js";
+import { Keypair, Transaction } from "@solana/web3.js";
 import {
   ChainName,
   PlatformToChains,
@@ -88,9 +88,22 @@ export class SolSigner implements Signer {
     const signed = [];
     for (const txn of tx) {
       const { description, transaction } = txn;
+
       console.log(`Signing: ${description} for ${this.address()}`);
       transaction.partialSign(this._keypair);
       signed.push(transaction.serialize());
+
+      // Uncomment for debug
+      //const st = transaction as Transaction;
+      //console.log(st.signatures);
+      //console.log(st.feePayer);
+      //st.instructions.forEach((ix) => {
+      //  console.log("Program", ix.programId.toBase58());
+      //  console.log("Data: ", ix.data.toString("hex"));
+      //  ix.keys.forEach((k) => {
+      //    console.log(k.pubkey.toBase58());
+      //  });
+      //});
     }
     return signed;
   }

diff --git a/examples/src/tokenBridge.ts b/examples/src/tokenBridge.ts
@@ -5,6 +5,7 @@ import {
   ChainName,
   Signer,
   normalizeAmount,
+  nativeChainAddress,
 } from "@wormhole-foundation/connect-sdk";
 // Import the platform specific packages
 import { EvmPlatform } from "@wormhole-foundation/connect-sdk-evm";
@@ -30,7 +31,6 @@ import { TransferStuff, getStuff, waitLog } from "./helpers";
   // Signer interface (e.g. wrapper around web wallet) should work
   const source = await getStuff(sendChain);
   const destination = await getStuff(rcvChain);
-
   const amt = normalizeAmount("0.01", 18n);
 
   // Choose your adventure

diff --git a/platforms/solana/src/platformUtils.ts b/platforms/solana/src/platformUtils.ts
@@ -57,7 +57,7 @@ export module SolanaUtils {
     if (!mint || !mint.value) throw new Error('could not fetch token details');
 
     const { decimals } = (mint.value.data as ParsedAccountData).parsed.info;
-    return decimals;
+    return BigInt(decimals);
   }
 
   export async function getBalance(

diff --git a/platforms/solana/src/protocols/tokenBridge.ts b/platforms/solana/src/protocols/tokenBridge.ts
@@ -435,7 +435,7 @@ export class SolanaTokenBridge implements TokenBridge<'Solana'> {
 
     const approvalIx = createApproveAuthoritySignerInstruction(
       this.tokenBridge.programId,
-      token.toUint8Array(),
+      senderTokenAddress,
       senderAddress,
       amount,
     );