Skip to content
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

bump version 1.0.0-alpha.16 #112

Merged
merged 1 commit into from
Oct 15, 2024
Merged

bump version 1.0.0-alpha.16 #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
pull_request:

env:
DOJO_VERSION: v1.0.0-alpha.15
DOJO_VERSION: v1.0.0-alpha.16
SCARB_VERSION: 2.7.0

jobs:
Expand Down
18 changes: 9 additions & 9 deletions Scarb.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,48 +9,48 @@ source = "git+https://github.com/dojoengine/cubit?branch=update_to_2.7.0#075bf5a
[[package]]
name = "dojo"
version = "1.0.0-alpha.4"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.15#f56c4f90eca84b92f348303dc85ff6e126609f16"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.16#3b3a78cd8239ca2ee524c49c83f36db4d79cb4bc"

[[package]]
name = "origami_algebra"
version = "1.0.0-alpha.15"
version = "1.0.0-alpha.16"
dependencies = [
"cubit",
]

[[package]]
name = "origami_defi"
version = "1.0.0-alpha.15"
version = "1.0.0-alpha.16"
dependencies = [
"cubit",
]

[[package]]
name = "origami_governance"
version = "1.0.0-alpha.15"
version = "1.0.0-alpha.16"
dependencies = [
"dojo",
]

[[package]]
name = "origami_map"
version = "1.0.0-alpha.15"
version = "1.0.0-alpha.16"

[[package]]
name = "origami_random"
version = "1.0.0-alpha.15"
version = "1.0.0-alpha.16"

[[package]]
name = "origami_rating"
version = "1.0.0-alpha.15"
version = "1.0.0-alpha.16"

[[package]]
name = "origami_security"
version = "1.0.0-alpha.15"
version = "1.0.0-alpha.16"

[[package]]
name = "origami_token"
version = "1.0.0-alpha.15"
version = "1.0.0-alpha.16"
dependencies = [
"dojo",
]
4 changes: 2 additions & 2 deletions Scarb.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ members = [
]

[workspace.package]
version = "1.0.0-alpha.15"
version = "1.0.0-alpha.16"

