From f1423a6996e3b7da39eae2e9cf4b00875901b355 Mon Sep 17 00:00:00 2001
From: CI <ci@meem.wtf>
Date: Tue, 26 Jul 2022 17:10:23 +0000
Subject: [PATCH 1/5] chore(release): 1.0.0 [skip ci]

# 1.0.0 (2022-07-26)
---
 CHANGELOG.md | 2 ++
 package.json | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b462339..698abf6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+# 1.0.0 (2022-07-26)
+
 ## [1.1.3](https://github.com/meemproject/clubs-web/compare/v1.1.2...v1.1.3) (2022-06-09)
 
 ## [1.1.2](https://github.com/meemproject/clubs-web/compare/v1.1.1...v1.1.2) (2022-06-09)
diff --git a/package.json b/package.json
index 79a119a..3e1b990 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@meemproject/epm",
-	"version": "0.0.1",
+	"version": "1.0.0",
 	"private": true,
 	"author": "Meem Project",
 	"contributors": [
@@ -94,4 +94,4 @@
 		"typechain": "^6.0.2",
 		"typescript": "4.6.3"
 	}
-}
\ No newline at end of file
+}

From caa6785febe3ce3715716de1cc97fe7d44e2f891 Mon Sep 17 00:00:00 2001
From: CI <ci@meem.wtf>
Date: Fri, 29 Jul 2022 17:50:42 +0000
Subject: [PATCH 2/5] chore(release): 1.0.1 [skip ci]

## [1.0.1](https://github.com/meemproject/epm/compare/v1.0.0...v1.0.1) (2022-07-29)

### Bug Fixes

