Skip to content

Cairo: Add ERC1155 #351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericglau merged 14 commits into from
Apr 3, 2024
Merged

Cairo: Add ERC1155 #351

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1459ac5
Add ERC1155
ericglau Apr 2, 2024
e846492
Update library version
ericglau Apr 2, 2024
db9f228
Handle updatable uri, add 1155 tests
ericglau Apr 2, 2024
37d98f1
Update other snapshots
ericglau Apr 2, 2024
b5cc339
Remove redundant not paused assertions
ericglau Apr 2, 2024
0949885
Fix ERC20 mixin impl
ericglau Apr 2, 2024
70e4f39
Update changelog
ericglau Apr 2, 2024
085d43d
Remove removed function from readme
ericglau Apr 2, 2024
8e54886
Update version, changelog
ericglau Apr 2, 2024
c15c401
Fix svelte check
ericglau Apr 2, 2024
e09a746
Sort imports alphabetically
ericglau Apr 3, 2024
a1338ef
Update snapshots
ericglau Apr 3, 2024
89feeb0
Update changelog
ericglau Apr 3, 2024
a3abead
Fix burn caller check
ericglau Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions packages/core-cairo/src/erc1155.test.ts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,9 @@ Generated by [AVA](https://avajs.dev).
#[external(v0)]␊
fn burn(ref self: ContractState, account: ContractAddress, token_id: u256, value: u256) {␊
let caller = get_caller_address();␊
assert(self.erc1155.is_approved_for_all(account, caller), ERC1155Component::Errors::UNAUTHORIZED);␊
if account != caller {␊
assert(self.erc1155.is_approved_for_all(account, caller), ERC1155Component::Errors::UNAUTHORIZED);␊
}␊
Copy link
Contributor

@andrew-fleming andrew-fleming Apr 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

self.erc1155.burn(account, token_id, value);␊
}␊
␊
Expand All @@ -273,7 +275,9 @@ Generated by [AVA](https://avajs.dev).
values: Span<u256>,␊
) {␊
let caller = get_caller_address();␊
assert(self.erc1155.is_approved_for_all(account, caller), ERC1155Component::Errors::UNAUTHORIZED);␊
if account != caller {␊
assert(self.erc1155.is_approved_for_all(account, caller), ERC1155Component::Errors::UNAUTHORIZED);␊
}␊
self.erc1155.batch_burn(account, token_ids, values);␊
}␊
␊
Expand Down Expand Up @@ -907,7 +911,9 @@ Generated by [AVA](https://avajs.dev).
fn burn(ref self: ContractState, account: ContractAddress, token_id: u256, value: u256) {␊
self.pausable.assert_not_paused();␊
let caller = get_caller_address();␊
assert(self.erc1155.is_approved_for_all(account, caller), ERC1155Component::Errors::UNAUTHORIZED);␊
if account != caller {␊
assert(self.erc1155.is_approved_for_all(account, caller), ERC1155Component::Errors::UNAUTHORIZED);␊
}␊
self.erc1155.burn(account, token_id, value);␊
}␊
␊
Expand All @@ -920,7 +926,9 @@ Generated by [AVA](https://avajs.dev).
) {␊
self.pausable.assert_not_paused();␊
let caller = get_caller_address();␊
assert(self.erc1155.is_approved_for_all(account, caller), ERC1155Component::Errors::UNAUTHORIZED);␊
if account != caller {␊
assert(self.erc1155.is_approved_for_all(account, caller), ERC1155Component::Errors::UNAUTHORIZED);␊
}␊
self.erc1155.batch_burn(account, token_ids, values);␊
}␊
␊
Expand Down
Binary file modified packages/core-cairo/src/erc1155.test.ts.snap
View file
Open in desktop
Binary file not shown.
8 changes: 6 additions & 2 deletions packages/core-cairo/src/erc1155.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,9 @@ const functions = defineFunctions({
],
code: [
'let caller = get_caller_address();',
'assert(self.erc1155.is_approved_for_all(account, caller), ERC1155Component::Errors::UNAUTHORIZED)',
'if account != caller {',
' assert(self.erc1155.is_approved_for_all(account, caller), ERC1155Component::Errors::UNAUTHORIZED)',
'}',
'self.erc1155.burn(account, token_id, value);'
]
},
Expand All @@ -217,7 +219,9 @@ const functions = defineFunctions({
],
code: [
'let caller = get_caller_address();',
'assert(self.erc1155.is_approved_for_all(account, caller), ERC1155Component::Errors::UNAUTHORIZED)',
'if account != caller {',
' assert(self.erc1155.is_approved_for_all(account, caller), ERC1155Component::Errors::UNAUTHORIZED)',
'}',
'self.erc1155.batch_burn(account, token_ids, values);'
]
},
Expand Down
4 changes: 2 additions & 2 deletions packages/core-cairo/src/print.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ function printFunction(fn: ContractFunction) {
for (let i = 0; i < codeLines.length; i++) {
const line = codeLines[i];
const shouldEndWithSemicolon = i < codeLines.length - 1 || fn.returns === undefined;
if (line !== undefined) {
if (shouldEndWithSemicolon && !line.endsWith(';')) {
if (line !== undefined && line.length > 0) {
if (shouldEndWithSemicolon && !['{', '}', ';'].includes(line.charAt(line.length - 1))) {
codeLines[i] += ';';
} else if (!shouldEndWithSemicolon && line.endsWith(';')) {
codeLines[i] = line.slice(0, line.length - 1);
Expand Down