A0-1236: Minting and burning reward tokens

contracts/README.md

@@ -46,15 +46,15 @@ Game continues in perpetuity (but in practice as long as there are accounts that
 - Tokens are continuously minted at the end of each iteration
 - Players are rewarded for playing, with the ultimate goal of being the Pressiah (the last person to click the button)
 - Reward rules:
-  - If you’re not ThePressiah, you get _k_ tokens if you pressed the button as the _k-th_ person in a row.
+  - If you're not ThePressiah, you get _k_ tokens if you pressed the button as the _k-th_ person in a row.
   - ThePressiah gets 20% of the total reward pool.
 
 # Development
 
 ## Prerequisites
 
 - Rust nightly
-- cargo-contract with bug fixes around URL parsing: `cargo install --git https://github.com/paritytech/cargo-contract.git --rev 5e6f941805e3d6032dbfa17771a887a362cb3460 --force`
+- cargo-contract with bug fixes around URL parsing: `cargo install --git https://github.com/paritytech/cargo-contract.git --rev 2b1758756de59bd81e7bed5f8429d364f281cb9a --force`
 
 ## Instructions
 
@@ -74,7 +74,7 @@ Specifically it will:
 
 - Deploy the contracts.
 - Set access control on them.
-- Make neccessary token transfers.
+- Make necessary token transfers.
 
 Third `test.sh` script plays the game from two well-known dev addresses.
 

contracts/access_control/roles.rs

@@ -10,10 +10,14 @@ use scale::{Decode, Encode};
 pub enum Role {
     /// Indicates a superuser.
     Admin(AccountId),
-    /// Indicates account can terminate a contract.
+    /// Indicates account that can terminate a contract.
     Owner(AccountId),
-    /// Indicates account can initialize a contract from a given code hash.
+    /// Indicates account that can initialize a contract from a given code hash.
     Initializer(Hash),
-    /// Indicates account can add liquidity to a DEX contract (call certain functions)
+    /// Indicates account that can add liquidity to a DEX contract (call certain functions)
     LiquidityProvider(AccountId),
+    /// Indicates account that can mint tokens of a given token contract,
+    Minter(AccountId),
+    /// Indicates account that can burn tokens of a given token contract,
+    Burner(AccountId),
 }

contracts/button/Cargo.toml

@@ -19,7 +19,7 @@ access_control = { path = "../access_control", default-features = false, feature
 game_token = { path = "../game_token", default-features = false, features = ["ink-as-dependency"] }
 ticket_token = { path = "../ticket_token", default-features = false, features = ["ink-as-dependency"] }
 marketplace = { path = "../marketplace", default-features = false, features = ["ink-as-dependency"] }
-openbrush = { git = "https://github.com/Supercolony-net/openbrush-contracts.git", rev = "8a20f95", default-features = false, features = ["psp22"] }
+openbrush = { git = "https://github.com/Supercolony-net/openbrush-contracts.git", rev = "15e6366", default-features = false, features = ["psp22"] }
 
 [lib]
 name = "button"

contracts/button/lib.rs

@@ -7,7 +7,7 @@ use ink_lang as ink;
 #[ink::contract]
 mod button_game {
     use access_control::{roles::Role, traits::AccessControlled, ACCESS_CONTROL_PUBKEY};
-    use game_token::MINT_TO_SELECTOR;
+    use game_token::MINT_SELECTOR;
     use ink_env::{
         call::{build_call, Call, ExecutionInput, Selector},
         CallFlags, DefaultEnvironment, Error as InkEnvError,
@@ -336,7 +336,7 @@ mod button_game {
                     ExecutionInput::new(Selector::new(TRANSFER_SELECTOR))
                         .push_arg(self.marketplace)
                         .push_arg(self.held_tickets()?)
-                        .push_arg(vec![0x0]),
+                        .push_arg::<vec::Vec<u8>>(vec![]),
                 )
                 .call_flags(CallFlags::default().set_allow_reentry(true))
                 .returns::<Result<(), PSP22Error>>()
@@ -414,7 +414,7 @@ mod button_game {
                         .push_arg(from)
                         .push_arg(to)
                         .push_arg(value)
-                        .push_arg(vec![0x0]),
+                        .push_arg::<vec::Vec<u8>>(vec![]),
                 )
                 .call_flags(CallFlags::default().set_allow_reentry(true))
                 .returns::<Result<(), PSP22Error>>()
@@ -429,7 +429,7 @@ mod button_game {
             build_call::<DefaultEnvironment>()
                 .call_type(Call::new().callee(self.reward_token))
                 .exec_input(
-                    ExecutionInput::new(Selector::new(MINT_TO_SELECTOR))
+                    ExecutionInput::new(Selector::new(MINT_SELECTOR))
                         .push_arg(to)
                         .push_arg(amount),
                 )

contracts/env/dev

@@ -8,4 +8,7 @@ export AUTHORITY_SEED=//Alice
 export LIFETIME=20
 
 # mint this many ticket tokens
-export TOTAL_BALANCE=1000
+export TICKET_BALANCE=100
+
+# initial price of ticket on the marketplace
+export INITIAL_PRICE=69

contracts/game_token/Cargo.toml

@@ -17,7 +17,7 @@ ink_engine = { version = "~3.3.0", default-features = false, optional = true }
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2", default-features = false, features = ["derive"], optional = true }
 
-openbrush = { git = "https://github.com/Supercolony-net/openbrush-contracts.git", rev = "8a20f95", default-features = false, features = ["psp22"] }
+openbrush = { git = "https://github.com/Supercolony-net/openbrush-contracts.git", rev = "15e6366", default-features = false, features = ["psp22"] }
 access_control = { path = "../access_control", default-features = false, features = ["ink-as-dependency"] }
 
 [lib]