Cardinal-Cryptography · obrok · Nov 4, 2022 · Oct 10, 2022 · Oct 14, 2022 · Oct 24, 2022
diff --git a/.github/workflows/contracts-e2e-tests-and-deploy.yaml b/.github/workflows/contracts-e2e-tests-and-deploy.yaml
@@ -62,7 +62,15 @@ jobs:
           target-key: e2e-contracts
           cargo-key: e2e-contracts
           cache-version: v3
-          cargo-targets: e2e-tests-contracts/target/
+          cargo-targets: |
+            e2e-tests/target/
+            contracts/access_control/target/
+            contracts/button/target/
+            contracts/game_token/target/
+            contracts/marketplace/target/
+            contracts/simple_dex/target/
+            contracts/ticket_token/target/
+            contracts/wrapped_azero/target/
 
       - name: Install cargo-contract
         run: |

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/aleph-client/Cargo.toml b/aleph-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "aleph_client"
-version = "1.9.0"
+version = "1.10.0"
 edition = "2021"
 license = "Apache 2.0"
 

diff --git a/aleph-client/src/contract/mod.rs b/aleph-client/src/contract/mod.rs
@@ -70,7 +70,7 @@ pub struct ContractInstance {
 
 impl ContractInstance {
     const MAX_READ_GAS: u64 = 500000000000u64;
-    const MAX_GAS: u64 = 10000000000u64;
+    const MAX_GAS: u64 = 100000000000u64;
     const PAYABLE_VALUE: u64 = 0u64;
     const STORAGE_FEE_LIMIT: Option<u128> = None;
 

diff --git a/aleph-client/src/contract/util.rs b/aleph-client/src/contract/util.rs
@@ -46,3 +46,21 @@ pub fn to_account_id(value: Value) -> Result<AccountId> {
         _ => Err(anyhow!("Expected {:?} to be a string", value)),
     }
 }
+
+/// Returns `Ok(bool)` if the given `Value` represents one, or `Err(_)` otherwise.
+/// ```
+/// # #![feature(assert_matches)]
+/// # use std::assert_matches::assert_matches;
+/// # use anyhow::anyhow;
+/// # use aleph_client::contract::util::to_bool;
+/// use contract_transcode::Value;
+///
+/// assert_matches!(to_bool(Value::Bool(true)), Ok(true));
+/// assert_matches!(to_bool(Value::UInt(42)), Err(_));
+/// ```
+pub fn to_bool(value: Value) -> Result<bool> {
+    match value {
+        Value::Bool(value) => Ok(value),
+        _ => Err(anyhow!("Expected {:?} to be a boolean", value)),
+    }
+}
diff --git a/aleph-client/src/lib.rs b/aleph-client/src/lib.rs
@@ -4,6 +4,7 @@ use ac_primitives::{PlainTipExtrinsicParamsBuilder, SubstrateDefaultSignedExtra}
 pub use account::{get_free_balance, locks};
 pub use balances::total_issuance;
 use codec::{Decode, Encode};
+pub use contract_transcode;
 pub use debug::print_storages;
 pub use elections::{
     get_committee_seats, get_current_era_non_reserved_validators,

diff --git a/bin/cliain/src/commands.rs b/bin/cliain/src/commands.rs
@@ -16,7 +16,7 @@ pub struct ContractOptions {
     #[clap(long, default_value = "0")]
     pub balance: u128,
     /// The gas limit enforced when executing the constructor
-    #[clap(long, default_value = "1_000_000_000")]
+    #[clap(long, default_value = "1000000000")]
     pub gas_limit: u64,
     /// The maximum amount of balance that can be charged/reserved from the caller to pay for the storage consumed
     #[clap(long)]

diff --git a/contracts/button/lib.rs b/contracts/button/lib.rs
@@ -5,7 +5,7 @@ mod errors;
 use ink_lang as ink;
 
 #[ink::contract]
-mod button_game {
+pub mod button_game {
     use access_control::{roles::Role, traits::AccessControlled, ACCESS_CONTROL_PUBKEY};
     use game_token::MINT_SELECTOR;
     use ink_env::{

diff --git a/contracts/env/dev b/contracts/env/dev
@@ -8,7 +8,7 @@ export AUTHORITY_SEED=//Alice
 export LIFETIME=20
 
 # mint this many ticket tokens
-export TICKET_BALANCE=100
+export TICKET_BALANCE=100000000
 
 # initial price of ticket on the marketplace
 export INITIAL_PRICE=69
diff --git a/contracts/scripts/deploy.sh b/contracts/scripts/deploy.sh
@@ -114,6 +114,7 @@ function deploy_button_game {
   cd "$CONTRACTS_PATH"/access_control
 
   cargo contract call --url "$NODE" --contract "$ACCESS_CONTROL" --message grant_role --args "$AUTHORITY" 'Owner('"$contract_address"')' --suri "$AUTHORITY_SEED" --skip-confirm
+  cargo contract call --url "$NODE" --contract "$ACCESS_CONTROL" --message grant_role --args "$AUTHORITY" 'Minter('"$game_token"')' --suri "$AUTHORITY_SEED" --skip-confirm
   cargo contract call --url "$NODE" --contract "$ACCESS_CONTROL" --message grant_role --args "$contract_address" 'Admin('"$marketplace"')' --suri "$AUTHORITY_SEED" --skip-confirm
   cargo contract call --url "$NODE" --contract "$ACCESS_CONTROL" --message grant_role --args "$contract_address" 'Minter('"$game_token"')' --suri "$AUTHORITY_SEED" --skip-confirm
 

diff --git a/contracts/scripts/test.sh b/contracts/scripts/test.sh
@@ -2,77 +2,26 @@
 
 set -euo pipefail
 
-# --- FUNCTIONS
-
-function play {
-
-  local contract_name=$1
-  local contract_address=$(cat "$CONTRACTS_PATH"/addresses.json | jq --raw-output ".$contract_name")
-  local ticket_address=$(cat "$CONTRACTS_PATH"/addresses.json | jq --raw-output ".${contract_name}_ticket")
-
-  # airdrop initial tickets
-
-  cd "$CONTRACTS_PATH"/ticket_token
-
-  echo "sending ticket token" ${contract_name}_ticket "["$ticket_address"]" "to " $PLAYER1
-
-  cargo contract call --url $NODE --contract $ticket_address --message PSP22::transfer --args $PLAYER1 1 "[0]" --suri $AUTHORITY_SEED --skip-confirm
-
-  echo "sending ticket token" ${contract_name}_ticket "["$ticket_address"]" "to " $PLAYER2
-
-  cargo contract call --url $NODE --contract $ticket_address --message PSP22::transfer --args $PLAYER2 1 "[0]" --suri $AUTHORITY_SEED --skip-confirm
-
-  # give allowance for spending tickets to the game contract
-
-  echo "allowing" $contract_name "["$contract_address"]" "to spend up to" $TICKET_BALANCE "of" ${contract_name}_ticket "["$ticket_address"]" "on behalf of" $PLAYER1
-
-  cargo contract call --url $NODE --contract $ticket_address --message PSP22::approve --args $contract_address $TICKET_BALANCE --suri $PLAYER1_SEED --skip-confirm
-
-  echo "allowing" $contract_name "["$contract_address"]" "to spend up to" $TICKET_BALANCE "of" ${contract_name}_ticket "["$ticket_address"]" "on behalf of" $PLAYER2
-
-  cargo contract call --url $NODE --contract $ticket_address --message PSP22::approve --args $contract_address $TICKET_BALANCE --suri $PLAYER2_SEED --skip-confirm
-
-# TODO: uncomment when cargo contract doesn't break on parsing "foreign" events
-#
-#  # play the game
-#
-#  cd "$CONTRACTS_PATH"/button
-#
-#  echo "calling press for" $contract_name "["$contract_address"]" "by" $PLAYER1_SEED
-#
-#  cargo contract call --url $NODE --contract $contract_address --message press --suri $PLAYER1_SEED --skip-confirm
-#
-#  sleep 1
-#
-#  echo "calling press for" $contract_name "["$contract_address "]" "by" $PLAYER2_SEED
-#
-#  cargo contract call --url $NODE --contract $contract_address --message press --suri $PLAYER2_SEED --skip-confirm
-#
-#  # ---  WAIT FOR THE BUTTON DEATH
-#
-#  sleep $(($LIFETIME + 1))
-#
-#  # --- TRIGGER GAME RESET
-#
-#  cargo contract call --url $NODE --contract $contract_address --message reset --suri $AUTHORITY_SEED --skip-confirm
-#
-#  echo "Done playing" $contract_name
-}
-
-# --- ARGUMENTS
-
+E2E_PATH=$(pwd)/e2e-tests
 CONTRACTS_PATH=$(pwd)/contracts
-
-PLAYER1=5D34dL5prEUaGNQtPPZ3yN5Y6BnkfXunKXXz6fo7ZJbLwRRH
-PLAYER1_SEED=//0
-PLAYER2=5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY
-PLAYER2_SEED=//Alice
-
-GAMES=(early_bird_special back_to_the_future the_pressiah_cometh)
-for GAME in "${GAMES[@]}"; do
-  (
-    play $GAME
-  )&
-done
+EARLY_BIRD_SPECIAL=$(jq --raw-output ".early_bird_special" < "$CONTRACTS_PATH"/addresses.json)
+THE_PRESSIAH_COMETH=$(jq --raw-output ".the_pressiah_cometh" < "$CONTRACTS_PATH"/addresses.json)
+BACK_TO_THE_FUTURE=$(jq --raw-output ".back_to_the_future" < "$CONTRACTS_PATH"/addresses.json)
+
+pushd "$E2E_PATH"
+
+RUST_LOG="aleph_e2e_client=info" cargo run --release -- \
+  --test-cases marketplace \
+  --test-cases button_game_reset \
+  --test-cases early_bird_special \
+  --test-cases the_pressiah_cometh \
+  --test-cases back_to_the_future \
+  --early-bird-special "$EARLY_BIRD_SPECIAL" \
+  --the-pressiah-cometh "$THE_PRESSIAH_COMETH" \
+  --back-to-the-future "$BACK_TO_THE_FUTURE" \
+  --button-game-metadata ../contracts/button/target/ink/metadata.json \
+  --ticket-token-metadata ../contracts/ticket_token/target/ink/metadata.json \
+  --reward-token-metadata ../contracts/game_token/target/ink/metadata.json \
+  --marketplace-metadata ../contracts/marketplace/target/ink/metadata.json
 
 exit $?
diff --git a/e2e-tests/Cargo.lock b/e2e-tests/Cargo.lock
diff --git a/e2e-tests/Cargo.toml b/e2e-tests/Cargo.toml
@@ -13,6 +13,9 @@ log = "0.4"
 serde_json = "1.0"
 codec = { package = 'parity-scale-codec', version = "3.0", default-features = false, features = ['derive'] }
 rayon = "1.5"
+rand = "0.8"
+itertools = "0.10"
+assert2 = "0.3"
 
 sp-core = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.26", default-features = false, features = ["full_crypto"] }
 sp-runtime = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.26", default-features = false }
@@ -30,5 +33,5 @@ default = ["std"]
 std = [
     "pallet-staking/std",
     "pallet-balances/std",
-    "primitives/std"
+    "primitives/std",
 ]
diff --git a/e2e-tests/src/cases.rs b/e2e-tests/src/cases.rs
@@ -2,16 +2,19 @@ use crate::{
     config::Config,
     test::{
         authorities_are_staking as test_authorities_are_staking,
-        batch_transactions as test_batch_transactions,
+        back_to_the_future as test_back_to_the_future,
+        batch_transactions as test_batch_transactions, button_game_reset as test_button_game_reset,
         change_stake_and_force_new_era as test_change_stake_and_force_new_era,
         change_validators as test_change_validators,
         channeling_fee_and_tip as test_channeling_fee_and_tip, disable_node as test_disable_node,
+        early_bird_special as test_early_bird_special,
         era_payouts_calculated_correctly as test_era_payout, era_validators as test_era_validators,
         fee_calculation as test_fee_calculation, finalization as test_finalization,
-        force_new_era as test_force_new_era, points_basic as test_points_basic,
-        points_stake_change as test_points_stake_change,
+        force_new_era as test_force_new_era, marketplace as test_marketplace,
+        points_basic as test_points_basic, points_stake_change as test_points_stake_change,
         staking_era_payouts as test_staking_era_payouts,
-        staking_new_validator as test_staking_new_validator, token_transfer as test_token_transfer,
+        staking_new_validator as test_staking_new_validator,
+        the_pressiah_cometh as test_the_pressiah_cometh, token_transfer as test_token_transfer,
         treasury_access as test_treasury_access, validators_rotate as test_validators_rotate,
     },
 };
@@ -55,5 +58,10 @@ pub fn possible_test_cases() -> PossibleTestCases {
             "authorities_are_staking",
             test_authorities_are_staking as TestCase,
         ),
+        ("button_game_reset", test_button_game_reset as TestCase),
+        ("early_bird_special", test_early_bird_special as TestCase),
+        ("back_to_the_future", test_back_to_the_future as TestCase),
+        ("the_pressiah_cometh", test_the_pressiah_cometh as TestCase),
+        ("marketplace", test_marketplace as TestCase),
     ]
 }