progress on factory interactions

ATXDAO · May 27, 2024 · eb9a86d · eb9a86d
1 parent 0a9c4ea
commit eb9a86d
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 46 deletions.
diff --git a/packages/foundry/lib/reputation b/packages/foundry/lib/reputation
diff --git a/packages/foundry/script/DeployFactory.s.sol b/packages/foundry/script/DeployFactory.s.sol
@@ -4,10 +4,8 @@ pragma solidity ^0.8.19;
 import {console} from "forge-std/console.sol";
 
 import {ScaffoldETHDeploy} from "./DeployHelpers.s.sol";
-import {ReputationTokensFactory} from
-    "@atxdao/contracts/reputation/ReputationTokensFactory.sol";
-import {ReputationTokensUpgradeable} from
-    "@atxdao/contracts/reputation/ReputationTokensUpgradeable.sol";
+import {ReputationTokensFactory} from "@atxdao/contracts/reputation/ReputationTokensFactory.sol";
+import {ReputationTokensUpgradeable} from "@atxdao/contracts/reputation/ReputationTokensUpgradeable.sol";
 
 contract DeployFactoryScript is ScaffoldETHDeploy {
     error InvalidPrivateKey(string);
@@ -28,9 +26,10 @@ contract DeployFactoryScript is ScaffoldETHDeploy {
         admins[0] = deployerPubKey;
         admins[1] = controller;
 
-        ReputationTokensUpgradeable implementation =
-            new ReputationTokensUpgradeable();
-        ReputationTokensFactory factory =
-            new ReputationTokensFactory(admins, admins, address(implementation));
+        ReputationTokensUpgradeable implementation = new ReputationTokensUpgradeable();
+        ReputationTokensFactory factory = new ReputationTokensFactory(
+            admins,
+            address(implementation)
+        );
     }
 }
diff --git a/packages/nextjs/app/factory/_components/Factory.tsx b/packages/nextjs/app/factory/_components/Factory.tsx
@@ -1,11 +1,43 @@
 "use client";
 
