sdk/js: Injective refactor

Updated injectivelabs packages, refactored code, added utility functions
abdeldrm · Nov 9, 2022 · d00c8ba · d00c8ba
1 parent 51eac51
commit d00c8ba
Show file tree

Hide file tree

Showing 14 changed files with 843 additions and 252 deletions.
diff --git a/sdk/js/CHANGELOG.md b/sdk/js/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.9.1
+
+### Added
+
+queryExternalIdInjective
+
+parseSmartContractStateResponse
+
 ## 0.9.0
 
 ### Added

diff --git a/sdk/js/package-lock.json b/sdk/js/package-lock.json
diff --git a/sdk/js/package.json b/sdk/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@certusone/wormhole-sdk",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "SDK for interacting with Wormhole",
   "homepage": "https://wormhole.com",
   "main": "./lib/cjs/index.js",
@@ -40,8 +40,8 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@improbable-eng/grpc-web-node-http-transport": "^0.15.0",
-    "@injectivelabs/networks": "^1.0.12",
-    "@injectivelabs/tx-ts": "^1.0.22",
+    "@injectivelabs/networks": "^1.0.37",
+    "@injectivelabs/tx-ts": "^1.0.43",
     "@openzeppelin/contracts": "^4.2.0",
     "@typechain/ethers-v5": "^7.0.1",
     "@types/elliptic": "^6.4.14",
