p2w-relay: Fix faulty merge resolution in favor of origin/main

Author: Stan Drozd

third_party/pyth/p2w-relay/package-lock.json

@@ -1,4 +1,3 @@
-import { fromUint8Array } from "js-base64";
 import {
   Coin,
   LCDClient,
@@ -7,7 +6,6 @@ import {
   Msg,
   MsgExecuteContract,
 } from "@terra-money/terra.js";
-import { hexToUint8Array } from "@certusone/wormhole-sdk";
 import axios from "axios";
 import { logger } from "../helpers";
 
@@ -67,6 +65,9 @@ export class TerraRelay implements Relay {
 
       const wallet = lcdClient.wallet(mk);
 
+      logger.debug("TIME: Querying fee");
+      let fee: Coin = await this.getUpdateFee(signedVAAs);
+
       logger.debug("TIME: creating messages");
 
       let base64VAAs = [];
@@ -182,18 +183,33 @@ export class TerraRelay implements Relay {
     logger.info("Querying terra for price info for priceId [" + priceId + "]");
 
     const lcdClient = new LCDClient(this.lcdConfig);
-
-    const mk = new MnemonicKey({
-      mnemonic: this.walletPrivateKey,
-    });
-
     return await lcdClient.wasm.contractQuery(this.contractAddress, {
       price_feed: {
         id: priceId,
       },
     });
   }
 
+  async getUpdateFee(hexVAAs: Array<string>): Promise<Coin> {
+    const lcdClient = new LCDClient(this.lcdConfig);
+
+    let base64VAAs = [];
+    for (let idx = 0; idx < hexVAAs.length; ++idx) {
+      base64VAAs.push(Buffer.from(hexVAAs[idx], "hex").toString("base64"));
+    }
+
+    let result = await lcdClient.wasm.contractQuery<Coin.Data>(
+      this.contractAddress,
+      {
+        get_update_fee: {
+          vaas: base64VAAs,
+        },
+      }
+    );
+
+    return Coin.fromData(result);
+  }
+
   async getPayerInfo(): Promise<{ address: string; balance: bigint }> {
     const lcdClient = new LCDClient(this.lcdConfig);