[workspace.dependencies]
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.15" }
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.16" }
# dojo = { path = "../dojo/crates/dojo-core" }
cubit = { git = "https://github.com/dojoengine/cubit", branch = "update_to_2.7.0" }
starknet = "^2.7.0"
Expand Down
2 changes: 1 addition & 1 deletion crates/token/src/components/tests/token/erc20/test_erc20_metadata.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ fn test_erc20_metadata_initialize() {

state.erc20_metadata.initialize("NAME", "SYMBOL", DECIMALS);

assert(state.erc20_metadata.name() == "NAME", 'Should be NAME');
assert(state.erc20_metadata.nameXXX() == "NAME", 'Should be NAME');
assert(state.erc20_metadata.symbol() == "SYMBOL", 'Should be SYMBOL');
assert(state.erc20_metadata.decimals() == DECIMALS, 'Should be 18');
assert(state.erc20_metadata.total_supply() == 0, 'Should be 0');
Expand Down
2 changes: 1 addition & 1 deletion crates/token/src/components/tests/token/erc721/test_erc721_metadata.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ fn test_erc721_metadata_initialize() {

state.erc721_metadata.initialize(NAME, SYMBOL, URI);

assert(state.erc721_metadata.name() == "NAME", 'Should be NAME');
assert(state.erc721_metadata.nameXXX() == "NAME", 'Should be NAME');
assert(state.erc721_metadata.symbol() == "SYMBOL", 'Should be SYMBOL');

state.erc721_mintable.mint(OWNER(), 1);
Expand Down
4 changes: 2 additions & 2 deletions crates/token/src/components/token/erc20/erc20_metadata.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ struct ERC20MetadataModel {

#[starknet::interface]
trait IERC20Metadata<TState> {
fn name(self: @TState) -> ByteArray;
fn nameXXX(self: @TState) -> ByteArray;
fn symbol(self: @TState) -> ByteArray;
fn decimals(self: @TState) -> u8;
}
Expand Down Expand Up @@ -61,7 +61,7 @@ mod erc20_metadata_component {
+IWorldProvider<TContractState>,
+Drop<TContractState>,
> of IERC20Metadata<ComponentState<TContractState>> {
fn name(self: @ComponentState<TContractState>) -> ByteArray {
fn nameXXX(self: @ComponentState<TContractState>) -> ByteArray {
self.get_metadata().name
}
fn symbol(self: @ComponentState<TContractState>) -> ByteArray {
Expand Down
4 changes: 2 additions & 2 deletions crates/token/src/components/token/erc721/erc721_metadata.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ struct ERC721MetaModel {

#[starknet::interface]
trait IERC721Metadata<TState> {
fn name(self: @TState) -> ByteArray;
fn nameXXX(self: @TState) -> ByteArray;
fn symbol(self: @TState) -> ByteArray;
fn token_uri(ref self: TState, token_id: u256) -> ByteArray;
}
Expand Down Expand Up @@ -62,7 +62,7 @@ mod erc721_metadata_component {
impl ERC721Owner: erc721_owner_comp::HasComponent<TContractState>,
+Drop<TContractState>,
> of IERC721Metadata<ComponentState<TContractState>> {
fn name(self: @ComponentState<TContractState>) -> ByteArray {
fn nameXXX(self: @ComponentState<TContractState>) -> ByteArray {
self.get_meta().name
}
fn symbol(self: @ComponentState<TContractState>) -> ByteArray {
Expand Down
4 changes: 2 additions & 2 deletions crates/token/src/components/token/erc721/interface.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ trait IERC721<TState> {

#[starknet::interface]
trait IERC721Metadata<TState> {
fn name(self: @TState) -> ByteArray;
fn nameXXX(self: @TState) -> ByteArray;
fn symbol(self: @TState) -> ByteArray;
fn token_uri(self: @TState, token_id: u256) -> ByteArray;
}
Expand Down Expand Up @@ -80,7 +80,7 @@ trait ERC721ABI<TState> {
) -> bool;

// IERC721Metadata
fn name(self: @TState) -> felt252;
fn nameXXX(self: @TState) -> felt252;
fn symbol(self: @TState) -> felt252;
fn token_uri(self: @TState, token_id: u256) -> felt252;

Expand Down
2 changes: 1 addition & 1 deletion crates/token/src/erc1155/erc1155.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ mod ERC1155 {

#[abi(embed_v0)]
impl ERC1155MetadataImpl of interface::IERC1155Metadata<ContractState> {
fn name(self: @ContractState) -> felt252 {
fn nameXXX(self: @ContractState) -> felt252 {
self.get_meta().name
}

Expand Down
4 changes: 2 additions & 2 deletions crates/token/src/erc1155/interface.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ trait IERC1155CamelOnly<TState> {

#[starknet::interface]
trait IERC1155Metadata<TState> {
fn name(self: @TState) -> felt252;
fn nameXXX(self: @TState) -> felt252;
fn symbol(self: @TState) -> felt252;
fn uri(self: @TState, token_id: u256) -> felt252;
}
Expand Down Expand Up @@ -94,7 +94,7 @@ trait ERC1155ABI<TState> {
);

// IERC1155Metadata
fn name(self: @TState) -> felt252;
fn nameXXX(self: @TState) -> felt252;
fn symbol(self: @TState) -> felt252;
fn uri(self: @TState, token_id: u256) -> felt252;

Expand Down
4 changes: 2 additions & 2 deletions crates/token/src/erc1155/tests.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ fn test_constructor() {
let (world, mut state) = STATE();
ERC1155::constructor(ref state, world.contract_address, NAME, SYMBOL, URI);

assert(ERC1155MetadataImpl::name(@state) == NAME, 'Name should be NAME');
assert(ERC1155MetadataImpl::nameXXX(@state) == NAME, 'Name should be NAME');
assert(ERC1155MetadataImpl::symbol(@state) == SYMBOL, 'Symbol should be SYMBOL');
assert(ERC1155MetadataImpl::uri(@state, 0) == URI, 'Uri should be URI');
// assert(
Expand All @@ -89,7 +89,7 @@ fn test_initializer() {
let (_world, mut state) = STATE();
InternalImpl::initializer(ref state, NAME, SYMBOL, URI);

assert(ERC1155MetadataImpl::name(@state) == NAME, 'Name should be NAME');
assert(ERC1155MetadataImpl::nameXXX(@state) == NAME, 'Name should be NAME');
assert(ERC1155MetadataImpl::symbol(@state) == SYMBOL, 'Symbol should be SYMBOL');

assert(ERC1155Impl::balance_of(@state, OWNER(), 0) == 0, 'Balance should be zero');
Expand Down
2 changes: 1 addition & 1 deletion crates/token/src/erc20/erc20.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ mod ERC20 {

#[abi(embed_v0)]
impl ERC20MetadataImpl of interface::IERC20Metadata<ContractState> {
fn name(self: @ContractState) -> felt252 {
fn nameXXX(self: @ContractState) -> felt252 {
self.get_meta().name
}

Expand Down
4 changes: 2 additions & 2 deletions crates/token/src/erc20/interface.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ trait IERC20<TState> {

#[starknet::interface]
trait IERC20Metadata<TState> {
fn name(self: @TState) -> felt252;
fn nameXXX(self: @TState) -> felt252;
fn symbol(self: @TState) -> felt252;
fn decimals(self: @TState) -> u8;
}
Expand Down Expand Up @@ -53,7 +53,7 @@ trait ERC20ABI<TState> {
fn approve(ref self: TState, spender: ContractAddress, amount: u256) -> bool;

// IERC20Metadata
fn name(self: @TState) -> felt252;
fn nameXXX(self: @TState) -> felt252;
fn symbol(self: @TState) -> felt252;
fn decimals(self: @TState) -> u8;

Expand Down
4 changes: 2 additions & 2 deletions crates/token/src/erc20/tests.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ fn test_initializer() {
let (_world, mut state) = STATE();
InternalImpl::initializer(ref state, NAME, SYMBOL);

assert(ERC20MetadataImpl::name(@state) == NAME, 'Name should be NAME');
assert(ERC20MetadataImpl::nameXXX(@state) == NAME, 'Name should be NAME');
assert(ERC20MetadataImpl::symbol(@state) == SYMBOL, 'Symbol should be SYMBOL');
assert(ERC20MetadataImpl::decimals(@state) == DECIMALS, 'Decimals should be 18');
assert(ERC20Impl::total_supply(@state) == 0, 'Supply should eq 0');
Expand All @@ -75,7 +75,7 @@ fn test_constructor() {

assert(ERC20Impl::balance_of(@state, OWNER()) == SUPPLY, 'Should eq inital_supply');
assert(ERC20Impl::total_supply(@state) == SUPPLY, 'Should eq inital_supply');
assert(ERC20MetadataImpl::name(@state) == NAME, 'Name should be NAME');
assert(ERC20MetadataImpl::nameXXX(@state) == NAME, 'Name should be NAME');
assert(ERC20MetadataImpl::symbol(@state) == SYMBOL, 'Symbol should be SYMBOL');
assert(ERC20MetadataImpl::decimals(@state) == DECIMALS, 'Decimals should be 18');
}
Expand Down
2 changes: 1 addition & 1 deletion crates/token/src/erc721/erc721.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ mod ERC721 {

#[abi(embed_v0)]
impl ERC721MetadataImpl of interface::IERC721Metadata<ContractState> {
fn name(self: @ContractState) -> felt252 {
fn nameXXX(self: @ContractState) -> felt252 {
self.get_meta().name
}

Expand Down
4 changes: 2 additions & 2 deletions crates/token/src/erc721/interface.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ trait IERC721<TState> {

#[starknet::interface]
trait IERC721Metadata<TState> {
fn name(self: @TState) -> felt252;
fn nameXXX(self: @TState) -> felt252;
fn symbol(self: @TState) -> felt252;
fn token_uri(self: @TState, token_id: u256) -> felt252;
}
Expand Down Expand Up @@ -80,7 +80,7 @@ trait ERC721ABI<TState> {
) -> bool;

// IERC721Metadata
fn name(self: @TState) -> felt252;
fn nameXXX(self: @TState) -> felt252;
fn symbol(self: @TState) -> felt252;
fn token_uri(self: @TState, token_id: u256) -> felt252;

Expand Down
4 changes: 2 additions & 2 deletions crates/token/src/erc721/tests.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ fn test_constructor() {
let (world, mut state) = STATE();
ERC721::constructor(ref state, world.contract_address, NAME, SYMBOL, URI, OWNER(), TOKEN_ID);

assert(ERC721MetadataImpl::name(@state) == NAME, 'Name should be NAME');
assert(ERC721MetadataImpl::nameXXX(@state) == NAME, 'Name should be NAME');
assert(ERC721MetadataImpl::symbol(@state) == SYMBOL, 'Symbol should be SYMBOL');
assert(ERC721Impl::balance_of(@state, OWNER()) == 1, 'Balance should be one');
assert(ERC721Impl::owner_of(@state, TOKEN_ID) == OWNER(), 'OWNER should be owner');
Expand All @@ -115,7 +115,7 @@ fn test_initializer() {
let (_world, mut state) = STATE();
InternalImpl::initializer(ref state, NAME, SYMBOL, URI);

assert(ERC721MetadataImpl::name(@state) == NAME, 'Name should be NAME');
assert(ERC721MetadataImpl::nameXXX(@state) == NAME, 'Name should be NAME');
assert(ERC721MetadataImpl::symbol(@state) == SYMBOL, 'Symbol should be SYMBOL');

assert(ERC721Impl::balance_of(@state, OWNER()) == 0, 'Balance should be zero');
Expand Down
2 changes: 1 addition & 1 deletion crates/token/src/presets/erc20/bridgeable.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ trait IERC20BridgeablePreset<TState> {

// IERC20Metadata
fn decimals(self: @TState,) -> u8;
fn name(self: @TState,) -> ByteArray;
fn nameXXX(self: @TState,) -> ByteArray;
fn symbol(self: @TState,) -> ByteArray;

// IERC20MetadataTotalSupply
Expand Down
2 changes: 1 addition & 1 deletion crates/token/src/presets/erc20/tests_bridgeable.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ fn test_initializer() {

assert(erc20_bridgeable.balance_of(OWNER()) == SUPPLY, 'Should eq inital_supply');
assert(erc20_bridgeable.total_supply() == SUPPLY, 'Should eq inital_supply');
assert(erc20_bridgeable.name() == "NAME", 'Name should be NAME');
assert(erc20_bridgeable.nameXXX() == "NAME", 'Name should be NAME');
assert(erc20_bridgeable.symbol() == "SYMBOL", 'Symbol should be SYMBOL');
assert(erc20_bridgeable.decimals() == DECIMALS, 'Decimals should be 18');
assert(erc20_bridgeable.l2_bridge_address() == BRIDGE(), 'Decimals should be BRIDGE');
Expand Down
2 changes: 1 addition & 1 deletion crates/token/src/presets/erc721/enumerable_mintable_burnable.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use dojo::world::IWorldDispatcher;
#[starknet::interface]
trait IERC721EnumMintBurnPreset<TState> {
// IERC721
fn name(self: @TState) -> ByteArray;
fn nameXXX(self: @TState) -> ByteArray;
fn symbol(self: @TState) -> ByteArray;
fn token_uri(ref self: TState, token_id: u256) -> ByteArray;
fn owner_of(self: @TState, account: ContractAddress) -> bool;
Expand Down
2 changes: 1 addition & 1 deletion crates/token/src/presets/erc721/mintable_burnable.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use dojo::world::IWorldDispatcher;
#[starknet::interface]
trait IERC721MintableBurnablePreset<TState> {
// IERC721
fn name(self: @TState) -> ByteArray;
fn nameXXX(self: @TState) -> ByteArray;
fn symbol(self: @TState) -> ByteArray;
fn token_uri(ref self: TState, token_id: u256) -> ByteArray;
fn owner_of(self: @TState, account: ContractAddress) -> bool;
Expand Down
2 changes: 1 addition & 1 deletion crates/token/src/presets/erc721/tests_enumerable_mintable_burnable.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ fn test_initializer() {
let (_world, mut enum_mint_burn) = setup();

assert(enum_mint_burn.balance_of(OWNER()) == 2, 'Should eq 2');
assert(enum_mint_burn.name() == "NAME", 'Name should be NAME');
assert(enum_mint_burn.nameXXX() == "NAME", 'Name should be NAME');
assert(enum_mint_burn.symbol() == "SYMBOL", 'Symbol should be SYMBOL');
assert(enum_mint_burn.token_uri(TOKEN_ID) == "URI21", 'Uri should be URI21');
}
Expand Down
2 changes: 1 addition & 1 deletion crates/token/src/presets/erc721/tests_mintable_burnable.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ fn test_initializer() {
let (_world, mut mintable_burnable) = setup();

assert(mintable_burnable.balance_of(OWNER()) == 2, 'Should eq 2');
assert(mintable_burnable.name() == "NAME", 'Name should be NAME');
assert(mintable_burnable.nameXXX() == "NAME", 'Name should be NAME');
assert(mintable_burnable.symbol() == "SYMBOL", 'Symbol should be SYMBOL');
assert(mintable_burnable.token_uri(TOKEN_ID) == "URI21", 'Uri should be URI21');
}
Expand Down
Loading