From 0bea55a1b2f27f4ae5539156245515c3bde9430c Mon Sep 17 00:00:00 2001 From: melanke Date: Tue, 17 Dec 2024 19:15:10 -0300 Subject: [PATCH 1/2] getFullCanvas --- packages/hardhat/contracts/PixelCanvas.sol | 333 +++++++++++++-------- 1 file changed, 211 insertions(+), 122 deletions(-) diff --git a/packages/hardhat/contracts/PixelCanvas.sol b/packages/hardhat/contracts/PixelCanvas.sol index e4b02d6..dc1e968 100644 --- a/packages/hardhat/contracts/PixelCanvas.sol +++ b/packages/hardhat/contracts/PixelCanvas.sol @@ -4,126 +4,215 @@ pragma solidity ^0.8.20; import "@openzeppelin/contracts/access/Ownable.sol"; contract PixelCanvas is Ownable { - // Canvas Dimensions - uint256 public constant CANVAS_WIDTH = 64; - uint256 public constant CANVAS_HEIGHT = 64; - - // Color Palette (Limited Options) - enum Color { - WHITE, - BLACK, - RED, - GREEN, - BLUE, - YELLOW, - PURPLE, - ORANGE - } - - // Pixel Structure - struct Pixel { - address author; - Color color; - uint256 timestamp; - } - - // Mapping to store modified pixels -mapping(uint256 => mapping(uint256 => Pixel)) public canvas; - - - // Events - event PixelPlaced(address indexed author, uint256 x, uint256 y, Color color); - event Withdrawal(address indexed owner, uint256 amount); - - // Constructor to initialize default Buidlguidl Batch11 drawing - constructor() Ownable(msg.sender){ - - // Initial drawing representing Buidlguidl Batch11 logo - initializeBuidlGuidlLogo(); - } - - /** - * @dev Initialize a default Buidlguidl Batch11 inspired pixel art - * This is a simplified representation and can be customized - */ - function initializeBuidlGuidlLogo() private { - for (uint256 x = 10; x < 20; x++) { - for (uint256 y = 10; y < 50; y++) { - canvas[x][y] = Pixel({ - author: msg.sender, - color: Color.BLUE, - timestamp: block.timestamp - }); - } - } - - // 11 representation with some pixels - for (uint256 x = 30; x < 40; x++) { - for (uint256 y = 20; y < 30; y++) { - canvas[x][y] = Pixel({ - author: msg.sender, - color: Color.GREEN, - timestamp: block.timestamp - }); - } - } - - // Add some distinctive pixels to represent Buidlguidl spirit - canvas[32][25] = Pixel({ - author: msg.sender, - color: Color.RED, - timestamp: block.timestamp - }); - } - - /** - * @dev Place a pixel on the canvas - * @param x X-coordinate of the pixel - * @param y Y-coordinate of the pixel - * @param color Color of the pixel - */ - function placePixel(uint256 x, uint256 y, Color color) external { - require(x < CANVAS_WIDTH, "X coordinate out of bounds"); - require(y < CANVAS_HEIGHT, "Y coordinate out of bounds"); - - canvas[x][y] = Pixel({ - author: msg.sender, - color: color, - timestamp: block.timestamp - }); - - emit PixelPlaced(msg.sender, x, y, color); -} - - - /** - * @dev Get pixel information - * @param x X-coordinate of the pixel - * @param y Y-coordinate of the pixel - * @return Pixel details - */ - function getPixel(uint256 x, uint256 y) external view returns (Pixel memory) { - require(x < CANVAS_WIDTH, "X coordinate out of bounds"); - require(y < CANVAS_HEIGHT, "Y coordinate out of bounds"); - return canvas[x][y]; -} - - - - function withdraw() external onlyOwner { - uint256 balance = address(this).balance; - require(balance > 0, "No funds to withdraw"); - - - (bool success, ) = payable(owner()).call{value: balance}(""); - require(success, "Transfer failed"); - - - emit Withdrawal(owner(), balance); -} - - // Fallback and receive functions to accept Ether - fallback() external payable {} - - receive() external payable {} + // Canvas Dimensions + uint256 public constant CANVAS_WIDTH = 64; + uint256 public constant CANVAS_HEIGHT = 64; + + // Color Palette (Limited Options) + enum Color { + WHITE, + BLACK, + RED, + GREEN, + BLUE, + YELLOW, + PURPLE, + ORANGE + } + + // Pixel Structure + struct Pixel { + address author; + Color color; + uint256 timestamp; + } + + // Mapping to store modified pixels + mapping(uint256 => mapping(uint256 => Pixel)) public canvas; + + // Events + event PixelPlaced( + address indexed author, + uint256 x, + uint256 y, + Color color + ); + event Withdrawal(address indexed owner, uint256 amount); + + // Constructor to initialize default Buidlguidl Batch11 drawing + constructor() Ownable(msg.sender) { + // Initial drawing representing Buidlguidl Batch11 logo + initializeBuidlGuidlLogo(); + } + + /** + * @dev Initialize a default Buidlguidl Batch11 inspired pixel art + * This is a simplified representation and can be customized + */ + function initializeBuidlGuidlLogo() private { + uint256 startx = 28; + uint256 starty = 28; + + canvas[startx][starty + 1] = Pixel({ + author: msg.sender, + color: Color.BLACK, + timestamp: block.timestamp + }); + + canvas[startx + 1][starty] = Pixel({ + author: msg.sender, + color: Color.BLACK, + timestamp: block.timestamp + }); + + canvas[startx + 1][starty + 1] = Pixel({ + author: msg.sender, + color: Color.BLACK, + timestamp: block.timestamp + }); + + canvas[startx + 1][starty + 2] = Pixel({ + author: msg.sender, + color: Color.BLACK, + timestamp: block.timestamp + }); + + canvas[startx + 1][starty + 3] = Pixel({ + author: msg.sender, + color: Color.BLACK, + timestamp: block.timestamp + }); + + canvas[startx + 1][starty + 4] = Pixel({ + author: msg.sender, + color: Color.BLACK, + timestamp: block.timestamp + }); + + canvas[startx][starty + 4] = Pixel({ + author: msg.sender, + color: Color.BLACK, + timestamp: block.timestamp + }); + canvas[startx + 2][starty + 4] = Pixel({ + author: msg.sender, + color: Color.BLACK, + timestamp: block.timestamp + }); + + startx = 32; + + canvas[startx][starty + 1] = Pixel({ + author: msg.sender, + color: Color.BLACK, + timestamp: block.timestamp + }); + + canvas[startx + 1][starty] = Pixel({ + author: msg.sender, + color: Color.BLACK, + timestamp: block.timestamp + }); + + canvas[startx + 1][starty + 1] = Pixel({ + author: msg.sender, + color: Color.BLACK, + timestamp: block.timestamp + }); + + canvas[startx + 1][starty + 2] = Pixel({ + author: msg.sender, + color: Color.BLACK, + timestamp: block.timestamp + }); + + canvas[startx + 1][starty + 3] = Pixel({ + author: msg.sender, + color: Color.BLACK, + timestamp: block.timestamp + }); + + canvas[startx + 1][starty + 4] = Pixel({ + author: msg.sender, + color: Color.BLACK, + timestamp: block.timestamp + }); + + canvas[startx][starty + 4] = Pixel({ + author: msg.sender, + color: Color.BLACK, + timestamp: block.timestamp + }); + canvas[startx + 2][starty + 4] = Pixel({ + author: msg.sender, + color: Color.BLACK, + timestamp: block.timestamp + }); + } + + /** + * @dev Place a pixel on the canvas + * @param x X-coordinate of the pixel + * @param y Y-coordinate of the pixel + * @param color Color of the pixel + */ + function placePixel(uint256 x, uint256 y, Color color) external { + require(x < CANVAS_WIDTH, "X coordinate out of bounds"); + require(y < CANVAS_HEIGHT, "Y coordinate out of bounds"); + + canvas[x][y] = Pixel({ + author: msg.sender, + color: color, + timestamp: block.timestamp + }); + + emit PixelPlaced(msg.sender, x, y, color); + } + + /** + * @dev Get pixel information + * @param x X-coordinate of the pixel + * @param y Y-coordinate of the pixel + * @return Pixel details + */ + function getPixel( + uint256 x, + uint256 y + ) external view returns (Pixel memory) { + require(x < CANVAS_WIDTH, "X coordinate out of bounds"); + require(y < CANVAS_HEIGHT, "Y coordinate out of bounds"); + return canvas[x][y]; + } + + /** + * @dev Get the entire canvas as a 2D array of pixels + * @return Array of arrays containing all pixels + */ + function getFullCanvas() external view returns (Pixel[][] memory) { + Pixel[][] memory fullCanvas = new Pixel[][](CANVAS_WIDTH); + + for (uint256 x = 0; x < CANVAS_WIDTH; x++) { + fullCanvas[x] = new Pixel[](CANVAS_HEIGHT); + for (uint256 y = 0; y < CANVAS_HEIGHT; y++) { + fullCanvas[x][y] = canvas[x][y]; + } + } + + return fullCanvas; + } + + function withdraw() external onlyOwner { + uint256 balance = address(this).balance; + require(balance > 0, "No funds to withdraw"); + + (bool success, ) = payable(owner()).call{ value: balance }(""); + require(success, "Transfer failed"); + + emit Withdrawal(owner(), balance); + } + + // Fallback and receive functions to accept Ether + fallback() external payable {} + + receive() external payable {} } From 956ffe80e74ca1dbeb7ae420e7001bc2ae38507d Mon Sep 17 00:00:00 2001 From: phipsae Date: Fri, 20 Dec 2024 07:13:47 +0100 Subject: [PATCH 2/2] update ABI, update address PixelCanvas to external contract --- .../nextjs/contracts/externalContracts.ts | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/packages/nextjs/contracts/externalContracts.ts b/packages/nextjs/contracts/externalContracts.ts index edf87fd..3df8164 100644 --- a/packages/nextjs/contracts/externalContracts.ts +++ b/packages/nextjs/contracts/externalContracts.ts @@ -806,7 +806,7 @@ const externalContracts = { ], }, PixelCanvas: { - address: "0x54c92BB9f6c3d3416c22070bcD5678cfF57784B4", + address: "0x12961542E5Aa59541F2a7bFeF3F504A406AfC946", abi: [ { inputs: [], @@ -968,6 +968,36 @@ const externalContracts = { stateMutability: "view", type: "function", }, + { + inputs: [], + name: "getFullCanvas", + outputs: [ + { + components: [ + { + internalType: "address", + name: "author", + type: "address", + }, + { + internalType: "enum PixelCanvas.Color", + name: "color", + type: "uint8", + }, + { + internalType: "uint256", + name: "timestamp", + type: "uint256", + }, + ], + internalType: "struct PixelCanvas.Pixel[][]", + name: "", + type: "tuple[][]", + }, + ], + stateMutability: "view", + type: "function", + }, { inputs: [ {