feat: support evm/svm gasstation

contract/src/abi_structs.sw

@@ -5,29 +5,29 @@ use std::{bytes::Bytes, hash::{Hash, Hasher}};
 abi GameContract {
     // initialize player, mint some coins
     #[storage(read, write)]
-    fn new_player();
+    fn new_player(address: Identity);
 
     // get asset ID
     fn get_asset_id() -> AssetId;
 
     // level up farming skill
     #[storage(read, write)]
-    fn level_up();
+    fn level_up(address: Identity);
 
     // buy any amount of a certain seed
     #[storage(read, write), payable]
-    fn buy_seeds(food_type: FoodType, amount: u64);
+    fn buy_seeds(food_type: FoodType, amount: u64, address: Identity);
 
     #[storage(read, write)]
-    fn plant_seed_at_index(food_type: FoodType, index: u64);
+    fn plant_seed_at_index(food_type: FoodType, index: u64, address: Identity);
 
     // harvest grown seeds at certain indexes
     #[storage(read, write)]
-    fn harvest(indexes: Vec<u64>);
+    fn harvest(indexes: Vec<u64>, address: Identity);
 
     // sell a harvested item
     #[storage(read, write)]
-    fn sell_item(food_type: FoodType, amount: u64);
+    fn sell_item(food_type: FoodType, amount: u64, address: Identity);
 
     #[storage(read)]
     fn get_player(id: Identity) -> Option<Player>;
@@ -45,7 +45,7 @@ abi GameContract {
     fn can_level_up(id: Identity) -> bool;
 
     #[storage(read)]
-    fn can_harvest(index: u64) -> bool;
+    fn can_harvest(index: u64, address: Identity) -> bool;
 }
 
 pub struct Player {

contract/src/main.sw

@@ -36,9 +36,10 @@ storage {
 
 impl GameContract for Contract {
     #[storage(read, write)]
-    fn new_player() {
+    fn new_player(address: Identity) {
         // get the message sender
-        let sender = msg_sender().unwrap();
+        let sender = address;
+        // let sender = msg_sender().unwrap();
 
         // make sure the player doesn't already exist
         require(
@@ -73,9 +74,11 @@ impl GameContract for Contract {
     }
 
     #[storage(read, write)]
-    fn level_up() {
+    fn level_up(address: Identity) {
         // get the player with the message sender
-        let mut player = storage.players.get(msg_sender().unwrap()).try_read().unwrap();
+        let sender = address;
+
+        let mut player = storage.players.get(sender).try_read().unwrap();
 
         // the max skill level is 10
         require(player.farming_skill < 10, "skill already max");
@@ -89,8 +92,6 @@ impl GameContract for Contract {
         // increase the player's skill level
         player.level_up_skill();
 
-        let sender = msg_sender().unwrap();
-
         // overwrite storage with the updated player struct
         storage.players.insert(sender, player);
 
@@ -102,7 +103,7 @@ impl GameContract for Contract {
     }
 
     #[storage(read, write), payable]
-    fn buy_seeds(food_type: FoodType, amount: u64) {
+    fn buy_seeds(food_type: FoodType, amount: u64, address: Identity) {
         let asset_id = msg_asset_id();
         require(
             asset_id == AssetId::default(),
@@ -121,7 +122,7 @@ impl GameContract for Contract {
         // require that the amount is at least the price of the item
         require(msg_amount() >= cost, InvalidError::NotEnoughTokens(amount));
 
-        let sender = msg_sender().unwrap();
+        let sender = address;
 
         // check how many seeds the player currenly has
         let current_amount_option = storage.player_seeds.get((sender, food_type)).try_read();
@@ -144,9 +145,9 @@ impl GameContract for Contract {
     }
 
     #[storage(read, write)]
-    fn plant_seed_at_index(food_type: FoodType, index: u64) {
+    fn plant_seed_at_index(food_type: FoodType, index: u64, address: Identity) {
         // get the sender
-        let sender = msg_sender().unwrap();
+        let sender = address;
         // require player has this many seeds
         let current_amount_option = storage.player_seeds.get((sender, food_type)).try_read();
         let current_amount = current_amount_option.unwrap_or(0);
@@ -174,13 +175,13 @@ impl GameContract for Contract {
     }
 
     #[storage(read, write)]
-    fn harvest(indexes: Vec<u64>) {
+    fn harvest(indexes: Vec<u64>, address: Identity) {
         // use this for testing
         let time = 0;
         // let one_min = 120;
         // let time = one_min * 5;
 
-        let sender = msg_sender().unwrap();
+        let sender = address;
         let mut planted_seeds = storage.planted_seeds.get(sender).try_read().unwrap();
         let current_time = timestamp();
 
@@ -216,8 +217,8 @@ impl GameContract for Contract {
     }
 
     #[storage(read, write)]
-    fn sell_item(food_type: FoodType, amount: u64) {
-        let sender = msg_sender().unwrap();
+    fn sell_item(food_type: FoodType, amount: u64, address: Identity) {
+        let sender = address;
 
         // make sure they have that amount
         let current_amount = storage.player_items.get((sender, food_type)).try_read().unwrap();
@@ -236,9 +237,9 @@ impl GameContract for Contract {
         };
 
         // increase the player's total_value_sold
-        let mut player = storage.players.get(msg_sender().unwrap()).try_read().unwrap();
+        let mut player = storage.players.get(sender).try_read().unwrap();
         player.increase_tvs(amount_to_mint);
-        storage.players.insert(msg_sender().unwrap(), player);
+        storage.players.insert(sender, player);
 
         // send tokens
         mint_to(sender, DEFAULT_SUB_ID, amount_to_mint);
@@ -297,8 +298,8 @@ impl GameContract for Contract {
     }
 
     #[storage(read)]
-    fn can_harvest(index: u64) -> bool {
-        let sender = msg_sender().unwrap();
+    fn can_harvest(index: u64, address: Identity) -> bool {
+        let sender = address;
         let planted_seeds_result = storage.planted_seeds.get(sender);
         if planted_seeds_result.try_read().is_none() {
             return false;

frontend/.gitignore

@@ -22,3 +22,4 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+*.env