Feat/evm nftgame1

apps/ethereum/nest/.eslintrc.js

@@ -1,25 +1,25 @@
 module.exports = {
-  parser: '@typescript-eslint/parser',
-  parserOptions: {
-    project: 'tsconfig.json',
-    sourceType: 'module',
-  },
-  plugins: ['@typescript-eslint/eslint-plugin'],
-  extends: [
-    'plugin:@typescript-eslint/recommended',
-    'plugin:prettier/recommended',
-  ],
-  root: true,
-  env: {
-    node: true,
-    jest: true,
-  },
-  ignorePatterns: ['.eslintrc.js'],
-  rules: {
-    '@typescript-eslint/interface-name-prefix': 'off',
-    '@typescript-eslint/explicit-function-return-type': 'off',
-    '@typescript-eslint/explicit-module-boundary-types': 'off',
-    '@typescript-eslint/no-var-requires': 'off',
-    '@typescript-eslint/no-explicit-any': 'off',
-  },
+	parser: '@typescript-eslint/parser',
+	parserOptions: {
+		project: './tsconfig.json',
+		sourceType: 'module',
+	},
+	plugins: ['@typescript-eslint/eslint-plugin'],
+	extends: [
+		'plugin:@typescript-eslint/recommended',
+		'plugin:prettier/recommended',
+	],
+	root: true,
+	env: {
+		node: true,
+		jest: true,
+	},
+	ignorePatterns: ['.eslintrc.js'],
+	rules: {
+		'@typescript-eslint/interface-name-prefix': 'off',
+		'@typescript-eslint/explicit-function-return-type': 'off',
+		'@typescript-eslint/explicit-module-boundary-types': 'off',
+		'@typescript-eslint/no-var-requires': 'off',
+		'@typescript-eslint/no-explicit-any': 'off',
+	},
 };

apps/ethereum/nft-game/components/CreateInstance.tsx

@@ -3,24 +3,25 @@ import { styled } from '../stitches.config';
 import { Button } from './basics/Button';
 import { InfoHeading } from './basics/InfoHeading';
 import { InputContainer, Label, StyledInput } from './basics/Input';
