diff --git a/package.json b/package.json index 71e6f0b9..79fcfc4f 100644 --- a/package.json +++ b/package.json @@ -52,6 +52,8 @@ "@babel/core": "^7.0.0-0", "@babel/preset-env": "^7.1.6", "@graphprotocol/client-cli": "^3.0.7", + "@graphprotocol/graph-cli": "^0.89.0", + "@graphprotocol/graph-ts": "^0.35.1", "@graphql-mesh/cache-localforage": "^0.102.7", "@graphql-mesh/cli": "^0.96.6", "@graphql-mesh/cross-helpers": "^0.4.7", @@ -66,6 +68,7 @@ "@graphql-tools/merge": "^8.3.14", "@graphql-tools/utils": "^10.5.5", "@graphql-tools/wrap": "^9.4.2", + "@lifi/widget": "^3.12.1", "@okxweb3/hardhat-explorer-verify": "^1.6.4", "@prisma/client": "^5.7.0", "@radix-ui/react-alert-dialog": "^1.0.5", @@ -186,4 +189,4 @@ "path": "./node_modules/cz-conventional-changelog" } } -} \ No newline at end of file +} diff --git a/src/app/app/[tab]/AppTabs.tsx b/src/app/app/[tab]/AppTabs.tsx index 82b0e184..caf49683 100644 --- a/src/app/app/[tab]/AppTabs.tsx +++ b/src/app/app/[tab]/AppTabs.tsx @@ -11,6 +11,7 @@ import { AppPreMining } from "@/components/app/pre-mining/AppPreMining"; import { SessionProvider } from "next-auth/react"; import { AppStaking } from "@/components/app/staking/AppStaking"; import { XSwapWidget } from "@/components/app/xswap/XswapWidget"; +import { WidgetPage } from "@/components/app/lifi/LiFiWidget"; import Link from "next/link"; import { AppAffiliate } from "@/components/app/affiliate/AppAffiliate"; import { AppSwap } from "@/components/app/swap/AppSwap"; @@ -57,7 +58,7 @@ const InnerAppTabs: FC = () => { Dashboard Affiliate Program - Swap + Swap Bridge
@@ -80,8 +81,8 @@ const InnerAppTabs: FC = () => { - - + + diff --git a/src/components/app/dashboard/AppDashboardActivity.tsx b/src/components/app/dashboard/AppDashboardActivity.tsx index 01f70f0c..e266a8fc 100644 --- a/src/components/app/dashboard/AppDashboardActivity.tsx +++ b/src/components/app/dashboard/AppDashboardActivity.tsx @@ -43,12 +43,8 @@ const SUPPORTED_NETWORKS = { name: 'Linea', endpoint: process.env.NEXT_PUBLIC_LINEA_SUBGRAPH_URL || '', prefix: '' - }, - 195: { - name: 'OKX X1 Testnet', - endpoint: process.env.NEXT_PUBLIC_OKX_SUBGRAPH_URL || '', - prefix: '' - }, + } + //ADD MORE NETWORKS HERE }; export const AppDashboardActivity: FC> = ({ className }) => { diff --git a/src/components/app/lifi/LiFiWidget.tsx b/src/components/app/lifi/LiFiWidget.tsx new file mode 100644 index 00000000..403dbefd --- /dev/null +++ b/src/components/app/lifi/LiFiWidget.tsx @@ -0,0 +1,16 @@ +import { LiFiWidget, WidgetConfig } from '@lifi/widget'; + +const widgetConfig: Omit = { + theme: { + container: { + border: '1px solid rgb(234, 234, 234)', + borderRadius: '16px', + }, + }, +}; + +export const WidgetPage = () => { + return ( + + ); +}; \ No newline at end of file diff --git a/subgraph/build/LTokenSignaler/LTokenSignaler.wasm b/subgraph/build/LTokenSignaler/LTokenSignaler.wasm index 6bb6e0ab..bc8292c0 100644 Binary files a/subgraph/build/LTokenSignaler/LTokenSignaler.wasm and b/subgraph/build/LTokenSignaler/LTokenSignaler.wasm differ diff --git a/subgraph/build/subgraph.yaml b/subgraph/build/subgraph.yaml index 43088d0f..e69de29b 100644 --- a/subgraph/build/subgraph.yaml +++ b/subgraph/build/subgraph.yaml @@ -1,87 +0,0 @@ -specVersion: 1.0.0 -indexerHints: - prune: auto -schema: - file: schema.graphql -dataSources: - - kind: ethereum/contract - name: LTokenSignaler - network: arbitrum-one - source: - address: "0x627Ff3485a2e34916a6E1c0D0b350A422F5d89D1" - abi: LTokenSignaler - startBlock: 239382294 - mapping: - kind: ethereum/events - apiVersion: 0.0.7 - language: wasm/assemblyscript - file: LTokenSignaler/LTokenSignaler.wasm - entities: - - LToken - abis: - - name: LTokenSignaler - file: contracts/abis/LTokenSignaler.json - - name: LToken - file: contracts/abis/LToken.json - eventHandlers: - - event: LTokenSignalEvent(indexed address) - handler: handleSignaledLToken - - kind: ethereum - name: LdyStaking - network: arbitrum-one - source: - address: "0x98002b5c06b44c8769dA3DAe97CA498aB6F97137" - abi: LdyStaking - startBlock: 218746026 - mapping: - kind: ethereum/events - apiVersion: 0.0.7 - language: wasm/assemblyscript - entities: - - Staked - - Unstaked - - RewardPaid - - NotifiedRewardAmount - abis: - - name: LdyStaking - file: contracts/abis/LdyStaking.json - eventHandlers: - - event: Staked(indexed address,uint256,uint256) - handler: handleStaked - - event: Unstaked(indexed address,uint256,uint256) - handler: handleUnstaked - - event: RewardPaid(indexed address,uint256,uint256) - handler: handleRewardPaid - - event: NotifiedRewardAmount(uint256,uint256) - handler: handleNotifiedRewardAmount - file: LTokenSignaler/LTokenSignaler.wasm -templates: - - kind: ethereum/contract - name: LToken - network: arbitrum-one - source: - abi: LToken - mapping: - kind: ethereum/events - apiVersion: 0.0.7 - language: wasm/assemblyscript - file: LTokenSignaler/LTokenSignaler.wasm - entities: - - LToken - - TVLChange - - APRChange - - Activity - - RewardsMint - abis: - - name: LToken - file: contracts/abis/LToken.json - eventHandlers: - - event: TVLChangeEvent(uint256) - handler: handleTVLChangeEvent - - event: APRChangeEvent(uint16) - handler: handleAPRChangeEvent - - event: ActivityEvent(indexed int256,indexed address,indexed - uint8,address,uint256,uint256,uint8,int256,string) - handler: handleActivityEvent - - event: MintedRewardsEvent(indexed address,uint256,uint256) - handler: handleMintedRewardsEvent diff --git a/subgraph/linea-subgraph.yaml b/subgraph/linea-subgraph.yaml index a0179626..4123e2ca 100644 --- a/subgraph/linea-subgraph.yaml +++ b/subgraph/linea-subgraph.yaml @@ -6,7 +6,7 @@ schema: dataSources: - kind: ethereum/contract name: LTokenSignaler - network: linea-mainnet + network: linea source: address: "0xBA427517505b14C560854aED003304Fc69cbadfb" abi: LTokenSignaler @@ -27,31 +27,10 @@ dataSources: - event: LTokenSignalEvent(indexed address) handler: handleSignaledLToken - - kind: ethereum/contract - name: PreMining - network: linea-mainnet - source: - address: "0xd54d564606611A3502FE8909bBD3075dbeb77813" - abi: PreMining - startBlock: 458807 - mapping: - kind: ethereum/events - apiVersion: 0.0.7 - language: wasm/assemblyscript - file: ./mapping.ts - entities: - - PreMining - abis: - - name: PreMining - file: ../contracts/abis/PreMining.json - eventHandlers: - - event: Lock(indexed address,uint256,uint8) - handler: handlePreMiningLock - templates: - kind: ethereum/contract name: LToken - network: linea-mainnet + network: linea source: abi: LToken mapping: @@ -73,7 +52,7 @@ templates: handler: handleTVLChangeEvent - event: APRChangeEvent(uint16) handler: handleAPRChangeEvent - - event: ActivityEvent(indexed int256,indexed address,indexed uint8,uint256,uint256,uint8,int256) + - event: ActivityEvent(indexed int256,indexed address,indexed uint8,address,uint256,uint256,uint8,int256,string) handler: handleActivityEvent - event: MintedRewardsEvent(indexed address,uint256,uint256) - handler: handleMintedRewardsEvent + handler: handleMintedRewardsEvent \ No newline at end of file diff --git a/subgraph/mapping.ts b/subgraph/mapping.ts index 18811ff8..b54ac2f5 100644 --- a/subgraph/mapping.ts +++ b/subgraph/mapping.ts @@ -10,7 +10,7 @@ import { Unstaked as UnstakedEvent, RewardPaid as RewardPaidEvent, NotifiedRewardAmount as NotififiedRewardAmountEvent, -} from "./generated/LdyStaking/LdyStaking"; +} from "./generated/LDYStaking/LDYStaking"; import { AffiliateUser, StakingUser, AffiliateActivity } from "./generated/schema"; import { Lock } from "./generated/PreMining/PreMining"; import { LToken as LTokenTemplate } from "./generated/templates"; diff --git a/subgraph/subgraph.yaml b/subgraph/subgraph.yaml index 253a814d..53ad0a0f 100644 --- a/subgraph/subgraph.yaml +++ b/subgraph/subgraph.yaml @@ -27,11 +27,11 @@ dataSources: - event: LTokenSignalEvent(indexed address) handler: handleSignaledLToken - kind: ethereum - name: LdyStaking + name: LDYStaking network: arbitrum-one source: address: "0x98002b5c06b44c8769dA3DAe97CA498aB6F97137" - abi: LdyStaking + abi: LDYStaking startBlock: 218746026 mapping: kind: ethereum/events @@ -43,8 +43,8 @@ dataSources: - RewardPaid - NotifiedRewardAmount abis: - - name: LdyStaking - file: ../contracts/abis/LdyStaking.json + - name: LDYStaking + file: ../contracts/abis/LDYStaking.json eventHandlers: - event: Staked(indexed address,uint256,uint256) handler: handleStaked