Merge pull request #38 from xendfinance/staging

fix btc backend error
xendfinance · Oct 15, 2024 · 3cd02ca · 3cd02ca
2 parents ed98ffb + 7221425
commit 3cd02ca
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/backend-wbtc/src/services/blockchain.ts b/backend-wbtc/src/services/blockchain.ts
@@ -26,7 +26,6 @@ async function signHashedTransaction(
   signerIndex: number
 ) {
   const wallet = getWallet(signerIndex)
-  console.log(wallet.address, 'addess', signerIndex)
   const domain = {
     name: EIP712DOMAIN_NAME,
     version: EIP712DOMAIN_VERSION,
@@ -79,15 +78,15 @@ export const signTransaction = async (
       0
     )
     signatures.push(signer0)
-
-    const signer1 = await signHashedTransaction(
-      extractFulfillTransaction(tx),
-      chainId,
-      toBridgeAddress,
-      1
-    )
-    signatures.push(signer1)
-
+    if (process.env.PRIVATE_KEY2){
+      const signer1 = await signHashedTransaction(
+        extractFulfillTransaction(tx),
+        chainId,
+        toBridgeAddress,
+        1
+      )
+      signatures.push(signer1)
+    }
     return signatures
   } else {
     throw Error('bad contract params')

diff --git a/frontend/src/api/history.ts b/frontend/src/api/history.ts
@@ -31,7 +31,6 @@ const getUrl = (symbol: Symbol) => {
 }
 
 const axiosClientToken = (token: Symbol) =>{
-  console.log(token, getUrl(token), 'saklsa')
   return axios.create({
     baseURL: getUrl(token),
     transformResponse: [
@@ -87,7 +86,6 @@ export async function getTokenSignature(
   fromUser: string,
   index: number
 ): Promise<string | string[]> {
-  console.log(symbol, 'sdkd')
   const [response, error] = await safe(
     axiosClientToken(symbol).get<{ signature: string | string[] }>(SIGN, {
       params: { fromBridgeAddress, toBridgeAssistAddress, fromChain, fromUser, index },

diff --git a/frontend/src/components/bridge/BridgeCard.vue b/frontend/src/components/bridge/BridgeCard.vue
@@ -273,7 +273,7 @@ const balanceAfterReceive = computed(() => {
 
 const hasAllowance = computed(() => {
   if (!token || !token.symbol) return false
-  if ((token.symbol === "RWA" && from.value === '42421') || (token.symbol === "RWA" && from.value === '42420') || (token.symbol === "BTC" && from.value === '200810') || (token.symbol === "BTC" && from.value === '200810')) return true
+  if ((token.symbol === "RWA" && from.value === '42421') || (token.symbol === "RWA" && from.value === '42420') || (token.symbol === "BTC" && from.value === '200810') || (token.symbol === "BTC" && from.value === '200901')) return true
   return allowance(bridgeUI.from)
 })
 

diff --git a/frontend/src/store/contracts/bridge.ts b/frontend/src/store/contracts/bridge.ts
@@ -424,7 +424,6 @@ export const useBridge = defineContractStore<IBridgeAssistState, IBridgeAssistAc
         }
         this.loadingHistory = false
 
-        // console.log(signedTransactions)
 
         return signedTransactions.map((d) => ({
           ...d,
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             this.loadingHistory = false
-            // console.log(signedTransactions)
             return signedTransactions.map((d) => ({
               ...d,
@@ Expand Down @@