added solana params to Query and tc-amm (#1478)

* added solana params to Query and tc-amm

* added solana params to Query and tc-amm

Author: Thorian1te

.changeset/loose-files-fall.md

@@ -0,0 +1,6 @@
+---
+'@xchainjs/xchain-thorchain-query': patch
+'@xchainjs/xchain-thorchain-amm': patch
+---
+
+Update to support solana for quoting and tc-amm

packages/xchain-thorchain-amm/package.json

@@ -48,6 +48,7 @@
     "@xchainjs/xchain-evm": "workspace:*",
     "@xchainjs/xchain-litecoin": "workspace:*",
     "@xchainjs/xchain-ripple": "workspace:*",
+    "@xchainjs/xchain-solana": "workspace:*",
     "@xchainjs/xchain-thorchain": "workspace:*",
     "@xchainjs/xchain-thorchain-query": "workspace:*",
     "@xchainjs/xchain-util": "workspace:*",

packages/xchain-thorchain-amm/src/thorchain-amm.ts

@@ -4,6 +4,7 @@ import { Client as XRPClient, defaultXRPParams } from '@xchainjs/xchain-ripple'
 import { Client as BtcClient, defaultBTCParams as defaultBtcParams } from '@xchainjs/xchain-bitcoin'
 import { Client as BchClient, defaultBchParams } from '@xchainjs/xchain-bitcoincash'
 import { Client as BscClient, defaultBscParams } from '@xchainjs/xchain-bsc'
+import { Client as SOLClient, defaultSolanaParams } from '@xchainjs/xchain-solana'
 import { Network } from '@xchainjs/xchain-client'
 import { Client as GaiaClient } from '@xchainjs/xchain-cosmos'
 import { Client as DogeClient, defaultDogeParams } from '@xchainjs/xchain-doge'
@@ -100,6 +101,7 @@ export class ThorchainAMM {
       THOR: new ThorClient({ ...defaultThorParams, network: Network.Mainnet }),
       BASE: new BaseClient({ ...defaultBaseParams, network: Network.Mainnet }),
       XRP: new XRPClient({ ...defaultXRPParams, network: Network.Mainnet }),
+      SOL: new SOLClient({ ...defaultSolanaParams, network: Network.Mainnet }),
     }),
   ) {
     this.thorchainQuery = thorchainQuery

packages/xchain-thorchain-amm/src/utils.ts

@@ -7,6 +7,7 @@ import { Network } from '@xchainjs/xchain-client'
 import { AssetATOM, Client as GaiaClient, GAIAChain } from '@xchainjs/xchain-cosmos'
 import { Client as DogeClient, DOGEChain, defaultDogeParams } from '@xchainjs/xchain-doge'
 import { Client as XRPClient, XRPChain, defaultXRPParams } from '@xchainjs/xchain-ripple'
+import { Client as SOLClient, SOLChain, defaultSolanaParams } from '@xchainjs/xchain-solana'
 import { AssetETH, Client as EthClient, ETHChain, defaultEthParams } from '@xchainjs/xchain-ethereum'
 import { Client as LtcClient, LTCChain, defaultLtcParams } from '@xchainjs/xchain-litecoin'
 import { Client as ThorClient, THORChain, defaultClientConfig as defaultThorParams } from '@xchainjs/xchain-thorchain'
@@ -88,6 +89,8 @@ export const validateAddress = (network: Network, chain: Chain, address: Address
       return new ThorClient({ ...defaultThorParams, network }).validateAddress(address)
     case XRPChain:
       return new XRPClient({ ...defaultXRPParams, network }).validateAddress(address)
+    case SOLChain:
+      return new SOLClient({ ...defaultSolanaParams, network }).validateAddress(address)
     default:
       throw Error('Unsupported chain')
   }

packages/xchain-thorchain-query/src/chain-defaults.ts

@@ -54,6 +54,10 @@ const DefaultChainAttributes: Record<Chain, ChainAttributes> = {
     blockReward: 0, // No block reward for xrp
     avgBlockTimeInSecs: 4, // Average block time for xrp in seconds
   },
+  SOL: {
+    blockReward: 0, // No block reward for sol
+    avgBlockTimeInSecs: 0.4, // Average block time for sol in seconds
+  },
 }
 
 // Export the DefaultChainAttributes object