+import { useAccount } from "wagmi";
+import { useScaffoldWatchContractEvent, useScaffoldWriteContract } from "~~/hooks/scaffold-eth";
+
 export function Factory() {
+  const account = useAccount();
+
+  const { writeContractAsync: writeFactoryAsync } = useScaffoldWriteContract("ReputationTokensFactory");
+
+  useScaffoldWatchContractEvent({
+    contractName: "ReputationTokensFactory",
+    eventName: "CreatedNewInstance",
+    // The onLogs function is called whenever a GreetingChange event is emitted by the contract.
+    // Parameters emitted by the event can be destructed using the below example
+    // for this example: event GreetingChange(address greetingSetter, string newGreeting, bool premium, uint256 value);
+    onLogs: logs => {
+      logs.map(log => {
+        const { instance } = log.args;
+        console.log("📡 Factory create", instance);
+      });
+    },
+  });
+
   return (
     <>
       <div className="py-5 space-y-5 flex flex-col justify-center items-center bg-primary bg-[length:100%_100%] py-1 px-5 sm:px-0 lg:py-auto max-w-[100vw] ">
         <div className="flex flex-row justify-center items-center">
           <div className="flex flex-col justify-center items-center">
+            <button
+              className="btn btn-secondary"
+              onClick={async () => {
+                await writeFactoryAsync({
+                  functionName: "createNewInstance",
+                  args: [account?.address, [account.address!]],
+                });
+              }}
+            >
+              Create Reputation Smart Contract
+            </button>
             <p>{"hello"}</p>
           </div>
         </div>

diff --git a/packages/nextjs/contracts/deployedContracts.ts b/packages/nextjs/contracts/deployedContracts.ts
@@ -7,7 +7,7 @@ import { GenericContractsDeclaration } from "~~/utils/scaffold-eth/contract";
 const deployedContracts = {
   31337: {
     ReputationTokens: {
-      address: "0x5FbDB2315678afecb367f032d93F642f64180aa3",
+      address: "0x9e545e3c0baab3e08cdfd552c960a1050f373042",
       abi: [
         {
           type: "constructor",
@@ -1447,7 +1447,7 @@ const deployedContracts = {
       },
     },
     ReputationFaucet: {
-      address: "0x8A791620dd6260079BF849Dc5567aDC3F2FdC318",
+      address: "0x99bba657f2bbc93c02d617f8ba121cb8fc104acf",
       abi: [
         {
           type: "constructor",
@@ -1572,7 +1572,7 @@ const deployedContracts = {
       },
     },
     Hats: {
-      address: "0x3Aa5ebB10DC797CAC828524e59A333d0A371443c",
+      address: "0xb7278a61aa25c888815afc32ad3cc52ff24fe575",
       abi: [
         {
           type: "constructor",
@@ -3533,7 +3533,7 @@ const deployedContracts = {
       },
     },
     MultiClaimsHatter: {
-      address: "0x4ed7c70F96B99c776995fB64377f0d4aB3B0e1C1",
+      address: "0x2bdcc0de6be1f7d2ee689a0342d76f52e8efaba3",
       abi: [
         {
           type: "constructor",
@@ -3859,7 +3859,7 @@ const deployedContracts = {
       },
     },
     ActiveModule: {
-      address: "0xa85233C63b9Ee964Add6F2cffe00Fd84eb32338f",
+      address: "0x7bc06c482dead17c0e297afbc32f6e63d3846650",
       abi: [
         {
           type: "function",
@@ -3889,7 +3889,7 @@ const deployedContracts = {
       inheritedFunctions: {},
     },
     ERC1155EligibiltiyModule: {
-      address: "0x09635F643e140090A9A8Dcd712eD6285858ceBef",
+      address: "0xcbeaf3bde82155f56486fb5a1072cb8baaf547cc",
       abi: [
         {
           type: "constructor",
@@ -3940,7 +3940,7 @@ const deployedContracts = {
       inheritedFunctions: {},
     },
     ReputationTokensUpgradeable: {
-      address: "0xc3e53F4d16Ae77Db1c982e75a937B9f60FE63690",
+      address: "0x922d6956c99e12dfeb3224dea977d0939758a1fe",
       abi: [
         {
           type: "function",
@@ -5400,7 +5400,7 @@ const deployedContracts = {
       },
     },
     ReputationTokensFactory: {
-      address: "0x84eA74d481Ee0A5332c457a4d796187F6Ba67fEB",
+      address: "0x5081a39b8a5f0e35a8d959395a630b68b74dd30f",
       abi: [
         {
           type: "constructor",
@@ -5411,12 +5411,7 @@ const deployedContracts = {
               internalType: "address[]",
             },
             {
-              name: "_controllers",
-              type: "address[]",
-              internalType: "address[]",
-            },
-            {
-              name: "_implementation",
+              name: "implementation",
               type: "address",
               internalType: "address",
             },
@@ -5547,19 +5542,6 @@ const deployedContracts = {
           ],
           stateMutability: "view",
         },
-        {
-          type: "function",
-          name: "implementation",
-          inputs: [],
-          outputs: [
-            {
-              name: "",
-              type: "address",
-              internalType: "address",
-            },
-          ],
-          stateMutability: "view",
-        },
         {
           type: "function",
           name: "instances",
@@ -5615,6 +5597,32 @@ const deployedContracts = {
           outputs: [],
           stateMutability: "nonpayable",
         },
+        {
+          type: "function",
+          name: "s_implementation",
+          inputs: [],
+          outputs: [
+            {
+              name: "",
+              type: "address",
+              internalType: "address",
+            },
+          ],
+          stateMutability: "view",
+        },
+        {
+          type: "function",
+          name: "setImplementation",
+          inputs: [
+            {
+              name: "implementation",
+              type: "address",
+              internalType: "address",
+            },
+          ],
+          outputs: [],
+          stateMutability: "nonpayable",
+        },
         {
           type: "function",
           name: "supportsInterface",
@@ -5639,7 +5647,7 @@ const deployedContracts = {
           name: "CreatedNewInstance",
           inputs: [
             {
-              name: "",
+              name: "instance",
               type: "address",
               indexed: false,
               internalType: "address",
@@ -5749,15 +5757,7 @@ const deployedContracts = {
           inputs: [],
         },
       ],
-      inheritedFunctions: {
-        DEFAULT_ADMIN_ROLE: "lib/openzeppelin-contracts/contracts/access/AccessControl.sol",
-        getRoleAdmin: "lib/openzeppelin-contracts/contracts/access/AccessControl.sol",
-        grantRole: "lib/openzeppelin-contracts/contracts/access/AccessControl.sol",
-        hasRole: "lib/openzeppelin-contracts/contracts/access/AccessControl.sol",
-        renounceRole: "lib/openzeppelin-contracts/contracts/access/AccessControl.sol",
-        revokeRole: "lib/openzeppelin-contracts/contracts/access/AccessControl.sol",
-        supportsInterface: "lib/openzeppelin-contracts/contracts/access/AccessControl.sol",
-      },
+      inheritedFunctions: {},
     },
   },
 } as const;
+16 −17		contracts/ReputationTokensFactory.sol
+14 −6		test/ReputationTokens__Distribute.t.sol
+11 −6		test/ReputationTokens__Mint.t.sol
+15 −9		test/ReputationTokens__UpdateToken.t.sol