Merge pull request #59 from permaweb/chore/update-cu

chore: switch to cu router for defaults / af-cu for factory

Author: NickJ202

src/api/index.ts

@@ -2,7 +2,7 @@ import { createDataItemSigner, message, result, results } from '@permaweb/aoconn
 
 import { TagType } from 'helpers/types';
 import { getTagValue } from 'helpers/utils';
-import { afCu } from 'providers/AOProvider';
+import { cu } from 'providers/AOProvider';
 
 export async function messageResult(args: {
 	processId: string;
@@ -160,7 +160,7 @@ export async function readHandler(args: {
 	const tags = [{ name: 'Action', value: args.action }];
 	if (args.tags) tags.push(...args.tags);
 
-	const response = await afCu.dryrun({
+	const response = await cu.dryrun({
 		process: args.processId,
 		tags: tags,
 		data: JSON.stringify(args.data || {}),

src/providers/AOProvider.tsx

@@ -5,10 +5,14 @@ import { connect } from '@permaweb/aoconnect';
 
 import { AO, AO_TOKEN_DENOMINATION, ENDPOINTS } from 'helpers/config';
 
-export const afCu = connect({
+export const cu = connect({
 	CU_URL: 'https://cu.ao-testnet.xyz',
 });
 
+export const afCu = connect({
+	CU_URL: 'https://cu-af.dataos.so',
+});
+
 export const goldsky = new Client({
 	url: ENDPOINTS.goldsky,
 	exchanges: [cacheExchange, fetchExchange],

src/providers/EthereumProvider.tsx

@@ -256,38 +256,18 @@ export function EthereumProvider(props: EthereumProviderProps) {
 				if (isNaN(totalUsdsDeposited)) throw new Error('Invalid totalUsdsDeposited');
 
 				const ethUsdFeed = new web3.eth.Contract(PRICE_FEED_ABI, ETH_CONTRACTS.ethUsdPriceFeed);
-				// const daiUsdFeed = new web3.eth.Contract(PRICE_FEED_ABI, ETH_CONTRACTS.daiUsdPriceFeed);
-				// const usdUsdSFeed = new web3.eth.Contract(PRICE_FEED_ABI, ETH_CONTRACTS.usdsUsdPriceFeed);
 
 				const ethUsdPriceData = await ethUsdFeed.methods.latestRoundData().call();
-				// const daiUsdPriceData = await daiUsdFeed.methods.latestRoundData().call();
 
 				const ethUsdPrice = (ethUsdPriceData as any).answer / BigInt(Math.pow(10, 8));
-				// const daiUsdPrice = (daiUsdPriceData as any).answer / BigInt(Math.pow(10, 8));
 				const daiUsdPrice = 1;
 				const usdsUsdPrice = 1;
 
-				// console.log('ethUsdPrice');
-				// console.log(ethUsdPrice);
-				// console.log('daiUsdPrice');
-				// console.log(daiUsdPrice);
-				// console.log('usdsUsdPrice')
-				// console.log(usdsUsdPrice)
-
 				const usdStEthValue = BigInt(Math.floor(totalStEthDeposited)) * BigInt(ethUsdPrice);
 				const usdDaiValue = BigInt(Math.floor(totalDaiDeposited)) * BigInt(daiUsdPrice);
 				const usdUsdsValue = BigInt(Math.floor(totalUsdsDeposited)) * BigInt(usdsUsdPrice);
 				const usdTotal = usdStEthValue + usdDaiValue + usdUsdsValue;
 
-				// console.log('usdStEthValue')
-				// console.log(usdStEthValue)
-				// console.log('usdDaiValue')
-				// console.log(usdDaiValue)
-				// console.log('usdUsdsValue')
-				// console.log(usdUsdsValue)
-				// console.log('usdTotal')
-				// console.log(usdTotal)
-
 				setTotalDeposited({
 					stEth: { value: totalStEthDeposited, display: formatDisplayAmount(totalStEthDeposited, 2) },
 					dai: { value: totalDaiDeposited, display: formatDisplayAmount(totalDaiDeposited, 2) },
@@ -300,78 +280,6 @@ export function EthereumProvider(props: EthereumProviderProps) {
 		})();
 	}, []);
 
-	// async function sendMessage(msg, key) {
-	// 	function createDataItemSigner(wallet) {
-	// 		const signer = async ({ data, tags, target, anchor }) => {
-	// 			const dataItem = createData(data, key, { tags, target, anchor });
-	// 			return dataItem.sign(key).then(async () => ({
-	// 				id: await dataItem.id,
-	// 				raw: await dataItem.getRaw(),
-	// 			}));
-	// 		};
-
-	// 		return signer;
-	// 	}
-
-	// 	const signer = createDataItemSigner(key);
-	// 	const message = await connect().message({
-	// 		process: AO_MINT,
-	// 		signer,
-	// 		data: msg.Data || Date.now().toString(),
-	// 		tags: msg.Tags,
-	// 	});
-	// 	return await connect().result({ process: AO_MINT, message });
-	// }
-
-	// const connector = config.connectors.find((c) => c.name === 'MetaMask');
-
-	// const provider = {
-	// 	getSigner: () => ({
-	// 		signMessage: async (message: any) => {
-	// 			const arg = message instanceof String ? message : { raw: message };
-
-	// 			const ethAccount = getAccount(config);
-
-	// 			return await signMessage(config, {
-	// 				message: arg as any,
-	// 				account: ethAccount.address,
-	// 				connector: connector,
-	// 			});
-	// 		},
-	// 	}),
-	// };
-
-	// const signer = new InjectedEthereumSigner(provider as any);
-	// signer.setPublicKey = async () => {
-	// 	const message = 'Sign this message to connect';
-	// 	const ethAccount = getAccount(config);
-
-	// 	const signature = await signMessage(config, {
-	// 		message: message,
-	// 		account: ethAccount.address,
-	// 		connector: connector,
-	// 	});
-	// 	const hash = await hashMessage(message);
-	// 	const recoveredKey = await recoverPublicKey({
-	// 		hash,
-	// 		signature,
-	// 	});
-	// 	signer.publicKey = Buffer.from(toBytes(recoveredKey));
-	// };
-
-	// React.useEffect(() => {
-	// 	(async function () {
-	// 		await signer.setPublicKey();
-	// 		const TResult = await sendMessage({
-	// 			Tags: [
-	// 				{ name: 'Action', value: 'User.Get-Tokens' },
-	// 				// { name: 'Token', value: 'DAI' },
-	// 			],
-	// 		}, signer);
-	// 		console.log('SendMessage Result:', TResult);
-	// 	})();
-	// }, []);
-
 	/* StETH - DAI Balance and Deposited */
 	React.useEffect(() => {
 		(async function () {

src/views/Fund/Dashboard/index.tsx

@@ -1,15 +1,15 @@
 import { useStore } from '@nanostores/react';
 import { useQuery } from '@tanstack/react-query';
 import { readHandler } from 'api';
-import React, { useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { ReactSVG } from 'react-svg';
 import styled from 'styled-components';
 
 import Modal from 'components/molecules/Modal/Modal';
 import { AO, ASSETS, STYLING } from 'helpers/config';
 import { formatNumberAuto, formatTicker, parseBigIntAsNumber } from 'helpers/format';
 import { retryable } from 'helpers/network';
-import { formatAddress, formatDate } from 'helpers/utils';
+import { formatAddress } from 'helpers/utils';
 import { useArweaveProvider } from 'providers/ArweaveProvider';
 
 import { getFlps, getUserDelegations } from '../../../api/fair-launch-api';
@@ -20,7 +20,6 @@ import { Skeleton } from '../components/LoadingSkeletons';
 import { MyFlpTableRow } from '../components/MyFlpTableRow';
 import { PiFavicon } from '../components/PiFavicon';
 import { TokenAvatar } from '../components/TokenAvatar';
-import { TrendChart } from '../components/TrendChart';
 import * as S from '../styles';
 
 const DashboardContainer = styled.div`
@@ -29,29 +28,6 @@ const DashboardContainer = styled.div`
 	gap: 40px;
 `;
 
-const mockDelegationRecords = [
-	{ timestamp: 1622505600000, value: 10 },
-	{ timestamp: 1625097600000, value: 200 },
-	{ timestamp: 1627776000000, value: 300 },
-	{ timestamp: 1630454400000, value: 400 },
-	{ timestamp: 1633046400000, value: 500 },
-];
-
-const chartData = {
-	labels: mockDelegationRecords.map((record) => formatDate(record.timestamp, 'dateString')),
-	datasets: [
-		{
-			data: mockDelegationRecords.map((record) => record.value),
-			borderColor: '#0DBD27',
-			backgroundColor: '#0DBD2733',
-			fill: true,
-			tension: 0.4,
-			pointRadius: 0,
-			borderWidth: 1,
-		},
-	],
-};
-
 export default function DashboardPage() {
 	const { data: allFlps } = useQuery({
 		queryKey: ['allFlps'],
@@ -164,7 +140,6 @@ export default function DashboardPage() {
 							<TokenAvatar logo={ASSETS.pi} size="xl" />
 						</S.StatValue>
 					</div>
-					{/* <TrendChart height={150} width={500} data={chartData} isLoading={!allFlps} /> */}
 				</S.StatCard>
 			)}
 
@@ -291,7 +266,7 @@ export default function DashboardPage() {
 				{!arProvider.walletAddress ? (
 					<S.SectionTitle style={{ margin: 'auto' }}>Connect wallet to view your delegations.</S.SectionTitle>
 				) : isLoading ? (
-					<div>
+					<div style={{ display: 'flex', flexDirection: 'column', gap: 10 }}>
 						{isTablet ? (
 							[1, 2, 3].map((i) => (
 								<div

src/views/Fund/index.tsx

@@ -1,5 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
-import React, { useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { ReactSVG } from 'react-svg';
 
 import { AO, ASSETS, STYLING } from 'helpers/config';