Skip to content

Commit

Permalink
Merge branch 'main' into integrate-ERC-4906
Browse files Browse the repository at this point in the history
  • Loading branch information
julienbrs authored Jun 28, 2024
2 parents 6495cda + a95fbfc commit 4ed42a7
Show file tree
Hide file tree
Showing 3 changed files with 121 additions and 2 deletions.
98 changes: 98 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
{
"files": [
"README.md"
],
"imageSize": 100,
"commit": false,
"commitType": "docs",
"commitConvention": "angular",
"contributors": [
{
"login": "julienbrs",
"name": "Ainur",
"avatar_url": "https://avatars.githubusercontent.com/u/106234742?v=4",
"profile": "https://github.com/julienbrs",
"contributions": [
"code"
]
},
{
"login": "tekkac",
"name": "Trunks @ Carbonable",
"avatar_url": "https://avatars.githubusercontent.com/u/98529704?v=4",
"profile": "https://github.com/tekkac",
"contributions": [
"code"
]
},
{
"login": "bitfalt",
"name": "bitfalt",
"avatar_url": "https://avatars.githubusercontent.com/u/75431447?v=4",
"profile": "https://github.com/bitfalt",
"contributions": [
"code"
]
},
{
"login": "axelizsak",
"name": "Axel Izsak",
"avatar_url": "https://avatars.githubusercontent.com/u/98711930?v=4",
"profile": "https://github.com/axelizsak",
"contributions": [
"code"
]
},
{
"login": "adrianvrj",
"name": "ADR!AN",
"avatar_url": "https://avatars.githubusercontent.com/u/111903096?v=4",
"profile": "https://github.com/adrianvrj",
"contributions": [
"code"
]
},
{
"login": "thomas192",
"name": "0xK2",
"avatar_url": "https://avatars.githubusercontent.com/u/65908739?v=4",
"profile": "https://github.com/thomas192",
"contributions": [
"code"
]
},
{
"login": "shivam6862",
"name": "Shivam kumar",
"avatar_url": "https://avatars.githubusercontent.com/u/115404926?v=4",
"profile": "https://shivam6862.github.io/",
"contributions": [
"code"
]
},
{
"login": "raizo07",
"name": "Wolf",
"avatar_url": "https://avatars.githubusercontent.com/u/81079370?v=4",
"profile": "https://github.com/raizo07",
"contributions": [
"bug"
]
},
{
"login": "Shoetan",
"name": "Emmanuel Soetan",
"avatar_url": "https://avatars.githubusercontent.com/u/17912134?v=4",
"profile": "https://soetandev.netlify.app/",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,
"skipCi": true,
"repoType": "github",
"repoHost": "https://github.com",
"projectName": "carbon-protocol-v3",
"projectOwner": "carbonable-labs"
}
19 changes: 17 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,26 @@ This project is licensed under the **Apache License, Version 2.0**. See [LICENSE
## Contributors ✨

Thanks go to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):

<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
<!-- prettier-ignore-start -->
<!-- markdownlint-disable -->

<table>
<tbody>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/julienbrs"><img src="https://avatars.githubusercontent.com/u/106234742?v=4?s=100" width="100px;" alt="Ainur"/><br /><sub><b>Ainur</b></sub></a><br /><a href="https://github.com/carbonable-labs/carbon-protocol-v3/commits?author=julienbrs" title="Code">πŸ’»</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/tekkac"><img src="https://avatars.githubusercontent.com/u/98529704?v=4?s=100" width="100px;" alt="Trunks @ Carbonable"/><br /><sub><b>Trunks @ Carbonable</b></sub></a><br /><a href="https://github.com/carbonable-labs/carbon-protocol-v3/commits?author=tekkac" title="Code">πŸ’»</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/bitfalt"><img src="https://avatars.githubusercontent.com/u/75431447?v=4?s=100" width="100px;" alt="bitfalt"/><br /><sub><b>bitfalt</b></sub></a><br /><a href="https://github.com/carbonable-labs/carbon-protocol-v3/commits?author=bitfalt" title="Code">πŸ’»</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/axelizsak"><img src="https://avatars.githubusercontent.com/u/98711930?v=4?s=100" width="100px;" alt="Axel Izsak"/><br /><sub><b>Axel Izsak</b></sub></a><br /><a href="https://github.com/carbonable-labs/carbon-protocol-v3/commits?author=axelizsak" title="Code">πŸ’»</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/adrianvrj"><img src="https://avatars.githubusercontent.com/u/111903096?v=4?s=100" width="100px;" alt="ADR!AN"/><br /><sub><b>ADR!AN</b></sub></a><br /><a href="https://github.com/carbonable-labs/carbon-protocol-v3/commits?author=adrianvrj" title="Code">πŸ’»</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/thomas192"><img src="https://avatars.githubusercontent.com/u/65908739?v=4?s=100" width="100px;" alt="0xK2"/><br /><sub><b>0xK2</b></sub></a><br /><a href="https://github.com/carbonable-labs/carbon-protocol-v3/commits?author=thomas192" title="Code">πŸ’»</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://shivam6862.github.io/"><img src="https://avatars.githubusercontent.com/u/115404926?v=4?s=100" width="100px;" alt="Shivam kumar"/><br /><sub><b>Shivam kumar</b></sub></a><br /><a href="https://github.com/carbonable-labs/carbon-protocol-v3/commits?author=shivam6862" title="Code">πŸ’»</a></td>
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/raizo07"><img src="https://avatars.githubusercontent.com/u/81079370?v=4?s=100" width="100px;" alt="Wolf"/><br /><sub><b>Wolf</b></sub></a><br /><a href="https://github.com/carbonable-labs/carbon-protocol-v3/issues?q=author%3Araizo07" title="Bug reports">πŸ›</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://soetandev.netlify.app/"><img src="https://avatars.githubusercontent.com/u/17912134?v=4?s=100" width="100px;" alt="Emmanuel Soetan"/><br /><sub><b>Emmanuel Soetan</b></sub></a><br /><a href="https://github.com/carbonable-labs/carbon-protocol-v3/commits?author=Shoetan" title="Code">πŸ’»</a></td>
</tr>
</tbody>
</table>

<!-- markdownlint-restore -->
<!-- prettier-ignore-end -->
Expand Down
6 changes: 6 additions & 0 deletions src/contracts/project.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ trait IExternal<ContractState> {
ref self: ContractState, from: ContractAddress, token_ids: Span<u256>, values: Span<u256>
);
fn set_uri(ref self: ContractState, uri: ByteArray);
fn get_uri(self: @ContractState, token_id: u256) -> ByteArray;
fn decimals(self: @ContractState) -> u8;
fn only_owner(self: @ContractState, caller_address: ContractAddress) -> bool;
fn grant_minter_role(ref self: ContractState, minter: ContractAddress);
Expand Down Expand Up @@ -236,6 +237,11 @@ mod Project {
);
}

fn get_uri(self: @ContractState, token_id: u256) -> ByteArray {
let uri_result: ByteArray = self.erc1155.uri(token_id);
uri_result
}

fn decimals(self: @ContractState) -> u8 {
self.absorber.get_cc_decimals()
}
Expand Down

0 comments on commit 4ed42a7

Please sign in to comment.