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

Jump to bottom

A0-1238: Marketplace for auctioning tickets #613

Merged
merged 9 commits into from
Sep 14, 2022
Merged

A0-1238: Marketplace for auctioning tickets #613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e1a3047
Prototype dummy marketplace
obrok Sep 1, 2022
bcc46bf
Implement selling tickets
obrok Sep 5, 2022
c6a166d
Emit events from marketplace
obrok Sep 6, 2022
2c0745c
Add docs
obrok Sep 8, 2022
dc362aa
Deploy markets for all games
obrok Sep 8, 2022
38cff68
Improve cosmetics
obrok Sep 12, 2022
6461952
Wrap original errors where possible
obrok Sep 12, 2022
b5d1ffa
Add max_price to buy()
obrok Sep 12, 2022
b1a19b5
Merge branch 'benjamin' into obrok/marketplace
obrok Sep 14, 2022
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
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# IDEs
/.idea
**/.idea
/.vscode
.projectile

Expand All @@ -14,7 +14,7 @@
*.out

# docker
docker/data/
**/docker/data/
db/
keystore/
chainspec.json
Expand Down
3 changes: 2 additions & 1 deletion contracts/button/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ mod button_game {
use game_token::MINT_TO_SELECTOR;
use ink_env::{
call::{build_call, Call, ExecutionInput, Selector},
DefaultEnvironment, Error as InkEnvError,
CallFlags, DefaultEnvironment, Error as InkEnvError,
};
use ink_lang::{codegen::EmitEvent, reflect::ContractEventBase};
use ink_prelude::{format, vec};
Expand Down Expand Up @@ -341,6 +341,7 @@ mod button_game {
.push_arg(value)
.push_arg(vec![0x0]),
)
.call_flags(CallFlags::default().set_allow_reentry(true))
.returns::<Result<(), PSP22Error>>()
.fire()
}
Expand Down
5 changes: 4 additions & 1 deletion contracts/game_token/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#![cfg_attr(not(feature = "std"), no_std)]
#![feature(min_specialization)]

pub use crate::game_token::{BALANCE_OF_SELECTOR, MINT_TO_SELECTOR, TRANSFER_SELECTOR};
pub use crate::game_token::{
BALANCE_OF_SELECTOR, MINT_TO_SELECTOR, TRANSFER_FROM_SELECTOR, TRANSFER_SELECTOR,
};

#[openbrush::contract]
pub mod game_token {
Expand All @@ -20,6 +22,7 @@ pub mod game_token {

pub const BALANCE_OF_SELECTOR: [u8; 4] = [0x65, 0x68, 0x38, 0x2f];
pub const TRANSFER_SELECTOR: [u8; 4] = [0xdb, 0x20, 0xf9, 0xf5];
pub const TRANSFER_FROM_SELECTOR: [u8; 4] = [0x54, 0xb3, 0xc7, 0x6e];
// TODO : use correct selector when mint/burn is implemented
pub const MINT_TO_SELECTOR: [u8; 4] = [0x0, 0x0, 0x0, 0x0];

Expand Down
Loading