packages/xchain-thorchain-query/src/utils/const.ts

@@ -14,6 +14,7 @@ export const assetUSDC = assetFromStringEx('ETH.USDC-0XA0B86991C6218B36C1D19D4A2
 export const AssetBNB = assetFromStringEx('BSC.BNB') as Asset
 export const AssetBASE = assetFromStringEx('BASE.ETH') as Asset
 export const AssetXRP = assetFromStringEx('XRP.XRP') as Asset
+export const AssetSOL = assetFromStringEx('SOL.SOL') as Asset
 
 export const BNBChain = 'BNB'
 export const BTCChain = 'BTC'
@@ -28,6 +29,7 @@ export const BSCChain = 'BSC'
 export const THORChain = 'THOR'
 export const BASEChain = 'BASE'
 export const XRPChain = 'XRP'
+export const SOLChain = 'SOL'
 
 export const THORCHAIN_DECIMAL = 8
 

packages/xchain-thorchain-query/src/utils/utils.ts

@@ -24,6 +24,7 @@ import {
   AssetLTC,
   AssetMAYA,
   AssetXRP,
+  AssetSOL,
   AssetRuneNative,
   BASEChain,
   BCHChain,
@@ -37,6 +38,7 @@ import {
   MAYAChain,
   THORChain,
   XRPChain,
+  SOLChain,
 } from './const'
 
 export const getBaseAmountWithDiffDecimals = (inputAmount: CryptoAmount, outDecimals: number): BigNumber => {
@@ -87,6 +89,8 @@ export const getChainAsset = (chain: Chain): Asset => {
       return AssetBASE
     case XRPChain:
       return AssetXRP
+    case SOLChain:
+      return AssetSOL
     default:
       throw Error('Unknown chain')
   }
@@ -154,6 +158,8 @@ export const calcNetworkFee = (asset: CompatibleAsset, inbound: InboundDetail):
       return new AssetCryptoAmount(baseAmount(inbound.gasRate), AssetBASE)
     case XRPChain:
       return new AssetCryptoAmount(baseAmount(inbound.gasRate), AssetXRP)
+    case SOLChain:
+      return new AssetCryptoAmount(baseAmount(inbound.gasRate), AssetSOL)
   }
   throw new Error(`could not calculate inbound fee for ${asset.chain}`)
 }
@@ -192,7 +198,11 @@ export const calcOutboundFee = (asset: CompatibleAsset, inbound: InboundDetail):
     case MAYAChain:
       return new AssetCryptoAmount(baseAmount(2000000), AssetMAYA)
     case BASEChain:
-      return new AssetCryptoAmount(baseAmount(2000000), AssetBASE)
+      return new AssetCryptoAmount(baseAmount(inbound.outboundFee), AssetBASE)
+    case XRPChain:
+      return new AssetCryptoAmount(baseAmount(inbound.outboundFee), AssetXRP)
+    case SOLChain:
+      return new AssetCryptoAmount(baseAmount(inbound.outboundFee), AssetSOL)
   }
   throw new Error(`could not calculate outbound fee for ${asset.chain}`)
 }
@@ -230,6 +240,8 @@ export const getChain = (chain: string): Chain => {
       return BASEChain
     case 'XRP':
       return XRPChain
+    case 'SOL':
+      return SOLChain
     default:
       throw Error('Unknown chain')
   }

yarn.lock

@@ -4381,6 +4381,7 @@ __metadata:
     "@xchainjs/xchain-evm": "workspace:*"
     "@xchainjs/xchain-litecoin": "workspace:*"
     "@xchainjs/xchain-ripple": "workspace:*"
+    "@xchainjs/xchain-solana": "workspace:*"
     "@xchainjs/xchain-thorchain": "workspace:*"
     "@xchainjs/xchain-thorchain-query": "workspace:*"
     "@xchainjs/xchain-util": "workspace:*"