Skip to content

Commit

Permalink
Merge pull request #3 from mfactory-lab/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
MGrgr authored Nov 7, 2023
2 parents 61372db + fd89613 commit 564c840
Show file tree
Hide file tree
Showing 7 changed files with 177 additions and 115 deletions.
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@
"typecheck": "vue-tsc --noEmit"
},
"dependencies": {
"@albus-finance/sdk": "^0.2.0",
"@albus-finance/swap-sdk": "^0.1.1",
"@albus-finance/transfer-sdk": "^0.2.3",
"@coral-xyz/anchor": "^0.28.0",
"@metaplex-foundation/beet": "^0.7.1",
"@metaplex-foundation/js": "^0.19.4",
"@metaplex-foundation/mpl-token-metadata": "^2.12.0",
"@mfactory-lab/albus-sdk": "^0.2.6",
"@mfactory-lab/albus-transfer-sdk": "^0.0.10",
"@rollup/plugin-inject": "^5.0.3",
"@solana/buffer-layout": "^4.0.1",
"@solana/buffer-layout-utils": "^0.2.0",
Expand Down
172 changes: 98 additions & 74 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/config/connection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const ENDPOINTS: Endpoint[] = [
url: import.meta.env.DEV
? 'https://restless-blue-valley.solana-mainnet.quiknode.pro/388d47063172de995210b42f44a3483d4269dcf9/'
: 'https://rpc.jfactory.ch/',
wsEndpoint: import.meta.env.DEV ? undefined : 'wss://sleek-solemn-rain.solana-mainnet.quiknode.pro/1bac3b4146d57810e23b4263129fda9dbff83fe9/',
wsEndpoint: import.meta.env.DEV ? undefined : 'wss://sleek-solemn-rain.solana-mainnet.quiknode.pro/6e7118f20a84b8d10c8f00ec8f16ab6878f00fb8/',
getToken: getJFRpcToken,
},
{
Expand Down
4 changes: 2 additions & 2 deletions src/hooks/swap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import BN from 'bn.js'
import { useAnchorWallet } from 'solana-wallets-vue'
import type { PublicKey } from '@solana/web3.js'
import { Transaction } from '@solana/web3.js'
import { getOrInitAssociatedTokenAddress, lamportsToSol, sendTransaction, solToLamports, startCreteCertificate } from '@/utils'
import { getOrInitAssociatedTokenAddress, lamportsToSol, sendTransaction, solToLamports, startCreateCertificate } from '@/utils'
import solToken from '@/assets/img/tokens/sol.png'
import usdcToken from '@/assets/img/tokens/usdc.png'

Expand Down Expand Up @@ -49,7 +49,7 @@ export function useSwap() {
async function swapSubmit() {
const tokenSwap = swapStore.tokenSwap
if (!userStore.certificateValid) {
return startCreteCertificate()
return startCreateCertificate()
}

if (!tokenSwap) {
Expand Down
Loading

0 comments on commit 564c840

Please sign in to comment.