Merge pull request #31 from xendfinance/fix

add coinbase and trustwallet
xendfinance · Sep 30, 2024 · 4e79224 · 4e79224
2 parents 6b97b2a + e6fd1ea
commit 4e79224
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 76 deletions.
diff --git a/backend-ausdce/src/services/blockchain.ts b/backend-ausdce/src/services/blockchain.ts
@@ -74,15 +74,15 @@ export const signTransaction = async (
   if (tx.toChain.startsWith('evm.')) {
     const chainId = tx.toChain.replace('evm.', '')
     // const { bridgeAssist } = useContracts(undefined, chainId as ChainId)
-    let signatures = []
+    let signatures : any[] = []
     const signer0 = await signHashedTransaction(
       extractFulfillTransaction(tx),
       chainId,
       toBridgeAddress,
       0
     )
     signatures.push(signer0)
-    if (process.env.PROD){
+    if (process.env.PRIVATE_KEY2){
       const signer1 = await signHashedTransaction(
         extractFulfillTransaction(tx),
         chainId,

diff --git a/backend-usdc/src/services/blockchain.ts b/backend-usdc/src/services/blockchain.ts
@@ -246,7 +246,7 @@ export const signTransaction = async (
       0
     )
     signatures.push(signer0)
-    if (process.env.PROD){
+    if (process.env.PRIVATE_KEY2){
       const signer1 = await signHashedTransaction(
         extractFulfillTransaction(tx),
         chainId,

diff --git a/backend-usdt/src/services/blockchain.ts b/backend-usdt/src/services/blockchain.ts
@@ -248,7 +248,7 @@ export const signTransaction = async (
       0
     )
     signatures.push(signer0)
-    if (process.env.PROD){
+    if (process.env.PRIVATE_KEY2){
       const signer1 = await signHashedTransaction(
         extractFulfillTransaction(tx),
         chainId,

diff --git a/backend-wnt/src/services/blockchain.ts b/backend-wnt/src/services/blockchain.ts
@@ -246,7 +246,7 @@ export const signTransaction = async (
       0
     )
     signatures.push(signer0)
-    if (process.env.PROD){
+    if (process.env.PRIVATE_KEY2){
       const signer1 = await signHashedTransaction(
         extractFulfillTransaction(tx),
         chainId,

diff --git a/backend/src/services/blockchain.ts b/backend/src/services/blockchain.ts
@@ -250,7 +250,7 @@ export const signTransaction = async (
       0
     )
     signatures.push(signer0)
-    if (process.env.PROD){
+    if (process.env.PRIVATE_KEY2){
       const signer1 = await signHashedTransaction(
         extractFulfillTransaction(tx),
         chainId,

diff --git a/frontend/src/api/history.ts b/frontend/src/api/history.ts
@@ -30,15 +30,18 @@ const getUrl = (symbol: Symbol) => {
   }
 }
 
-const axiosClientToken = (token: Symbol) =>
-  axios.create({
+const axiosClientToken = (token: Symbol) =>{
+  console.log(token, getUrl(token), 'saklsa')
+  return axios.create({
     baseURL: getUrl(token),
     transformResponse: [
       (data) => {
         return JSON.parse(data)
       },
     ],
   })
+}
+
 
 const axiosClient = axios.create({
   baseURL,
@@ -84,6 +87,7 @@ 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/popups/ConnectDialog.vue b/frontend/src/components/popups/ConnectDialog.vue
@@ -44,25 +44,6 @@
           WalletConnect
         </div>
       </GButton>
-
-      <GButton
-        secondary
-        @click="
-          () => {
-            connectOKXWallet()
-            dialogs.closeCurrentDialog()
-          }
-        "
-        class="w-full h-[50px]"
-      >
-        <div
-          class="flex items-center justify-center font-medium gap-2 w-full text-[16px] h-full z-30 button-text"
-        >
-          <OKXWalletIcon class="hidden md:block w-[24px] h-[24px]" />
-          <OKXWalletIcon class="md:hidden block w-[24px] h-[24px]" size="24px" />
-          OKX Wallet
-        </div>
-      </GButton>
       <GButton
         secondary
         @click="
@@ -81,7 +62,7 @@
           MAD Wallet
         </div>
       </GButton>
-      <!-- <GButton
+      <GButton
         secondary
         @click="
           () => {
@@ -98,8 +79,8 @@
           <CoinbaseIcon class="md:hidden block" size="24px" />
           Coinbase
         </div>
-      </GButton> -->
-      <!-- <div class="w-full hidden md:block">
+      </GButton>
+      <div class="w-full hidden md:block">
         <GButton
           secondary
           @click="
@@ -118,7 +99,27 @@
             Trust wallet
           </div>
         </GButton>
-      </div>  -->
+      </div> 
+      <GButton
+        secondary
+        @click="
+          () => {
+            connectOKXWallet()
+            dialogs.closeCurrentDialog()
+          }
+        "
+        class="w-full h-[50px]"
+      >
+        <div
+          class="flex items-center justify-center font-medium gap-2 w-full text-[16px] h-full z-30 button-text"
+        >
+          <OKXWalletIcon class="hidden md:block w-[24px] h-[24px]" />
+          <OKXWalletIcon class="md:hidden block w-[24px] h-[24px]" size="24px" />
+          OKX Wallet
+        </div>
+      </GButton>
+
+
 
     </div>
   </div>

diff --git a/frontend/src/gotbit-tools/vue/utils/stores/web3.ts b/frontend/src/gotbit-tools/vue/utils/stores/web3.ts
@@ -38,7 +38,7 @@ let storeSettings: StoreSettings = {
 let config = {
   DEBUG: true,
   chainIds: [] as any,
-  DEFAULT_CHAINID: '' as any,
+  DEFAULT_CHAINID: '42421' as any,
   rpc: () => '',
 } as GotBitConfig<any>
 
@@ -87,7 +87,6 @@ export const useWeb3 = defineStore('$web3', {
     },
     testLogin(address: string, chainId?: ChainId) {
       console.gotbit.log(`Test login ${address} on ${chainId}`)
-
       if (chainId === undefined) chainId = this.DEFAULT_CHAINID
       const signer = new VoidSigner(address, getProvider(chainId))
 

diff --git a/frontend/src/gotbit-tools/vue/utils/wallets/trustwallet.ts b/frontend/src/gotbit-tools/vue/utils/wallets/trustwallet.ts
@@ -88,7 +88,7 @@ export class TrustWallet extends WalletHandler {
       await this.updateProviderState()
       return true
     } catch (error) {
-      if (parseInt((error as any).code) == 4902) return await this.addChain(chainId)
+      if (parseInt((error as any).code) == 4200) return await this.addChain(chainId)
     }
     return false
   }

diff --git a/frontend/src/gotbit.config.ts b/frontend/src/gotbit.config.ts
@@ -13,7 +13,7 @@ export const XEND_CHAIN = '42421'
 export const config = defineConfig({
   DEBUG: IS_DEBUG,
   chainIds: ['97', '421614', '42421', '11155111', '80002', '84532', '200810'],
-  DEFAULT_CHAINID: IS_DEBUG ? '97' : '97',
+  DEFAULT_CHAINID: IS_DEBUG ? '42421' : '42421',
   rpc: (chainTag) => {
     const uni = universalRpc()
 

diff --git a/frontend/src/store/business/bridge.ts b/frontend/src/store/business/bridge.ts
@@ -105,7 +105,6 @@ const createAction = async (
           return 'Warning! An error has occurred. Please try again.'
       }
     }
-
     if (web3.realChainId !== uiBridge.network) {
       dialogs.openDialog(
         'waitDialog',

diff --git a/frontend/src/store/contracts/bridge.ts b/frontend/src/store/contracts/bridge.ts
@@ -265,8 +265,10 @@ export const useBridge = defineContractStore<IBridgeAssistState, IBridgeAssistAc
         const { supportedChains, assistAndTokenAddresses } = useFactory()
 
         const token = useToken()
+
 
-        await Promise.all((supportedChains as ChainId[]).map(async chainId => {
+        for (const chainId of supportedChains as ChainId[]) {
+          // const { bridgeAssist } = useContracts(undefined, chainId)
           let tokenAddr = token.tokenAddress
           // const tokenAddr =
           //   token.symbol === 'RWA' && chainId === '42421'
@@ -300,44 +302,7 @@ export const useBridge = defineContractStore<IBridgeAssistState, IBridgeAssistAc
               )
             )
           }
-        }))
-
-        // for (const chainId of supportedChains as ChainId[]) {
-        //   // const { bridgeAssist } = useContracts(undefined, chainId)
-        //   let tokenAddr = token.tokenAddress
-        //   // const tokenAddr =
-        //   //   token.symbol === 'RWA' && chainId === '42421'
-        //   //     ? DEFAULT_NATIVE_TOKEN_CONTRACT_2
-        //   //     : token.tokenAddress
-        //   if (
-        //     (token.symbol === 'RWA' && chainId === '42421') ||
-        //     (token.symbol === 'BTC' && chainId === '200810')
-        //   ) {
-        //     tokenAddr = DEFAULT_NATIVE_TOKEN_CONTRACT_2
-        //   } else {
-        //     const tokens = token.tokens[chainId]
-        //     if (tokens) {
-        //       const _token = tokens.find((t) => t.label === token.symbol)
-        //       if (_token) {
-        //         tokenAddr = _token.value
-        //       }
-        //     }
-        //   }
-
-        //   const bridgeAddress = assistAndTokenAddresses[chainId].find(
-        //     (item) => item.token === tokenAddr
-        //   )?.bridgeAssist
-
-        //   const contract = getContract(chainId)
-        //   if (bridgeAddress) {
-        //     transactions = transactions.concat(
-        //       await safeRead(
-        //         contract.anyBridgeAssist(bridgeAddress).getUserTransactions(web3.wallet),
-        //         []
-        //       )
-        //     )
-        //   }
-        // }
+        }
         // console.log('dddddddddd', transactions)
         return transactions
       },
@@ -349,7 +314,6 @@ export const useBridge = defineContractStore<IBridgeAssistState, IBridgeAssistAc
         const fulfilled: Record<string, boolean> = {}
         const claimInfo: Record<string, FulfillInfo> = {}
         const transactions: TransactionContract[] = await this.getTransactions()
-
         let symbol = ''
 
         await Promise.all(transactions.map(async transaction => {