+
Dailys
{props.timeLeftInDay}
diff --git a/frontend/src/tabs/templates/EventItem.css b/frontend/src/tabs/templates/EventItem.css
new file mode 100644
index 00000000..955c9be5
--- /dev/null
+++ b/frontend/src/tabs/templates/EventItem.css
@@ -0,0 +1,107 @@
+.EventItem {
+ display: grid;
+ grid-template-columns: minmax(0, 2fr) minmax(0, 1fr);
+ padding: 0.4rem;
+ margin: 0.5rem;
+ border-radius: 0.3rem;
+ box-shadow: 0 0.3rem 0.7rem rgba(0, 0, 0, 0.5);
+ position: relative;
+}
+
+.EventItem:hover {
+ transform: translateY(-0.3rem);
+ box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.7);
+}
+
+.EventItem:active {
+ transform: translateY(0);
+ box-shadow: 0 0.3rem 0.7rem rgba(0, 0, 0, 0.5);
+}
+
+.EventItem__image {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ margin: 0;
+ padding: 0;
+ display: block;
+ border: 2px solid rgba(0, 0, 150, 0.1);
+ box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+ overflow: hidden;
+}
+
+.EventItem__desc {
+ position: absolute;
+ bottom: 0;
+ right: 0;
+ padding: 0 0.5rem;
+ margin: 0.5rem;
+ display: flex;
+ flex-direction: row;
+ justify-content: right;
+ width: 95%;
+}
+
+/* TODO: Fix ellipsis */
+.EventItem__name {
+ font-size: 1rem;
+ color: rgba(255, 255, 255, 0.8);
+ background-color: rgba(0, 0, 0, 0.5);
+ border-radius: 0.3rem;
+ box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+ margin-right: 0.5rem;
+ padding: 0 0.5rem;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+}
+
+.EventItem__users {
+ min-width: 3rem;
+ text-align: center;
+ background-color: rgba(255, 255, 255, 0.5);
+ border-radius: 0.3rem;
+ box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+ font-size: 1rem;
+ margin-right: 0.5rem;
+}
+
+.EventItem__time {
+ text-align: center;
+ background-color: rgba(255, 255, 255, 0.5);
+ border-radius: 0.3rem;
+ box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+ font-size: 1rem;
+ padding: 0 0.3rem;
+}
+
+/* TODO: icon */
+
+.EventItem__info {
+ font-size: 1rem;
+ display: flex;
+ flex-direction: column;
+ padding: 0;
+ margin: 0;
+ background-color: rgba(255, 255, 255, 0.5);
+}
+
+.EventItem__info__item {
+ flex-grow: 1;
+ text-align: center;
+ border: 2px solid rgba(0, 0, 150, 0.1);
+ padding: 0.5rem 0;
+ margin: 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
+/* Style children of .EventItem__info__item */
+.EventItem__info__item > * {
+ margin: 0;
+ padding: 0.3rem;
+}
+
+/* Underline the first child of .EventItem__info__item */
+.EventItem__info__item > *:first-child { text-decoration: underline;
+}
diff --git a/frontend/src/tabs/templates/EventItem.js b/frontend/src/tabs/templates/EventItem.js
new file mode 100644
index 00000000..b9e14208
--- /dev/null
+++ b/frontend/src/tabs/templates/EventItem.js
@@ -0,0 +1,84 @@
+import React, { useCallback, useEffect } from 'react'
+import './EventItem.css';
+import canvasConfig from "../../configs/canvas.config.json"
+
+const EventItem = props => {
+ // TODO: Reward color
+ // TODO: alt text for image
+ const posx = props.template.position % canvasConfig.canvas.width;
+ const posy = Math.floor(props.template.position / canvasConfig.canvas.width);
+
+ const [formatedEnding, setFormatedEnding] = React.useState("");
+
+ // Create changing gradient color backgroundColor
+ const [color, setColor] = React.useState(0);
+ const btrColorOffset = 1000;
+
+ useEffect(() => {
+ const interval = setInterval(() => {
+ setColor((color + 3) % 360);
+ }, 50);
+ return () => clearInterval(interval);
+ }, [color]);
+
+ // Update the time every second
+ const formatEnding = useCallback((time) => {
+ const timeDiff = time - Date.now();
+ const seconds = Math.floor(timeDiff / 1000);
+ const minutes = Math.floor(seconds / 60);
+ const hours = Math.floor(minutes / 60);
+ const pad = (num) => num < 10 ? '0' + num : num;
+ return `${pad(hours)}:${pad(minutes % 60)}:${pad(seconds % 60)}`;
+ }, []);
+
+ useEffect(() => {
+ const interval = setInterval(() => {
+ setFormatedEnding(formatEnding(props.template.end_time));
+ }, 1000);
+ return () => clearInterval(interval);
+ }, [formatEnding, props.template.end_time]);
+
+ return (
+
+
+
+
+
+
{props.template.name}
+
+
+
{props.template.users}
+
+
+
+
+
+ { props.template.reward !== undefined &&
+
+
Reward
+
{props.template.reward} {props.template.reward_token}
+
+ }
+
+
Pos
+
({posx}, {posy})
+
+
+
Size
+
{props.template.width}x{props.template.height}
+
+ { props.template.creator !== undefined &&
+
+
Creator
+
{props.template.creator}
+
+ }
+
+
+ );
+ // TODO: Handle unknown tokens
+}
+
+export default EventItem;
diff --git a/frontend/src/tabs/templates/TemplateItem.css b/frontend/src/tabs/templates/TemplateItem.css
new file mode 100644
index 00000000..975d8702
--- /dev/null
+++ b/frontend/src/tabs/templates/TemplateItem.css
@@ -0,0 +1,118 @@
+.TemplateItem {
+ display: grid;
+ grid-template-columns: minmax(0, 2fr) minmax(0, 1fr);
+ padding: 0;
+ margin: 0.5rem;
+ border-radius: 0.3rem;
+ box-shadow: 0 0.1rem 0.6rem rgba(0, 0, 0, 0.5);
+ position: relative;
+}
+
+.TemplateItem:hover {
+ transform: translateY(-0.3rem);
+ box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.5);
+}
+
+.TemplateItem:active {
+ transform: translateY(0);
+ box-shadow: 0 0.1rem 0.6rem rgba(0, 0, 0, 0.5);
+}
+
+.TemplateItem__image {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ margin: 0;
+ padding: 0;
+ display: block;
+ border: 2px solid rgba(0, 0, 150, 0.1);
+ box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+ overflow: hidden;
+ image-rendering: pixelated;
+}
+
+.TemplateItem__desc {
+ position: absolute;
+ bottom: 0;
+ right: 0;
+ padding: 0 0.5rem;
+ margin: 0.5rem;
+ display: flex;
+ flex-direction: row;
+ justify-content: right;
+ width: 95%;
+}
+
+/* TODO: Fix ellipsis */
+.TemplateItem__name {
+ font-size: 1rem;
+ color: rgba(255, 255, 255, 0.8);
+ background-color: rgba(0, 0, 0, 0.5);
+ border-radius: 0.3rem;
+ box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+ margin-right: 0.5rem;
+ padding: 0 0.5rem;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+}
+
+.TemplateItem__users {
+ min-width: 3rem;
+ text-align: center;
+ background-color: rgba(255, 255, 255, 0.5);
+ border-radius: 0.3rem;
+ box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+ font-size: 1rem;
+ margin-right: 0.5rem;
+}
+
+.TemplateItem__like {
+ min-width: 3rem;
+ text-align: center;
+ background-color: rgba(255, 255, 255, 0.5);
+ border-radius: 0.3rem;
+ box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+ font-size: 1rem;
+}
+
+.TemplateItem__like:hover {
+ background-color: rgba(255, 255, 255, 0.8);
+ transform: scale(1.1) translateY(-0.2rem);
+ box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
+}
+
+.TemplateItem__like:active {
+ transform: scale(1) translateY(0);
+ box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
+}
+
+/* TODO: icon */
+
+.TemplateItem__info {
+ font-size: 1rem;
+ display: flex;
+ flex-direction: column;
+ padding: 0;
+ margin: 0;
+}
+
+.TemplateItem__info__item {
+ flex-grow: 1;
+ text-align: center;
+ border: 2px solid rgba(0, 0, 150, 0.1);
+ padding: 0.5rem 0;
+ margin: 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
+/* Style children of .TemplateItem__info__item */
+.TemplateItem__info__item > * {
+ margin: 0;
+ padding: 0.3rem;
+}
+
+/* Underline the first child of .TemplateItem__info__item */
+.TemplateItem__info__item > *:first-child { text-decoration: underline;
+}
diff --git a/frontend/src/tabs/templates/TemplateItem.js b/frontend/src/tabs/templates/TemplateItem.js
new file mode 100644
index 00000000..bf46c4e9
--- /dev/null
+++ b/frontend/src/tabs/templates/TemplateItem.js
@@ -0,0 +1,54 @@
+import React from 'react'
+import './TemplateItem.css';
+import canvasConfig from "../../configs/canvas.config.json"
+
+const TemplateItem = props => {
+ // TODO: Reward color
+ // TODO: alt text for image
+ // TODO: Follow button in top right of image
+ const posx = props.template.position % canvasConfig.canvas.width;
+ const posy = Math.floor(props.template.position / canvasConfig.canvas.width);
+ return (
+
+
+
+
+
+
{props.template.name}
+
+
+
{props.template.users}
+
+
+
{props.template.likes}
+
+
+
+
+ { props.template.reward !== undefined &&
+
+
Reward
+
{props.template.reward} {props.template.reward_token}
+
+ }
+
+
Pos
+
({posx}, {posy})
+
+
+
Size
+
{props.template.width}x{props.template.height}
+
+ { props.template.creator !== undefined &&
+
+
Creator
+
{props.template.creator}
+
+ }
+
+
+ );
+ // TODO: Handle unknown tokens
+}
+
+export default TemplateItem;
diff --git a/frontend/src/tabs/templates/Templates.css b/frontend/src/tabs/templates/Templates.css
new file mode 100644
index 00000000..b62a88c7
--- /dev/null
+++ b/frontend/src/tabs/templates/Templates.css
@@ -0,0 +1,88 @@
+.Templates__main {
+ position: relative;
+ width: min(100%, 40rem);
+
+ transition: all 0.5s;
+}
+
+.Templates__container {
+ height: 55vh;
+ overflow-y: scroll;
+ display: flex;
+ flex-direction: column;
+ margin-top: 0.5rem;
+}
+
+.Templates__header {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-evenly;
+ align-items: center;
+}
+
+.Templates__heading {
+ font-size: 1.4rem;
+ text-align: center;
+ padding: 0;
+ padding-bottom: 0.5rem;
+ margin: 0;
+ text-decoration: underline;
+}
+
+.Templates__subheading {
+ font-size: 1.4rem;
+ text-align: center;
+ padding: 1rem 0;
+ margin: 0;
+ text-decoration: underline;
+}
+
+.Templates__create {
+ padding: 0.5rem;
+ font-size: 1.2rem;
+ text-align: center;
+ border-radius: 1rem;
+ background-color: rgba(255, 255, 255, 0.8);
+ border: 0.1rem solid rgba(0, 0, 0, 0.5);
+ cursor: pointer;
+}
+
+.Templates__create:hover {
+ transform: scale(1.1) translateY(-2px);
+ box-shadow: 0 0 1rem rgba(0, 0, 0, 0.5);
+}
+
+.Templates__create:active {
+ transform: scale(1) translateY(2px);
+ box-shadow: 0 0 1rem rgba(0, 0, 0, 0.5);
+}
+
+.Templates__all {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ width: 100%;
+ border-left: 4px solid rgba(0, 0, 0, 0.3);
+}
+
+.Templates__all__grid {
+ margin-top: 0.5rem;
+ width: 100%;
+ display: grid;
+ grid-template-columns: repeat(auto-fill, minmax(30rem, 1fr));
+ grid-template-rows: min-content;
+ height: 55vh;
+ overflow: scroll;
+}
+
+.Templates__all__item {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+
+ border-radius: 1rem;
+ background-color: rgba(255, 255, 255, 0.8);
+
+ height: 13rem;
+}
diff --git a/frontend/src/tabs/templates/Templates.js b/frontend/src/tabs/templates/Templates.js
new file mode 100644
index 00000000..93a4924f
--- /dev/null
+++ b/frontend/src/tabs/templates/Templates.js
@@ -0,0 +1,217 @@
+import React, { useRef, useState } from 'react'
+import './Templates.css';
+import EventItem from './EventItem.js';
+import TemplateItem from './TemplateItem.js';
+import ExpandableTab from '../ExpandableTab.js';
+import canvasConfig from '../../configs/canvas.config.json';
+import backendConfig from "../../configs/backend.config.json"
+
+const TemplatesMainSection = props => {
+ // Each color represented as 'RRGGBB'
+ const colorsPalette = canvasConfig.colors;
+
+ const backendUrl = "http://" + backendConfig.host + ":" + backendConfig.port
+ const imageURL = backendUrl + "/templates/"
+
+ const imageToPalette = (image) => {
+ // Convert image pixels to be within the color palette
+
+ // Get image data
+ const canvas = document.createElement('canvas');
+ const ctx = canvas.getContext('2d');
+ canvas.width = image.width;
+ canvas.height = image.height;
+ ctx.drawImage(image, 0, 0);
+ const imageData = ctx.getImageData(0, 0, image.width, image.height);
+ const data = imageData.data;
+
+ let imagePalleteIds = [];
+ // Convert image data to color palette
+ for (let i = 0; i < data.length; i += 4) {
+ if (data[i + 3] < 128) {
+ data[i] = 255;
+ data[i + 1] = 255;
+ data[i + 2] = 255;
+ data[i + 3] = 0;
+ imagePalleteIds.push(255);
+ continue;
+ }
+ let minDistance = 1000000;
+ let minColor = colorsPalette[0];
+ let minColorIndex = 0;
+ for (let j = 0; j < colorsPalette.length; j++) {
+ const color = colorsPalette[j].match(/[A-Za-z0-9]{2}/g).map(x => parseInt(x, 16));
+ const distance = Math.sqrt(Math.pow(data[i] - color[0], 2) + Math.pow(data[i + 1] - color[1], 2) + Math.pow(data[i + 2] - color[2], 2));
+ if (distance < minDistance) {
+ minDistance = distance;
+ minColor = color;
+ minColorIndex = j;
+ }
+ }
+ data[i] = minColor[0];
+ data[i + 1] = minColor[1];
+ data[i + 2] = minColor[2];
+ imagePalleteIds.push(minColorIndex);
+ }
+
+ // Set image data back to canvas
+ ctx.putImageData(imageData, 0, 0);
+ return [canvas.toDataURL(), imagePalleteIds];
+ }
+
+ const uploadTemplate = () => {
+ // Open file upload dialog
+ props.inputFile.current.click();
+ }
+
+ const handleFileChange = (event) => {
+ const file = event.target.files[0];
+ if (file === undefined) {
+ return
+ }
+
+ const reader = new FileReader();
+ reader.readAsDataURL(file);
+ reader.onload = function(e) {
+ var image = new Image();
+ image.src = e.target.result;
+
+ image.onload = function() {
+ var height = this.height;
+ var width = this.width;
+ if (height < 5 || width < 5) {
+ alert("Image is too small, minimum size is 5x5. Given size is " + width + "x" + height);
+ return;
+ }
+ if (height > 50 || width > 50) {
+ alert("Image is too large, maximum size is 50x50. Given size is " + width + "x" + height);
+ return;
+ }
+ const [paletteImage, colorIds] = imageToPalette(image);
+ // TODO: Upload to backend and get template hash back
+ props.setTemplateImage(paletteImage);
+ props.setTemplateColorIds(colorIds);
+ props.setTemplateCreationMode(true);
+ };
+ };
+ }
+
+ return (
+
+
+
+
Events
+ {props.eventTemplates.map((template, index) => {
+ return
+ })}
+ {props.availableTemplates.map((template, index) => {
+ let formattedhash = template.hash.replace("0x0", "0x")
+ template.image = imageURL + "template-" + formattedhash + ".png"
+ return
+ })}
+ Mine
+ {props.myTemplates.map((template, index) => {
+ return
+ })}
+ Subscribed
+ {props.subscribedTemplates.map((template, index) => {
+ return
+ })}
+
+
+ );
+}
+
+const TemplatesExpandedSection = props => {
+ return (
+
+
+
All Templates
+
+
+ {props.allTemplates.map((template, index) => {
+ return
+ })}
+
+
+ );
+}
+
+const Templates = props => {
+ const endTime = (minutes) => {
+ const now = Date.now();
+ const endTime = new Date(now + minutes * 60000);
+ return endTime;
+ }
+
+ const eventTemplates = [
+ { name: "Event Template 1", image: "https://www.w3schools.com/w3images/mountains.jpg", users: 20, width: 20, height: 20, end_time: endTime(10), position: 0, reward: 100, reward_token: "ETH" },
+ { name: "Event Template 2", image: "https://www.w3schools.com/w3images/mountains.jpg", users: 12, width: 25, height: 20, end_time: endTime(13), position: 47, reward: 100, reward_token: "STRK" },
+ { name: "Event Template 3", image: "https://www.w3schools.com/w3images/mountains.jpg", users: 15, width: 20, height: 20, end_time: endTime(15), position: 0, reward: 0.010, reward_token: "ETH" },
+ { name: "Event Template 4", image: "https://www.w3schools.com/w3images/mountains.jpg", users: 10, width: 20, height: 20, end_time: endTime(20), position: 0 }
+ ];
+
+ const myTemplates = [
+ { name: "My Template 1", image: "https://www.w3schools.com/w3images/mountains.jpg", users: 20, width: 20, height: 20, position: 25, likes: 10, reward: 100, reward_token: "ETH" },
+ { name: "My Template With long name 2", image: "https://www.w3schools.com/w3images/mountains.jpg", users: 12, width: 25, height: 20, position: 47, likes: 20, reward: 0.000003, reward_token: "ETH" },
+ { name: "My Template 3", image: "https://www.w3schools.com/w3images/mountains.jpg", users: 15, width: 20, height: 20, position: 0, likes: 5, reward: 200, reward_token: "STRK" },
+ { name: "My Template 4", image: "https://www.w3schools.com/w3images/mountains.jpg", users: 10, width: 20, height: 20, position: 47, likes: 15, reward: 100, reward_token: "STRK" },
+ ];
+
+ const subscribedTemplates = [
+ { name: "Subscribed Template 1", image: "https://www.w3schools.com/w3images/mountains.jpg", users: 20, width: 20, height: 20, position: 0, likes: 12, creator: "hello.stark", reward: 100, reward_token: "ETH" },
+ { name: "Subscribed Template 2", image: "https://www.w3schools.com/w3images/mountains.jpg", users: 12, width: 25, height: 20, position: 47, likes: 15, creator: "0x000000000000000000000000", reward: 200, reward_token: "STRK" },
+ { name: "Subscribed Template 3", image: "https://www.w3schools.com/w3images/mountains.jpg", users: 15, width: 20, height: 20, position: 0, likes: 20, creator: "good.stark" },
+ { name: "Subscribed Template 4", image: "https://www.w3schools.com/w3images/mountains.jpg", users: 10, width: 20, height: 20, position: 47, likes: 25, creator: "Me" }
+ ];
+
+ const allTemplates = [
+ { name: "All Template 1", image: "https://www.w3schools.com/w3images/mountains.jpg", users: 20, width: 20, height: 20, position: 0, likes: 12, creator: "hello.stark", reward: 100, reward_token: "STRK" },
+ { name: "All Template 2", image: "https://www.w3schools.com/w3images/mountains.jpg", users: 12, width: 25, height: 20, position: 47, likes: 15, creator: "0x00000000000000000000000", reward: 100, reward_token: "STRK" },
+ { name: "All Template 3", image: "https://www.w3schools.com/w3images/mountains.jpg", users: 15, width: 20, height: 20, position: 0, likes: 20, creator: "good.stark", reward: 100, reward_token: "STRK" },
+ { name: "All Template 4", image: "https://www.w3schools.com/w3images/mountains.jpg", users: 10, width: 20, height: 20, position: 47, likes: 25, creator: "Me",reward: 0.00002100023, reward_token: "ETH" },
+ { name: "All Template 5", image: "https://www.w3schools.com/w3images/mountains.jpg", users: 20, width: 20, height: 20, position: 0, likes: 12, creator: "hello.stark" },
+ { name: "All Template 6", image: "https://www.w3schools.com/w3images/mountains.jpg", users: 12, width: 25, height: 20, position: 47, likes: 15, creator: "You" },
+ { name: "All Template 7", image: "https://www.w3schools.com/w3images/mountains.jpg", users: 15, width: 20, height: 20, position: 0, likes: 20, creator: "good.stark" },
+ { name: "All Template 8", image: "https://www.w3schools.com/w3images/mountains.jpg", users: 10, width: 20, height: 20, position: 47, likes: 25, creator: "Me" },
+ { name: "All Template 9", image: "https://www.w3schools.com/w3images/mountains.jpg", users: 20, width: 20, height: 20, position: 0, likes: 12, creator: "hello.stark" },
+ { name: "All Template 10", image: "https://www.w3schools.com/w3images/mountains.jpg", users: 12, width: 25, height: 20, position: 47, likes: 15, creator: ";kjhdflakj" }
+ ];
+
+ const backendUrl = "http://" + backendConfig.host + ":" + backendConfig.port
+ const [setup, setSetup] = useState(false)
+ const [availableTemplates, setAvailableTemplates] = useState([])
+ const inputFile = useRef()
+
+ React.useEffect(() => {
+ if (!setup) {
+ setSetup(true)
+ } else {
+ return
+ }
+
+ let getTemplatesEndpoint = backendUrl + "/get-templates";
+ fetch(getTemplatesEndpoint, {
+ mode: 'cors',
+ }).then(response => {
+ return response.json();
+ }).then(data => {
+ if (data === null) {
+ data = []
+ }
+ setAvailableTemplates(data)
+ }).catch((error) => {
+ console.error('Error:', error);
+ });
+ }, [setup, backendUrl])
+
+ return (
+
+ );
+}
+
+export default Templates;
diff --git a/indexer/script.js b/indexer/script.js
index 0390248a..ce8412c2 100644
--- a/indexer/script.js
+++ b/indexer/script.js
@@ -7,9 +7,21 @@ export const config = {
events: [
{
fromAddress: Deno.env.get("ART_PEACE_CONTRACT_ADDRESS"),
- keys: [
- "0x2D7B50EBF415606D77C7E7842546FC13F8ACFBFD16F7BCF2BC2D08F54114C23",
- ],
+ keys: ["0x2D7B50EBF415606D77C7E7842546FC13F8ACFBFD16F7BCF2BC2D08F54114C23"],
+ includeReverted: false,
+ includeTransaction: false,
+ includeReceipt: false,
+ },
+ {
+ fromAddress: Deno.env.get("NFT_CONTRACT_ADDRESS"),
+ keys: ["0x30826E0CD9A517F76E857E3F3100FE5B9098E9F8216D3DB283FB4C9A641232F"],
+ includeReverted: false,
+ includeTransaction: false,
+ includeReceipt: false,
+ },
+ {
+ fromAddress: Deno.env.get("ART_PEACE_CONTRACT_ADDRESS"),
+ keys: ["0x3E18EC266FE76A2EFCE73F91228E6E04456B744FC6984C7A6374E417FB4BF59"],
includeReverted: false,
includeTransaction: false,
includeReceipt: false,
diff --git a/onchain/Scarb.toml b/onchain/Scarb.toml
index ad672acb..65bcb533 100644
--- a/onchain/Scarb.toml
+++ b/onchain/Scarb.toml
@@ -10,6 +10,8 @@ snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v
openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.11.0" }
starknet = "2.6.3"
+#[lib]
+
[scripts]
test = "snforge test"
diff --git a/onchain/src/art_peace.cairo b/onchain/src/art_peace.cairo
index 9d1bd625..e5c13f0c 100644
--- a/onchain/src/art_peace.cairo
+++ b/onchain/src/art_peace.cairo
@@ -82,7 +82,6 @@ pub mod ArtPeace {
pub end_time: u64,
pub daily_quests: Span
,
pub main_quests: Span,
- pub nft_contract: ContractAddress,
}
const DAY_IN_SECONDS: u64 = consteval_int!(60 * 60 * 24);
@@ -108,6 +107,12 @@ pub mod ArtPeace {
self.end_time.write(init_params.end_time);
self.day_index.write(0);
+ // TODO: Dev only - remove
+ let test_address = starknet::contract_address_const::<
+ 0x328ced46664355fc4b885ae7011af202313056a7e3d44827fb24c9d3206aaa0
+ >();
+ self.extra_pixels.write(test_address, 1000);
+
// TODO: To config
let daily_quests_count = self.get_daily_quest_count();
let mut i = 0;
@@ -127,8 +132,6 @@ pub mod ArtPeace {
self.main_quests.write(i, *init_params.main_quests.at(i));
i += 1;
};
-
- self.nft_contract.write(init_params.nft_contract);
}
#[abi(embed_v0)]
@@ -165,13 +168,16 @@ pub mod ArtPeace {
fn place_pixel(ref self: ContractState, pos: u128, color: u8) {
let now = starknet::get_block_timestamp();
- assert(now <= self.end_time.read(), '');
- assert(pos < self.total_pixels.read(), '');
- assert(color < self.color_count.read(), '');
+ assert(now <= self.end_time.read(), 'ArtPeace game has ended');
+ assert(pos < self.total_pixels.read(), 'Position out of bounds');
+ assert(color < self.color_count.read(), 'Color out of bounds');
// TODO: Use sender not caller?
let caller = starknet::get_caller_address();
// TODO: Only if the user has placed a pixel before?
- assert(now - self.last_placed_time.read(caller) >= self.time_between_pixels.read(), '');
+ assert(
+ now - self.last_placed_time.read(caller) >= self.time_between_pixels.read(),
+ 'Pixel not available'
+ );
let pixel = Pixel { color, owner: caller };
self.canvas.write(pos, pixel);
self.last_placed_time.write(caller, now);
@@ -191,12 +197,12 @@ pub mod ArtPeace {
fn place_extra_pixels(ref self: ContractState, positions: Array, colors: Array) {
let now = starknet::get_block_timestamp();
- assert(now <= self.end_time.read(), '');
+ assert(now <= self.end_time.read(), 'ArtPeace game has ended');
let pixel_count = positions.len();
- assert(pixel_count == colors.len(), '');
+ assert(pixel_count == colors.len(), 'Positions & Colors must match');
let caller = starknet::get_caller_address();
let extra_pixels = self.extra_pixels.read(caller);
- assert(pixel_count <= extra_pixels, '');
+ assert(pixel_count <= extra_pixels, 'Not enough extra pixels');
let color_palette_count = self.color_count.read();
let total_pixels = self.total_pixels.read();
let day = self.day_index.read();
@@ -204,8 +210,8 @@ pub mod ArtPeace {
while i < pixel_count {
let pos = *positions.at(i);
let color = *colors.at(i);
- assert(pos < total_pixels, '');
- assert(color < color_palette_count, '');
+ assert(pos < total_pixels, 'Position out of bounds');
+ assert(color < color_palette_count, 'Color out of bounds');
let pixel = Pixel { color, owner: caller };
self.canvas.write(pos, pixel);
self
@@ -214,6 +220,7 @@ pub mod ArtPeace {
(day, caller, color), self.user_pixels_placed.read((day, caller, color)) + 1
);
i += 1;
+ self.emit(PixelPlaced { placed_by: caller, pos, day, color });
};
self.extra_pixels.write(caller, extra_pixels - pixel_count);
//TODO: to extra pixel self.emit(ExtraPixelsPlaced { placed_by: caller, positions, day, colors });
@@ -353,7 +360,7 @@ pub mod ArtPeace {
fn claim_today_quest(ref self: ContractState, quest_id: u32, calldata: Span) {
let now = starknet::get_block_timestamp();
- assert(now <= self.end_time.read(), '');
+ assert(now <= self.end_time.read(), 'ArtPeace game has ended');
let quest = self.daily_quests.read((self.day_index.read(), quest_id));
let user = starknet::get_caller_address();
let reward = IQuestDispatcher { contract_address: quest }.claim(user, calldata);
@@ -369,7 +376,7 @@ pub mod ArtPeace {
fn claim_main_quest(ref self: ContractState, quest_id: u32, calldata: Span) {
let now = starknet::get_block_timestamp();
- assert(now <= self.end_time.read(), '');
+ assert(now <= self.end_time.read(), 'ArtPeace game has ended');
let quest = self.main_quests.read(quest_id);
let user = starknet::get_caller_address();
let reward = IQuestDispatcher { contract_address: quest }.claim(user, calldata);
@@ -440,6 +447,14 @@ pub mod ArtPeace {
#[abi(embed_v0)]
impl ArtPeaceNFTMinter of IArtPeaceNFTMinter {
+ fn add_nft_contract(ref self: ContractState, nft_contract: ContractAddress) {
+ let zero_address = starknet::contract_address_const::<0>();
+ assert(self.nft_contract.read() == zero_address, 'NFT contract already set');
+ self.nft_contract.write(nft_contract);
+ ICanvasNFTAdditionalDispatcher { contract_address: nft_contract }
+ .set_canvas_contract(starknet::get_contract_address());
+ }
+
fn mint_nft(self: @ContractState, mint_params: NFTMintParams) {
let metadata = NFTMetadata {
position: mint_params.position,
@@ -459,8 +474,8 @@ pub mod ArtPeace {
impl ArtPeaceTemplateVerifier of ITemplateVerifier {
// TODO: Check template function
fn complete_template(ref self: ContractState, template_id: u32, template_image: Span) {
- assert(template_id < self.get_templates_count(), '');
- assert(!self.is_template_complete(template_id), '');
+ assert(template_id < self.get_templates_count(), 'Template ID out of bounds');
+ assert(!self.is_template_complete(template_id), 'Template already completed');
// TODO: ensure template_image matches the template size & hash
let template_metadata: TemplateMetadata = self.get_template(template_id);
let non_zero_width: core::zeroable::NonZero:: = template_metadata
diff --git a/onchain/src/nfts/canvas_nft.cairo b/onchain/src/nfts/canvas_nft.cairo
index 537d6ed2..5524a792 100644
--- a/onchain/src/nfts/canvas_nft.cairo
+++ b/onchain/src/nfts/canvas_nft.cairo
@@ -4,6 +4,7 @@ mod CanvasNFT {
use openzeppelin::introspection::src5::SRC5Component;
use starknet::ContractAddress;
use art_peace::nfts::component::CanvasNFTStoreComponent;
+ use art_peace::nfts::component::CanvasNFTStoreComponent::CanvasNFTMinted;
use art_peace::nfts::{ICanvasNFTAdditional, NFTMetadata};
component!(path: ERC721Component, storage: erc721, event: ERC721Event);
@@ -45,16 +46,19 @@ mod CanvasNFT {
}
#[constructor]
- fn constructor(
- ref self: ContractState, name: ByteArray, symbol: ByteArray, art_peace_addr: ContractAddress
- ) {
- self.art_peace.write(art_peace_addr);
- let base_uri = format!("{:?}", art_peace_addr);
+ fn constructor(ref self: ContractState, name: ByteArray, symbol: ByteArray) {
+ let base_uri = "test"; // TODO: change to real base uri
self.erc721.initializer(name, symbol, base_uri);
}
#[abi(embed_v0)]
impl CanvasNFTAdditional of ICanvasNFTAdditional {
+ fn set_canvas_contract(ref self: ContractState, canvas_contract: ContractAddress) {
+ let zero_address = starknet::contract_address_const::<0>();
+ assert(self.art_peace.read() == zero_address, 'ArtPeace contract already set');
+ self.art_peace.write(canvas_contract);
+ }
+
fn mint(ref self: ContractState, metadata: NFTMetadata, receiver: ContractAddress) {
assert(
self.art_peace.read() == starknet::get_caller_address(),
@@ -64,7 +68,7 @@ mod CanvasNFT {
self.nfts.nfts_data.write(token_id, metadata);
self.erc721._mint(receiver, token_id);
self.nfts.nfts_count.write(token_id + 1);
- // TODO: self.emit(Event::NFTEvent::CanvasNFTMinted { token_id, metadata });
+ self.nfts.emit(CanvasNFTMinted { token_id, metadata });
}
}
}
diff --git a/onchain/src/nfts/component.cairo b/onchain/src/nfts/component.cairo
index e0d8eb70..87b71993 100644
--- a/onchain/src/nfts/component.cairo
+++ b/onchain/src/nfts/component.cairo
@@ -16,10 +16,10 @@ pub mod CanvasNFTStoreComponent {
}
#[derive(Drop, starknet::Event)]
- struct CanvasNFTMinted {
+ pub struct CanvasNFTMinted {
#[key]
- token_id: u256,
- metadata: NFTMetadata,
+ pub token_id: u256,
+ pub metadata: NFTMetadata,
}
#[embeddable_as(CanvasNFTStoreImpl)]
diff --git a/onchain/src/nfts/interfaces.cairo b/onchain/src/nfts/interfaces.cairo
index dccf722d..f5c5c3f4 100644
--- a/onchain/src/nfts/interfaces.cairo
+++ b/onchain/src/nfts/interfaces.cairo
@@ -5,7 +5,7 @@ pub struct NFTMintParams {
pub height: u128,
}
-#[derive(Drop, Serde, PartialEq, starknet::Store)]
+#[derive(Drop, Copy, Serde, PartialEq, starknet::Store)]
pub struct NFTMetadata {
pub position: u128,
pub width: u128,
@@ -28,12 +28,16 @@ pub trait ICanvasNFTStore {
#[starknet::interface]
pub trait ICanvasNFTAdditional {
+ // Sets up the contract addresses
+ fn set_canvas_contract(ref self: TContractState, canvas_contract: starknet::ContractAddress);
// Mint a new NFT called by the ArtPeaceNFTMinter contract.
fn mint(ref self: TContractState, metadata: NFTMetadata, receiver: starknet::ContractAddress);
}
#[starknet::interface]
pub trait IArtPeaceNFTMinter {
+ // Sets up the contract addresses
+ fn add_nft_contract(ref self: TContractState, nft_contract: starknet::ContractAddress);
// Mints a new NFT from the canvas using init params, and returns the token ID.
fn mint_nft(self: @TContractState, mint_params: NFTMintParams);
}
diff --git a/onchain/src/templates/interfaces.cairo b/onchain/src/templates/interfaces.cairo
index 2ecb9962..41f0f967 100644
--- a/onchain/src/templates/interfaces.cairo
+++ b/onchain/src/templates/interfaces.cairo
@@ -3,6 +3,7 @@ use starknet::ContractAddress;
#[derive(Drop, Copy, Serde, starknet::Store)]
pub struct TemplateMetadata {
pub hash: felt252,
+ pub name: felt252,
pub position: u128,
pub width: u128,
pub height: u128,
diff --git a/onchain/src/tests/art_peace.cairo b/onchain/src/tests/art_peace.cairo
index 73c10d43..8b685325 100644
--- a/onchain/src/tests/art_peace.cairo
+++ b/onchain/src/tests/art_peace.cairo
@@ -82,7 +82,6 @@ fn deploy_contract() -> ContractAddress {
end_time: 1000000,
daily_quests: array![].span(),
main_quests: array![].span(),
- nft_contract: NFT_CONTRACT(),
}
.serialize(ref calldata);
let contract_addr = contract.deploy_at(@calldata, ART_PEACE_CONTRACT()).unwrap();
@@ -119,7 +118,6 @@ fn deploy_with_quests_contract(
end_time: 1000000,
daily_quests: daily_quests,
main_quests: main_quests,
- nft_contract: NFT_CONTRACT(),
}
.serialize(ref calldata);
let contract_addr = contract.deploy_at(@calldata, ART_PEACE_CONTRACT()).unwrap();
@@ -195,7 +193,6 @@ fn deploy_nft_contract() -> ContractAddress {
let symbol: ByteArray = "A/P";
name.serialize(ref calldata);
symbol.serialize(ref calldata);
- calldata.append(ART_PEACE_CONTRACT().into());
contract.deploy_at(@calldata, NFT_CONTRACT()).unwrap()
}
@@ -402,7 +399,13 @@ fn template_full_basic_test() {
let template_image = array![1, 2, 3, 4];
let template_hash = compute_template_hash(template_image.span());
let template_metadata = TemplateMetadata {
- hash: template_hash, position: 0, width: 2, height: 2, reward: 0, reward_token: erc20_mock,
+ name: 'test',
+ hash: template_hash,
+ position: 0,
+ width: 2,
+ height: 2,
+ reward: 0,
+ reward_token: erc20_mock,
};
template_store.add_template(template_metadata);
@@ -500,6 +503,7 @@ fn nft_mint_test() {
let nft_minter = IArtPeaceNFTMinterDispatcher { contract_address: art_peace.contract_address };
let nft_store = ICanvasNFTStoreDispatcher { contract_address: NFT_CONTRACT() };
let nft = IERC721Dispatcher { contract_address: NFT_CONTRACT() };
+ nft_minter.add_nft_contract(NFT_CONTRACT());
let mint_params = NFTMintParams { position: 10, width: 16, height: 16, };
snf::start_prank(CheatTarget::One(nft_minter.contract_address), PLAYER1());
@@ -544,6 +548,7 @@ fn deposit_reward_test() {
let template_image = array![1, 2, 3, 4];
let template_hash = compute_template_hash(template_image.span());
let template_metadata = TemplateMetadata {
+ name: 'test',
hash: template_hash,
position: 0,
width: 2,
diff --git a/postgres/init.sql b/postgres/init.sql
index f3fe8bc5..420640e9 100644
--- a/postgres/init.sql
+++ b/postgres/init.sql
@@ -109,5 +109,18 @@ CREATE TABLE Templates (
width integer NOT NULL,
height integer NOT NULL,
position integer NOT NULL,
- data bytea NOT NULL
+ reward integer NOT NULL,
+ rewardToken char(64) NOT NULL
+-- ,data bytea NOT NULL
+);
+
+-- TODO: Owner & change on transfer
+CREATE TABLE NFTs (
+ key integer NOT NULL PRIMARY KEY,
+ position integer NOT NULL,
+ width integer NOT NULL,
+ height integer NOT NULL,
+ imageHash text NOT NULL,
+ blockNumber integer NOT NULL,
+ minter char(64) NOT NULL
);
diff --git a/tests/integration/docker/add_template.sh b/tests/integration/docker/add_template.sh
new file mode 100755
index 00000000..aee9031b
--- /dev/null
+++ b/tests/integration/docker/add_template.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 $5 $6 $7 0 $8 $9" > $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 $7 0 $8 $9 > $LOG_DIR/output.json
diff --git a/tests/integration/docker/deploy.sh b/tests/integration/docker/deploy.sh
index 7204e68a..7e455e2f 100755
--- a/tests/integration/docker/deploy.sh
+++ b/tests/integration/docker/deploy.sh
@@ -30,14 +30,19 @@ 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
-
CONTRACT_DIR=$WORK_DIR/onchain
-CLASS_NAME="ArtPeace"
+ART_PEACE_CLASS_NAME="ArtPeace"
#TODO: Issue if no declare done
-CLASS_DECLARE_RESULT=$(cd $CONTRACT_DIR && /root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json declare --contract-name $CLASS_NAME | tail -n 1)
-CLASS_HASH=$(echo $CLASS_DECLARE_RESULT | jq -r '.class_hash')
-echo "Declared class \"$CLASS_NAME\" with hash $CLASS_HASH"
+ART_PEACE_CLASS_DECLARE_RESULT=$(cd $CONTRACT_DIR && /root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json declare --contract-name $ART_PEACE_CLASS_NAME | tail -n 1)
+ART_PEACE_CLASS_HASH=$(echo $ART_PEACE_CLASS_DECLARE_RESULT | jq -r '.class_hash')
+echo "Declared class \"$ART_PEACE_CLASS_NAME\" with hash $ART_PEACE_CLASS_HASH"
+
+NFT_CLASS_NAME="CanvasNFT"
+
+NFT_CLASS_DECLARE_RESULT=$(cd $CONTRACT_DIR && /root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json declare --contract-name $NFT_CLASS_NAME | tail -n 1)
+NFT_CLASS_HASH=$(echo $NFT_CLASS_DECLARE_RESULT | jq -r '.class_hash')
+echo "Declared class \"$NFT_CLASS_NAME\" with hash $NFT_CLASS_HASH"
CANVAS_CONFIG=$WORK_DIR/configs/canvas.config.json
WIDTH=$(jq -r '.canvas.width' $CANVAS_CONFIG)
@@ -48,18 +53,37 @@ COLORS=$(jq -r '.colors[]' $CANVAS_CONFIG | sed 's/^/0x/')
END_TIME=3000000000
# [WIDTH, HEIGHT, TIME_BETWEEN_PIXELS, COLOR_PALLETE_LEN, COLORS, END_TIME, DAILY_QUESTS_LEN, D AILY_QUESTS, DAILY_QUESTS_LEN, MAIN_QUESTS, NFT_CONTRACT]
-CALLDATA=$(echo -n $WIDTH $HEIGHT $PLACE_DELAY $COLOR_COUNT $COLORS $END_TIME 0 0 0)
+CALLDATA=$(echo -n $WIDTH $HEIGHT $PLACE_DELAY $COLOR_COUNT $COLORS $END_TIME 0 0)
+
+# Precalculated contract address
+# echo "Precalculating contract address..."
# TODO: calldata passed as parameters
-echo "Deploying contract \"$CLASS_NAME\"..."
-echo "/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json deploy --class-hash $CLASS_HASH --constructor-calldata $CALLDATA"
-CONTRACT_DEPLOY_RESULT=$(/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json deploy --class-hash $CLASS_HASH --constructor-calldata $CALLDATA | tail -n 1)
-CONTRACT_ADDRESS=$(echo $CONTRACT_DEPLOY_RESULT | jq -r '.contract_address')
-echo "Deployed contract \"$CLASS_NAME\" with address $CONTRACT_ADDRESS"
+echo "Deploying contract \"$ART_PEACE_CLASS_NAME\"..."
+echo "/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json deploy --class-hash $ART_PEACE_CLASS_HASH --constructor-calldata $CALLDATA"
+ART_PEACE_CONTRACT_DEPLOY_RESULT=$(/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json deploy --class-hash $ART_PEACE_CLASS_HASH --constructor-calldata $CALLDATA | tail -n 1)
+ART_PEACE_CONTRACT_ADDRESS=$(echo $ART_PEACE_CONTRACT_DEPLOY_RESULT | jq -r '.contract_address')
+echo "Deployed contract \"$ART_PEACE_CLASS_NAME\" with address $ART_PEACE_CONTRACT_ADDRESS"
+
+NFT_NAME="0 318195848183955342120051 10"
+NFT_SYMBOL="0 4271952 3"
+CALLDATA=$(echo -n $NFT_NAME $NFT_SYMBOL)
+
+echo "Deploying contract \"$NFT_CLASS_NAME\"..."
+echo "/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json deploy --class-hash $NFT_CLASS_HASH --constructor-calldata $CALLDATA"
+NFT_CONTRACT_DEPLOY_RESULT=$(/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json deploy --class-hash $NFT_CLASS_HASH --constructor-calldata $CALLDATA | tail -n 1)
+NFT_CONTRACT_ADDRESS=$(echo $NFT_CONTRACT_DEPLOY_RESULT | jq -r '.contract_address')
+echo "Deployed contract \"$NFT_CLASS_NAME\" with address $NFT_CONTRACT_ADDRESS"
+
+echo "Setting up contract \"$ART_PEACE_CLASS_NAME\"..."
+echo "/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json invoke --contract-address $ART_PEACE_CONTRACT_ADDRESS --function set_nft_contract --calldata $NFT_CONTRACT_ADDRESS"
+/root/.local/bin/sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json invoke --contract-address $ART_PEACE_CONTRACT_ADDRESS --function add_nft_contract --calldata $NFT_CONTRACT_ADDRESS
# TODO: Remove these lines?
-echo "ART_PEACE_CONTRACT_ADDRESS=$CONTRACT_ADDRESS" > /configs/configs.env
-echo "REACT_APP_ART_PEACE_CONTRACT_ADDRESS=$CONTRACT_ADDRESS" >> /configs/configs.env
+echo "ART_PEACE_CONTRACT_ADDRESS=$ART_PEACE_CONTRACT_ADDRESS" > /configs/configs.env
+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
# TODO
# MULTICALL_TEMPLATE_DIR=$CONTRACT_DIR/tests/multicalls
diff --git a/tests/integration/docker/initialize.sh b/tests/integration/docker/initialize.sh
index 8d7a8f7e..5f35eab2 100755
--- a/tests/integration/docker/initialize.sh
+++ b/tests/integration/docker/initialize.sh
@@ -9,7 +9,7 @@ echo "Initializing the canvas"
curl http://backend:8080/initCanvas -X POST
echo "Set the contract address"
-CONTRACT_ADDRESS=$(cat /configs/configs.env | tail -n 1 | cut -d '=' -f2)
+CONTRACT_ADDRESS=$(cat /configs/configs.env | grep "^ART_PEACE_CONTRACT_ADDRESS" | cut -d '=' -f2)
curl http://backend:8080/setContractAddress -X POST -d "$CONTRACT_ADDRESS"
echo "Setup the colors from the color config"
diff --git a/tests/integration/docker/mint_nft.sh b/tests/integration/docker/mint_nft.sh
new file mode 100755
index 00000000..b0635f4f
--- /dev/null
+++ b/tests/integration/docker/mint_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 $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
diff --git a/tests/integration/docker/place_extra_pixels.sh b/tests/integration/docker/place_extra_pixels.sh
new file mode 100755
index 00000000..63bd103f
--- /dev/null
+++ b/tests/integration/docker/place_extra_pixels.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/local/add_template.sh b/tests/integration/local/add_template.sh
new file mode 100755
index 00000000..d00b6bb5
--- /dev/null
+++ b/tests/integration/local/add_template.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+# This script runs the integration tests.
+
+# TODO: Host?
+RPC_HOST="127.0.0.1"
+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
+
+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 "sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME invoke --contract-address $1 --function $2 --calldata $3 $4 $5 $6 $7 0 $8 $9" > $LOG_DIR/cmd.txt
+sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json invoke --contract-address $1 --function $2 --calldata $3 $4 $5 $6 $7 0 $8 $9 > $LOG_DIR/output.json
diff --git a/tests/integration/local/deploy.sh b/tests/integration/local/deploy.sh
index cf398e4e..7c928bc7 100755
--- a/tests/integration/local/deploy.sh
+++ b/tests/integration/local/deploy.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# This script runs the integration tests.
+# This script deploys the ArtPeace contract to the StarkNet devnet locally
RPC_HOST="127.0.0.1"
RPC_PORT=5050
@@ -30,14 +30,19 @@ ACCOUNT_FILE=$TMP_DIR/starknet_accounts.json
sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE account add --name $ACCOUNT_NAME --address $ACCOUNT_ADDRESS --private-key $ACCOUNT_PRIVATE_KEY
-
CONTRACT_DIR=$WORK_DIR/onchain
-CLASS_NAME="ArtPeace"
+ART_PEACE_CLASS_NAME="ArtPeace"
#TODO: Issue if no declare done
-CLASS_DECLARE_RESULT=$(cd $CONTRACT_DIR && sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json declare --contract-name $CLASS_NAME | tail -n 1)
-CLASS_HASH=$(echo $CLASS_DECLARE_RESULT | jq -r '.class_hash')
-echo "Declared class \"$CLASS_NAME\" with hash $CLASS_HASH"
+ART_PEACE_CLASS_DECLARE_RESULT=$(cd $CONTRACT_DIR && sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json declare --contract-name $ART_PEACE_CLASS_NAME | tail -n 1)
+ART_PEACE_CLASS_HASH=$(echo $ART_PEACE_CLASS_DECLARE_RESULT | jq -r '.class_hash')
+echo "Declared class \"$ART_PEACE_CLASS_NAME\" with hash $ART_PEACE_CLASS_HASH"
+
+NFT_CLASS_NAME="CanvasNFT"
+
+NFT_CLASS_DECLARE_RESULT=$(cd $CONTRACT_DIR && sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json declare --contract-name $NFT_CLASS_NAME | tail -n 1)
+NFT_CLASS_HASH=$(echo $NFT_CLASS_DECLARE_RESULT | jq -r '.class_hash')
+echo "Declared class \"$NFT_CLASS_NAME\" with hash $NFT_CLASS_HASH"
CANVAS_CONFIG=$WORK_DIR/configs/canvas.config.json
WIDTH=$(jq -r '.canvas.width' $CANVAS_CONFIG)
@@ -47,15 +52,32 @@ COLOR_COUNT=$(jq -r '.colors[]' $CANVAS_CONFIG | wc -l | tr -d ' ')
COLORS=$(jq -r '.colors[]' $CANVAS_CONFIG | sed 's/^/0x/')
END_TIME=3000000000
-# [WIDTH, HEIGHT, TIME_BETWEEN_PIXELS, COLOR_PALLETE_LEN, COLORS, END_TIME, DAILY_QUESTS_LEN, DAILY_QUESTS, DAILY_QUESTS_LEN, MAIN_QUESTS]
-CALLDATA=$(echo -n $WIDTH $HEIGHT $PLACE_DELAY $COLOR_COUNT $COLORS $END_TIME 0 0 0)
-echo "Calldata: $CALLDATA"
+# [WIDTH, HEIGHT, TIME_BETWEEN_PIXELS, COLOR_PALLETE_LEN, COLORS, END_TIME, DAILY_QUESTS_LEN, D AILY_QUESTS, DAILY_QUESTS_LEN, MAIN_QUESTS, NFT_CONTRACT]
+CALLDATA=$(echo -n $WIDTH $HEIGHT $PLACE_DELAY $COLOR_COUNT $COLORS $END_TIME 0 0)
+
+# Precalculated contract address
+# echo "Precalculating contract address..."
+
# TODO: calldata passed as parameters
-echo "Deploying contract \"$CLASS_NAME\"..."
-echo "sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json deploy --class-hash $CLASS_HASH --constructor-calldata $CALLDATA"
-CONTRACT_DEPLOY_RESULT=$(sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json deploy --class-hash $CLASS_HASH --constructor-calldata $CALLDATA | tail -n 1)
-CONTRACT_ADDRESS=$(echo $CONTRACT_DEPLOY_RESULT | jq -r '.contract_address')
-echo "Deployed contract \"$CLASS_NAME\" with address $CONTRACT_ADDRESS"
+echo "Deploying contract \"$ART_PEACE_CLASS_NAME\"..."
+echo "sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json deploy --class-hash $ART_PEACE_CLASS_HASH --constructor-calldata $CALLDATA"
+ART_PEACE_CONTRACT_DEPLOY_RESULT=$(sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json deploy --class-hash $ART_PEACE_CLASS_HASH --constructor-calldata $CALLDATA | tail -n 1)
+ART_PEACE_CONTRACT_ADDRESS=$(echo $ART_PEACE_CONTRACT_DEPLOY_RESULT | jq -r '.contract_address')
+echo "Deployed contract \"$ART_PEACE_CLASS_NAME\" with address $ART_PEACE_CONTRACT_ADDRESS"
+
+NFT_NAME="0 318195848183955342120051 10"
+NFT_SYMBOL="0 4271952 3"
+CALLDATA=$(echo -n $NFT_NAME $NFT_SYMBOL)
+
+echo "Deploying contract \"$NFT_CLASS_NAME\"..."
+echo "sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json deploy --class-hash $NFT_CLASS_HASH --constructor-calldata $CALLDATA"
+NFT_CONTRACT_DEPLOY_RESULT=$(sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json deploy --class-hash $NFT_CLASS_HASH --constructor-calldata $CALLDATA | tail -n 1)
+NFT_CONTRACT_ADDRESS=$(echo $NFT_CONTRACT_DEPLOY_RESULT | jq -r '.contract_address')
+echo "Deployed contract \"$NFT_CLASS_NAME\" with address $NFT_CONTRACT_ADDRESS"
+
+echo "Setting up contract \"$ART_PEACE_CLASS_NAME\"..."
+echo "sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json invoke --contract-address $ART_PEACE_CONTRACT_ADDRESS --function set_nft_contract --calldata $NFT_CONTRACT_ADDRESS"
+sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait --json invoke --contract-address $ART_PEACE_CONTRACT_ADDRESS --function add_nft_contract --calldata $NFT_CONTRACT_ADDRESS
# TODO
# MULTICALL_TEMPLATE_DIR=$CONTRACT_DIR/tests/multicalls
@@ -66,3 +88,5 @@ echo "Deployed contract \"$CLASS_NAME\" with address $CONTRACT_ADDRESS"
# sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait multicall run --path $HELLO_STARKNET_MULTI
#
# sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME --wait call --contract-address $CONTRACT_ADDRESS --function get_balance --block-id latest
+#
+# TODO: exit 1 on failure
diff --git a/tests/integration/local/mint_nft.sh b/tests/integration/local/mint_nft.sh
new file mode 100755
index 00000000..a99c1212
--- /dev/null
+++ b/tests/integration/local/mint_nft.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+# This script runs the integration tests.
+
+# TODO: Host?
+RPC_HOST="127.0.0.1"
+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
+
+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 "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
+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
diff --git a/tests/integration/local/place_extra_pixels.sh b/tests/integration/local/place_extra_pixels.sh
new file mode 100755
index 00000000..e0551d10
--- /dev/null
+++ b/tests/integration/local/place_extra_pixels.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+#
+# This script runs the integration tests.
+
+RPC_HOST="127.0.0.1"
+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
+
+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 "sncast --url $RPC_URL --accounts-file $ACCOUNT_FILE --account $ACCOUNT_NAME invoke --contract-address $1 --function $2 --calldata $3 $4" > $LOG_DIR/cmd.txt
+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/local/run.sh b/tests/integration/local/run.sh
index 6e7d4986..a190d19d 100755
--- a/tests/integration/local/run.sh
+++ b/tests/integration/local/run.sh
@@ -67,8 +67,10 @@ DEPLOY_LOG_FILE=$LOG_DIR/deploy.log
touch $DEPLOY_LOG_FILE
$SCRIPT_DIR/deploy.sh 2>&1 > $DEPLOY_LOG_FILE
# Read last word of last line of deploy log
-ART_PEACE_CONTRACT_ADDRESS=$(cat $DEPLOY_LOG_FILE | tail -n 1 | awk '{print $NF}')
+ART_PEACE_CONTRACT_ADDRESS=$(cat $DEPLOY_LOG_FILE | grep Deployed\ contract\ \"ArtPeace\" | tail -n 1 | awk '{print $NF}')
+CANVAS_NFT_CONTRACT_ADDRESS=$(cat $DEPLOY_LOG_FILE | grep Deployed\ contract\ \"CanvasNFT\" | tail -n 1 | awk '{print $NF}')
echo "Deployed art-peace contract(s) at $ART_PEACE_CONTRACT_ADDRESS"
+echo "Deployed canvas NFT contract at $CANVAS_NFT_CONTRACT_ADDRESS"
# Start the art-peace place_pixel indexer script
echo "Starting art-peace place_pixel indexer script ..."
@@ -80,6 +82,7 @@ cd $WORK_DIR/indexer
rm -f $TMP_DIR/indexer.env
touch $TMP_DIR/indexer.env
echo "ART_PEACE_CONTRACT_ADDRESS=$ART_PEACE_CONTRACT_ADDRESS" >> $TMP_DIR/indexer.env
+echo "NFT_CONTRACT_ADDRESS=$CANVAS_NFT_CONTRACT_ADDRESS" >> $TMP_DIR/indexer.env
echo "APIBARA_STREAM_URL=http://localhost:7171" >> $TMP_DIR/indexer.env
echo "BACKEND_TARGET_URL=http://localhost:8080/consumeIndexerMsg" >> $TMP_DIR/indexer.env
apibara run script.js --allow-env $TMP_DIR/indexer.env 2>&1 > $INDEXER_SCRIPT_LOG_FILE &