* add bundle facet not fetching contract ([880bde6](https://github.com/meemproject/epm/commit/880bde6))
---
 CHANGELOG.md | 7 +++++++
 package.json | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 698abf6..4c8a2c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [1.0.1](https://github.com/meemproject/epm/compare/v1.0.0...v1.0.1) (2022-07-29)
+
+
+### Bug Fixes
+
+* add bundle facet not fetching contract ([880bde6](https://github.com/meemproject/epm/commit/880bde6))
+
 # 1.0.0 (2022-07-26)
 
 ## [1.1.3](https://github.com/meemproject/clubs-web/compare/v1.1.2...v1.1.3) (2022-06-09)
diff --git a/package.json b/package.json
index 8729bbc..ccfd087 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@meemproject/epm",
-	"version": "1.0.0",
+	"version": "1.0.1",
 	"private": true,
 	"author": "Meem Project",
 	"contributors": [

From caac55f9a974e6485700ec6e5d343ff334dbb164 Mon Sep 17 00:00:00 2001
From: Ken Goldfarb <hello@kengoldfarb.com>
Date: Tue, 2 Aug 2022 18:50:49 -0400
Subject: [PATCH 3/5] deploy w/ address array; detect upgrader role

---
 src/components/Atoms/FacetList.tsx            |  3 +
 src/components/Contracts/DeployContract.tsx   | 45 +++++++++++++-
 .../ManageDiamond/ManageDiamondContainer.tsx  | 58 +++++++++++++++++--
 src/graphql/contracts.tsx                     |  2 +-
 src/lib/diamond.ts                            | 24 ++++++++
 5 files changed, 124 insertions(+), 8 deletions(-)

diff --git a/src/components/Atoms/FacetList.tsx b/src/components/Atoms/FacetList.tsx
index fe9b357..e480daa 100644
--- a/src/components/Atoms/FacetList.tsx
+++ b/src/components/Atoms/FacetList.tsx
@@ -230,6 +230,9 @@ export const FacetList: React.FC<IProps> = ({
 															<>
 																<Switch
 																	key={`${contract?.id}-${selector}`}
+																	disabled={
+																		!isEnabled
+																	}
 																	checked={
 																		isInUse
 																	}
diff --git a/src/components/Contracts/DeployContract.tsx b/src/components/Contracts/DeployContract.tsx
index dd180a1..23079bb 100644
--- a/src/components/Contracts/DeployContract.tsx
+++ b/src/components/Contracts/DeployContract.tsx
@@ -1,5 +1,13 @@
 import log from '@kengoldfarb/log'
-import { Text, Button, TextInput, Space, Title, Modal } from '@mantine/core'
+import {
+	Text,
+	Button,
+	TextInput,
+	Space,
+	Title,
+	Modal,
+	Textarea
+} from '@mantine/core'
 import { useForm } from '@mantine/form'
 import { showNotification } from '@mantine/notifications'
 import { chains, MeemAPI } from '@meemproject/api'
@@ -60,8 +68,23 @@ export const DeployContract: React.FC<IProps> = ({
 	const handleDeploy = async () => {
 		const args: any[] = []
 		for (let i = 0; i < inputs.length; i += 1) {
-			// @ts-ignore
-			args.push(form.values[`args${i}`])
+			const input = inputs[i]
+			switch (input.type) {
+				case 'address[]': {
+					// @ts-ignore
+					const vals = form.values[`args${i}`].split('\n')
+					console.log({ formVal: form.values[`args${i}`], vals })
+					args.push(vals.map(item => item.trim()))
+					break
+				}
+
+				case 'address':
+				default: {
+					// @ts-ignore
+					args.push(form.values[`args${i}`])
+					break
+				}
+			}
 		}
 
 		try {
@@ -143,7 +166,23 @@ export const DeployContract: React.FC<IProps> = ({
 					})}
 				>
 					{inputs.map((input, i) => {
+						console.log({ input, i })
+
 						switch (input.type) {
+							case 'address[]':
+								return (
+									<Textarea
+										key={`input-${name}`}
+										label={input.name}
+										placeholder={
+											input.type === 'address[]'
+												? '0x...\n0x...'
+												: ''
+										}
+										// @ts-ignore
+										{...form.getInputProps(`args${i}`)}
+									/>
+								)
 							case 'address':
 							default: {
 								return (
diff --git a/src/components/ManageDiamond/ManageDiamondContainer.tsx b/src/components/ManageDiamond/ManageDiamondContainer.tsx
index 7d7e445..c158936 100644
--- a/src/components/ManageDiamond/ManageDiamondContainer.tsx
+++ b/src/components/ManageDiamond/ManageDiamondContainer.tsx
@@ -104,6 +104,7 @@ export const ManageDiamondContainer: React.FC = () => {
 	const [fetchedAddress, setFetchedAddress] = useState<string>()
 	const [fetchedChainId, setFetchedChainId] = useState<number>()
 	const [contractOwner, setContractOwner] = useState<string>()
+	const [isUpgrader, setIsUpgrader] = useState<boolean>(false)
 	const [hasFoundAllFacets, setHasFoundAllFacets] = useState(true)
 	const [facets, setFacets] = useState<
 		{ selectors: string[]; target: string }[]
@@ -331,11 +332,15 @@ export const ManageDiamondContainer: React.FC = () => {
 				signer
 			)
 
-			const [facetResult, bytecodeResult, ownerResult] =
+			const [facetResult, bytecodeResult, ownerResult, hasRoleResult] =
 				await Promise.allSettled([
 					diamond.facets(),
 					web3Provider?.getCode(form.values.address),
-					diamond.owner()
+					diamond.owner(),
+					diamond.hasRole(
+						'0x189ab7a9244df0848122154315af71fe140f3db0fe014031783b0946b8c9d2e3',
+						signer?.getAddress()
+					)
 				])
 
 			const result =
@@ -347,6 +352,9 @@ export const ManageDiamondContainer: React.FC = () => {
 			const owner =
 				ownerResult.status === 'fulfilled' && ownerResult.value
 
+			const hasRole =
+				hasRoleResult.status === 'fulfilled' && hasRoleResult.value
+
 			form.values.facets.splice(0, form.values.facets.length)
 			// form.setFieldValue('facets', formList(result))
 			if (Array.isArray(result)) {
@@ -362,6 +370,7 @@ export const ManageDiamondContainer: React.FC = () => {
 			setFacets(result)
 			setBytecode(bc && bc !== '0x' ? bc : undefined)
 			setContractOwner(owner)
+			setIsUpgrader(hasRole)
 			setFetchedAddress(form.values.address)
 			setFetchedChainId(chainId)
 			setIsDiamond(!!result)
@@ -550,6 +559,8 @@ export const ManageDiamondContainer: React.FC = () => {
 		}
 	}, [data, isLoading, facets])
 
+	const shouldShowUpgradeControls = isContractOwner || isUpgrader
+
 	return (
 		<Page>
 			<form onSubmit={form.onSubmit(() => handleSave())}>
@@ -750,6 +761,12 @@ export const ManageDiamondContainer: React.FC = () => {
 											You are the owner of this contract.
 										</Text>
 									)}
+									{isContractOwner && !isUpgrader && (
+										<Text color="dimmed" size="sm">
+											You are not listed as an upgrader on
+											the contract
+										</Text>
+									)}
 									{!isContractOwner && (
 										<Text color="dimmed" size="sm">
 											The connected account is not the
@@ -758,6 +775,39 @@ export const ManageDiamondContainer: React.FC = () => {
 									)}
 								</Timeline.Item>
 							)}
+							{bytecode && isUpgrader && (
+								<Timeline.Item
+									active
+									bullet={
+										<ThemeIcon
+											color={isUpgrader ? 'green' : 'red'}
+										>
+											{isUpgrader ? (
+												<Check size={20} />
+											) : (
+												<FaceIdError size={20} />
+											)}
+										</ThemeIcon>
+									}
+									title={
+										isUpgrader
+											? 'Contract Upgrader'
+											: 'Not Contract Upgrader'
+									}
+								>
+									{isUpgrader && (
+										<Text color="dimmed" size="sm">
+											You have the upgrader role on this
+											contract
+										</Text>
+									)}
+									{!isUpgrader && !isContractOwner && (
+										<Text color="dimmed" size="sm">
+											{`You can't upgrade this contract`}
+										</Text>
+									)}
+								</Timeline.Item>
+							)}
 							{bytecode && (
 								<Timeline.Item
 									active
@@ -792,7 +842,7 @@ export const ManageDiamondContainer: React.FC = () => {
 						{isDiamond && (
 							<>
 								<Space h={48} />
-								{isContractOwner && (
+								{shouldShowUpgradeControls && (
 									<div className={classes.section_wrapper}>
 										<Text size="xl">Facets</Text>
 										<Space w={12} />
@@ -826,7 +876,7 @@ export const ManageDiamondContainer: React.FC = () => {
 											proxyContract as ContractInstances
 										}
 										isLoading={isLoading}
-										isEnabled={isContractOwner}
+										isEnabled={shouldShowUpgradeControls}
 									/>
 								)}
 								{!hasFoundAllFacets && (
diff --git a/src/graphql/contracts.tsx b/src/graphql/contracts.tsx
index ae87d74..da5a6d9 100644
--- a/src/graphql/contracts.tsx
+++ b/src/graphql/contracts.tsx
@@ -252,7 +252,7 @@ export const SUB_GET_MY_CONTRACTS = gql`
 	subscription SubGetMyContracts($address: String!) {
 		Wallets(where: { address: { _ilike: $address } }) {
 			id
-			WalletContractInstances {
+			WalletContractInstances(order_by: { createdAt: desc }) {
 				id
 				note
 				name
diff --git a/src/lib/diamond.ts b/src/lib/diamond.ts
index e1a5871..6b36524 100644
--- a/src/lib/diamond.ts
+++ b/src/lib/diamond.ts
@@ -279,5 +279,29 @@ export const diamondABI = [
 	{
 		stateMutability: 'payable',
 		type: 'receive'
+	},
+	{
+		inputs: [
+			{
+				internalType: 'bytes32',
+				name: 'role',
+				type: 'bytes32'
+			},
+			{
+				internalType: 'address',
+				name: 'user',
+				type: 'address'
+			}
+		],
+		name: 'hasRole',
+		outputs: [
+			{
+				internalType: 'bool',
+				name: '',
+				type: 'bool'
+			}
+		],
+		stateMutability: 'view',
+		type: 'function'
 	}
 ]

From 555186da75894dffe0a3bfd1b9254a8f48731253 Mon Sep 17 00:00:00 2001
From: Ken Goldfarb <hello@kengoldfarb.com>
Date: Fri, 5 Aug 2022 08:10:42 -0400
Subject: [PATCH 4/5] cleanup

---
 src/components/Contracts/DeployContract.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/Contracts/DeployContract.tsx b/src/components/Contracts/DeployContract.tsx
index 23079bb..e777eaa 100644
--- a/src/components/Contracts/DeployContract.tsx
+++ b/src/components/Contracts/DeployContract.tsx
@@ -166,8 +166,6 @@ export const DeployContract: React.FC<IProps> = ({
 					})}
 				>
 					{inputs.map((input, i) => {
-						console.log({ input, i })
-
 						switch (input.type) {
 							case 'address[]':
 								return (

From 3ed9ebc0b4edd725c76ff94163eb03c8a6115b1a Mon Sep 17 00:00:00 2001
From: Ken Goldfarb <hello@kengoldfarb.com>
Date: Fri, 5 Aug 2022 08:12:32 -0400
Subject: [PATCH 5/5] cleanup

---
 src/components/Contracts/DeployContract.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Contracts/DeployContract.tsx b/src/components/Contracts/DeployContract.tsx
index e777eaa..d8da3e1 100644
--- a/src/components/Contracts/DeployContract.tsx
+++ b/src/components/Contracts/DeployContract.tsx
@@ -73,7 +73,7 @@ export const DeployContract: React.FC<IProps> = ({
 				case 'address[]': {
 					// @ts-ignore
 					const vals = form.values[`args${i}`].split('\n')
-					console.log({ formVal: form.values[`args${i}`], vals })
+
 					args.push(vals.map(item => item.trim()))
 					break
 				}