Skip to content

Commit

Permalink
Merge branch 'strkfarm:dev' into feat/Add-sSTRK-DEX-pools
Browse files Browse the repository at this point in the history
  • Loading branch information
0xdevcollins authored Dec 31, 2024
2 parents 071014c + 535c009 commit b7d1559
Show file tree
Hide file tree
Showing 8 changed files with 590 additions and 399 deletions.
8 changes: 4 additions & 4 deletions .env.sample
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
NEXT_PUBLIC_RPC_URL=
RPC_URL=
NEXT_PUBLIC_RPC_URL=https://starknet-mainnet.public.blastapi.io/rpc/v0_7
RPC_URL=https://starknet-mainnet.public.blastapi.io/rpc/v0_7
HOSTNAME=http://localhost:3000

# Referral and Signing storage DB, not required unless u r testing this feature
Expand All @@ -10,10 +10,10 @@ DATABASE_URL=
ACCOUNT_PK=0x0574ba4998dd9aedf1c4d6e56b747b29256a795bc3846437d121cd64b972bdd8
NEXT_PUBLIC_OG_NFT_CONTRACT=0x3cb654f2f557a7f71a0c16d97c05a2dec62a0b744979d11afc95b804e1d7307


# Not required unless u want to schedule some job on vercel
CRON_SECRET=

# mainnet or sepolia
# Note: Not everything is supported on sepolia
# Default: mainnet
NEXT_PUBLIC_NETWORK=mainnet
NEXT_PUBLIC_NETWORK=mainnet
4 changes: 1 addition & 3 deletions .github/workflows/lint_and_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ jobs:

- name: Setup env
run: |
touch .env.local
echo "NEXT_PUBLIC_RPC_URL=${{secrets.RPC_URL}}" >> .env.local
echo "RPC_URL=${{secrets.RPC_URL}}" >> .env.local
cp .env.sample .env
- name: Run linting check
run: yarn run lint:check
Expand Down
476 changes: 285 additions & 191 deletions public/banners/endur.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
476 changes: 285 additions & 191 deletions public/banners/endur_mobile.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/banners/strkfarm_braavos.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ import { useEffect, useState } from 'react';
import { isMobile } from 'react-device-detect';

const banner_images = [
{
desktop: '/banners/strkfarm_braavos.jpg',
mobile: '/banners/strkfarm_braavos.jpg',
link: 'https://x.com/strkfarm/status/1871870516686209314',
},
{
desktop: '/banners/endur.svg',
mobile: '/banners/endur_mobile.svg',
Expand Down
12 changes: 6 additions & 6 deletions src/store/endur.store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ import { atom } from 'jotai';

import RewardsAbi from '@/abi/rewards.abi.json';

import { IDapp } from './IDapp.store';
import { Category, PoolInfo, PoolType } from './pools';
import CONSTANTS, { provider } from '@/constants';
import { getTokenInfoFromName } from '@/utils';
import { StrategyLiveStatus } from '@/strategies/IStrategy';
import { Contract } from 'starknet';
import MyNumber from '@/utils/MyNumber';
import { AutoXSTRKStrategy } from '@/strategies/auto_xstrk.strat';
import { StrategyLiveStatus } from '@/strategies/IStrategy';
import { getTokenInfoFromName } from '@/utils';
import { customAtomWithFetch } from '@/utils/customAtomWithFetch';
import { customAtomWithQuery } from '@/utils/customAtomWithQuery';
import MyNumber from '@/utils/MyNumber';
import { Contract } from 'starknet';
import { IDapp } from './IDapp.store';
import { Category, PoolInfo, PoolType } from './pools';

interface PoolData {
tvl: number;
Expand Down
8 changes: 4 additions & 4 deletions src/store/protocols.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@ import strkfarmLogo from '@public/logo.png';
import { atom } from 'jotai';
import CarmineAtoms, { carmine } from './carmine.store';
import EkuboAtoms, { ekubo } from './ekobu.store';
import EndurAtoms, { endur } from './endur.store';
import HaikoAtoms, { haiko } from './haiko.store';
import HashstackAtoms, { hashstack } from './hashstack.store';
import MySwapAtoms, { mySwap } from './myswap.store';
import NimboraDexAtoms, { nimboraDex } from './nimboradex.store';
import NostraDegenAtoms, { nostraDegen } from './nostradegen.store';
import NostraDexAtoms, { nostraDex } from './nostradex.store';
import NostraLendingAtoms, { nostraLending } from './nostralending.store';
import VesuAtoms, { vesu } from './vesu.store';
import ZkLendAtoms, { zkLend } from './zklend.store';
import NimboraDexAtoms, { nimboraDex } from './nimboradex.store';
import { Category, PoolInfo, PoolType } from './pools';
import { getLiveStatusEnum } from './strategies.atoms';
import STRKFarmAtoms, {
strkfarm,
STRKFarmStrategyAPIResult,
} from './strkfarm.atoms';
import EndurAtoms, { endur } from './endur.store';
import VesuAtoms, { vesu } from './vesu.store';
import ZkLendAtoms, { zkLend } from './zklend.store';

export const PROTOCOLS = [
{
Expand Down

0 comments on commit b7d1559

Please sign in to comment.