From ec8bb7397ff58fb8c16e9be3e80de95b99abac39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Barbora?= Date: Mon, 13 Jan 2025 13:55:40 +0100 Subject: [PATCH 1/2] add baseURI view function --- src/BaseGen.sol | 4 ++++ test/BaseGen.t.sol | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/src/BaseGen.sol b/src/BaseGen.sol index 95f29dc..826c1d9 100644 --- a/src/BaseGen.sol +++ b/src/BaseGen.sol @@ -54,6 +54,10 @@ contract BaseGen is ERC721, ERC721Burnable, ERC721Royalty, Ownable { return _generatorURI; } + function baseURI() external view returns (string memory) { + return _generatorURI; + } + // or e.g. "https://external-link-url.com/my-contract-metadata.json"; function contractURI() external view returns (string memory) { diff --git a/test/BaseGen.t.sol b/test/BaseGen.t.sol index 544dd62..b56a234 100644 --- a/test/BaseGen.t.sol +++ b/test/BaseGen.t.sol @@ -34,6 +34,13 @@ contract BaseGenTest is Test { string memory baseUri = "https://data.kodadot.xyz/base/"; string memory scAddress = Strings.toHexString(uint160(address(instance)), 20); string memory expected = string.concat(baseUri, scAddress, "/"); + assertEq(instance.baseURI(), expected); + } + + function testTokenUri() public view { + string memory baseUri = "https://data.kodadot.xyz/base/"; + string memory scAddress = Strings.toHexString(uint160(address(instance)), 20); + string memory expected = string.concat(baseUri, scAddress, "/"); assertEq(instance.tokenURI(0), string.concat(expected, "0")); } From 5864a02da28b9bfc35aeaa1420f870d052458a85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Barbora?= Date: Mon, 13 Jan 2025 15:04:31 +0100 Subject: [PATCH 2/2] call internal function Co-authored-by: Viki Val --- src/BaseGen.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BaseGen.sol b/src/BaseGen.sol index 826c1d9..48f9130 100644 --- a/src/BaseGen.sol +++ b/src/BaseGen.sol @@ -55,7 +55,7 @@ contract BaseGen is ERC721, ERC721Burnable, ERC721Royalty, Ownable { } function baseURI() external view returns (string memory) { - return _generatorURI; + return _baseURI(); } // or e.g. "https://external-link-url.com/my-contract-metadata.json";