@@ -63,7 +63,7 @@
   "dependencies": {
     "@certusone/wormhole-sdk-proto-web": "^0.0.5",
     "@certusone/wormhole-sdk-wasm": "^0.0.1",
-    "@injectivelabs/sdk-ts": "^1.0.75",
+    "@injectivelabs/sdk-ts": "^1.0.211",
     "@project-serum/anchor": "^0.25.0",
     "@solana/spl-token": "^0.3.5",
     "@solana/web3.js": "^1.66.2",

diff --git a/sdk/js/src/cosmwasm/query.testnet.test.ts b/sdk/js/src/cosmwasm/query.testnet.test.ts
@@ -6,12 +6,13 @@ import {
   privateKeyToPublicKeyBase64,
 } from "@injectivelabs/sdk-ts";
 import { createTransaction, MsgArg, TxGrpcClient } from "@injectivelabs/tx-ts";
-import { PrivateKey } from "@injectivelabs/sdk-ts/dist/local";
+import { PrivateKey } from "@injectivelabs/sdk-ts";
 import { expect, test } from "@jest/globals";
 import {
   attestFromAlgorand,
   attestFromInjective,
   CHAIN_ID_ALGORAND,
+  CHAIN_ID_BSC,
   CHAIN_ID_INJECTIVE,
   coalesceChainId,
   CONTRACTS,
@@ -121,11 +122,11 @@ test.skip("testnet - injective query token bridge", async () => {
     Buffer.from(
       JSON.stringify({
         wrapped_registry: {
-          chain: coalesceChainId("injective"),
-          address: tryNativeToHexString(
-            "inj10jc4vr9vfq0ykkmfvfgz430w8z6hwdlqhdw9l8",
-            "injective"
-          ),
+          chain: CHAIN_ID_BSC,
+          address: Buffer.from(
+            "000000000000000000000000ae13d989dac2f0debff460ac112a837c89baa7cd",
+            "hex"
+          ).toString("base64"),
         },
       })
     ).toString("base64")
@@ -179,22 +180,19 @@ test.skip("testnet - injective attest native asset", async () => {
 
   /** Append Signatures */
   txRaw.setSignaturesList([signature]);
-  const txService = new TxGrpcClient({
-    txRaw,
-    endpoint: network.sentryGrpcApi,
-  });
+  const txService = new TxGrpcClient(network.sentryGrpcApi);
 
   console.log("Simulating transaction...");
   /** Simulate transaction */
-  const simulationResponse = await txService.simulate();
+  const simulationResponse = await txService.simulate(txRaw);
   console.log(
     `Transaction simulation response: ${JSON.stringify(
       simulationResponse.gasInfo
     )}`
   );
 
   /** Broadcast transaction */
-  const txResponse = await txService.broadcast();
+  const txResponse = await txService.broadcast(txRaw);
   console.log(
     `Broadcasted transaction hash: ${JSON.stringify(txResponse.txhash)}`
   );
@@ -237,7 +235,7 @@ test.skip("testnet - injective attest native asset", async () => {
 });
 test.skip("testnet - injective attest foreign asset", async () => {
   const tba = CONTRACTS.TESTNET.injective.token_bridge;
-  const wallet = "inj180rl9ezc4389t72pc3vvlkxxs5d9jx60w9eeu3";
+  const wallet = "inj13un2qqjaenrvlsr605u82c5q5y8zjkkhdgcetq";
   const foreignAssetAddress = "inj13772jvadyx4j0hrlfh4jzk0v39k8uyfxrfs540";
   const result = await attestFromInjective(tba, wallet, foreignAssetAddress);
   console.log("token", JSON.stringify(result.params.msg));
@@ -270,21 +268,18 @@ test.skip("testnet - injective attest foreign asset", async () => {
 
   /** Append Signatures */
   txRaw.setSignaturesList([signature]);
-  const txService = new TxGrpcClient({
-    txRaw,
-    endpoint: network.sentryGrpcApi,
-  });
+  const txService = new TxGrpcClient(network.sentryGrpcApi);
 
   /** Simulate transaction */
-  const simulationResponse = await txService.simulate();
+  const simulationResponse = await txService.simulate(txRaw);
   console.log(
     `Transaction simulation response: ${JSON.stringify(
       simulationResponse.gasInfo
     )}`
   );
 
   /** Broadcast transaction */
-  const txResponse = await txService.broadcast();
+  const txResponse = await txService.broadcast(txRaw);
   console.log(
     `Broadcasted transaction hash: ${JSON.stringify(txResponse.txhash)}`
   );
@@ -297,14 +292,13 @@ test.skip("testnet - injective get foreign asset", async () => {
   const network = getNetworkInfo(getEndPoint());
   const client = new ChainGrpcWasmApi(network.sentryGrpcApi);
   // const foreignAssetAddress = "inj10jc4vr9vfq0ykkmfvfgz430w8z6hwdlqhdw9l8";
-  const foreignAssetAddress = "inj13772jvadyx4j0hrlfh4jzk0v39k8uyfxrfs540";
-  const ateArray = tryNativeToUint8Array(foreignAssetAddress, "injective");
-  console.log("wormhole address:", ateArray);
+  const foreignAssetAddress =
+    "000000000000000000000000ae13d989dac2f0debff460ac112a837c89baa7cd";
   const result = await getForeignAssetInjective(
     tba,
     client,
-    CHAIN_ID_INJECTIVE,
-    ateArray
+    CHAIN_ID_BSC,
+    hexToUint8Array(foreignAssetAddress)
   );
   console.log("result", result);
 
@@ -436,14 +430,11 @@ test.skip("testnet - injective submit a vaa", async () => {
     /** Append Signatures */
     txRaw.setSignaturesList([signature]);
 
-    const txService = new TxGrpcClient({
-      txRaw,
-      endpoint: network.sentryGrpcApi,
-    });
+    const txService = new TxGrpcClient(network.sentryGrpcApi);
 
     console.log("simulate transaction...");
     /** Simulate transaction */
-    const simulationResponse = await txService.simulate();
+    const simulationResponse = await txService.simulate(txRaw);
     console.log(
       `Transaction simulation response: ${JSON.stringify(
         simulationResponse.gasInfo
@@ -452,7 +443,7 @@ test.skip("testnet - injective submit a vaa", async () => {
 
     console.log("broadcast transaction...");
     /** Broadcast transaction */
-    const txResponse = await txService.broadcast();
+    const txResponse = await txService.broadcast(txRaw);
     console.log("txResponse", txResponse);
 
     if (txResponse.code !== 0) {
@@ -534,14 +525,11 @@ test.skip("testnet - injective submit a vaa", async () => {
       /** Append Signatures */
       txRaw.setSignaturesList([sig]);
 
-      const txService = new TxGrpcClient({
-        txRaw,
-        endpoint: network.sentryGrpcApi,
-      });
+      const txService = new TxGrpcClient(network.sentryGrpcApi);
 
       console.log("simulate transaction...");
       /** Simulate transaction */
-      const simulationResponse = await txService.simulate();
+      const simulationResponse = await txService.simulate(txRaw);
       console.log(
         `Transaction simulation response: ${JSON.stringify(
           simulationResponse.gasInfo
@@ -550,7 +538,7 @@ test.skip("testnet - injective submit a vaa", async () => {
 
       console.log("broadcast transaction...");
       /** Broadcast transaction */
-      const txResponse = await txService.broadcast();
+      const txResponse = await txService.broadcast(txRaw);
       console.log("txResponse", txResponse);
 
       if (txResponse.code !== 0) {
@@ -629,7 +617,7 @@ test.skip("testnet - injective submit a vaa", async () => {
 
 test.skip("Attest and transfer token from Injective to Algorand", async () => {
   const Asset: string = "inj";
-  const walletPKHash: string = process.env.INJ_PK_HASH || "";
+  const walletPKHash: string = process.env.ETH_KEY || "";
   const walletPK = PrivateKey.fromPrivateKey(walletPKHash);
   const walletInjAddr = walletPK.toBech32();
   const walletPublicKey = privateKeyToPublicKeyBase64(
@@ -671,14 +659,11 @@ test.skip("Attest and transfer token from Injective to Algorand", async () => {
   /** Append Signatures */
   txRaw.setSignaturesList([signedMsg]);
 
-  const txService = new TxGrpcClient({
-    txRaw,
-    endpoint: network.sentryGrpcApi,
-  });
+  const txService = new TxGrpcClient(network.sentryGrpcApi);
 
   console.log("simulate transaction...");
   /** Simulate transaction */
-  const simulationResponse = await txService.simulate();
+  const simulationResponse = await txService.simulate(txRaw);
   console.log(
     `Transaction simulation response: ${JSON.stringify(
       simulationResponse.gasInfo
@@ -687,7 +672,7 @@ test.skip("Attest and transfer token from Injective to Algorand", async () => {
 
   console.log("broadcast transaction...");
   /** Broadcast transaction */
-  const txResponse = await txService.broadcast();
+  const txResponse = await txService.broadcast(txRaw);
   console.log("txResponse", txResponse);
 
   if (txResponse.code !== 0) {
@@ -800,22 +785,19 @@ test.skip("Attest and transfer token from Injective to Algorand", async () => {
     /** Append Signatures */
     txRaw.setSignaturesList([signedMsg]);
 
-    const txService = new TxGrpcClient({
-      txRaw,
-      endpoint: network.sentryGrpcApi,
-    });
+    const txService = new TxGrpcClient(network.sentryGrpcApi);
 
     console.log("simulate transaction...");
     /** Simulate transaction */
-    const simulationResponse = await txService.simulate();
+    const simulationResponse = await txService.simulate(txRaw);
     console.log(
       `Transaction simulation response: ${JSON.stringify(
         simulationResponse.gasInfo
       )}`
     );
     console.log("broadcast transaction...");
     /** Broadcast transaction */
-    const txResponse = await txService.broadcast();
+    const txResponse = await txService.broadcast(txRaw);
     console.log("txResponse", txResponse);
 
     if (txResponse.code !== 0) {

diff --git a/sdk/js/src/token_bridge/attest.testnet.test.ts b/sdk/js/src/token_bridge/attest.testnet.test.ts
@@ -3,14 +3,14 @@ import {
   ChainRestAuthApi,
   DEFAULT_STD_FEE,
   MsgExecuteContract,
+  PrivateKey,
   privateKeyToPublicKeyBase64,
 } from "@injectivelabs/sdk-ts";
 import {
   createTransaction,
   TxClient,
   TxGrpcClient,
 } from "@injectivelabs/tx-ts";
-import { PrivateKey } from "@injectivelabs/sdk-ts/dist/local";
 import { test } from "@jest/globals";
 import { CONTRACTS } from "..";
 
@@ -83,14 +83,11 @@ test.skip("testnet - injective attest native token", async () => {
   console.log("Calculate hash");
   console.log(`Transaction Hash: ${await TxClient.hash(txRaw)}`);
 
-  const txService = new TxGrpcClient({
-    txRaw,
-    endpoint: network.sentryGrpcApi,
-  });
+  const txService = new TxGrpcClient(network.sentryGrpcApi);
 
   /** Simulate transaction */
   console.log("Simulate transaction");
-  const simulationResponse = await txService.simulate();
+  const simulationResponse = await txService.simulate(txRaw);
   console.log(
     `Transaction simulation response: ${JSON.stringify(
       simulationResponse.gasInfo
@@ -99,7 +96,7 @@ test.skip("testnet - injective attest native token", async () => {
 
   /** Broadcast transaction */
   console.log("Broadcast transaction");
-  const txResponse = await txService.broadcast();
+  const txResponse = await txService.broadcast(txRaw);
   console.log(
     `Broadcasted transaction hash: ${JSON.stringify(txResponse.txhash)}`
   );

diff --git a/sdk/js/src/token_bridge/attest.ts b/sdk/js/src/token_bridge/attest.ts
@@ -18,7 +18,6 @@ import {
   OnApplicationComplete,
   SuggestedParams,
 } from "algosdk";
-import { Account as nearAccount } from "near-api-js";
 import BN from "bn.js";
 import { ethers, PayableOverrides } from "ethers";
 import { isNativeDenom } from "../terra";

diff --git a/sdk/js/src/token_bridge/getForeignAsset.ts b/sdk/js/src/token_bridge/getForeignAsset.ts
@@ -20,6 +20,7 @@ import {
   coalesceChainId,
   getAssetFullyQualifiedType,
   coalesceModuleAddress,
+  parseSmartContractStateResponse,
 } from "../utils";
 import { Provider } from "near-api-js/lib/providers";
 import { LCDClient as XplaLCDClient } from "@xpla/xpla.js";
@@ -97,13 +98,8 @@ export async function getForeignAssetInjective(
         })
       ).toString("base64")
     );
-    let result: any = null;
-    if (typeof queryResult.data === "string") {
-      result = JSON.parse(
-        Buffer.from(queryResult.data, "base64").toString("utf-8")
-      );
-    }
-    return result.address;
+    const parsed = parseSmartContractStateResponse(queryResult);
+    return parsed.address;
   } catch (e) {
     return null;
   }

diff --git a/sdk/js/src/token_bridge/getIsTransferCompleted.ts b/sdk/js/src/token_bridge/getIsTransferCompleted.ts
@@ -7,7 +7,11 @@ import axios from "axios";
 import { ethers } from "ethers";
 import { fromUint8Array } from "js-base64";
 import { redeemOnTerra } from ".";
-import { ensureHexPrefix, TERRA_REDEEMED_CHECK_WALLET_ADDRESS } from "..";
+import {
+  ensureHexPrefix,
+  parseSmartContractStateResponse,
+  TERRA_REDEEMED_CHECK_WALLET_ADDRESS,
+} from "..";
 import { getClaim } from "../solana/wormhole";
 import {
   BITS_PER_KEY,
@@ -125,13 +129,8 @@ export async function getIsTransferCompletedInjective(
       })
     ).toString("base64")
   );
-  if (typeof queryResult.data === "string") {
-    const result = JSON.parse(
-      Buffer.from(queryResult.data, "base64").toString("utf-8")
-    );
-    return result.is_redeemed;
-  }
-  return false;
+  const parsed = parseSmartContractStateResponse(queryResult);
+  return parsed.is_redeemed;
 }
 
 export async function getIsTransferCompletedXpla(