Merge pull request #1 from meemproject/dev

Dev -> Stage

CHANGELOG.md

@@ -1,3 +1,12 @@
+## [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)
 
 ## [1.1.2](https://github.com/meemproject/clubs-web/compare/v1.1.1...v1.1.2) (2022-06-09)

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@meemproject/epm",
-	"version": "0.0.1",
+	"version": "1.0.1",
 	"private": true,
 	"author": "Meem Project",
 	"contributors": [
@@ -94,4 +94,4 @@
 		"typechain": "^6.0.2",
 		"typescript": "4.6.3"
 	}
-}
+}

src/components/Atoms/FacetList.tsx

@@ -230,6 +230,9 @@ export const FacetList: React.FC<IProps> = ({
 															<>
 																<Switch
 																	key={`${contract?.id}-${selector}`}
+																	disabled={
+																		!isEnabled
+																	}
 																	checked={
 																		isInUse
 																	}

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')
+
+					args.push(vals.map(item => item.trim()))
+					break
+				}
+
+				case 'address':
+				default: {
+					// @ts-ignore
+					args.push(form.values[`args${i}`])
+					break
+				}
+			}
 		}
 
 		try {
@@ -144,6 +167,20 @@ export const DeployContract: React.FC<IProps> = ({
 				>
 					{inputs.map((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 (

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 && (

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

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'
 	}
 ]