- {props.chainFaction === null && props.exploreMode === false ? (
+ {props.chainFaction === null &&
+ props.exploreMode === false &&
+ !props.gameEnded ? (
Pick a faction to represent your favorite chain
props.setExploreMode(true)}
>
Explore
- {props.chainOptions.map((chain, idx) => (
+ {props.chainFactions.map((chain, idx) => (
props.joinChain(idx)}
+ onClick={() => props.joinChain(idx + 1)}
>
@@ -239,23 +243,49 @@ const FactionsExpandedSection = (props) => {
- {props.allFactions.map((faction, idx) => (
-
- ))}
+
+ {props.allFactions.map((faction, idx) => (
+
+ ))}
+
+
Chain Factions
+
+ {props.chainFactions.map((chain, idx) => (
+
+ ))}
+
)}
@@ -263,29 +293,171 @@ const FactionsExpandedSection = (props) => {
);
};
+const chainIcons = {
+ Starknet: Starknet,
+ Solana: Solana,
+ Bitcoin: Bitcoin,
+ Base: Base,
+ ZkSync: ZkSync,
+ Polygon: Polygon,
+ Optimism: Optimism,
+ Scroll: Scroll
+};
+
const Factions = (props) => {
const [expanded, setExpanded] = useState(false);
const [exploreMode, setExploreMode] = useState(false);
- const [myFactions, setMyFactions] = useState([]);
+ const [chainFactions, setChainFactions] = useState([]);
const [allFactions, setAllFactions] = useState([]);
- const chainOptions = [
- { name: 'Starknet', icon: Starknet },
- { name: 'Solana', icon: Solana },
- { name: 'Bitcoin', icon: Bitcoin },
- { name: 'Base', icon: Base },
- { name: 'ZkSync', icon: ZkSync },
- { name: 'Polygon', icon: Polygon },
- { name: 'Optimism', icon: Optimism },
- { name: 'Scroll', icon: Scroll }
- ];
- const joinChain = (chainId) => {
- props.setChainFaction(chainOptions[chainId]);
- setExpanded(false);
+ const [calls, setCalls] = useState([]);
+ const joinChainCall = (chainId) => {
+ if (props.gameEnded) return;
+ if (devnetMode) return;
+ if (!props.address || !props.artPeaceContract) return;
+ if (chainId === 0) return;
+ setCalls(
+ props.usernameContract.populateTransaction['join_chain_faction'](chainId)
+ );
+ };
+ const joinFactionCall = (factionId) => {
+ if (devnetMode) return;
+ if (!props.address || !props.artPeaceContract) return;
+ if (factionId === 0) return;
+ setCalls(
+ props.usernameContract.populateTransaction['join_faction'](factionId)
+ );
+ };
+
+ useEffect(() => {
+ const factionCall = async () => {
+ if (devnetMode) return;
+ if (calls.length === 0) return;
+ await writeAsync();
+ console.log('Faction call successful:', data, isPending);
+ };
+ factionCall();
+ }, [calls]);
+
+ const { writeAsync, data, isPending } = useContractWrite({
+ calls
+ });
+
+ const joinChain = async (chainId) => {
+ if (!devnetMode) {
+ joinChainCall(chainId);
+ setExpanded(false);
+ let newChainFactions = chainFactions.map((chain) => {
+ if (chain.factionId === chainId) {
+ chain.isMember = true;
+ chain.members += 1;
+ }
+ return chain;
+ });
+ let chain = chainFactions.find((chain) => chain.factionId === chainId);
+ if (chain) {
+ props.setChainFaction(chain);
+ let newChainFactionPixelsData = {
+ allocation: 2,
+ factionId: chainId,
+ lastPlacedTime: new Date(0).getTime(),
+ memberPixels: 0
+ };
+ props.setChainFactionPixelsData([newChainFactionPixelsData]);
+ }
+ setChainFactions(newChainFactions);
+ return;
+ }
+ let joinChainResponse = await fetchWrapper('join-chain-faction-devnet', {
+ mode: 'cors',
+ method: 'POST',
+ body: JSON.stringify({
+ chainId: chainId.toString()
+ })
+ });
+ if (joinChainResponse.result) {
+ setExpanded(false);
+ let newChainFactions = chainFactions.map((chain) => {
+ if (chain.factionId === chainId) {
+ chain.isMember = true;
+ chain.members += 1;
+ }
+ return chain;
+ });
+ let chain = chainFactions.find((chain) => chain.factionId === chainId);
+ if (chain) {
+ props.setChainFaction(chain);
+ let newChainFactionPixelsData = {
+ allocation: 2,
+ factionId: chainId,
+ lastPlacedTime: new Date(0).getTime(),
+ memberPixels: 0
+ };
+ props.setChainFactionPixelsData([newChainFactionPixelsData]);
+ }
+ setChainFactions(newChainFactions);
+ }
+ };
+
+ const joinFaction = async (factionId) => {
+ if (!devnetMode) {
+ joinFactionCall(factionId);
+ let newAllFactions = allFactions.map((faction) => {
+ if (faction.factionId === factionId) {
+ faction.isMember = true;
+ faction.members += 1;
+ }
+ return faction;
+ });
+ let faction = allFactions.find(
+ (faction) => faction.factionId === factionId
+ );
+ let newUserFactions = [...props.userFactions, faction];
+ props.setUserFactions(newUserFactions);
+ // TODO: Hardcoded
+ let newFactionPixelsData = {
+ allocation: 1,
+ factionId: factionId,
+ lastPlacedTime: new Date(0).getTime(),
+ memberPixels: 0
+ };
+ props.setFactionPixelsData([newFactionPixelsData]);
+ setAllFactions(newAllFactions);
+ return;
+ }
+ let joinFactionResponse = await fetchWrapper('join-faction-devnet', {
+ mode: 'cors',
+ method: 'POST',
+ body: JSON.stringify({
+ factionId: factionId.toString()
+ })
+ });
+ if (joinFactionResponse.result) {
+ let newAllFactions = allFactions.map((faction) => {
+ if (faction.factionId === factionId) {
+ faction.isMember = true;
+ faction.members += 1;
+ }
+ return faction;
+ });
+ let faction = allFactions.find(
+ (faction) => faction.factionId === factionId
+ );
+ let newUserFactions = [...props.userFactions, faction];
+ props.setUserFactions(newUserFactions);
+ let newFactionPixelsData = {
+ allocation: 1,
+ factionId: factionId,
+ lastPlacedTime: new Date(0).getTime(),
+ memberPixels: 0
+ };
+ props.setFactionPixelsData([newFactionPixelsData]);
+ setAllFactions(newAllFactions);
+ }
};
useEffect(() => {
- if (!props.chainFaction) {
+ if (props.queryAddress !== '0' && !props.chainFaction) {
setExpanded(true);
}
}, [props.chainFaction]);
@@ -300,21 +472,10 @@ const Factions = (props) => {
});
const [selectedFaction, setSelectedFaction] = useState(null);
- const selectFaction = (factionId) => {
- // TODO: Make this more efficient
- for (let i = 0; i < myFactions.length; i++) {
- if (myFactions[i].factionId === factionId) {
- setSelectedFaction(myFactions[i]);
- return;
- }
- }
-
- for (let i = 0; i < allFactions.length; i++) {
- if (allFactions[i].factionId === factionId) {
- setSelectedFaction(allFactions[i]);
- return;
- }
- }
+ const [selectedFactionType, setSelectedFactionType] = useState(null);
+ const selectFaction = (faction, isChain) => {
+ setSelectedFaction(faction);
+ setSelectedFactionType(isChain ? 'chain' : 'faction');
};
const clearFactionSelection = () => {
@@ -328,18 +489,27 @@ const Factions = (props) => {
expandedSection={FactionsExpandedSection}
setActiveTab={props.setActiveTab}
userFactions={props.userFactions}
+ setUserFactions={props.setUserFactions}
+ chainFactionPixels={props.chainFactionPixels}
factionPixels={props.factionPixels}
+ chainFactionPixelsData={props.chainFactionPixelsData}
+ setChainFactionPixelsData={props.setChainFactionPixelsData}
factionPixelsData={props.factionPixelsData}
+ setFactionPixelsData={props.setFactionPixelsData}
expanded={expanded}
setExpanded={setExpanded}
exploreMode={exploreMode}
setExploreMode={setExploreMode}
chainFaction={props.chainFaction}
joinChain={joinChain}
- chainOptions={chainOptions}
- canExpand={props.chainFaction !== null || exploreMode}
- myFactions={myFactions}
- setMyFactions={setMyFactions}
+ joinFaction={joinFaction}
+ chainFactions={chainFactions}
+ setChainFactions={setChainFactions}
+ queryAddress={props.queryAddress}
+ canExpand={
+ (props.queryAddress !== '0' && props.chainFaction !== null) ||
+ exploreMode
+ }
myFactionsPagination={myFactionsPagination}
setMyFactionsPagination={setMyFactionsPagination}
allFactionsPagination={allFactionsPagination}
@@ -347,11 +517,13 @@ const Factions = (props) => {
allFactions={allFactions}
setAllFactions={setAllFactions}
selectedFaction={selectedFaction}
+ selectedFactionType={selectedFactionType}
selectFaction={selectFaction}
clearFactionSelection={clearFactionSelection}
setTemplateOverlayMode={props.setTemplateOverlayMode}
setOverlayTemplate={props.setOverlayTemplate}
isMobile={props.isMobile}
+ gameEnded={props.gameEnded}
/>
);
};
diff --git a/frontend/src/tabs/nfts/NFTItem.css b/frontend/src/tabs/nfts/NFTItem.css
index b639f853..b9475408 100644
--- a/frontend/src/tabs/nfts/NFTItem.css
+++ b/frontend/src/tabs/nfts/NFTItem.css
@@ -35,6 +35,7 @@
display: flex;
flex-direction: row;
justify-content: right;
+ align-items: center;
padding: 0;
margin: 0;
}
@@ -66,6 +67,22 @@
box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
}
+.NFTItem__button--disabled {
+ background-color: rgba(255, 255, 255, 0.3) !important;
+ border: 1px solid rgba(0, 0, 0, 0.1) !important;
+ box-shadow: none !important;
+}
+
+.NFTItem__button--disabled:hover {
+ transform: none !important;
+ box-shadow: none !important;
+}
+
+.NFTItem__button--disabled:active {
+ transform: none !important;
+ box-shadow: none !important;
+}
+
.NFTItem__info {
position: absolute;
top: 0;
@@ -140,6 +157,26 @@
margin: 0.5rem 0;
}
+.NFTItem__name {
+ position: absolute;
+ top: 0;
+ left: 0;
+ margin: 0.5rem;
+ max-width: 80%;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ background-image: linear-gradient(
+ to bottom right,
+ rgba(255, 255, 255, 0.7),
+ rgba(255, 255, 255, 0.8)
+ );
+ border-radius: 1.5rem;
+ border: 1px solid rgba(0, 0, 0, 0.3);
+ box-shadow: 0 0 0.5rem rgba(0, 0, 0, 0.3);
+ padding: 0.5rem 1rem;
+}
+
.list-transition-enter,
.list-transition-appear {
transform: translateX(120%);
@@ -161,3 +198,4 @@
transform: translateX(120%);
transition: all 150ms;
}
+
diff --git a/frontend/src/tabs/nfts/NFTItem.js b/frontend/src/tabs/nfts/NFTItem.js
index a8792b4b..c578dc4e 100644
--- a/frontend/src/tabs/nfts/NFTItem.js
+++ b/frontend/src/tabs/nfts/NFTItem.js
@@ -1,5 +1,6 @@
import React, { useEffect, useState } from 'react';
import { CSSTransition } from 'react-transition-group';
+import { useContractWrite } from '@starknet-react/core';
import './NFTItem.css';
import { fetchWrapper } from '../../services/apiService';
import canvasConfig from '../../configs/canvas.config.json';
@@ -7,50 +8,82 @@ import ShareIcon from '../../resources/icons/Share.png';
import LikeIcon from '../../resources/icons/Like.png';
import LikedIcon from '../../resources/icons/Liked.png';
import Info from '../../resources/icons/Info.png';
+import { devnetMode } from '../../utils/Consts.js';
const NFTItem = (props) => {
- const [likes, setLikes] = useState(props.likes);
- const [liked, setLiked] = useState(props.liked);
+ const [calls, setCalls] = useState([]);
+ const likeNftCall = (tokenId) => {
+ if (devnetMode) return;
+ if (!props.address || !props.canvasNftContract) return;
+ setCalls(props.usernameContract.populateTransaction['like_nft'](tokenId));
+ };
+ const unlikeNftCall = (tokenId) => {
+ if (devnetMode) return;
+ if (!props.address || !props.canvasNftContract) return;
+ setCalls(props.usernameContract.populateTransaction['unlike_nft'](tokenId));
+ };
+
useEffect(() => {
- setLikes(props.likes);
- setLiked(props.liked);
- }, [props.likes, props.liked]);
+ const likeCall = async () => {
+ if (devnetMode) return;
+ if (calls.length === 0) return;
+ await writeAsync();
+ console.log('Like call successful:', data, isPending);
+ // TODO: Update the UI
+ };
+ likeCall();
+ }, [calls]);
+
+ const { writeAsync, data, isPending } = useContractWrite({
+ calls
+ });
+
+ const handleLikePress = async (event) => {
+ if (props.queryAddress === '0') {
+ return;
+ }
+ event.preventDefault();
+ if (!devnetMode) {
+ if (liked) {
+ unlikeNftCall(props.tokenId);
+ } else {
+ likeNftCall(props.tokenId);
+ }
+ return;
+ }
- const handleLike = async () => {
- async function fetchLikeNFT() {
- const response = await fetchWrapper('like-nft', {
+ if (!liked) {
+ let likeResponse = await fetchWrapper('like-nft-devnet', {
+ mode: 'cors',
method: 'POST',
body: JSON.stringify({
- nftkey: props.tokenId,
- useraddress: props.queryAddress
+ tokenId: props.tokenId.toString()
})
});
- if (response.result) {
- // TODO: Update likes on my nfts tab || explore tab if they are the same
- setLikes(likes + 1);
- setLiked(true);
+ if (likeResponse.result) {
+ props.updateLikes(props.tokenId, likes + 1, true);
}
- }
- fetchLikeNFT();
- };
-
- const handleUnlike = async () => {
- async function fetchUnlikeNFT() {
- const response = await fetchWrapper('unlike-nft', {
+ } else {
+ let unlikeResponse = await fetchWrapper('unlike-nft-devnet', {
+ mode: 'cors',
method: 'POST',
body: JSON.stringify({
- nftkey: props.tokenId,
- useraddress: props.queryAddress
+ tokenId: props.tokenId.toString()
})
});
- if (response.result) {
- setLikes(likes - 1);
- setLiked(false);
+ if (unlikeResponse.result) {
+ props.updateLikes(props.tokenId, likes - 1, false);
}
}
- fetchUnlikeNFT();
};
+ const [likes, setLikes] = useState(props.likes);
+ const [liked, setLiked] = useState(props.liked);
+ useEffect(() => {
+ setLikes(props.likes);
+ setLiked(props.liked);
+ }, [props.likes, props.liked]);
+
const posx = props.position % canvasConfig.canvas.width;
const posy = Math.floor(props.position / canvasConfig.canvas.width);
@@ -102,14 +135,15 @@ const NFTItem = (props) => {
alt={`nft-image-${props.tokenId}`}
className='NFTItem__image'
/>
+
{props.name}
![]()
{
+ // TODO: Arrows to control position and size
const closePanel = () => {
props.setNftMintingMode(false);
props.setNftSelectionStarted(false);
props.setNftSelected(false);
};
+ const toHex = (str) => {
+ let hex = '0x';
+ for (let i = 0; i < str.length; i++) {
+ hex += '' + str.charCodeAt(i).toString(16);
+ }
+ return hex;
+ };
+
const [calls, setCalls] = useState([]);
- const mintNftCall = (position, width, height) => {
+ const mintNftCall = (position, width, height, name) => {
if (devnetMode) return;
if (!props.address || !props.artPeaceContract) return;
// TODO: Validate the position, width, and height
@@ -21,7 +30,8 @@ const NFTMintingPanel = (props) => {
let mintParams = {
position: position,
width: width,
- height: height
+ height: height,
+ name: toHex(name)
};
setCalls(
props.artPeaceContract.populateTransaction['mint_nft'](mintParams)
@@ -36,6 +46,7 @@ const NFTMintingPanel = (props) => {
console.log('Mint nft successful:', data, isPending);
// TODO: Update the UI with the new NFT
closePanel();
+ props.setActiveTab('NFTs');
};
mintNft();
}, [calls]);
@@ -44,9 +55,11 @@ const NFTMintingPanel = (props) => {
calls
});
+ const [nftName, setNftName] = useState('');
const submit = async () => {
+ if (nftName.length === 0 || nftName.length > 31) return;
if (!devnetMode) {
- mintNftCall(props.nftPosition, props.nftWidth, props.nftHeight);
+ mintNftCall(props.nftPosition, props.nftWidth, props.nftHeight, nftName);
return;
}
let mintNFTEndpoint = 'mint-nft-devnet';
@@ -56,15 +69,22 @@ const NFTMintingPanel = (props) => {
body: JSON.stringify({
position: props.nftPosition.toString(),
width: props.nftWidth.toString(),
- height: props.nftHeight.toString()
+ height: props.nftHeight.toString(),
+ name: toHex(nftName)
})
});
if (response.result) {
console.log(response.result);
closePanel();
+ props.setActiveTab('NFTs');
}
};
+ const cancel = () => {
+ props.setNftSelectionStarted(false);
+ props.setNftSelected(false);
+ };
+
// TODO: Add preview of the NFT && Add input fields for the NFT metadata
return (
@@ -76,11 +96,6 @@ const NFTMintingPanel = (props) => {
art/peace NFT Mint
- {props.nftSelected && (
-
submit()}>
- Submit
-
- )}
{props.nftSelectionStarted === false && (
@@ -134,19 +149,41 @@ const NFTMintingPanel = (props) => {
-
Width
-
- {props.nftWidth}
-
-
-
-
Height
+
Size
- {props.nftHeight}
+ {props.nftWidth} x {props.nftHeight}
+ {props.nftSelected && (
+
+
+
Name
+
setNftName(e.target.value)}
+ />
+
+
+
cancel()}
+ >
+ Cancel
+
+
31 ? 'Button__disabled' : ''}`}
+ onClick={() => submit()}
+ >
+ Submit
+
+
+
+ )}
);
};
diff --git a/frontend/src/tabs/nfts/NFTs.css b/frontend/src/tabs/nfts/NFTs.css
index eb86ca55..1116c541 100644
--- a/frontend/src/tabs/nfts/NFTs.css
+++ b/frontend/src/tabs/nfts/NFTs.css
@@ -1,11 +1,18 @@
.NFTs__main {
position: relative;
- width: min(100%, 40rem);
+ width: 100%;
margin: 0 auto;
transition: all 0.5s;
}
+.NFTs__main__expanded {
+ position: relative;
+ width: min(100%, 40rem);
+ margin: 0 auto;
+ transition: all 0.5s;
+}
+
.NFTs__container {
height: 55vh;
display: grid;
@@ -20,7 +27,7 @@
display: flex;
flex-direction: row;
justify-content: space-between;
- align-items: center;
+ align-items: space-between;
padding: 0.5rem;
margin: 0 0.5rem;
width: calc(100% - 1rem);
@@ -28,13 +35,22 @@
.NFTs__heading {
font-size: 1.6rem;
- text-align: center;
padding: 0;
padding-bottom: 0.5rem;
margin: 0;
text-decoration: underline;
}
+.NFTS__nowallet {
+ text-align: center;
+}
+
+.NFTs__buttons {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+}
+
.NFTs__button {
padding: 1rem;
font-size: 1.2rem;
diff --git a/frontend/src/tabs/nfts/NFTs.js b/frontend/src/tabs/nfts/NFTs.js
index a86b7e70..b7aecfec 100644
--- a/frontend/src/tabs/nfts/NFTs.js
+++ b/frontend/src/tabs/nfts/NFTs.js
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
import './NFTs.css';
import ExpandableTab from '../ExpandableTab.js';
import NFTItem from './NFTItem.js';
-import { backendUrl } from '../../utils/Consts.js';
+import { nftUrl } from '../../utils/Consts.js';
import {
fetchWrapper,
getMyNftsFn,
@@ -14,19 +14,43 @@ import {
import { PaginationView } from '../../ui/pagination.js';
const NFTsMainSection = (props) => {
- const imageURL = backendUrl + '/nft-images/';
+ const imageURL = nftUrl + '/nft-images/';
return (
-
+
My Collection
-
props.setNftMintingMode(true)}
- >
- Mint
+
+ {!props.gameEnded && props.queryAddress !== '0' && (
+
{
+ props.setNftMintingMode(true);
+ props.setActiveTab('Canvas');
+ }}
+ >
+ Mint
+
+ )}
+ {!props.expanded && (
+
{
+ props.setExpanded(true);
+ }}
+ >
+ Explore
+
+ )}
+ {props.queryAddress === '0' && (
+
+ Please login with your wallet to view your NFTs
+
+ )}
{props.nftsCollection.map((nft, index) => {
return (
{
image={imageURL + 'nft-' + nft.tokenId + '.png'}
width={nft.width}
height={nft.height}
+ name={nft.name}
blockNumber={nft.blockNumber}
likes={nft.likes}
liked={nft.liked}
minter={nft.minter}
queryAddress={props.queryAddress}
+ updateLikes={props.updateLikes}
/>
);
})}
@@ -55,7 +81,7 @@ const NFTsMainSection = (props) => {
};
const NFTsExpandedSection = (props) => {
- const imageURL = backendUrl + '/nft-images/';
+ const imageURL = nftUrl + '/nft-images/';
return (
@@ -87,11 +113,13 @@ const NFTsExpandedSection = (props) => {
image={imageURL + 'nft-' + nft.tokenId + '.png'}
width={nft.width}
height={nft.height}
+ name={nft.name}
blockNumber={nft.blockNumber}
likes={nft.likes}
liked={nft.liked}
minter={nft.minter}
queryAddress={props.queryAddress}
+ updateLikes={props.updateLikes}
/>
);
})}
@@ -130,6 +158,25 @@ const NFTs = (props) => {
}
};
+ const updateLikes = (tokenId, likes, liked) => {
+ let newMyNFTs = myNFTs.map((nft) => {
+ if (nft.tokenId === tokenId) {
+ return { ...nft, likes: likes, liked: liked };
+ }
+ return nft;
+ });
+
+ let newAllNFTs = allNFTs.map((nft) => {
+ if (nft.tokenId === tokenId) {
+ return { ...nft, likes: likes, liked: liked };
+ }
+ return nft;
+ });
+
+ setMyNFTs(newMyNFTs);
+ setAllNFTs(newAllNFTs);
+ };
+
useEffect(() => {
if (
props.latestMintedTokenId !== null &&
@@ -178,22 +225,26 @@ const NFTs = (props) => {
if (activeFilter === 'hot') {
result = await getHotNftsFn({
page: allNftPagination.page,
- pageLength: allNftPagination.pageLength
+ pageLength: allNftPagination.pageLength,
+ queryAddress: props.queryAddress
});
} else if (activeFilter === 'new') {
result = await getNewNftsFn({
page: allNftPagination.page,
- pageLength: allNftPagination.pageLength
+ pageLength: allNftPagination.pageLength,
+ queryAddress: props.queryAddress
});
} else if (activeFilter === 'top') {
result = await getTopNftsFn({
page: allNftPagination.page,
- pageLength: allNftPagination.pageLength
+ pageLength: allNftPagination.pageLength,
+ queryAddress: props.queryAddress
});
} else {
result = await getNftsFn({
page: allNftPagination.page,
- pageLength: allNftPagination.pageLength
+ pageLength: allNftPagination.pageLength,
+ queryAddress: props.queryAddress
});
}
@@ -233,6 +284,7 @@ const NFTs = (props) => {
title='NFTs'
mainSection={NFTsMainSection}
expandedSection={NFTsExpandedSection}
+ updateLikes={updateLikes}
nftMintingMode={props.nftMintingMode}
setNftMintingMode={props.setNftMintingMode}
nftsCollection={myNFTs}
@@ -250,6 +302,7 @@ const NFTs = (props) => {
setActiveFilter={setActiveFilter}
filters={filters}
isMobile={props.isMobile}
+ gameEnded={props.gameEnded}
/>
);
};
diff --git a/frontend/src/tabs/quests/QuestItem.css b/frontend/src/tabs/quests/QuestItem.css
index a0daf948..304d9d29 100644
--- a/frontend/src/tabs/quests/QuestItem.css
+++ b/frontend/src/tabs/quests/QuestItem.css
@@ -166,6 +166,9 @@
.QuestItem__form__input {
flex: 1;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
}
.QuestItem__form__submit {
diff --git a/frontend/src/tabs/quests/QuestItem.js b/frontend/src/tabs/quests/QuestItem.js
index c8795d64..3fde26b3 100644
--- a/frontend/src/tabs/quests/QuestItem.js
+++ b/frontend/src/tabs/quests/QuestItem.js
@@ -9,20 +9,9 @@ import { devnetMode } from '../../utils/Consts.js';
const QuestItem = (props) => {
// TODO: Flash red on quest if clicked and not completed w/ no args
const [expanded, setExpanded] = useState(false);
- const _expandQuest = () => {
- if (props.status == 'completed') {
- return;
- }
-
- if (props.args == null || props.args.length == 0) {
- return;
- }
- setExpanded(!expanded);
- };
-
const [inputsValidated, setInputsValidated] = useState(false);
const validateInputs = (event) => {
- if (props.args == null || props.args.length == 0) {
+ if (props.claimParams == null || props.claimParams.length == 0) {
return;
}
@@ -34,24 +23,24 @@ const QuestItem = (props) => {
if (input.value == '') {
validated = false;
}
- // Switch based on props.args.type[inputIndex]
- if (props.args[inputIndex].inputType == 'address') {
+ // Switch based on props.claimParams.claimType[inputIndex]
+ if (props.claimParams[inputIndex].claimType == 'address') {
// Starts w/ 0x and is 65 || 66 hex characters long
let hexPattern = /^0x[0-9a-fA-F]{63,64}$/;
if (!hexPattern.test(input.value)) {
validated = false;
}
- } else if (props.args[inputIndex].inputType == 'text') {
+ } else if (props.claimParams[inputIndex].claimType == 'text') {
// Any string < 32 characters
if (input.value.length >= 32) {
validated = false;
}
- } else if (props.args[inputIndex].inputType == 'number') {
+ } else if (props.claimParams[inputIndex].claimType == 'number') {
// Any number
if (isNaN(input.value)) {
validated = false;
}
- } else if (props.args[inputIndex].type == 'twitter') {
+ } else if (props.claimParams[inputIndex].claimType == 'twitter') {
// Starts w/ @ and is < 16 characters
if (!input.value.startsWith('@') || input.value.length >= 16) {
validated = false;
@@ -76,10 +65,15 @@ const QuestItem = (props) => {
);
};
- const claimMainQuest = () => {
+ const claimMainQuestCall = (quest_id, calldata) => {
if (devnetMode) return;
if (!props.address || !props.artPeaceContract) return;
- setCalls(props.artPeaceContract.populateTransaction['claim_main_quest']());
+ setCalls(
+ props.artPeaceContract.populateTransaction['claim_main_quest'](
+ quest_id,
+ calldata
+ )
+ );
};
useEffect(() => {
@@ -95,15 +89,36 @@ const QuestItem = (props) => {
calls
});
+ const [canClaim, setCanClaim] = useState(false);
const claimOrExpand = async () => {
+ if (!canClaim || props.gameEnded || props.queryAddress === '0') {
+ return;
+ }
if (props.status == 'completed') {
return;
}
+ let questCalldata = [];
+ if (props.claimParams && props.claimParams.length > 0) {
+ if (inputsValidated) {
+ let component = event.target.closest('.QuestItem');
+ let inputs = component.querySelectorAll('.QuestItem__form__input');
+ inputs.forEach((input) => {
+ questCalldata.push(input.value);
+ });
+ setExpanded(!expanded);
+ } else if (props.claimParams[0].input) {
+ setExpanded(!expanded);
+ return;
+ }
+ }
+ if (props.calldata) {
+ questCalldata = props.calldata;
+ }
if (!devnetMode) {
if (props.type === 'daily') {
- claimTodayQuestCall(props.questId, []);
+ claimTodayQuestCall(props.questId, questCalldata);
} else if (props.type === 'main') {
- claimMainQuest();
+ claimMainQuestCall(props.questId, questCalldata);
} else {
console.log('Quest type not recognized');
}
@@ -122,15 +137,14 @@ const QuestItem = (props) => {
mode: 'cors',
method: 'POST',
body: JSON.stringify({
- // TODO
- questId: props.questId.toString()
+ questId: props.questId.toString(),
+ calldata: questCalldata.length > 0 ? questCalldata[0].toString() : ''
})
});
if (response.result) {
console.log(response.result);
props.markCompleted(props.questId, props.type);
}
- // TODO: Expand if not claimable && has args
};
const [percentCompletion, setPercentCompletion] = useState(0);
@@ -161,12 +175,38 @@ const QuestItem = (props) => {
}
if (props.status === 'completed') {
setProgressionColor('rgba(32, 225, 32, 0.80)');
+ } else if (
+ props.claimParams &&
+ props.claimParams.length > 0 &&
+ props.claimParams[0].input
+ ) {
+ setProgressionColor(`hsla(${0.5 * 60}, 100%, 60%, 0.78)`);
} else {
setProgressionColor(`hsla(${(percent / 100) * 60}, 100%, 60%, 0.78)`);
}
setPercentCompletion(percent);
}, [props.progress, props.needed, props.status]);
+ useEffect(() => {
+ if (props.gameEnded || props.queryAddress === '0') {
+ setCanClaim(false);
+ return;
+ }
+ if (props.status === 'completed') {
+ setCanClaim(false);
+ return;
+ }
+ if (props.claimParams && props.claimParams.length > 0) {
+ if (props.claimParams[0].input) {
+ setCanClaim(true);
+ } else {
+ setCanClaim(props.progress >= props.needed);
+ }
+ return;
+ }
+ setCanClaim(props.progress >= props.needed);
+ }, [props]);
+
// TODO: Claimable if progress >= needed
// TODO: 100% to the top of list
return (
@@ -186,9 +226,7 @@ const QuestItem = (props) => {
{
}
>
- {props.args &&
- props.args.map((arg, idx) => (
+ {props.claimParams &&
+ props.claimParams.map((arg, idx) => (
))}
- {props.args && (
+ {props.claimParams && (
diff --git a/frontend/src/tabs/quests/Quests.css b/frontend/src/tabs/quests/Quests.css
index 57883345..569717f5 100644
--- a/frontend/src/tabs/quests/Quests.css
+++ b/frontend/src/tabs/quests/Quests.css
@@ -10,6 +10,11 @@
padding: 0.5rem;
}
+.Quests__nowallet {
+ padding: 0.5rem;
+ text-align: center;
+}
+
.Quests__timer {
margin: 1rem 0 0.5rem 1rem;
padding: 0.5rem 1rem;
@@ -58,6 +63,6 @@
}
.Quests__timer--active:active {
- transform: scale(1.0) translateY(0rem);
+ transform: scale(1) translateY(0rem);
box-shadow: 0 0 0.3rem rgba(0, 0, 0, 0.3);
}
diff --git a/frontend/src/tabs/quests/Quests.js b/frontend/src/tabs/quests/Quests.js
index e7740187..6d72e259 100644
--- a/frontend/src/tabs/quests/Quests.js
+++ b/frontend/src/tabs/quests/Quests.js
@@ -31,8 +31,7 @@ const Quests = (props) => {
setMainQuests(combineQuests(mainQuestsInfo, mainQuestsStatus));
}, [todaysQuestsInfo, mainQuestsInfo, todaysQuestsStatus, mainQuestsStatus]);
- // TODO: remove local quests
- const createArgs = (labels, placeholders, types) => {
+ const _createArgs = (labels, placeholders, types) => {
const args = [];
for (let i = 0; i < labels.length; i++) {
args.push({
@@ -44,67 +43,6 @@ const Quests = (props) => {
return args;
};
- const localDailyQuests = [
- {
- name: 'Place 10 pixels',
- description:
- 'Add 10 pixels on the canvas [art/peace theme](https://www.google.com/)',
- reward: '3',
- completed: false,
- progress: 0,
- needed: 10
- },
- {
- name: 'Build a template',
- description: 'Create a template for the community to use',
- reward: '3',
- completed: false,
- progress: 1,
- needed: 20
- },
- {
- name: 'Deploy a Memecoin',
- description: 'Create an Unruggable memecoin',
- reward: '10',
- completed: false,
- args: createArgs(['MemeCoin Address'], ['0x1234'], ['address']),
- progress: 1,
- needed: 1
- }
- ];
-
- const localMainQuests = [
- {
- name: 'Tweet #art/peace',
- description: 'Tweet about art/peace using the hashtag & addr',
- reward: '10',
- completed: true,
- args: createArgs(
- ['Twitter Handle', 'Address', 'test'],
- ['@test', '0x1234', 'asdioj'],
- ['twitter', 'address', 'text']
- ),
- progress: 13,
- needed: 13
- },
- {
- name: 'Place 100 pixels',
- description: 'Add 100 pixels on the canvas',
- reward: '10',
- completed: false,
- progress: 98,
- needed: 100
- },
- {
- name: 'Mint art/peace NFT',
- description: 'Mint an NFT using the art/peace theme',
- reward: '5',
- completed: false,
- progress: 14,
- needed: 13
- }
- ];
-
useEffect(() => {
const fetchQuests = async () => {
try {
@@ -115,7 +53,7 @@ const Quests = (props) => {
let dailyData = await dailyResponse.json();
dailyData = dailyData.data;
if (!dailyData) {
- dailyData = localDailyQuests;
+ dailyData = [];
}
setTodaysQuestsInfo(sortByCompleted(dailyData));
@@ -126,8 +64,7 @@ const Quests = (props) => {
let mainData = await mainResponse.json();
mainData = mainData.data;
if (!mainData) {
- // TODO: remove this & use []
- mainData = localMainQuests;
+ mainData = [];
}
setMainQuestsInfo(sortByCompleted(mainData));
} catch (error) {
@@ -202,9 +139,14 @@ const Quests = (props) => {
return (
+ {props.queryAddress === '0' && (
+
+ Please login with your wallet to view your quests.
+
+ )}
{
{todaysQuests.map((quest, index) => (
{
artPeaceContract={props.artPeaceContract}
progress={quest.progress}
needed={quest.needed}
+ calldata={quest.calldata}
+ claimParams={quest.claimParams}
type='daily'
+ gameEnded={props.gameEnded}
/>
))}
@@ -240,6 +186,7 @@ const Quests = (props) => {
{mainQuests.map((quest, index) => (
{
artPeaceContract={props.artPeaceContract}
progress={quest.progress}
needed={quest.needed}
+ calldata={quest.calldata}
+ claimParams={quest.claimParams}
type='main'
+ gameEnded={props.gameEnded}
/>
))}
diff --git a/frontend/src/tabs/voting/VoteItem.js b/frontend/src/tabs/voting/VoteItem.js
index b6e7ddbf..1e64e5c8 100644
--- a/frontend/src/tabs/voting/VoteItem.js
+++ b/frontend/src/tabs/voting/VoteItem.js
@@ -5,7 +5,7 @@ const VoteItem = (props) => {
return (
props.castVote(props.index)}
>
{props.userVote === props.index && (
diff --git a/frontend/src/tabs/voting/Voting.css b/frontend/src/tabs/voting/Voting.css
index ae338a29..1e988295 100644
--- a/frontend/src/tabs/voting/Voting.css
+++ b/frontend/src/tabs/voting/Voting.css
@@ -1,6 +1,8 @@
.Voting__description {
padding: 0 0.5rem 0 1rem;
margin: 0.7rem 0;
+ line-height: 1.6rem;
+ text-align: center;
}
.Voting__timer {
@@ -51,7 +53,7 @@
}
.Voting__timer--active:active {
- transform: scale(1.0) translateY(0rem);
+ transform: scale(1) translateY(0rem);
box-shadow: 0 0 0.3rem rgba(0, 0, 0, 0.3);
}
diff --git a/frontend/src/tabs/voting/Voting.js b/frontend/src/tabs/voting/Voting.js
index 2ac231d5..c528534f 100644
--- a/frontend/src/tabs/voting/Voting.js
+++ b/frontend/src/tabs/voting/Voting.js
@@ -59,6 +59,9 @@ const Voting = (props) => {
}, [props.queryAddress]);
const castVote = async (index) => {
+ if (props.queryAddress === '0') {
+ return; // Prevent voting if not logged in
+ }
if (userVote === index) {
return; // Prevent re-voting for the same index
}
@@ -91,6 +94,13 @@ const Voting = (props) => {
};
useEffect(() => {
+ if (props.isLastDay || props.gameEnded) {
+ setVotableColorApiState((prevState) => ({
+ ...prevState,
+ data: []
+ }));
+ return;
+ }
const fetchVotableColors = async () => {
try {
setVotableColorApiState((prevState) => ({
@@ -115,48 +125,86 @@ const Voting = (props) => {
}
};
fetchVotableColors();
- }, []);
+ }, [props.isLastDay, props.gameEnded]);
return (
-
-
Vote closes
-
props.startNextDay()}
- >
- {props.timeLeftInDay}
-
-
- Vote for a new palette color
-
+ {props.isLastDay && !props.gameEnded && (
+
+
+
Voting has ended
+
props.startNextDay()}
+ >
+ {props.timeLeftInDay}
+
+
+
+
+ Check back tomorrow after the game ends to vote for the best NFTs.
+
+
+
+
+
Time left to vote
+
props.startNextDay()}
+ >
+ {props.timeLeftInDay}
+
+
+
+ {props.queryAddress === '0'
+ ? 'Please login with your wallet to vote'
+ : 'Vote for a new palette color'}
+
-
- {votableColorApiState.data && votableColorApiState.data.length ? (
- votableColorApiState.data.map((color, index) => (
-
- ))
- ) : (
-
- No Color Added Yet
+
+ {votableColorApiState.data && votableColorApiState.data.length ? (
+ votableColorApiState.data.map((color, index) => (
+
+ ))
+ ) : (
+
+ No Color Added Yet
+
+ )}
- )}
-
+
+ )}
);
};
diff --git a/frontend/src/utils/Consts.js b/frontend/src/utils/Consts.js
index 0ca7015c..cad5b29c 100644
--- a/frontend/src/utils/Consts.js
+++ b/frontend/src/utils/Consts.js
@@ -8,6 +8,10 @@ export const wsUrl = backendConfig.production
? 'wss://' + backendConfig.host + '/ws'
: 'ws://' + backendConfig.host + ':' + backendConfig.consumer_port + '/ws';
+export const nftUrl = backendConfig.production
+ ? 'https://' + backendConfig.host
+ : 'http://' + backendConfig.host + ':' + backendConfig.consumer_port;
+
export const devnetMode = backendConfig.production === false;
export const convertUrl = (url) => {
diff --git a/indexer/prod-script.js b/indexer/prod-script.js
index 30baacd9..5cdffe88 100644
--- a/indexer/prod-script.js
+++ b/indexer/prod-script.js
@@ -15,6 +15,7 @@ export const config = {
includeTransaction: false,
includeReceipt: false
},
+
{
// Color Added Event
fromAddress: Deno.env.get("ART_PEACE_CONTRACT_ADDRESS"),
@@ -46,10 +47,20 @@ export const config = {
includeReceipt: false
},
{
- // Member Pixels Placed Event
+ // Faction Pixels Placed Event
fromAddress: Deno.env.get("ART_PEACE_CONTRACT_ADDRESS"),
keys: [
- "0x0165248ea72ba05120b18ec02e729e1f03a465f728283e6bb805bb284086c859"
+ "0x02838056c6784086957f2252d4a36a24d554ea2db7e09d2806cc69751d81f0a2"
+ ],
+ includeReverted: false,
+ includeTransaction: false,
+ includeReceipt: false
+ },
+ {
+ // Chain Faction Pixels Placed Event
+ fromAddress: Deno.env.get("ART_PEACE_CONTRACT_ADDRESS"),
+ keys: [
+ "0x02e4d1feaacd0627a6c7d5002564bdb4ca4877d47f00cad4714201194690a7a9"
],
includeReverted: false,
includeTransaction: false,
@@ -116,10 +127,36 @@ export const config = {
includeReceipt: false
},
{
- // Member Replaced Event
- fromAddress: Deno.env.get("ART_PEACE_CONTRACT_ADDRESS"),
+ // Faction Joined Event
+ keys: [
+ "0x01e3fbdf8156ad0dde21e886d61a16d85c9ef54451eb6e253f3f427de32a47ac"
+ ],
+ includeReverted: false,
+ includeTransaction: false,
+ includeReceipt: false
+ },
+ {
+ // Faction Left Event
+ keys: [
+ "0x014ef8cc25c96157e2a00e9ceaa7c014a162d11d58a98871087ec488a67d7925"
+ ],
+ includeReverted: false,
+ includeTransaction: false,
+ includeReceipt: false
+ },
+ {
+ // Chain Faction Created Event
keys: [
- "0x01f8936599822d668e09401ffcef1989aca342fb1f003f9b3b1fd1cbf605ed6b"
+ "0x020c994ab49a8316bcc78b06d4ff9929d83b2995af33f480b93e972cedb0c926"
+ ],
+ includeReverted: false,
+ includeTransaction: false,
+ includeReceipt: false
+ },
+ {
+ // Chain Faction Joined Event
+ keys: [
+ "0x02947960ff713d9b594a3b718b90a45360e46d1bbacef94b727bb0d461d04207"
],
includeReverted: false,
includeTransaction: false,
@@ -135,6 +172,26 @@ export const config = {
includeTransaction: false,
includeReceipt: false
},
+ {
+ // NFT Liked Event
+ fromAddress: Deno.env.get("NFT_CONTRACT_ADDRESS"),
+ keys: [
+ "0x028d7ee09447088eecdd12a86c9467a5e9ad18f819a20f9adcf6e34e0bd51453"
+ ],
+ includeReverted: false,
+ includeTransaction: false,
+ includeReceipt: false
+ },
+ {
+ // NFT Unliked Event
+ fromAddress: Deno.env.get("NFT_CONTRACT_ADDRESS"),
+ keys: [
+ "0x03b57514b19693484c35249c6e8b15bfe6e476205720680c2ff9f02faaf94941"
+ ],
+ includeReverted: false,
+ includeTransaction: false,
+ includeReceipt: false
+ },
{
// User Name Claimed Event
fromAddress: Deno.env.get("USERNAME_STORE_ADDRESS"),
@@ -183,7 +240,6 @@ export const config = {
}
};
-// This transform does nothing.
export default function transform(block) {
return block;
}
diff --git a/indexer/script.js b/indexer/script.js
index 179342a6..233a0b6d 100644
--- a/indexer/script.js
+++ b/indexer/script.js
@@ -47,10 +47,20 @@ export const config = {
includeReceipt: false
},
{
- // Member Pixels Placed Event
+ // Faction Pixels Placed Event
fromAddress: Deno.env.get("ART_PEACE_CONTRACT_ADDRESS"),
keys: [
- "0x0165248ea72ba05120b18ec02e729e1f03a465f728283e6bb805bb284086c859"
+ "0x02838056c6784086957f2252d4a36a24d554ea2db7e09d2806cc69751d81f0a2"
+ ],
+ includeReverted: false,
+ includeTransaction: false,
+ includeReceipt: false
+ },
+ {
+ // Chain Faction Pixels Placed Event
+ fromAddress: Deno.env.get("ART_PEACE_CONTRACT_ADDRESS"),
+ keys: [
+ "0x02e4d1feaacd0627a6c7d5002564bdb4ca4877d47f00cad4714201194690a7a9"
],
includeReverted: false,
includeTransaction: false,
@@ -117,10 +127,36 @@ export const config = {
includeReceipt: false
},
{
- // Member Replaced Event
- fromAddress: Deno.env.get("ART_PEACE_CONTRACT_ADDRESS"),
+ // Faction Joined Event
+ keys: [
+ "0x01e3fbdf8156ad0dde21e886d61a16d85c9ef54451eb6e253f3f427de32a47ac"
+ ],
+ includeReverted: false,
+ includeTransaction: false,
+ includeReceipt: false
+ },
+ {
+ // Faction Left Event
+ keys: [
+ "0x014ef8cc25c96157e2a00e9ceaa7c014a162d11d58a98871087ec488a67d7925"
+ ],
+ includeReverted: false,
+ includeTransaction: false,
+ includeReceipt: false
+ },
+ {
+ // Chain Faction Created Event
keys: [
- "0x01f8936599822d668e09401ffcef1989aca342fb1f003f9b3b1fd1cbf605ed6b"
+ "0x020c994ab49a8316bcc78b06d4ff9929d83b2995af33f480b93e972cedb0c926"
+ ],
+ includeReverted: false,
+ includeTransaction: false,
+ includeReceipt: false
+ },
+ {
+ // Chain Faction Joined Event
+ keys: [
+ "0x02947960ff713d9b594a3b718b90a45360e46d1bbacef94b727bb0d461d04207"
],
includeReverted: false,
includeTransaction: false,
@@ -136,6 +172,26 @@ export const config = {
includeTransaction: false,
includeReceipt: false
},
+ {
+ // NFT Liked Event
+ fromAddress: Deno.env.get("NFT_CONTRACT_ADDRESS"),
+ keys: [
+ "0x028d7ee09447088eecdd12a86c9467a5e9ad18f819a20f9adcf6e34e0bd51453"
+ ],
+ includeReverted: false,
+ includeTransaction: false,
+ includeReceipt: false
+ },
+ {
+ // NFT Unliked Event
+ fromAddress: Deno.env.get("NFT_CONTRACT_ADDRESS"),
+ keys: [
+ "0x03b57514b19693484c35249c6e8b15bfe6e476205720680c2ff9f02faaf94941"
+ ],
+ includeReverted: false,
+ includeTransaction: false,
+ includeReceipt: false
+ },
{
// User Name Claimed Event
fromAddress: Deno.env.get("USERNAME_STORE_ADDRESS"),
diff --git a/onchain/src/art_peace.cairo b/onchain/src/art_peace.cairo
index 6e7652f5..e605c997 100644
--- a/onchain/src/art_peace.cairo
+++ b/onchain/src/art_peace.cairo
@@ -4,7 +4,7 @@ pub mod ArtPeace {
use starknet::ContractAddress;
use core::poseidon::PoseidonTrait;
use core::hash::{HashStateTrait, HashStateExTrait};
- use art_peace::{IArtPeace, Pixel, Faction, MemberMetadata};
+ use art_peace::{IArtPeace, Pixel, Faction, ChainFaction, MemberMetadata};
use art_peace::quests::interfaces::{IQuestDispatcher, IQuestDispatcherTrait};
use art_peace::nfts::interfaces::{
IArtPeaceNFTMinter, NFTMetadata, NFTMintParams, ICanvasNFTAdditionalDispatcher,
@@ -36,14 +36,18 @@ pub mod ArtPeace {
factions_count: u32,
// Map: faction id -> faction data
factions: LegacyMap::
,
- // Map: faction id -> amount of members
- faction_member_counts: LegacyMap::,
- // Map: (faction id, member index) -> member's metadata
- faction_members: LegacyMap::<(u32, u32), MemberMetadata>,
- // Map: member address -> amount of faction memberships
- user_memberships_count: LegacyMap::,
- // Map: (member address, membership index) -> (faction id, member index)
- user_memberships: LegacyMap::<(ContractAddress, u32), (u32, u32)>,
+ // Map: members address -> faction id ( 0 => no faction )
+ users_faction: LegacyMap::,
+ // Map: members address -> membership metadata
+ users_faction_meta: LegacyMap::,
+ chain_factions_count: u32,
+ // Map: chain faction id -> chain faction data
+ chain_factions: LegacyMap::,
+ // Map: chain members address -> faction id ( 0 => no faction )
+ users_chain_faction: LegacyMap::,
+ // Map: chain members address -> membership metadata
+ users_chain_faction_meta: LegacyMap::,
+ // TODO: Extra factions ( assigned at start with larger allocations )
color_count: u8,
// Map: color index -> color value in RGBA
color_palette: LegacyMap::,
@@ -81,13 +85,17 @@ pub mod ArtPeace {
ColorAdded: ColorAdded,
PixelPlaced: PixelPlaced,
BasicPixelPlaced: BasicPixelPlaced,
- MemberPixelsPlaced: MemberPixelsPlaced,
+ FactionPixelsPlaced: FactionPixelsPlaced,
+ ChainFactionPixelsPlaced: ChainFactionPixelsPlaced,
ExtraPixelsPlaced: ExtraPixelsPlaced,
DailyQuestClaimed: DailyQuestClaimed,
MainQuestClaimed: MainQuestClaimed,
VoteColor: VoteColor,
FactionCreated: FactionCreated,
- MemberReplaced: MemberReplaced,
+ ChainFactionCreated: ChainFactionCreated,
+ FactionJoined: FactionJoined,
+ FactionLeft: FactionLeft,
+ ChainFactionJoined: ChainFactionJoined,
VotableColorAdded: VotableColorAdded,
// TODO: Integrate template event
#[flat]
@@ -127,11 +135,17 @@ pub mod ArtPeace {
}
#[derive(Drop, starknet::Event)]
- struct MemberPixelsPlaced {
+ struct FactionPixelsPlaced {
#[key]
- faction_id: u32,
+ user: ContractAddress,
+ placed_time: u64,
+ member_pixels: u32,
+ }
+
+ #[derive(Drop, starknet::Event)]
+ struct ChainFactionPixelsPlaced {
#[key]
- member_id: u32,
+ user: ContractAddress,
placed_time: u64,
member_pixels: u32,
}
@@ -190,17 +204,39 @@ pub mod ArtPeace {
faction_id: u32,
name: felt252,
leader: ContractAddress,
- pool: u32,
- members: Span,
+ joinable: bool,
+ allocation: u32,
+ }
+
+ #[derive(Drop, starknet::Event)]
+ struct ChainFactionCreated {
+ #[key]
+ faction_id: u32,
+ name: felt252,
+ }
+
+ #[derive(Drop, starknet::Event)]
+ struct FactionJoined {
+ #[key]
+ faction_id: u32,
+ #[key]
+ user: ContractAddress,
+ }
+
+ #[derive(Drop, starknet::Event)]
+ struct FactionLeft {
+ #[key]
+ faction_id: u32,
+ #[key]
+ user: ContractAddress,
}
#[derive(Drop, starknet::Event)]
- struct MemberReplaced {
+ struct ChainFactionJoined {
#[key]
faction_id: u32,
#[key]
- member_id: u32,
- new_member: ContractAddress,
+ user: ContractAddress,
}
#[derive(Drop, Serde)]
@@ -228,6 +264,7 @@ pub mod ArtPeace {
self.total_pixels.write(init_params.canvas_width * init_params.canvas_height);
self.time_between_pixels.write(init_params.time_between_pixels);
+ self.time_between_member_pixels.write(init_params.time_between_pixels);
let color_count: u8 = init_params.color_palette.len().try_into().unwrap();
self.color_count.write(color_count);
@@ -319,91 +356,6 @@ pub mod ArtPeace {
);
}
- fn place_pixel_inner(ref self: ContractState, pos: u128, color: u8) {
- self.check_valid_pixel(pos, color);
-
- let caller = starknet::get_caller_address();
- let pixel = Pixel { color, owner: caller };
- self.canvas.write(pos, pixel);
- let day = self.day_index.read();
- self
- .user_pixels_placed
- .write(
- (day, caller, color), self.user_pixels_placed.read((day, caller, color)) + 1
- );
- // TODO: Optimize?
- self.emit(PixelPlaced { placed_by: caller, pos, day, color });
- }
-
- // TODO: Make the function internal only
- fn place_basic_pixel_inner(ref self: ContractState, pos: u128, color: u8, now: u64) {
- self.place_pixel_inner(pos, color);
- let caller = starknet::get_caller_address();
- self.last_placed_time.write(caller, now);
- self.emit(BasicPixelPlaced { placed_by: caller, timestamp: now });
- }
-
- fn place_member_pixels_inner(
- ref self: ContractState,
- faction_id: u32,
- member_id: u32,
- positions: Span,
- colors: Span,
- mut offset: u32,
- now: u64
- ) -> u32 {
- let pixel_count = positions.len();
- let member_pixels = self.get_faction_members_pixels(faction_id, member_id, now);
- let mut member_pixels_left = member_pixels;
- while member_pixels_left > 0 {
- let pos = *positions.at(offset);
- let color = *colors.at(offset);
- self.place_pixel_inner(pos, color);
- offset += 1;
- member_pixels_left -= 1;
- if offset == pixel_count {
- break;
- }
- };
- let caller = starknet::get_caller_address();
- if member_pixels != 0 {
- // TODO: Optimize
- if member_pixels_left == 0 {
- let new_member_metadata = MemberMetadata {
- address: caller, member_placed_time: now, member_pixels: 0
- };
- self.faction_members.write((faction_id, member_id), new_member_metadata);
- self
- .emit(
- MemberPixelsPlaced {
- faction_id, member_id, placed_time: now, member_pixels: 0
- }
- );
- } else {
- let last_placed_time = self
- .faction_members
- .read((faction_id, member_id))
- .member_placed_time;
- let new_member_metadata = MemberMetadata {
- address: caller,
- member_placed_time: last_placed_time,
- member_pixels: member_pixels_left
- };
- self.faction_members.write((faction_id, member_id), new_member_metadata);
- self
- .emit(
- MemberPixelsPlaced {
- faction_id,
- member_id,
- placed_time: last_placed_time,
- member_pixels: member_pixels_left
- }
- );
- }
- }
- return offset;
- }
-
fn place_pixel(ref self: ContractState, pos: u128, color: u8, now: u64) {
self.check_game_running();
self.check_timing(now);
@@ -413,7 +365,7 @@ pub mod ArtPeace {
'Pixel not available'
);
- self.place_basic_pixel_inner(pos, color, now);
+ place_basic_pixel_inner(ref self, pos, color, now);
}
fn place_pixel_xy(ref self: ContractState, x: u128, y: u128, color: u8, now: u64) {
@@ -442,27 +394,21 @@ pub mod ArtPeace {
if now - self.last_placed_time.read(caller) >= self.time_between_pixels.read() {
let pos = *positions.at(pixels_placed);
let color = *colors.at(pixels_placed);
- self.place_basic_pixel_inner(pos, color, now);
+ place_basic_pixel_inner(ref self, pos, color, now);
pixels_placed += 1;
if pixels_placed == pixel_count {
return;
}
}
- // Use member pixels if available
- let membership_count = self.user_memberships_count.read(caller);
- let mut i = 0;
- while i < membership_count {
- let (faction_id, member_id) = self.user_memberships.read((caller, i));
- pixels_placed = self
- .place_member_pixels_inner(
- faction_id, member_id, positions, colors, pixels_placed, now
- );
- if pixels_placed == pixel_count {
- break;
- }
- i += 1;
- };
+ pixels_placed =
+ place_chain_faction_pixels_inner(ref self, positions, colors, pixels_placed, now);
+ if pixels_placed == pixel_count {
+ return;
+ }
+
+ pixels_placed =
+ place_user_faction_pixels_inner(ref self, positions, colors, pixels_placed, now);
if pixels_placed == pixel_count {
return;
}
@@ -475,7 +421,7 @@ pub mod ArtPeace {
while pixels_placed < pixel_count {
let pos = *positions.at(pixels_placed);
let color = *colors.at(pixels_placed);
- self.place_pixel_inner(pos, color);
+ place_pixel_inner(ref self, pos, color);
pixels_placed += 1;
};
let extra_pixels_placed = pixel_count - prior_pixels;
@@ -509,10 +455,6 @@ pub mod ArtPeace {
self.factions_count.read()
}
- fn get_user_factions_count(self: @ContractState, user: ContractAddress) -> u32 {
- self.user_memberships_count.read(user)
- }
-
fn get_faction(self: @ContractState, faction_id: u32) -> Faction {
self.factions.read(faction_id)
}
@@ -521,138 +463,91 @@ pub mod ArtPeace {
self.factions.read(faction_id).leader
}
+ // TODO: Tests
fn init_faction(
ref self: ContractState,
name: felt252,
leader: ContractAddress,
- pool: u32,
- members: Span
+ joinable: bool,
+ allocation: u32
) {
- // TODO
- //assert(
- // starknet::get_caller_address() == self.host.read(), 'Factions are set by the host'
- //);
+ // TODO: Init with members?
+ assert(
+ starknet::get_caller_address() == self.host.read(), 'Factions are set by the host'
+ );
self.check_game_running();
- assert(members.len() <= pool, 'Invalid faction members count');
- let faction_id = self.factions_count.read();
- let faction = Faction { name, leader, pixel_pool: pool };
+ let faction_id = self.factions_count.read() + 1;
+ let faction = Faction { name, leader, joinable, allocation };
self.factions.write(faction_id, faction);
- self.factions_count.write(faction_id + 1);
- let mut i = 0;
- while i < members
- .len() {
- let member_address = *members.at(i);
- let member = MemberMetadata {
- address: member_address, member_placed_time: 0, member_pixels: 0
- };
- let member_membership_count = self.user_memberships_count.read(member_address);
- self.faction_members.write((faction_id, i), member);
- self
- .user_memberships
- .write((member_address, member_membership_count), (faction_id, i));
- self.user_memberships_count.write(member_address, member_membership_count + 1);
- i += 1;
- };
- self.faction_member_counts.write(faction_id, members.len());
- self.emit(FactionCreated { faction_id, name, leader, pool, members });
+ self.factions_count.write(faction_id);
+ self.emit(FactionCreated { faction_id, name, leader, joinable, allocation });
}
- // TODO: Tests and integration
- // TODO: Infinite replacement exploit
- fn replace_member(
- ref self: ContractState, faction_id: u32, member_id: u32, new_member: ContractAddress
- ) {
- self.check_game_running();
+ fn init_chain_faction(ref self: ContractState, name: felt252) {
assert(
- starknet::get_caller_address() == self.get_faction_leader(faction_id),
- 'Only leader can replace members'
+ starknet::get_caller_address() == self.host.read(), 'Factions are set by the host'
);
- let member_count = self.faction_member_counts.read(faction_id);
- assert(member_id < member_count, 'Member ID out of bounds');
+ self.check_game_running();
+ let faction_id = self.chain_factions_count.read() + 1;
+ let chain_faction = ChainFaction { name };
+ self.chain_factions.write(faction_id, chain_faction);
+ self.chain_factions_count.write(faction_id);
+ self.emit(ChainFactionCreated { faction_id, name });
+ }
- let old_member = self.faction_members.read((faction_id, member_id));
- let old_member_address = old_member.address;
+ fn join_faction(ref self: ContractState, faction_id: u32) {
+ self.check_game_running();
+ assert(faction_id != 0, 'Faction 0 is not joinable');
+ assert(faction_id <= self.factions_count.read(), 'Faction does not exist');
+ assert(
+ self.users_faction.read(starknet::get_caller_address()) == 0,
+ 'User already in a faction'
+ );
+ let caller = starknet::get_caller_address();
+ let faction = self.factions.read(faction_id);
+ assert(faction.joinable, 'Faction is not joinable');
+ self.users_faction.write(caller, faction_id);
+ self.emit(FactionJoined { faction_id, user: caller });
+ }
- let old_member_membership_count = self.user_memberships_count.read(old_member.address);
- let mut member_id = 0;
- while member_id < old_member_membership_count {
- let (fid, mid) = self.user_memberships.read((old_member_address, member_id));
- if fid == faction_id && mid == member_id {
- break;
- }
- member_id += 1;
- };
- let last_member_membership = self
- .user_memberships
- .read((old_member.address, old_member_membership_count - 1));
- self.user_memberships.write((old_member.address, member_id), last_member_membership);
- self.user_memberships_count.write(old_member.address, old_member_membership_count - 1);
-
- let member = MemberMetadata {
- address: new_member, member_placed_time: 0, member_pixels: 0
- };
- self.faction_members.write((faction_id, member_id), member);
+ fn leave_faction(ref self: ContractState) {
+ self.check_game_running();
+ let caller = starknet::get_caller_address();
+ let faction_id = self.users_faction.read(caller);
+ self.users_faction.write(caller, 0);
+ self.emit(FactionLeft { faction_id, user: caller });
+ }
- let new_member_membership_count = self.user_memberships_count.read(new_member);
- self
- .user_memberships
- .write((new_member, new_member_membership_count), (faction_id, member_id));
- self.user_memberships_count.write(new_member, new_member_membership_count + 1);
- self.emit(MemberReplaced { faction_id, member_id, new_member });
- }
-
- //fn add_faction_member(ref self: ContractState, faction_id: u32, member: ContractAddress) {
- // self.check_game_running();
- // assert(
- // starknet::get_caller_address() == self.get_faction_owner(faction_id),
- // 'Only the faction owner can add members'
- // );
- // let faction = self.factions.read(faction_id);
- // let member_count = self.faction_member_counts.read(faction_id);
- // assert(member_count < faction.pixel_pool, 'Faction is full');
- // let member_data = MemberMetadata { address: member, member_placed_time: 0, member_pixels: 0 };
- // self.faction_members.write((faction_id, member_count), member_data);
- // self.faction_member_counts.write(faction_id, member_count + 1);
- //}
-
- //fn remove_faction_member(ref self: ContractState, faction_id: u32, member_id: u32) {
- // self.check_game_running();
- // assert(
- // starknet::get_caller_address() == self.get_faction_owner(faction_id),
- // 'Only the faction owner can remove members'
- // );
- // let member_count = self.faction_member_counts.read(faction_id);
- // // Replace the removed member with the last member
- // let last_member = self.faction_members.read((faction_id, member_count - 1));
- // self.faction_members.write((faction_id, member_id), last_member);
- // self.faction_member_counts.write(faction_id, member_count - 1);
- //}
-
- fn get_faction_members(self: @ContractState, faction_id: u32) -> Span {
- let member_count = self.faction_member_counts.read(faction_id);
- let mut i = 0;
- let mut members = array![];
- while i < member_count {
- members.append(self.faction_members.read((faction_id, i)).address);
- i += 1;
- };
+ fn join_chain_faction(ref self: ContractState, faction_id: u32) {
+ self.check_game_running();
+ assert(faction_id != 0, 'Faction 0 is not joinable');
+ assert(faction_id <= self.chain_factions_count.read(), 'Faction does not exist');
+ assert(
+ self.users_chain_faction.read(starknet::get_caller_address()) == 0,
+ 'User already in a chain faction'
+ );
+ let caller = starknet::get_caller_address();
+ self.users_chain_faction.write(caller, faction_id);
+ self.emit(ChainFactionJoined { faction_id, user: caller });
+ }
- members.span()
+ fn get_user_faction(self: @ContractState, user: ContractAddress) -> u32 {
+ self.users_faction.read(user)
}
- fn get_faction_member_count(self: @ContractState, faction_id: u32) -> u32 {
- self.faction_member_counts.read(faction_id)
+ fn get_user_chain_faction(self: @ContractState, user: ContractAddress) -> u32 {
+ self.users_chain_faction.read(user)
}
- fn get_faction_members_pixels(
- self: @ContractState, faction_id: u32, member_id: u32, now: u64
+ fn get_user_faction_members_pixels(
+ self: @ContractState, user: ContractAddress, now: u64
) -> u32 {
- let member_count = self.faction_member_counts.read(faction_id);
- let pixel_pool = self.factions.read(faction_id).pixel_pool;
- let member_metadata = self.faction_members.read((faction_id, member_id));
- if member_id >= member_count {
+ let faction_id = self.users_faction.read(user);
+ if faction_id == 0 {
+ // 0 => no faction
return 0;
}
+ let member_metadata = self.users_faction_meta.read(user);
if member_metadata.member_pixels > 0 {
// TODO: If member_pixels > 0 && < allocation && enough time has passed, return allocation instead of member_pixels
return member_metadata.member_pixels;
@@ -662,8 +557,28 @@ pub mod ArtPeace {
if time_since_last_pixel < self.time_between_member_pixels.read() {
return 0;
} else {
- // TODO: Think about when pixel_pool % member_count != 0
- return pixel_pool / member_count.into();
+ return self.factions.read(faction_id).allocation;
+ }
+ }
+ }
+
+ fn get_chain_faction_members_pixels(
+ self: @ContractState, user: ContractAddress, now: u64
+ ) -> u32 {
+ let faction_id = self.users_chain_faction.read(user);
+ if faction_id == 0 {
+ // 0 => no faction
+ return 0;
+ }
+ let member_metadata = self.users_chain_faction_meta.read(user);
+ if member_metadata.member_pixels > 0 {
+ return member_metadata.member_pixels;
+ } else {
+ let time_since_last_pixel = now - member_metadata.member_placed_time;
+ if time_since_last_pixel < self.time_between_member_pixels.read() {
+ return 0;
+ } else {
+ return 2; // Chain faction allocation
}
}
}
@@ -950,8 +865,10 @@ pub mod ArtPeace {
position: mint_params.position,
width: mint_params.width,
height: mint_params.height,
+ name: mint_params.name,
image_hash: 0, // TODO
block_number: starknet::get_block_number(),
+ day_index: self.day_index.read(),
minter: starknet::get_caller_address(),
};
ICanvasNFTAdditionalDispatcher { contract_address: self.nft_contract.read(), }
@@ -1165,6 +1082,10 @@ pub mod ArtPeace {
// update palette & votable colors
let next_day = day + 1;
+ let start_day_time = self.start_day_time.read();
+ let end_day_time = start_day_time + DAY_IN_SECONDS;
+ let end_game_time = self.end_time.read();
+ let start_new_vote: bool = end_day_time < end_game_time;
let mut color_index = self.color_count.read();
let mut next_day_votable_index = 1;
votable_index = 1;
@@ -1175,7 +1096,7 @@ pub mod ArtPeace {
self.color_palette.write(color_index, color);
self.emit(ColorAdded { color_key: color_index, color });
color_index += 1;
- } else {
+ } else if start_new_vote {
self.votable_colors.write((next_day_votable_index, next_day), color);
self
.emit(
@@ -1188,7 +1109,126 @@ pub mod ArtPeace {
votable_index += 1;
};
self.color_count.write(color_index);
- self.votable_colors_count.write(next_day, next_day_votable_index - 1);
+ if start_new_vote {
+ self.votable_colors_count.write(next_day, next_day_votable_index - 1);
+ }
+ }
+
+ fn place_pixel_inner(ref self: ContractState, pos: u128, color: u8) {
+ self.check_valid_pixel(pos, color);
+
+ let caller = starknet::get_caller_address();
+ let pixel = Pixel { color, owner: caller };
+ self.canvas.write(pos, pixel);
+ let day = self.day_index.read();
+ self
+ .user_pixels_placed
+ .write((day, caller, color), self.user_pixels_placed.read((day, caller, color)) + 1);
+ // TODO: Optimize?
+ self.emit(PixelPlaced { placed_by: caller, pos, day, color });
}
-}
+ // TODO: Make the function internal
+ fn place_basic_pixel_inner(ref self: ContractState, pos: u128, color: u8, now: u64) {
+ place_pixel_inner(ref self, pos, color);
+ let caller = starknet::get_caller_address();
+ self.last_placed_time.write(caller, now);
+ self.emit(BasicPixelPlaced { placed_by: caller, timestamp: now });
+ }
+
+ fn place_user_faction_pixels_inner(
+ ref self: ContractState, positions: Span, colors: Span, mut offset: u32, now: u64
+ ) -> u32 {
+ let faction_pixels = self
+ .get_user_faction_members_pixels(starknet::get_caller_address(), now);
+ if faction_pixels == 0 {
+ return offset;
+ }
+
+ let pixel_count = positions.len();
+ let mut faction_pixels_left = faction_pixels;
+ while faction_pixels_left > 0 {
+ let pos = *positions.at(offset);
+ let color = *colors.at(offset);
+ place_pixel_inner(ref self, pos, color);
+ offset += 1;
+ faction_pixels_left -= 1;
+ if offset == pixel_count {
+ break;
+ }
+ };
+ let caller = starknet::get_caller_address();
+ if faction_pixels_left == 0 {
+ let new_member_metadata = MemberMetadata { member_placed_time: now, member_pixels: 0 };
+ self.users_faction_meta.write(caller, new_member_metadata);
+ self.emit(FactionPixelsPlaced { user: caller, placed_time: now, member_pixels: 0 });
+ } else {
+ let last_placed_time = self.users_faction_meta.read(caller).member_placed_time;
+ let new_member_metadata = MemberMetadata {
+ member_placed_time: last_placed_time, member_pixels: faction_pixels_left
+ };
+ self.users_faction_meta.write(caller, new_member_metadata);
+ self
+ .emit(
+ FactionPixelsPlaced {
+ user: caller,
+ placed_time: last_placed_time,
+ member_pixels: faction_pixels_left
+ }
+ );
+ }
+ return offset;
+ }
+
+ fn place_chain_faction_pixels_inner(
+ ref self: ContractState, positions: Span, colors: Span, mut offset: u32, now: u64
+ ) -> u32 {
+ let pixel_count = positions.len();
+ let caller = starknet::get_caller_address();
+ let member_pixels = self.get_chain_faction_members_pixels(caller, now);
+ let mut member_pixels_left = member_pixels;
+ while member_pixels_left > 0 {
+ let pos = *positions.at(offset);
+ let color = *colors.at(offset);
+ place_pixel_inner(ref self, pos, color);
+ offset += 1;
+ member_pixels_left -= 1;
+ if offset == pixel_count {
+ break;
+ }
+ };
+ let caller = starknet::get_caller_address();
+ if member_pixels != 0 {
+ if member_pixels_left == 0 {
+ let new_member_metadata = MemberMetadata {
+ member_placed_time: now, member_pixels: 0
+ };
+ self.users_chain_faction_meta.write(caller, new_member_metadata);
+ self
+ .emit(
+ ChainFactionPixelsPlaced {
+ user: caller, placed_time: now, member_pixels: 0
+ }
+ );
+ } else {
+ let last_placed_time = self
+ .users_chain_faction_meta
+ .read(caller)
+ .member_placed_time;
+ let new_member_metadata = MemberMetadata {
+ member_placed_time: last_placed_time, member_pixels: member_pixels_left
+ };
+ self.users_chain_faction_meta.write(caller, new_member_metadata);
+ self
+ .emit(
+ ChainFactionPixelsPlaced {
+ user: caller,
+ placed_time: last_placed_time,
+ member_pixels: member_pixels_left
+ }
+ );
+ }
+ }
+ return offset;
+ }
+}
diff --git a/onchain/src/interfaces.cairo b/onchain/src/interfaces.cairo
index f8b33698..a4e8512e 100644
--- a/onchain/src/interfaces.cairo
+++ b/onchain/src/interfaces.cairo
@@ -10,12 +10,17 @@ pub struct Pixel {
pub struct Faction {
pub name: felt252,
pub leader: starknet::ContractAddress,
- pub pixel_pool: u32
+ pub joinable: bool,
+ pub allocation: u32
+}
+
+#[derive(Drop, Serde, starknet::Store)]
+pub struct ChainFaction {
+ pub name: felt252,
}
#[derive(Drop, Serde, starknet::Store)]
pub struct MemberMetadata {
- pub address: starknet::ContractAddress,
pub member_placed_time: u64,
pub member_pixels: u32
}
@@ -39,17 +44,6 @@ pub trait IArtPeace {
fn check_timing(self: @TContractState, now: u64);
// Place pixels on the canvas
- fn place_pixel_inner(ref self: TContractState, pos: u128, color: u8);
- fn place_basic_pixel_inner(ref self: TContractState, pos: u128, color: u8, now: u64);
- fn place_member_pixels_inner(
- ref self: TContractState,
- faction_id: u32,
- member_id: u32,
- positions: Span,
- colors: Span,
- offset: u32,
- now: u64
- ) -> u32;
fn place_pixel(ref self: TContractState, pos: u128, color: u8, now: u64);
fn place_pixel_xy(ref self: TContractState, x: u128, y: u128, color: u8, now: u64);
fn place_pixel_blocktime(ref self: TContractState, pos: u128, color: u8);
@@ -66,28 +60,26 @@ pub trait IArtPeace {
// Faction stuff
fn get_factions_count(self: @TContractState) -> u32;
- fn get_user_factions_count(self: @TContractState, user: starknet::ContractAddress) -> u32;
fn get_faction(self: @TContractState, faction_id: u32) -> Faction;
fn get_faction_leader(self: @TContractState, faction_id: u32) -> starknet::ContractAddress;
fn init_faction(
ref self: TContractState,
name: felt252,
leader: starknet::ContractAddress,
- pool: u32,
- members: Span
- );
- fn replace_member(
- ref self: TContractState,
- faction_id: u32,
- member_id: u32,
- new_member: starknet::ContractAddress
+ joinable: bool,
+ allocation: u32
);
- fn get_faction_members(
- self: @TContractState, faction_id: u32
- ) -> Span;
- fn get_faction_member_count(self: @TContractState, faction_id: u32) -> u32;
- fn get_faction_members_pixels(
- self: @TContractState, faction_id: u32, member_id: u32, now: u64
+ fn init_chain_faction(ref self: TContractState, name: felt252);
+ fn join_faction(ref self: TContractState, faction_id: u32);
+ fn leave_faction(ref self: TContractState);
+ fn join_chain_faction(ref self: TContractState, faction_id: u32);
+ fn get_user_faction(self: @TContractState, user: starknet::ContractAddress) -> u32;
+ fn get_user_chain_faction(self: @TContractState, user: starknet::ContractAddress) -> u32;
+ fn get_user_faction_members_pixels(
+ self: @TContractState, user: starknet::ContractAddress, now: u64
+ ) -> u32;
+ fn get_chain_faction_members_pixels(
+ self: @TContractState, user: starknet::ContractAddress, now: u64
) -> u32;
// Get color info
diff --git a/onchain/src/lib.cairo b/onchain/src/lib.cairo
index 93a9ce68..db846dce 100644
--- a/onchain/src/lib.cairo
+++ b/onchain/src/lib.cairo
@@ -2,7 +2,8 @@ pub mod art_peace;
pub mod interfaces;
use art_peace::ArtPeace;
use interfaces::{
- IArtPeace, IArtPeaceDispatcher, IArtPeaceDispatcherTrait, Pixel, Faction, MemberMetadata
+ IArtPeace, IArtPeaceDispatcher, IArtPeaceDispatcherTrait, Pixel, Faction, ChainFaction,
+ MemberMetadata
};
mod quests {
@@ -16,6 +17,7 @@ mod quests {
pub mod nft_quest;
pub mod hodl_quest;
pub mod faction_quest;
+ pub mod chain_faction_quest;
pub mod vote_quest;
use interfaces::{
@@ -72,6 +74,7 @@ mod tests {
pub(crate) mod hodl_quest;
pub(crate) mod pixel_quest;
pub(crate) mod faction_quest;
+ pub(crate) mod chain_faction_quest;
pub(crate) mod rainbow_quest;
pub(crate) mod template_quest;
pub(crate) mod unruggable_quest;
diff --git a/onchain/src/nfts/canvas_nft.cairo b/onchain/src/nfts/canvas_nft.cairo
index daeef160..399bbc4c 100644
--- a/onchain/src/nfts/canvas_nft.cairo
+++ b/onchain/src/nfts/canvas_nft.cairo
@@ -55,15 +55,17 @@ mod CanvasNFT {
#[derive(Drop, starknet::Event)]
struct NFTLiked {
#[key]
- user_address: ContractAddress,
- token_id: u256
+ token_id: u256,
+ #[key]
+ user_address: ContractAddress
}
#[derive(Drop, starknet::Event)]
struct NFTUnliked {
#[key]
- user_address: ContractAddress,
- token_id: u256
+ token_id: u256,
+ #[key]
+ user_address: ContractAddress
}
diff --git a/onchain/src/nfts/component.cairo b/onchain/src/nfts/component.cairo
index 87b71993..db4b1055 100644
--- a/onchain/src/nfts/component.cairo
+++ b/onchain/src/nfts/component.cairo
@@ -41,6 +41,11 @@ pub mod CanvasNFTStoreComponent {
return metadata.minter;
}
+ fn get_nft_day_index(self: @ComponentState, token_id: u256) -> u32 {
+ let metadata: NFTMetadata = self.nfts_data.read(token_id);
+ return metadata.day_index;
+ }
+
fn get_nft_image_hash(self: @ComponentState, token_id: u256) -> felt252 {
let metadata: NFTMetadata = self.nfts_data.read(token_id);
return metadata.image_hash;
diff --git a/onchain/src/nfts/interfaces.cairo b/onchain/src/nfts/interfaces.cairo
index 3e1406a4..96e0b7a7 100644
--- a/onchain/src/nfts/interfaces.cairo
+++ b/onchain/src/nfts/interfaces.cairo
@@ -3,6 +3,7 @@ pub struct NFTMintParams {
pub position: u128,
pub width: u128,
pub height: u128,
+ pub name: felt252,
}
#[derive(Drop, Copy, Serde, PartialEq, starknet::Store)]
@@ -10,8 +11,10 @@ pub struct NFTMetadata {
pub position: u128,
pub width: u128,
pub height: u128,
+ pub name: felt252,
pub image_hash: felt252,
pub block_number: u64,
+ pub day_index: u32,
pub minter: starknet::ContractAddress,
}
@@ -21,6 +24,7 @@ pub trait ICanvasNFTStore {
fn get_nft_metadata(self: @TContractState, token_id: u256) -> NFTMetadata;
fn get_nft_minter(self: @TContractState, token_id: u256) -> starknet::ContractAddress;
fn get_nft_image_hash(self: @TContractState, token_id: u256) -> felt252;
+ fn get_nft_day_index(self: @TContractState, token_id: u256) -> u32;
// Returns the number of NFTs stored in the contract state.
fn get_nfts_count(self: @TContractState) -> u256;
diff --git a/onchain/src/quests/chain_faction_quest.cairo b/onchain/src/quests/chain_faction_quest.cairo
new file mode 100644
index 00000000..cf8c0631
--- /dev/null
+++ b/onchain/src/quests/chain_faction_quest.cairo
@@ -0,0 +1,67 @@
+#[starknet::contract]
+pub mod ChainFactionQuest {
+ use art_peace::{IArtPeaceDispatcher, IArtPeaceDispatcherTrait};
+ use art_peace::quests::{IQuest};
+
+ use starknet::{ContractAddress, get_caller_address};
+
+ #[storage]
+ struct Storage {
+ art_peace: ContractAddress,
+ reward: u32,
+ claimed: LegacyMap,
+ }
+
+ #[derive(Drop, Serde)]
+ pub struct ChainFactionQuestInitParams {
+ pub art_peace: ContractAddress,
+ pub reward: u32,
+ }
+
+ #[constructor]
+ fn constructor(ref self: ContractState, init_params: ChainFactionQuestInitParams) {
+ self.art_peace.write(init_params.art_peace);
+ self.reward.write(init_params.reward);
+ }
+
+
+ #[abi(embed_v0)]
+ impl ChainFactionQuest of IQuest {
+ fn get_reward(self: @ContractState) -> u32 {
+ self.reward.read()
+ }
+
+ fn is_claimable(
+ self: @ContractState, user: ContractAddress, calldata: Span
+ ) -> bool {
+ if self.claimed.read(user) {
+ return false;
+ }
+
+ let art_peace_dispatcher = IArtPeaceDispatcher {
+ contract_address: self.art_peace.read()
+ };
+
+ let user_faction = art_peace_dispatcher.get_user_chain_faction(user);
+
+ if user_faction == 0 {
+ return false;
+ }
+
+ return true;
+ }
+
+
+ fn claim(ref self: ContractState, user: ContractAddress, calldata: Span) -> u32 {
+ assert(get_caller_address() == self.art_peace.read(), 'Only ArtPeace can claim quests');
+
+ assert(self.is_claimable(user, calldata), 'Quest not claimable');
+
+ self.claimed.write(user, true);
+ let reward = self.reward.read();
+
+ reward
+ }
+ }
+}
+
diff --git a/onchain/src/quests/faction_quest.cairo b/onchain/src/quests/faction_quest.cairo
index 9cef785c..ec8d6381 100644
--- a/onchain/src/quests/faction_quest.cairo
+++ b/onchain/src/quests/faction_quest.cairo
@@ -42,9 +42,9 @@ pub mod FactionQuest {
contract_address: self.art_peace.read()
};
- let user_factions_count = art_peace_dispatcher.get_user_factions_count(user);
+ let user_faction = art_peace_dispatcher.get_user_faction(user);
- if (user_factions_count == 0) {
+ if user_faction == 0 {
return false;
}
diff --git a/onchain/src/quests/nft_quest.cairo b/onchain/src/quests/nft_quest.cairo
index 1a7965ed..3b01f44e 100644
--- a/onchain/src/quests/nft_quest.cairo
+++ b/onchain/src/quests/nft_quest.cairo
@@ -10,6 +10,8 @@ pub mod NFTMintQuest {
canvas_nft: ContractAddress,
art_peace: ContractAddress,
reward: u32,
+ is_daily: bool,
+ day_index: u32,
claimed: LegacyMap,
}
@@ -18,6 +20,8 @@ pub mod NFTMintQuest {
pub canvas_nft: ContractAddress,
pub art_peace: ContractAddress,
pub reward: u32,
+ pub is_daily: bool,
+ pub day_index: u32,
}
#[constructor]
@@ -25,6 +29,8 @@ pub mod NFTMintQuest {
self.canvas_nft.write(init_params.canvas_nft);
self.art_peace.write(init_params.art_peace);
self.reward.write(init_params.reward);
+ self.is_daily.write(init_params.is_daily);
+ self.day_index.write(init_params.day_index);
}
#[abi(embed_v0)]
@@ -50,6 +56,13 @@ pub mod NFTMintQuest {
return false;
}
+ if self.is_daily.read() {
+ let day_index = nft_store.get_nft_day_index(token_id);
+ if day_index != self.day_index.read() {
+ return false;
+ }
+ }
+
return true;
}
diff --git a/onchain/src/tests/art_peace.cairo b/onchain/src/tests/art_peace.cairo
index e1519e45..eab7df94 100644
--- a/onchain/src/tests/art_peace.cairo
+++ b/onchain/src/tests/art_peace.cairo
@@ -354,7 +354,7 @@ fn nft_mint_test() {
nft_minter.add_nft_contract(utils::NFT_CONTRACT());
snf::stop_prank(CheatTarget::One(nft_minter.contract_address));
- let mint_params = NFTMintParams { position: 10, width: 16, height: 16, };
+ let mint_params = NFTMintParams { position: 10, width: 16, height: 16, name: 'test' };
snf::start_prank(CheatTarget::One(nft_minter.contract_address), utils::PLAYER1());
nft_minter.mint_nft(mint_params);
snf::stop_prank(CheatTarget::One(nft_minter.contract_address));
@@ -363,7 +363,9 @@ fn nft_mint_test() {
position: 10,
width: 16,
height: 16,
+ name: 'test',
image_hash: 0,
+ day_index: 0,
block_number: 2000, // TODO
minter: utils::PLAYER1(),
};
diff --git a/onchain/src/tests/chain_faction_quest.cairo b/onchain/src/tests/chain_faction_quest.cairo
new file mode 100644
index 00000000..1771bfa4
--- /dev/null
+++ b/onchain/src/tests/chain_faction_quest.cairo
@@ -0,0 +1,93 @@
+use art_peace::{IArtPeaceDispatcher, IArtPeaceDispatcherTrait};
+use art_peace::quests::chain_faction_quest::ChainFactionQuest::ChainFactionQuestInitParams;
+use art_peace::tests::art_peace::deploy_with_quests_contract;
+use art_peace::tests::utils;
+use snforge_std as snf;
+use snforge_std::{CheatTarget, ContractClassTrait, declare};
+use starknet::{ContractAddress, contract_address_const};
+
+
+const reward_amt: u32 = 10;
+
+fn deploy_chain_faction_quest_main() -> ContractAddress {
+ let contract = declare("ChainFactionQuest");
+
+ let mut hodl_quest_calldata = array![];
+ ChainFactionQuestInitParams { art_peace: utils::ART_PEACE_CONTRACT(), reward: reward_amt, }
+ .serialize(ref hodl_quest_calldata);
+
+ contract.deploy(@hodl_quest_calldata).unwrap()
+}
+
+
+#[test]
+fn deploy_chain_faction_quest_main_test() {
+ let chain_faction_quest = deploy_chain_faction_quest_main();
+
+ let art_peace = IArtPeaceDispatcher {
+ contract_address: deploy_with_quests_contract(
+ array![].span(), array![chain_faction_quest].span()
+ )
+ };
+
+ let zero_address = contract_address_const::<0>();
+
+ assert!(
+ art_peace.get_days_quests(0) == array![zero_address, zero_address, zero_address].span(),
+ "Daily quests were not set correctly"
+ );
+ assert!(
+ art_peace.get_main_quests() == array![chain_faction_quest].span(),
+ "Main quests were not set correctly"
+ );
+}
+
+#[test]
+fn chain_faction_quest_test() {
+ let chain_faction_quest_contract_address = deploy_chain_faction_quest_main();
+
+ let art_peace = IArtPeaceDispatcher {
+ contract_address: deploy_with_quests_contract(
+ array![].span(), array![chain_faction_quest_contract_address].span()
+ )
+ };
+
+ snf::start_prank(CheatTarget::One(art_peace.contract_address), utils::HOST());
+ art_peace.init_chain_faction('TestFaction');
+ snf::stop_prank(CheatTarget::One(art_peace.contract_address));
+
+ snf::start_prank(CheatTarget::One(art_peace.contract_address), utils::PLAYER1());
+ art_peace.join_chain_faction(1);
+
+ art_peace.claim_main_quest(0, utils::EMPTY_CALLDATA());
+
+ assert!(
+ art_peace.get_extra_pixels_count() == reward_amt,
+ "Extra pixels are wrong after main quest claim"
+ );
+ snf::stop_prank(CheatTarget::One(art_peace.contract_address));
+}
+
+
+#[test]
+#[should_panic(expected: 'Quest not claimable')]
+fn chain_faction_quest_is_not_claimable_test() {
+ let chain_faction_quest_contract_address = deploy_chain_faction_quest_main();
+
+ let art_peace = IArtPeaceDispatcher {
+ contract_address: deploy_with_quests_contract(
+ array![].span(), array![chain_faction_quest_contract_address].span()
+ )
+ };
+
+ snf::start_prank(CheatTarget::One(art_peace.contract_address), utils::PLAYER1());
+
+ art_peace.claim_main_quest(0, utils::EMPTY_CALLDATA());
+
+ assert!(
+ art_peace.get_extra_pixels_count() == reward_amt,
+ "Extra pixels are wrong after main quest claim"
+ );
+ snf::stop_prank(CheatTarget::One(art_peace.contract_address));
+}
+
diff --git a/onchain/src/tests/faction_quest.cairo b/onchain/src/tests/faction_quest.cairo
index cbf59df3..a1788858 100644
--- a/onchain/src/tests/faction_quest.cairo
+++ b/onchain/src/tests/faction_quest.cairo
@@ -50,9 +50,12 @@ fn faction_quest_test() {
)
};
- snf::start_prank(CheatTarget::One(art_peace.contract_address), utils::PLAYER1());
+ snf::start_prank(CheatTarget::One(art_peace.contract_address), utils::HOST());
+ art_peace.init_faction('TestFaction', utils::HOST(), true, 1);
+ snf::stop_prank(CheatTarget::One(art_peace.contract_address));
- art_peace.init_faction('TestFaction', utils::HOST(), 20, array![utils::PLAYER1()].span());
+ snf::start_prank(CheatTarget::One(art_peace.contract_address), utils::PLAYER1());
+ art_peace.join_faction(1);
art_peace.claim_main_quest(0, utils::EMPTY_CALLDATA());
diff --git a/onchain/src/tests/nft_quest.cairo b/onchain/src/tests/nft_quest.cairo
index 38bf7ab6..9402358c 100644
--- a/onchain/src/tests/nft_quest.cairo
+++ b/onchain/src/tests/nft_quest.cairo
@@ -14,7 +14,7 @@ use starknet::{ContractAddress, contract_address_const};
const reward_amt: u32 = 18;
-fn deploy_nft_quest() -> ContractAddress {
+fn deploy_normal_nft_quest() -> ContractAddress {
let contract = snf::declare("NFTMintQuest");
let mut nft_quest_calldata = array![];
@@ -22,6 +22,24 @@ fn deploy_nft_quest() -> ContractAddress {
canvas_nft: utils::NFT_CONTRACT(),
art_peace: utils::ART_PEACE_CONTRACT(),
reward: reward_amt,
+ is_daily: false,
+ day_index: 0,
+ }
+ .serialize(ref nft_quest_calldata);
+
+ contract.deploy(@nft_quest_calldata).unwrap()
+}
+
+fn deploy_daily_nft_quest() -> ContractAddress {
+ let contract = snf::declare("NFTMintQuest");
+
+ let mut nft_quest_calldata = array![];
+ NFTMintQuestInitParams {
+ canvas_nft: utils::NFT_CONTRACT(),
+ art_peace: utils::ART_PEACE_CONTRACT(),
+ reward: reward_amt,
+ is_daily: true,
+ day_index: 0,
}
.serialize(ref nft_quest_calldata);
@@ -29,8 +47,8 @@ fn deploy_nft_quest() -> ContractAddress {
}
#[test]
-fn deploy_nft_quest_test() {
- let nft_quest = deploy_nft_quest();
+fn deploy_normal_nft_quest_test() {
+ let nft_quest = deploy_normal_nft_quest();
let art_peace = IArtPeaceDispatcher {
contract_address: deploy_with_quests_contract(array![].span(), array![nft_quest].span())
};
@@ -47,9 +65,25 @@ fn deploy_nft_quest_test() {
);
}
+#[test]
+fn deploy_daily_nft_quest_test() {
+ let nft_quest = deploy_daily_nft_quest();
+ let art_peace = IArtPeaceDispatcher {
+ contract_address: deploy_with_quests_contract(array![nft_quest].span(), array![].span())
+ };
+
+ let zero_address = contract_address_const::<0>();
+
+ assert!(
+ art_peace.get_days_quests(0) == array![nft_quest, zero_address, zero_address].span(),
+ "Daily quests were not set correctly"
+ );
+ assert!(art_peace.get_main_quests() == array![].span(), "Main quests were not set correctly");
+}
+
#[test]
fn nft_quest_test() {
- let nft_mint_quest = deploy_nft_quest();
+ let nft_mint_quest = deploy_normal_nft_quest();
let art_peace = IArtPeaceDispatcher {
contract_address: deploy_with_quests_contract(
@@ -66,7 +100,7 @@ fn nft_quest_test() {
let calldata: Array = array![0];
snf::start_prank(CheatTarget::One(art_peace.contract_address), utils::PLAYER1());
- let mint_params = NFTMintParams { height: 2, width: 2, position: 10 };
+ let mint_params = NFTMintParams { height: 2, width: 2, position: 10, name: 'test' };
art_peace_nft_minter.mint_nft(mint_params);
art_peace.claim_main_quest(0, calldata.span());
@@ -80,7 +114,7 @@ fn nft_quest_test() {
#[test]
#[should_panic(expected: ('Quest not claimable',))]
fn nft_quest_claim_if_not_claimable_test() {
- let nft_mint_quest = deploy_nft_quest();
+ let nft_mint_quest = deploy_normal_nft_quest();
let art_peace = IArtPeaceDispatcher {
contract_address: deploy_with_quests_contract(
array![].span(), array![nft_mint_quest].span()
diff --git a/postgres/init.sql b/postgres/init.sql
index 749b3e74..72dbbcf0 100644
--- a/postgres/init.sql
+++ b/postgres/init.sql
@@ -65,6 +65,20 @@ CREATE INDEX dailyQuestsInput_day_index_index ON DailyQuestsInput (day_index);
CREATE INDEX dailyQuestsInput_quest_id_index ON DailyQuestsInput (quest_id);
CREATE INDEX dailyQuestsInput_input_key_index ON DailyQuestsInput (input_key);
+CREATE TABLE DailyQuestsClaimParams (
+ day_index integer NOT NULL,
+ quest_id integer NOT NULL,
+ claim_key integer NOT NULL,
+ claim_type text NOT NULL,
+ name text NOT NULL,
+ example text,
+ input boolean NOT NULL,
+ PRIMARY KEY (day_index, quest_id, claim_key)
+);
+CREATE INDEX dailyQuestsClaimParams_day_index_index ON DailyQuestsClaimParams (day_index);
+CREATE INDEX dailyQuestsClaimParams_quest_id_index ON DailyQuestsClaimParams (quest_id);
+CREATE INDEX dailyQuestsClaimParams_claim_key_index ON DailyQuestsClaimParams (claim_key);
+
-- Table for storing the daily quests that the user has completed
CREATE TABLE UserDailyQuests (
-- Postgres auto-incrementing primary key
@@ -97,6 +111,18 @@ CREATE TABLE MainQuestsInput (
CREATE INDEX mainQuestsInput_quest_id_index ON MainQuestsInput (quest_id);
CREATE INDEX mainQuestsInput_input_key_index ON MainQuestsInput (input_key);
+CREATE TABLE MainQuestsClaimParams (
+ quest_id integer NOT NULL,
+ claim_key integer NOT NULL,
+ claim_type text NOT NULL,
+ name text NOT NULL,
+ example text,
+ input boolean NOT NULL,
+ PRIMARY KEY (quest_id, claim_key)
+);
+CREATE INDEX mainQuestsClaimParams_quest_id_index ON MainQuestsClaimParams (quest_id);
+CREATE INDEX mainQuestsClaimParams_claim_key_index ON MainQuestsClaimParams (claim_key);
+
-- Table for storing the main quests that the user has completed
CREATE TABLE UserMainQuests (
-- Postgres auto-incrementing primary key
@@ -165,8 +191,10 @@ CREATE TABLE NFTs (
position integer NOT NULL,
width integer NOT NULL,
height integer NOT NULL,
+ name text NOT NULL,
image_hash text NOT NULL,
block_number integer NOT NULL,
+ day_index integer NOT NULL,
minter char(64) NOT NULL,
owner char(64) NOT NULL
);
@@ -181,13 +209,19 @@ CREATE INDEX nftLikes_nft_key_index ON NFTLikes (nftKey);
CREATE INDEX nftLikes_liker_index ON NFTLikes (liker);
CREATE TABLE Factions (
- -- Postgres auto-incrementing primary key
- key integer PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
+ faction_id integer NOT NULL PRIMARY KEY,
name text NOT NULL,
leader char(64) NOT NULL,
- pixel_pool integer NOT NULL
+ joinable boolean NOT NULL,
+ allocation integer NOT NULL
);
CREATE INDEX factions_leader_index ON Factions (leader);
+CREATE INDEX factions_joinable_index ON Factions (joinable);
+
+CREATE TABLE ChainFactions (
+ faction_id integer NOT NULL PRIMARY KEY,
+ name text NOT NULL
+);
CREATE TABLE FactionLinks (
faction_id integer NOT NULL,
@@ -200,19 +234,47 @@ CREATE TABLE FactionLinks (
);
CREATE INDEX factionLinks_faction_id_index ON FactionLinks (faction_id);
+CREATE TABLE ChainFactionLinks (
+ faction_id integer NOT NULL,
+ icon text NOT NULL,
+ telegram text,
+ twitter text,
+ github text,
+ site text,
+ PRIMARY KEY (faction_id)
+);
+CREATE INDEX chainFactionLinks_faction_id_index ON ChainFactionLinks (faction_id);
+
CREATE TABLE FactionMembersInfo (
faction_id integer NOT NULL,
- member_id integer NOT NULL,
user_address char(64) NOT NULL,
- allocation integer NOT NULL,
last_placed_time timestamp NOT NULL,
member_pixels integer NOT NULL,
- UNIQUE (faction_id, member_id)
+ UNIQUE (faction_id, user_address)
);
CREATE INDEX factionMembersInfo_faction_id_index ON FactionMembersInfo (faction_id);
CREATE INDEX factionMembersInfo_user_address_index ON FactionMembersInfo (user_address);
+CREATE TABLE ChainFactionMembersInfo (
+ faction_id integer NOT NULL,
+ user_address char(64) NOT NULL,
+ last_placed_time timestamp NOT NULL,
+ member_pixels integer NOT NULL,
+ UNIQUE (faction_id, user_address)
+);
+CREATE INDEX chainFactionMembersInfo_faction_id_index ON ChainFactionMembersInfo (faction_id);
+CREATE INDEX chainFactionMembersInfo_user_address_index ON ChainFactionMembersInfo (user_address);
+
CREATE TABLE FactionTemplates (
template_key integer NOT NULL,
faction_id integer NOT NULL
);
+CREATE INDEX factionTemplates_template_key_index ON FactionTemplates (template_key);
+CREATE INDEX factionTemplates_faction_id_index ON FactionTemplates (faction_id);
+
+CREATE TABLE ChainFactionTemplates (
+ template_key integer NOT NULL,
+ faction_id integer NOT NULL
+);
+CREATE INDEX chainFactionTemplates_template_key_index ON ChainFactionTemplates (template_key);
+CREATE INDEX chainFactionTemplates_faction_id_index ON ChainFactionTemplates (faction_id);
diff --git a/tests/integration/docker/deploy.sh b/tests/integration/docker/deploy.sh
index 5766a658..3ed57769 100755
--- a/tests/integration/docker/deploy.sh
+++ b/tests/integration/docker/deploy.sh
@@ -42,7 +42,7 @@ CANVAS_CONFIG=$WORK_DIR/configs/canvas.config.json
QUESTS_CONFIG=$WORK_DIR/configs/quests.config.json
WIDTH=$(jq -r '.canvas.width' $CANVAS_CONFIG)
HEIGHT=$(jq -r '.canvas.height' $CANVAS_CONFIG)
-PLACE_DELAY=0x00
+PLACE_DELAY=120
COLOR_COUNT=$(jq -r '.colors[]' $CANVAS_CONFIG | wc -l | tr -d ' ')
COLORS=$(jq -r '.colors[]' $CANVAS_CONFIG | sed 's/^/0x/')
VOTABLE_COLOR_COUNT=$(jq -r '.votableColors[]' $CANVAS_CONFIG | wc -l | tr -d ' ')
@@ -106,8 +106,10 @@ echo "ART_PEACE_CONTRACT_ADDRESS=$ART_PEACE_CONTRACT_ADDRESS" > /configs/configs
echo "REACT_APP_ART_PEACE_CONTRACT_ADDRESS=$ART_PEACE_CONTRACT_ADDRESS" >> /configs/configs.env
echo "NFT_CONTRACT_ADDRESS=$NFT_CONTRACT_ADDRESS" >> /configs/configs.env
echo "REACT_APP_NFT_CONTRACT_ADDRESS=$NFT_CONTRACT_ADDRESS" >> /configs/configs.env
+echo "CANVAS_NFT_ADDRESS=$NFT_CONTRACT_ADDRESS" >> /configs/configs.env
+echo "REACT_APP_CANVAS_NFT_CONTRACT_ADDRESS=$NFT_CONTRACT_ADDRESS" >> /configs/configs.env
echo "USERNAME_STORE_ADDRESS=$USERNAME_STORE_ADDRESS" >> /configs/configs.env
-echo "REACT_APP_USERNAME_STORE_ADDRESS=$USERNAME_STORE_ADDRESS" >> /configs/configs.env
+echo "REACT_APP_USERNAME_STORE_CONTRACT_ADDRESS=$USERNAME_STORE_ADDRESS" >> /configs/configs.env
# TODO
# MULTICALL_TEMPLATE_DIR=$CONTRACT_DIR/tests/multicalls
diff --git a/tests/integration/docker/deploy_quests.sh b/tests/integration/docker/deploy_quests.sh
index 4a6ae4c9..b855a11f 100755
--- a/tests/integration/docker/deploy_quests.sh
+++ b/tests/integration/docker/deploy_quests.sh
@@ -71,7 +71,7 @@ for entry in $(echo $DAILY_QUESTS | jq -r '.[] | @base64'); do
echo " Contract type: $QUEST_TYPE"
CALLDATA=$(echo -n $QUEST_INIT_PARAMS | jq -r '[.[]] | join(" ")')
echo " Contract calldata: $CALLDATA"
- CLASS_HASH_IDX=$(echo ${DECLARED_CONTRACT_TYPES[@]} | tr ' ' '\n' | grep -n $QUEST_TYPE | cut -d: -f1)
+ CLASS_HASH_IDX=$(echo ${DECLARED_CONTRACT_TYPES[@]} | tr ' ' '\n' | grep -n ^$QUEST_TYPE$ | cut -d: -f1)
echo " Class hash index: $CLASS_HASH_IDX"
CLASS_HASH=${DECLARED_CONTRACT_HASHES[$CLASS_HASH_IDX-1]}
echo " Using class hash $CLASS_HASH"
@@ -112,7 +112,7 @@ for entry in $(echo $MAIN_QUESTS | jq -r '.[] | @base64'); do
echo " Contract type: $QUEST_TYPE"
CALLDATA=$(echo -n $QUEST_INIT_PARAMS | jq -r '[.[]] | join(" ")')
echo " Contract calldata: $CALLDATA"
- CLASS_HASH_IDX=$(echo ${DECLARED_CONTRACT_TYPES[@]} | tr ' ' '\n' | grep -n $QUEST_TYPE | cut -d: -f1)
+ CLASS_HASH_IDX=$(echo ${DECLARED_CONTRACT_TYPES[@]} | tr ' ' '\n' | grep -n ^$QUEST_TYPE$ | cut -d: -f1)
echo " Class hash index: $CLASS_HASH_IDX"
CLASS_HASH=${DECLARED_CONTRACT_HASHES[$CLASS_HASH_IDX-1]}
echo " Using class hash $CLASS_HASH"
diff --git a/tests/integration/docker/initialize.sh b/tests/integration/docker/initialize.sh
index cf0c3365..9bc07392 100755
--- a/tests/integration/docker/initialize.sh
+++ b/tests/integration/docker/initialize.sh
@@ -16,6 +16,10 @@ echo "Set the username store address"
USERNAME_STORE_ADDRESS=$(cat /configs/configs.env | grep "^USERNAME_STORE_ADDRESS" | cut -d '=' -f2)
curl http://backend:8080/set-username-store-address -X POST -d "$USERNAME_STORE_ADDRESS"
+echo "Set the canvas nft address"
+CANVAS_NFT_ADDRESS=$(cat /configs/configs.env | grep "^CANVAS_NFT_ADDRESS" | cut -d '=' -f2)
+curl http://backend:8080/set-canvas-nft-address -X POST -d "$CANVAS_NFT_ADDRESS"
+
echo "Setup the quests from the quest config"
QUESTS_CONFIG_FILE="/configs/quests.config.json"
curl http://backend:8080/init-quests -X POST -d "@$QUESTS_CONFIG_FILE"
diff --git a/tests/integration/docker/join_chain_faction.sh b/tests/integration/docker/join_chain_faction.sh
new file mode 100755
index 00000000..431e5a69
--- /dev/null
+++ b/tests/integration/docker/join_chain_faction.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+# This script runs the integration tests.
+
+# TODO: Host?
+RPC_HOST="devnet"
+RPC_PORT=5050
+
+RPC_URL=http://$RPC_HOST:$RPC_PORT
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+WORK_DIR=$SCRIPT_DIR/..
+
+#TODO: 2 seperate directories when called from the test script
+OUTPUT_DIR=$HOME/.art-peace-tests
+TIMESTAMP=$(date +%s)
+LOG_DIR=$OUTPUT_DIR/logs/$TIMESTAMP
+TMP_DIR=$OUTPUT_DIR/tmp/$TIMESTAMP
+
+# TODO: Clean option to remove old logs and state
+#rm -rf $OUTPUT_DIR/logs/*
+#rm -rf $OUTPUT_DIR/tmp/*
+mkdir -p $LOG_DIR
+mkdir -p $TMP_DIR
+
+ACCOUNT_NAME=art_peace_acct
+ACCOUNT_ADDRESS=0x328ced46664355fc4b885ae7011af202313056a7e3d44827fb24c9d3206aaa0
+ACCOUNT_PRIVATE_KEY=0x856c96eaa4e7c40c715ccc5dacd8bf6e
+ACCOUNT_PROFILE=starknet-devnet
+ACCOUNT_FILE=$TMP_DIR/starknet_accounts.json
+
+/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE account add --name $ACCOUNT_NAME --address $ACCOUNT_ADDRESS --private-key $ACCOUNT_PRIVATE_KEY
+
+#TODO: rename script and make more generic
+echo "/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME invoke --contract-address $1 --function $2 --calldata $3" > $LOG_DIR/cmd.txt
+/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json invoke --contract-address $1 --function $2 --calldata $3 > $LOG_DIR/output.json
diff --git a/tests/integration/docker/join_faction.sh b/tests/integration/docker/join_faction.sh
new file mode 100755
index 00000000..431e5a69
--- /dev/null
+++ b/tests/integration/docker/join_faction.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+# This script runs the integration tests.
+
+# TODO: Host?
+RPC_HOST="devnet"
+RPC_PORT=5050
+
+RPC_URL=http://$RPC_HOST:$RPC_PORT
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+WORK_DIR=$SCRIPT_DIR/..
+
+#TODO: 2 seperate directories when called from the test script
+OUTPUT_DIR=$HOME/.art-peace-tests
+TIMESTAMP=$(date +%s)
+LOG_DIR=$OUTPUT_DIR/logs/$TIMESTAMP
+TMP_DIR=$OUTPUT_DIR/tmp/$TIMESTAMP
+
+# TODO: Clean option to remove old logs and state
+#rm -rf $OUTPUT_DIR/logs/*
+#rm -rf $OUTPUT_DIR/tmp/*
+mkdir -p $LOG_DIR
+mkdir -p $TMP_DIR
+
+ACCOUNT_NAME=art_peace_acct
+ACCOUNT_ADDRESS=0x328ced46664355fc4b885ae7011af202313056a7e3d44827fb24c9d3206aaa0
+ACCOUNT_PRIVATE_KEY=0x856c96eaa4e7c40c715ccc5dacd8bf6e
+ACCOUNT_PROFILE=starknet-devnet
+ACCOUNT_FILE=$TMP_DIR/starknet_accounts.json
+
+/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE account add --name $ACCOUNT_NAME --address $ACCOUNT_ADDRESS --private-key $ACCOUNT_PRIVATE_KEY
+
+#TODO: rename script and make more generic
+echo "/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME invoke --contract-address $1 --function $2 --calldata $3" > $LOG_DIR/cmd.txt
+/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json invoke --contract-address $1 --function $2 --calldata $3 > $LOG_DIR/output.json
diff --git a/tests/integration/docker/leave_faction.sh b/tests/integration/docker/leave_faction.sh
new file mode 100755
index 00000000..431e5a69
--- /dev/null
+++ b/tests/integration/docker/leave_faction.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+# This script runs the integration tests.
+
+# TODO: Host?
+RPC_HOST="devnet"
+RPC_PORT=5050
+
+RPC_URL=http://$RPC_HOST:$RPC_PORT
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+WORK_DIR=$SCRIPT_DIR/..
+
+#TODO: 2 seperate directories when called from the test script
+OUTPUT_DIR=$HOME/.art-peace-tests
+TIMESTAMP=$(date +%s)
+LOG_DIR=$OUTPUT_DIR/logs/$TIMESTAMP
+TMP_DIR=$OUTPUT_DIR/tmp/$TIMESTAMP
+
+# TODO: Clean option to remove old logs and state
+#rm -rf $OUTPUT_DIR/logs/*
+#rm -rf $OUTPUT_DIR/tmp/*
+mkdir -p $LOG_DIR
+mkdir -p $TMP_DIR
+
+ACCOUNT_NAME=art_peace_acct
+ACCOUNT_ADDRESS=0x328ced46664355fc4b885ae7011af202313056a7e3d44827fb24c9d3206aaa0
+ACCOUNT_PRIVATE_KEY=0x856c96eaa4e7c40c715ccc5dacd8bf6e
+ACCOUNT_PROFILE=starknet-devnet
+ACCOUNT_FILE=$TMP_DIR/starknet_accounts.json
+
+/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE account add --name $ACCOUNT_NAME --address $ACCOUNT_ADDRESS --private-key $ACCOUNT_PRIVATE_KEY
+
+#TODO: rename script and make more generic
+echo "/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME invoke --contract-address $1 --function $2 --calldata $3" > $LOG_DIR/cmd.txt
+/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json invoke --contract-address $1 --function $2 --calldata $3 > $LOG_DIR/output.json
diff --git a/tests/integration/docker/like_nft.sh b/tests/integration/docker/like_nft.sh
new file mode 100755
index 00000000..63bd103f
--- /dev/null
+++ b/tests/integration/docker/like_nft.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+# This script runs the integration tests.
+
+# TODO: Host?
+RPC_HOST="devnet"
+RPC_PORT=5050
+
+RPC_URL=http://$RPC_HOST:$RPC_PORT
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+WORK_DIR=$SCRIPT_DIR/..
+
+#TODO: 2 seperate directories when called from the test script
+OUTPUT_DIR=$HOME/.art-peace-tests
+TIMESTAMP=$(date +%s)
+LOG_DIR=$OUTPUT_DIR/logs/$TIMESTAMP
+TMP_DIR=$OUTPUT_DIR/tmp/$TIMESTAMP
+
+# TODO: Clean option to remove old logs and state
+#rm -rf $OUTPUT_DIR/logs/*
+#rm -rf $OUTPUT_DIR/tmp/*
+mkdir -p $LOG_DIR
+mkdir -p $TMP_DIR
+
+ACCOUNT_NAME=art_peace_acct
+ACCOUNT_ADDRESS=0x328ced46664355fc4b885ae7011af202313056a7e3d44827fb24c9d3206aaa0
+ACCOUNT_PRIVATE_KEY=0x856c96eaa4e7c40c715ccc5dacd8bf6e
+ACCOUNT_PROFILE=starknet-devnet
+ACCOUNT_FILE=$TMP_DIR/starknet_accounts.json
+
+/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE account add --name $ACCOUNT_NAME --address $ACCOUNT_ADDRESS --private-key $ACCOUNT_PRIVATE_KEY
+
+#TODO: rename script and make more generic
+echo "/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME invoke --contract-address $1 --function $2 --calldata $3 $4" > $LOG_DIR/cmd.txt
+/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json invoke --contract-address $1 --function $2 --calldata $3 $4 > $LOG_DIR/output.json
diff --git a/tests/integration/docker/mint_nft.sh b/tests/integration/docker/mint_nft.sh
index b0635f4f..66a7a51b 100755
--- a/tests/integration/docker/mint_nft.sh
+++ b/tests/integration/docker/mint_nft.sh
@@ -32,5 +32,5 @@ ACCOUNT_FILE=$TMP_DIR/starknet_accounts.json
/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE account add --name $ACCOUNT_NAME --address $ACCOUNT_ADDRESS --private-key $ACCOUNT_PRIVATE_KEY
#TODO: rename script and make more generic
-echo "/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME invoke --contract-address $1 --function $2 --calldata $3 $4 $5" > $LOG_DIR/cmd.txt
-/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json invoke --contract-address $1 --function $2 --calldata $3 $4 $5 > $LOG_DIR/output.json
+echo "/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME invoke --contract-address $1 --function $2 --calldata $3 $4 $5 $6" > $LOG_DIR/cmd.txt
+/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json invoke --contract-address $1 --function $2 --calldata $3 $4 $5 $6 > $LOG_DIR/output.json
diff --git a/tests/integration/docker/setup_factions.sh b/tests/integration/docker/setup_factions.sh
index 847f1f7e..6cf6b585 100755
--- a/tests/integration/docker/setup_factions.sh
+++ b/tests/integration/docker/setup_factions.sh
@@ -26,24 +26,28 @@ for entry in $(cat $FACTIONS_CONFIG_FILE | jq -r '.factions.[] | @base64'); do
FACTION_ID=$(_jq '.id')
FACTION_NAME=$(_jq '.name')
FACTION_LEADER=$(_jq '.leader')
- FACTION_POOL=$(_jq '.pool')
- FACTION_PER_MEMBER=$(_jq '.per_member')
- FACTION_MEMBERS=$(_jq '.members')
+ JOINABLE=$(_jq '.joinable')
+ ALLOCATION=$(_jq '.allocation')
# Add faction onchain
FACTION_NAME_HEX=0x$(echo -n $FACTION_NAME | xxd -p)
- FACTION_MEMBERS_COUNT=$(echo $FACTION_MEMBERS | jq '. | length')
- FACTION_MEMBERS_CALLDATA=$(echo $FACTION_MEMBERS | jq -r '[.[]] | join(" ")')
-
- if [ $FACTION_PER_MEMBER == "true" ]; then
- POOL=$(($FACTION_POOL * $FACTION_MEMBERS_COUNT))
- else
- POOL=$FACTION_POOL
+ FACTION_JOINABLE_HEX=1
+ if [ "$JOINABLE" = "false" ]; then
+ FACTION_JOINABLE_HEX=0
fi
- CALLDATA="$FACTION_NAME_HEX $FACTION_LEADER $POOL $FACTION_MEMBERS_COUNT $FACTION_MEMBERS_CALLDATA"
+ CALLDATA="$FACTION_NAME_HEX $FACTION_LEADER $FACTION_JOINABLE_HEX $ALLOCATION"
echo "/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME invoke --contract-address $ART_PEACE_CONTRACT_ADDRESS --function init_faction --calldata $CALLDATA"
/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json invoke --contract-address $ART_PEACE_CONTRACT_ADDRESS --function init_faction --calldata $CALLDATA
done
+for entry in $(cat $FACTIONS_CONFIG_FILE | jq -r '.chain_factions.[]'); do
+ FACTION_NAME=$entry
+ FACTION_NAME_HEX=0x$(echo -n $FACTION_NAME | xxd -p)
+
+ CALLDATA="$FACTION_NAME_HEX"
+ echo "/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME invoke --contract-address $ART_PEACE_CONTRACT_ADDRESS --function init_chain_faction --calldata $CALLDATA"
+ /root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json invoke --contract-address $ART_PEACE_CONTRACT_ADDRESS --function init_chain_faction --calldata $CALLDATA
+done
+
# #TODO: rename script and make more generic
diff --git a/tests/integration/docker/unlike_nft.sh b/tests/integration/docker/unlike_nft.sh
new file mode 100755
index 00000000..63bd103f
--- /dev/null
+++ b/tests/integration/docker/unlike_nft.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+# This script runs the integration tests.
+
+# TODO: Host?
+RPC_HOST="devnet"
+RPC_PORT=5050
+
+RPC_URL=http://$RPC_HOST:$RPC_PORT
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+WORK_DIR=$SCRIPT_DIR/..
+
+#TODO: 2 seperate directories when called from the test script
+OUTPUT_DIR=$HOME/.art-peace-tests
+TIMESTAMP=$(date +%s)
+LOG_DIR=$OUTPUT_DIR/logs/$TIMESTAMP
+TMP_DIR=$OUTPUT_DIR/tmp/$TIMESTAMP
+
+# TODO: Clean option to remove old logs and state
+#rm -rf $OUTPUT_DIR/logs/*
+#rm -rf $OUTPUT_DIR/tmp/*
+mkdir -p $LOG_DIR
+mkdir -p $TMP_DIR
+
+ACCOUNT_NAME=art_peace_acct
+ACCOUNT_ADDRESS=0x328ced46664355fc4b885ae7011af202313056a7e3d44827fb24c9d3206aaa0
+ACCOUNT_PRIVATE_KEY=0x856c96eaa4e7c40c715ccc5dacd8bf6e
+ACCOUNT_PROFILE=starknet-devnet
+ACCOUNT_FILE=$TMP_DIR/starknet_accounts.json
+
+/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE account add --name $ACCOUNT_NAME --address $ACCOUNT_ADDRESS --private-key $ACCOUNT_PRIVATE_KEY
+
+#TODO: rename script and make more generic
+echo "/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME invoke --contract-address $1 --function $2 --calldata $3 $4" > $LOG_DIR/cmd.txt
+/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json invoke --contract-address $1 --function $2 --calldata $3 $4 > $LOG_DIR/output.json
+ )}
-