-import { useEthereum } from '@decentology/hyperverse-ethereum';
-import { useNFTGame } from '@decentology/hyperverse-evm-nft-game-1';
+import { useEthereum } from '@decentology/hyperverse-ethereum/react';
+import { useNFTGame } from '@decentology/hyperverse-evm-nft-game/react';
 import { useMutation, useQuery } from 'react-query';
 import { NavLink } from './basics/NavLink';
 
 export const CreateInstance = () => {
 	const { account } = useEthereum();
 	const NFTGame = useNFTGame();
-
 	const { data: instance } = useQuery('instance', () => NFTGame.checkInstance!(account), {
-		enabled: !!NFTGame.factoryContract,
-	});
-
-	const { data: instanceAddress } = useQuery('instanceAddress', () => NFTGame.getProxy!(account), {
-		enabled: !!NFTGame.factoryContract && !!instance,
+		enabled: !!NFTGame.factoryContract && !!NFTGame.checkInstance,
 	});
 
-	console.log(instanceAddress);
+	const { data: instanceAddress } = useQuery(
+		'instanceAddress',
+		() => NFTGame.getProxy!(account),
+		{
+			enabled: !!NFTGame.factoryContract && !!instance,
+		}
+	);
 
 	const [tokenName, setTokenName] = React.useState<string>('');
 	const [tokenSymbol, setTokenSymbol] = React.useState<string>('');
@@ -47,7 +48,14 @@ export const CreateInstance = () => {
 			/>
 			{!!instanceAddress && (
 				<InfoBox>
-					<InfoContainer><NavLink to={`https://rinkeby.etherscan.io/address/${instanceAddress}`} external>{instanceAddress}</NavLink></InfoContainer>
+					<InfoContainer>
+						<NavLink
+							to={`https://rinkeby.etherscan.io/address/${instanceAddress}`}
+							external
+						>
+							{instanceAddress}
+						</NavLink>
+					</InfoContainer>
 				</InfoBox>
 			)}
 
@@ -99,15 +107,14 @@ export const Container = styled('div', {
 
 	variants: {
 		instance: {
-			true :  {
+			true: {
 				alignItems: 'center',
 				flexDirection: 'row',
 				columnGap: 10,
 				justifyContent: 'space-between',
-
-			}
-		}
-	}
+			},
+		},
+	},
 });
 
 export const Inputs = styled('div', {
@@ -137,8 +144,6 @@ const InfoBox = styled(Inputs, {
 	width: '80%',
 	marginBottom: 0,
 	display: 'flex',
-
-
 });
 
 const InfoContainer = styled(InputContainer, {
@@ -148,6 +153,4 @@ const InfoContainer = styled(InputContainer, {
 	justifyContent: 'center',
 	alignItems: 'flex-end',
 	border: 'none',
-
-
 });

apps/ethereum/nft-game/components/Dashboard.tsx

@@ -8,7 +8,7 @@ import { TenantMint } from "./Mint"
 export const Dashboard = () => {
   return (
     <Container>
-    <Heading>NFTGame-1 Module</Heading>
+    <Heading>NFTGame Module</Heading>
 
       <SubContainer>
 
@@ -37,4 +37,4 @@ const SubContainer = styled('div', {
   display: 'flex',
   flexDirection: 'column',
   rowGap: 16,
-})
+})

apps/ethereum/nft-game/components/GetAtrributes.tsx

@@ -3,8 +3,8 @@ import { styled } from '../stitches.config';
 import { Button } from './basics/Button';
 import { InfoHeading } from './basics/InfoHeading';
 import { InputContainer, Label, StyledInput } from './basics/Input';
-import { useEthereum } from '@decentology/hyperverse-ethereum';
-import { useNFTGame } from '@decentology/hyperverse-evm-nft-game-1';
+import { useEthereum } from '@decentology/hyperverse-ethereum/react';
+import { useNFTGame } from '@decentology/hyperverse-evm-nft-game/react';
 import { useMutation, useQuery } from 'react-query';
 import { Container, Inputs, ButtonContainer } from './CreateInstance';
 
@@ -16,11 +16,11 @@ export const GetAttributes = () => {
 		enabled: !!NFTGame.factoryContract,
 	});
 
-	const [tokenId, setTokenId] = React.useState<string | undefined>();
+	const [tokenId, setTokenId] = React.useState<number>();
 
 	const { data: attributes, isLoading, refetch } = useQuery(
 		'attributes',
-		() => NFTGame.getAttributes!(tokenId),
+		() => NFTGame.getAttributesByTokenId!(tokenId!),
 		{
 			enabled: !!NFTGame.factoryContract,
 		}
@@ -39,7 +39,7 @@ export const GetAttributes = () => {
 							<Label>Token ID</Label>
 							<StyledInput
 								placeholder="Token ID"
-								onChange={(e) => setTokenId(e.target.value)}
+								onChange={(e) => setTokenId(parseInt(e.target.value))}
 							/>
 						</InputContainer>
 					</Inputs>

apps/ethereum/nft-game/components/Header.tsx

@@ -4,7 +4,7 @@ import { styled } from '../stitches.config'
 import { HEADER_LINKS } from '../utils/constants'
 import { Github } from './basics/icons'
 import { NavLink } from './basics/NavLink'
-import { useEthereum } from '@decentology/hyperverse-ethereum'
+import { useEthereum } from '@decentology/hyperverse-ethereum/react'
 import dynamic from 'next/dynamic'
 
 export function Header() {

apps/ethereum/nft-game/components/Mint.tsx

@@ -1,5 +1,5 @@
-import { useEthereum } from '@decentology/hyperverse-ethereum';
-import { useNFTGame } from '@decentology/hyperverse-evm-nft-game-1';
+import { useEthereum } from '@decentology/hyperverse-ethereum/react';
+import { useNFTGame } from '@decentology/hyperverse-evm-nft-game/react';
 import React from 'react';
 import { useMutation, useQuery } from 'react-query';
 import { styled } from '../stitches.config';
@@ -18,9 +18,14 @@ export const TenantMint = () => {
 
 	const [reciever, setReciever] = React.useState<string>('');
 	const [tokenName, setTokenName] = React.useState<string>('');
-	const [eyeId, setEyeId] = React.useState<string>('');
-	const [mouthId, setMouthId] = React.useState<string>('');
-	const [bodyId, setBodyId] = React.useState<string>('');
+	const [eyeId, setEyeId] = React.useState<number>();
+	const [mouthId, setMouthId] = React.useState<number>();
+	const [bodyId, setBodyId] = React.useState<number>();
+	const [level, setLevel] = React.useState<number>();
+	const [standardChoices, setStandardChoices] = React.useState<string>();
+	const [standardOptions, setStandardOptions] = React.useState<string>();
+	const [specialChoices, setSpecialChoices] = React.useState<string>();
+	const [specialOptions, setSpecialOptions] = React.useState<string>();
 
 	const { mutate, isLoading } = useMutation('tenantMint', NFTGame.tenantMint);
 
@@ -29,9 +34,14 @@ export const TenantMint = () => {
 			mutate({
 				to: reciever,
 				tokenName,
-				eyeId,
-				mouthId,
-				bodyId,
+				eyeId: eyeId!,
+				mouthId: mouthId!,
+				bodyId: bodyId!,
+				level: level!,
+				specialChoices: specialChoices?.split(',').map((x) => parseInt(x)) || [],
+				specialOptions: specialOptions?.split(',').map((x) => parseInt(x)) || [],
+				standardChoices: standardChoices?.split(',').map((x) => parseInt(x)) || [],
+				standardOptions: standardOptions?.split(',').map((x) => parseInt(x)) || [],
 			});
 		} catch (error) {
 			throw error;
@@ -59,20 +69,62 @@ export const TenantMint = () => {
 			<Inputs>
 				<InputContainer>
 					<Label>Eye Id</Label>
-					<StyledInput placeholder="Eye Id" onChange={(e) => setEyeId(e.target.value)} />
+					<StyledInput
+						placeholder="Eye Id"
+						onChange={(e) => setEyeId(parseInt(e.target.value))}
+					/>
 				</InputContainer>
 				<InputContainer>
 					<Label>Mouth Id</Label>
 					<StyledInput
 						placeholder="Mouth Id"
-						onChange={(e) => setMouthId(e.target.value)}
+						onChange={(e) => setMouthId(parseInt(e.target.value))}
 					/>
 				</InputContainer>
 				<InputContainer>
 					<Label>Body Id</Label>
 					<StyledInput
 						placeholder="Body Id"
-						onChange={(e) => setBodyId(e.target.value)}
+						onChange={(e) => setBodyId(parseInt(e.target.value))}
+					/>
+				</InputContainer>
+				<InputContainer>
+					<Label>Level</Label>
+					<StyledInput
+						placeholder="Level"
+						onChange={(e) => setLevel(parseInt(e.target.value))}
+					/>
+				</InputContainer>
+			</Inputs>
+			<Inputs>
+				<InputContainer>
+					<Label>Standard Choices</Label>
+					<StyledInput
+						placeholder="1,1,0,0"
+						onChange={(e) => setStandardChoices(e.target.value)}
+					/>
+				</InputContainer>
+				<InputContainer>
+					<Label>Standard Options</Label>
+					<StyledInput
+						placeholder="1,1,0,0"
+						onChange={(e) => setStandardOptions(e.target.value)}
+					/>
+				</InputContainer>
+			</Inputs>
+			<Inputs>
+				<InputContainer>
+					<Label>Special Choices</Label>
+					<StyledInput
+						placeholder="0,0"
+						onChange={(e) => setSpecialChoices(e.target.value)}
+					/>
+				</InputContainer>
+				<InputContainer>
+					<Label>Special Options</Label>
+					<StyledInput
+						placeholder="0,0"
+						onChange={(e) => setSpecialOptions(e.target.value)}
 					/>
 				</InputContainer>
 			</Inputs>

apps/ethereum/nft-game/next.config.js

@@ -2,7 +2,7 @@ const withTM = require('next-transpile-modules')([
 	'@decentology/unstated-next',
 	'@decentology/hyperverse',
 	'@decentology/hyperverse-ethereum',
-	'@decentology/hyperverse-evm-nft-game-1',
+	'@decentology/hyperverse-evm-nft-game',
 ]);
 
 module.exports = withTM({

apps/ethereum/nft-game/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@decentology/hyperverse": "workspace:^",
     "@decentology/hyperverse-ethereum": "workspace:^",
-    "@decentology/hyperverse-evm-nft-game-1": "workspace:^",
+    "@decentology/hyperverse-evm-nft-game": "workspace:^",
     "@decentology/unstated-next": "^1.1.1",
     "@radix-ui/react-hover-card": "^0.1.5",
     "@stitches/react": "^1.2.6",
@@ -21,7 +21,8 @@
     "next-transpile-modules": "^9.0.0",
     "react": "17.0.2",
     "react-dom": "17.0.2",
-    "react-query": "^3.38.0"
+    "react-query": "^3.38.0",
+    "react-toastify": "^9.0.5"
   },
   "devDependencies": {
     "@decentology/config": "^1.0.0",