From ee822b75ab4016facbfd6e5cb4ee10710efe2f1c Mon Sep 17 00:00:00 2001
From: Kilter <mateodaza@gmail.com>
Date: Wed, 4 Dec 2024 15:22:52 -0500
Subject: [PATCH 1/4] integrating base for recurring anchor contract

---
 .../views/create/AddressInterface.tsx         | 80 +++++++++++++++++--
 .../create/AlloProtocol/AlloProtocolModal.tsx | 53 ++++++++++++
 src/components/views/create/CreateProject.tsx |  9 ++-
 src/config/development.tsx                    |  1 +
 src/config/production.tsx                     |  1 +
 src/types/config.ts                           |  6 +-
 6 files changed, 140 insertions(+), 10 deletions(-)

diff --git a/src/components/views/create/AddressInterface.tsx b/src/components/views/create/AddressInterface.tsx
index c6a2e251fc..311271d1e4 100644
--- a/src/components/views/create/AddressInterface.tsx
+++ b/src/components/views/create/AddressInterface.tsx
@@ -1,5 +1,6 @@
 import { useFormContext } from 'react-hook-form';
 import { useIntl } from 'react-intl';
+import { useAccount, useSwitchChain } from 'wagmi';
 import styled, { css } from 'styled-components';
 import {
 	B,
@@ -23,13 +24,16 @@ import { getChainName } from '@/lib/network';
 import { IChainType } from '@/types/config';
 import { findAddressByChain } from '@/lib/helpers';
 import { useGeneralWallet } from '@/providers/generalWalletProvider';
-import { IAnchorContractData } from '@/apollo/types/types';
+import { IAnchorContractData, IProject } from '@/apollo/types/types';
 import { IconWithTooltip } from '@/components/IconWithToolTip';
 import { EInputs } from './types';
 import links from '@/lib/constants/links';
+import { STOP_RECURRING_SETUP_ON_CREATION } from './CreateProject';
+import { saveAnchorContract } from './AlloProtocol/AlloProtocolModal';
 
 interface IAddressInterfaceProps extends IChainType {
 	networkId: number;
+	project?: IProject;
 	onButtonClick?: () => void;
 	anchorContractData?: IAnchorContractData;
 	isEditMode?: boolean;
@@ -41,21 +45,30 @@ interface IconContainerProps {
 
 const AddressInterface = ({
 	networkId,
+	project,
 	onButtonClick,
 	chainType,
 	anchorContractData,
 	isEditMode,
 }: IAddressInterfaceProps) => {
+	const { chain } = useAccount();
+	const { switchChain } = useSwitchChain();
 	const { setValue, watch } = useFormContext();
 	const { formatMessage } = useIntl();
 	const { isOnEVM } = useGeneralWallet();
 
+	const isOnOptimism = chain
+		? chain.id === config.OPTIMISM_NETWORK_NUMBER
+		: false;
+	const isOnBase = chain ? chain.id === config.BASE_NETWORK_NUMBER : false;
+
 	const inputName = EInputs.addresses;
 	const alloProtocolRegistry = watch(EInputs.alloProtocolRegistry) as boolean;
 
 	const value = watch(inputName);
 
 	const isOptimism = networkId === config.OPTIMISM_NETWORK_NUMBER;
+	const isBase = networkId === config.BASE_NETWORK_NUMBER;
 
 	const addressObj = findAddressByChain(value, networkId, chainType);
 	const walletAddress = addressObj?.address;
@@ -67,6 +80,15 @@ const AddressInterface = ({
 		config.OPTIMISM_NETWORK_NUMBER,
 		chainType,
 	);
+	const hasBaseAddress = !!findAddressByChain(
+		value,
+		config.BASE_NETWORK_NUMBER,
+		chainType,
+	);
+	const isRecurringOnOptimismReady = isOptimism && hasOptimismAddress;
+	const isRecurringOnBaseReady = isBase && hasBaseAddress;
+	const isRecurringDonationsReady =
+		isRecurringOnBaseReady || isRecurringOnOptimismReady;
 
 	return (
 		<Container>
@@ -117,7 +139,7 @@ const AddressInterface = ({
 						{hasAddress ? walletAddress : 'No address added yet!'}
 					</AddressContainer>
 					{hasAddress &&
-						(hasAnchorContract && isOptimism ? (
+						(hasAnchorContract && (isOptimism || isBase) ? (
 							<IconWithTooltip
 								direction='top'
 								icon={
@@ -153,10 +175,10 @@ const AddressInterface = ({
 							</IconContainer>
 						))}
 				</Flex>
-				{isOptimism && isOnEVM && (
-					// Render this section only on Optimism
+				{(isOptimism || isBase) && isOnEVM && (
+					// Render this section only on Optimism and Base
 					<AlloProtocolContainer>
-						<Flex>
+						<Flex $flexDirection='column' $alignItems='end'>
 							<div>
 								<B>
 									{hasAnchorContract && isEditMode
@@ -192,18 +214,55 @@ const AddressInterface = ({
 								<IconCheckContainer>
 									<IconCheck16 color={brandColors.giv[100]} />
 								</IconCheckContainer>
+							) : STOP_RECURRING_SETUP_ON_CREATION ? (
+								<EnableBtn>
+									<Button
+										buttonType={
+											isRecurringDonationsReady
+												? 'secondary'
+												: 'texty-secondary'
+										}
+										label={'Enable'}
+										disabled={!isRecurringDonationsReady}
+										onClick={() => {
+											if (!project) return;
+											if (
+												isRecurringOnOptimismReady &&
+												!isOnOptimism
+											) {
+												switchChain?.({
+													chainId:
+														config.OPTIMISM_NETWORK_NUMBER,
+												});
+											} else if (
+												isRecurringOnBaseReady &&
+												!isOnBase
+											) {
+												switchChain?.({
+													chainId:
+														config.BASE_NETWORK_NUMBER,
+												});
+											}
+
+											saveAnchorContract({
+												addedProjectState: project,
+												chainId: networkId,
+											});
+										}}
+									/>
+								</EnableBtn>
 							) : (
 								<ToggleSwitch
 									isOn={alloProtocolRegistry}
 									toggleOnOff={() => {
-										if (!hasOptimismAddress) return;
+										if (!isRecurringDonationsReady) return;
 										setValue(
 											EInputs.alloProtocolRegistry,
 											!alloProtocolRegistry,
 										);
 									}}
 									label=''
-									disabled={!hasOptimismAddress}
+									disabled={!isRecurringDonationsReady}
 								/>
 							)}
 						</Flex>
@@ -233,7 +292,7 @@ const TopContainer = styled.div`
 `;
 
 const MiddleContainer = styled.div`
-	padding: 24px 0;
+	padding: 24px 0 0 0;
 `;
 
 const AddressContainer = styled.div<{ $hasAddress: boolean }>`
@@ -286,4 +345,9 @@ const CustomLink = styled.a`
 	cursor: pointer;
 `;
 
+const EnableBtn = styled.div`
+	width: 100px;
+	margin: 12px 0 0 0;
+`;
+
 export default AddressInterface;
diff --git a/src/components/views/create/AlloProtocol/AlloProtocolModal.tsx b/src/components/views/create/AlloProtocol/AlloProtocolModal.tsx
index 4b6e83dc5f..c400b2c412 100644
--- a/src/components/views/create/AlloProtocol/AlloProtocolModal.tsx
+++ b/src/components/views/create/AlloProtocol/AlloProtocolModal.tsx
@@ -31,6 +31,59 @@ interface IAlloProtocolModal extends IModal {
 	addedProjectState: IProject;
 }
 
+export const saveAnchorContract = async ({
+	addedProjectState,
+	chainId,
+}: {
+	addedProjectState: IProject;
+	chainId: number;
+}) => {
+	try {
+		const isOptimism = chainId === config.OPTIMISM_NETWORK_NUMBER;
+		const hash = await writeContract(wagmiConfig, {
+			address: isOptimism
+				? config.OPTIMISM_CONFIG.anchorRegistryAddress
+				: config.BASE_CONFIG.anchorRegistryAddress,
+			functionName: 'createProfile',
+			abi: createProfileABI.abi,
+			chainId,
+			args: [
+				generateRandomNonce(), //nonce
+				addedProjectState?.id!,
+				{
+					protocol: 1,
+					pointer: '',
+				},
+				addedProjectState?.adminUser?.walletAddress, //admin user wallet address
+				[],
+			],
+		});
+		if (hash) {
+			const data = await waitForTransactionReceipt(wagmiConfig, {
+				hash: hash,
+				chainId,
+			});
+
+			const contractAddress = extractContractAddressFromString(
+				data.logs[0].data,
+			);
+			console.log({ data, contractAddress });
+			//Call backend to update project
+			await client.mutate({
+				mutation: CREATE_ANCHOR_CONTRACT_ADDRESS_QUERY,
+				variables: {
+					projectId: Number(addedProjectState.id),
+					networkId: chainId,
+					address: contractAddress,
+					txHash: hash,
+				},
+			});
+		}
+	} catch (error) {
+		console.error('Error Contract', error);
+	}
+};
+
 const AlloProtocolModal: FC<IAlloProtocolModal> = ({
 	setShowModal,
 	addedProjectState,
diff --git a/src/components/views/create/CreateProject.tsx b/src/components/views/create/CreateProject.tsx
index e1507dcaf8..4ae39771c0 100644
--- a/src/components/views/create/CreateProject.tsx
+++ b/src/components/views/create/CreateProject.tsx
@@ -59,6 +59,7 @@ import SocialMedias from './SocialMediaBox/SocialMedias';
 import { CreateHeader } from './CreateHeader';
 
 const ALL_CHAINS = config.CHAINS;
+export const STOP_RECURRING_SETUP_ON_CREATION = true;
 
 interface ICreateProjectProps {
 	project?: IProjectEdition;
@@ -405,7 +406,12 @@ const CreateProject: FC<ICreateProjectProps> = ({ project }) => {
 			if (addedProject) {
 				// Success
 
-				if (watchAlloProtocolRegistry && hasOptimismAddress && !draft) {
+				if (
+					!STOP_RECURRING_SETUP_ON_CREATION &&
+					watchAlloProtocolRegistry &&
+					hasOptimismAddress &&
+					!draft
+				) {
 					setShowAlloProtocolModal(true);
 					localStorage.removeItem(StorageLabel.CREATE_PROJECT_FORM);
 				} else {
@@ -530,6 +536,7 @@ const CreateProject: FC<ICreateProjectProps> = ({ project }) => {
 									{ALL_CHAINS.map(chain => (
 										<AddressInterface
 											key={chain.id}
+											project={project as IProject}
 											networkId={chain.id}
 											chainType={
 												(chain as NonEVMChain).chainType
diff --git a/src/config/development.tsx b/src/config/development.tsx
index 11f737c951..0cb620561b 100644
--- a/src/config/development.tsx
+++ b/src/config/development.tsx
@@ -423,6 +423,7 @@ const config: EnvConfig = {
 		gasPreference: {
 			// Keep it empty for automatic configuration
 		},
+		anchorRegistryAddress: '0x4AAcca72145e1dF2aeC137E1f3C5E3D75DB8b5f3',
 		chainLogo: (logoSize?: number) => <IconBase size={logoSize} />,
 	},
 
diff --git a/src/config/production.tsx b/src/config/production.tsx
index 27c51ceb91..5e14ddccc8 100644
--- a/src/config/production.tsx
+++ b/src/config/production.tsx
@@ -581,6 +581,7 @@ const config: EnvConfig = {
 		gasPreference: {
 			// Keep it empty for automatic configuration
 		},
+		anchorRegistryAddress: '0x4AAcca72145e1dF2aeC137E1f3C5E3D75DB8b5f3',
 		subgraphAddress: '',
 		coingeckoChainName: 'base',
 		chainLogo: (logoSize = 24) => <IconBase size={logoSize} />,
diff --git a/src/types/config.ts b/src/types/config.ts
index 65e64c97e1..8277337d7b 100644
--- a/src/types/config.ts
+++ b/src/types/config.ts
@@ -172,6 +172,10 @@ export interface OptimismNetworkConfig extends NetworkConfig {
 	GIVETH_ANCHOR_CONTRACT_ADDRESS: Address;
 }
 
+export interface BaseNetworkConfig extends NetworkConfig {
+	anchorRegistryAddress: Address;
+}
+
 interface MicroservicesConfig {
 	authentication: string;
 	notification: string;
@@ -222,7 +226,7 @@ export interface EnvConfig {
 	OPTIMISM_CONFIG: OptimismNetworkConfig;
 	CELO_CONFIG: NetworkConfig;
 	ARBITRUM_CONFIG: NetworkConfig;
-	BASE_CONFIG: NetworkConfig;
+	BASE_CONFIG: BaseNetworkConfig;
 	ZKEVM_CONFIG: NetworkConfig;
 	CLASSIC_CONFIG: NetworkConfig;
 	BACKEND_LINK: string;

From ae8d70bf5b3a5335dd4228a32e594b916c602a47 Mon Sep 17 00:00:00 2001
From: Kilter <mateodaza@gmail.com>
Date: Mon, 9 Dec 2024 12:04:04 -0500
Subject: [PATCH 2/4] networkId on anchorContracts

---
 src/apollo/gql/gqlProjects.ts                       |  4 ++++
 src/apollo/gql/gqlSuperfluid.ts                     |  2 ++
 src/apollo/gql/gqlUser.ts                           |  1 +
 src/apollo/types/types.ts                           |  1 +
 src/components/views/create/AddressInterface.tsx    |  7 +++++--
 .../views/create/AlloProtocol/AlloProtocolModal.tsx |  6 ++++--
 src/components/views/create/CreateProject.tsx       | 13 ++++++++-----
 7 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/apollo/gql/gqlProjects.ts b/src/apollo/gql/gqlProjects.ts
index 6546c7d2c0..edcf834f83 100644
--- a/src/apollo/gql/gqlProjects.ts
+++ b/src/apollo/gql/gqlProjects.ts
@@ -55,6 +55,7 @@ export const PROJECT_CARD_FIELDS = gql`
 		anchorContracts {
 			address
 			isActive
+			networkId
 		}
 	}
 `;
@@ -196,6 +197,7 @@ export const FETCH_PROJECT_BY_SLUG_DONATION = gql`
 			anchorContracts {
 				address
 				isActive
+				networkId
 			}
 		}
 	}
@@ -294,6 +296,7 @@ export const FETCH_PROJECT_BY_SLUG_SINGLE_PROJECT = gql`
 			anchorContracts {
 				address
 				isActive
+				networkId
 			}
 		}
 	}
@@ -332,6 +335,7 @@ export const FETCH_PROJECT_BY_ID = gql`
 			anchorContracts {
 				address
 				isActive
+				networkId
 			}
 		}
 	}
diff --git a/src/apollo/gql/gqlSuperfluid.ts b/src/apollo/gql/gqlSuperfluid.ts
index 864833e4b9..3021fb4ed9 100644
--- a/src/apollo/gql/gqlSuperfluid.ts
+++ b/src/apollo/gql/gqlSuperfluid.ts
@@ -55,12 +55,14 @@ export const CREATE_ANCHOR_CONTRACT_ADDRESS_QUERY = gql`
 		$projectId: Int!
 		$networkId: Int!
 		$address: String!
+		$recipientAddress: String
 		$txHash: String!
 	) {
 		addAnchorContractAddress(
 			projectId: $projectId
 			networkId: $networkId
 			address: $address
+			recipientAddress: $recipientAddress
 			txHash: $txHash
 		) {
 			id
diff --git a/src/apollo/gql/gqlUser.ts b/src/apollo/gql/gqlUser.ts
index 975eb9da1b..7238d10f02 100644
--- a/src/apollo/gql/gqlUser.ts
+++ b/src/apollo/gql/gqlUser.ts
@@ -154,6 +154,7 @@ export const FETCH_USER_RECURRING_DONATIONS = gql`
 					anchorContracts {
 						address
 						isActive
+						networkId
 					}
 				}
 				finished
diff --git a/src/apollo/types/types.ts b/src/apollo/types/types.ts
index 5187903452..582960c8e9 100644
--- a/src/apollo/types/types.ts
+++ b/src/apollo/types/types.ts
@@ -32,6 +32,7 @@ export interface IEstimatedMatching {
 export interface IAnchorContractData {
 	address: Address;
 	isActive: boolean;
+	networkId: number;
 }
 
 export interface IProject {
diff --git a/src/components/views/create/AddressInterface.tsx b/src/components/views/create/AddressInterface.tsx
index 311271d1e4..eeec515eed 100644
--- a/src/components/views/create/AddressInterface.tsx
+++ b/src/components/views/create/AddressInterface.tsx
@@ -224,7 +224,7 @@ const AddressInterface = ({
 										}
 										label={'Enable'}
 										disabled={!isRecurringDonationsReady}
-										onClick={() => {
+										onClick={async () => {
 											if (!project) return;
 											if (
 												isRecurringOnOptimismReady &&
@@ -244,10 +244,13 @@ const AddressInterface = ({
 												});
 											}
 
-											saveAnchorContract({
+											await saveAnchorContract({
 												addedProjectState: project,
 												chainId: networkId,
+												recipientAddress:
+													walletAddress || value,
 											});
+											// update here so it shows it already has a contract
 										}}
 									/>
 								</EnableBtn>
diff --git a/src/components/views/create/AlloProtocol/AlloProtocolModal.tsx b/src/components/views/create/AlloProtocol/AlloProtocolModal.tsx
index c400b2c412..9787837d16 100644
--- a/src/components/views/create/AlloProtocol/AlloProtocolModal.tsx
+++ b/src/components/views/create/AlloProtocol/AlloProtocolModal.tsx
@@ -34,9 +34,11 @@ interface IAlloProtocolModal extends IModal {
 export const saveAnchorContract = async ({
 	addedProjectState,
 	chainId,
+	recipientAddress,
 }: {
 	addedProjectState: IProject;
 	chainId: number;
+	recipientAddress?: string;
 }) => {
 	try {
 		const isOptimism = chainId === config.OPTIMISM_NETWORK_NUMBER;
@@ -63,11 +65,10 @@ export const saveAnchorContract = async ({
 				hash: hash,
 				chainId,
 			});
-
 			const contractAddress = extractContractAddressFromString(
 				data.logs[0].data,
 			);
-			console.log({ data, contractAddress });
+
 			//Call backend to update project
 			await client.mutate({
 				mutation: CREATE_ANCHOR_CONTRACT_ADDRESS_QUERY,
@@ -75,6 +76,7 @@ export const saveAnchorContract = async ({
 					projectId: Number(addedProjectState.id),
 					networkId: chainId,
 					address: contractAddress,
+					recipientAddress,
 					txHash: hash,
 				},
 			});
diff --git a/src/components/views/create/CreateProject.tsx b/src/components/views/create/CreateProject.tsx
index 4ae39771c0..a281688b7e 100644
--- a/src/components/views/create/CreateProject.tsx
+++ b/src/components/views/create/CreateProject.tsx
@@ -26,6 +26,7 @@ import {
 } from '@/apollo/gql/gqlProjects';
 import {
 	EProjectSocialMediaType,
+	IAnchorContractData,
 	IProject,
 	IProjectCreation,
 	IProjectEdition,
@@ -455,7 +456,6 @@ const CreateProject: FC<ICreateProjectProps> = ({ project }) => {
 			localStorage.removeItem(StorageLabel.CREATE_PROJECT_FORM);
 		}
 	};
-
 	return (
 		<>
 			<CreateHeader
@@ -552,10 +552,13 @@ const CreateProject: FC<ICreateProjectProps> = ({ project }) => {
 											}}
 											isEditMode={isEditMode}
 											anchorContractData={
-												(project?.anchorContracts &&
-													project
-														?.anchorContracts[0]) ??
-												undefined
+												project?.anchorContracts?.find(
+													(
+														contract: IAnchorContractData,
+													) =>
+														contract.networkId ===
+														chain.id,
+												) ?? undefined
 											}
 										/>
 									))}

From ed25c165ed8874c3278cde98643bf12918f0840c Mon Sep 17 00:00:00 2001
From: Kilter <mateodaza@gmail.com>
Date: Mon, 9 Dec 2024 12:14:38 -0500
Subject: [PATCH 3/4] Update AddressInterface.tsx

---
 src/components/views/create/AddressInterface.tsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/views/create/AddressInterface.tsx b/src/components/views/create/AddressInterface.tsx
index eeec515eed..2e6da5a77e 100644
--- a/src/components/views/create/AddressInterface.tsx
+++ b/src/components/views/create/AddressInterface.tsx
@@ -1,3 +1,4 @@
+import { useState } from 'react';
 import { useFormContext } from 'react-hook-form';
 import { useIntl } from 'react-intl';
 import { useAccount, useSwitchChain } from 'wagmi';
@@ -57,6 +58,10 @@ const AddressInterface = ({
 	const { formatMessage } = useIntl();
 	const { isOnEVM } = useGeneralWallet();
 
+	const [hasAnchorContract, setHasAnchorContract] = useState(
+		anchorContractData?.isActive || false,
+	);
+
 	const isOnOptimism = chain
 		? chain.id === config.OPTIMISM_NETWORK_NUMBER
 		: false;
@@ -74,7 +79,7 @@ const AddressInterface = ({
 	const walletAddress = addressObj?.address;
 
 	const hasAddress = !!walletAddress;
-	const hasAnchorContract = !!anchorContractData?.isActive;
+
 	const hasOptimismAddress = !!findAddressByChain(
 		value,
 		config.OPTIMISM_NETWORK_NUMBER,
@@ -250,7 +255,7 @@ const AddressInterface = ({
 												recipientAddress:
 													walletAddress || value,
 											});
-											// update here so it shows it already has a contract
+											setHasAnchorContract(true);
 										}}
 									/>
 								</EnableBtn>

From c0ee3d9be4a12025c2fbb11219e899575eea01fa Mon Sep 17 00:00:00 2001
From: Kilter <mateodaza@gmail.com>
Date: Tue, 10 Dec 2024 10:59:44 -0500
Subject: [PATCH 4/4] Update AlloProtocolModal.tsx

---
 src/components/views/create/AlloProtocol/AlloProtocolModal.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/create/AlloProtocol/AlloProtocolModal.tsx b/src/components/views/create/AlloProtocol/AlloProtocolModal.tsx
index 9787837d16..ffd95248f0 100644
--- a/src/components/views/create/AlloProtocol/AlloProtocolModal.tsx
+++ b/src/components/views/create/AlloProtocol/AlloProtocolModal.tsx
@@ -65,6 +65,7 @@ export const saveAnchorContract = async ({
 				hash: hash,
 				chainId,
 			});
+
 			const contractAddress = extractContractAddressFromString(
 				data.logs[0].data,
 			);