f

dojoengine · Sep 4, 2024 · b6c0c0c · b6c0c0c
1 parent 04ec14b
commit b6c0c0c
Show file tree

Hide file tree

Showing 40 changed files with 6,230 additions and 5,588 deletions.
diff --git a/Scarb.toml b/Scarb.toml
@@ -17,8 +17,6 @@ origami_token = { git = "https://github.com/Larkooo/origami" }
 
 [[target.dojo]]
 
-[tool.dojo]
-
 build-external-contracts = [
     "origami_token::components::security::initializable::initializable_model",
     "origami_token::components::token::erc20::erc20_metadata::erc_20_metadata_model",

diff --git a/indexer.db b/indexer.db
diff --git a/...ontracts/flippyflop-actions-4407e5f5.json → ...s/contracts/flippyflop-game-23e1ad43.json b/...ontracts/flippyflop-actions-4407e5f5.json → ...s/contracts/flippyflop-game-23e1ad43.json
@@ -128,32 +128,23 @@
   },
   {
     "type": "impl",
-    "name": "ActionsImpl",
-    "interface_name": "flippyflop::systems::actions::IActions"
+    "name": "GameManagerImpl",
+    "interface_name": "flippyflop::systems::game::IGameManager"
   },
   {
     "type": "interface",
-    "name": "flippyflop::systems::actions::IActions",
+    "name": "flippyflop::systems::game::IGameManager",
     "items": [
       {
         "type": "function",
-        "name": "flip",
-        "inputs": [
-          {
-            "name": "x",
-            "type": "core::integer::u32"
-          },
-          {
-            "name": "y",
-            "type": "core::integer::u32"
-          }
-        ],
+        "name": "lock_game",
+        "inputs": [],
         "outputs": [],
         "state_mutability": "external"
       },
       {
         "type": "function",
-        "name": "flop",
+        "name": "unlock_game",
         "inputs": [],
         "outputs": [],
         "state_mutability": "external"
@@ -163,11 +154,11 @@
   {
     "type": "impl",
     "name": "IDojoInitImpl",
-    "interface_name": "flippyflop::systems::actions::actions::IDojoInit"
+    "interface_name": "flippyflop::systems::game::game::IDojoInit"
   },
   {
     "type": "interface",
-    "name": "flippyflop::systems::actions::actions::IDojoInit",
+    "name": "flippyflop::systems::game::game::IDojoInit",
     "items": [
       {
         "type": "function",
@@ -227,7 +218,7 @@
   },
   {
     "type": "event",
-    "name": "flippyflop::systems::actions::actions::Event",
+    "name": "flippyflop::systems::game::game::Event",
     "kind": "enum",
     "variants": [
       {

diff --git a/manifests/dev/base/abis/models/flippyflop-ERC20AllowanceModel-55d0c41e.json b/manifests/dev/base/abis/models/flippyflop-ERC20AllowanceModel-55d0c41e.json
@@ -364,7 +364,7 @@
   {
     "type": "impl",
     "name": "erc_20_allowance_modelImpl",
-    "interface_name": "flippyflop::tokens::flip::Ierc_20_allowance_model"
+    "interface_name": "origami_token::components::token::erc20::erc20_allowance::Ierc_20_allowance_model"
   },
   {
     "type": "struct",
@@ -382,7 +382,7 @@
   },
   {
     "type": "struct",
-    "name": "flippyflop::tokens::flip::ERC20AllowanceModel",
+    "name": "origami_token::components::token::erc20::erc20_allowance::ERC20AllowanceModel",
     "members": [
       {
         "name": "token",
@@ -404,15 +404,15 @@
   },
   {
     "type": "interface",
-    "name": "flippyflop::tokens::flip::Ierc_20_allowance_model",
+    "name": "origami_token::components::token::erc20::erc20_allowance::Ierc_20_allowance_model",
     "items": [
       {
         "type": "function",
         "name": "ensure_abi",
         "inputs": [
           {
             "name": "model",
-            "type": "flippyflop::tokens::flip::ERC20AllowanceModel"
+            "type": "origami_token::components::token::erc20::erc20_allowance::ERC20AllowanceModel"
           }
         ],
         "outputs": [],
@@ -422,7 +422,7 @@
   },
   {
     "type": "event",
-    "name": "flippyflop::tokens::flip::erc_20_allowance_model::Event",
+    "name": "origami_token::components::token::erc20::erc20_allowance::erc_20_allowance_model::Event",
     "kind": "enum",
     "variants": []
   }

diff --git a/manifests/dev/base/abis/models/flippyflop-ERC20BalanceModel-7866fe9f.json b/manifests/dev/base/abis/models/flippyflop-ERC20BalanceModel-7866fe9f.json
@@ -364,7 +364,7 @@
   {
     "type": "impl",
     "name": "erc_20_balance_modelImpl",
-    "interface_name": "flippyflop::tokens::flip::Ierc_20_balance_model"
+    "interface_name": "origami_token::components::token::erc20::erc20_balance::Ierc_20_balance_model"
   },
   {
     "type": "struct",
@@ -382,7 +382,7 @@
   },
   {
     "type": "struct",
-    "name": "flippyflop::tokens::flip::ERC20BalanceModel",
+    "name": "origami_token::components::token::erc20::erc20_balance::ERC20BalanceModel",
     "members": [
       {
         "name": "token",
@@ -400,15 +400,15 @@
   },
   {
     "type": "interface",
-    "name": "flippyflop::tokens::flip::Ierc_20_balance_model",
+    "name": "origami_token::components::token::erc20::erc20_balance::Ierc_20_balance_model",
     "items": [
       {
         "type": "function",
         "name": "ensure_abi",
         "inputs": [
           {
             "name": "model",
-            "type": "flippyflop::tokens::flip::ERC20BalanceModel"
+            "type": "origami_token::components::token::erc20::erc20_balance::ERC20BalanceModel"
           }
         ],
         "outputs": [],
@@ -418,7 +418,7 @@
   },
   {
     "type": "event",
-    "name": "flippyflop::tokens::flip::erc_20_balance_model::Event",
+    "name": "origami_token::components::token::erc20::erc20_balance::erc_20_balance_model::Event",
     "kind": "enum",
     "variants": []
   }

diff --git a/manifests/dev/base/abis/models/flippyflop-ERC20MetadataModel-1fc3dc07.json b/manifests/dev/base/abis/models/flippyflop-ERC20MetadataModel-1fc3dc07.json
@@ -364,7 +364,7 @@
   {
     "type": "impl",
     "name": "erc_20_metadata_modelImpl",
-    "interface_name": "flippyflop::tokens::flip::Ierc_20_metadata_model"
+    "interface_name": "origami_token::components::token::erc20::erc20_metadata::Ierc_20_metadata_model"
   },
   {
     "type": "struct",
@@ -382,7 +382,7 @@
   },
   {
     "type": "struct",
-    "name": "flippyflop::tokens::flip::ERC20MetadataModel",
+    "name": "origami_token::components::token::erc20::erc20_metadata::ERC20MetadataModel",
     "members": [
       {
         "name": "token",
@@ -408,15 +408,15 @@
   },
   {
     "type": "interface",
-    "name": "flippyflop::tokens::flip::Ierc_20_metadata_model",
+    "name": "origami_token::components::token::erc20::erc20_metadata::Ierc_20_metadata_model",
     "items": [
       {
         "type": "function",
         "name": "ensure_abi",
         "inputs": [
           {
             "name": "model",
-            "type": "flippyflop::tokens::flip::ERC20MetadataModel"
+            "type": "origami_token::components::token::erc20::erc20_metadata::ERC20MetadataModel"
           }
         ],
         "outputs": [],
@@ -426,7 +426,7 @@
   },
   {
     "type": "event",
-    "name": "flippyflop::tokens::flip::erc_20_metadata_model::Event",
+    "name": "origami_token::components::token::erc20::erc20_metadata::erc_20_metadata_model::Event",
     "kind": "enum",
     "variants": []
   }

diff --git a/...abis/models/flippyflop-User-25ca4606.json → ...ippyflop-InitializableModel-4239d2f3.json b/...abis/models/flippyflop-User-25ca4606.json → ...ippyflop-InitializableModel-4239d2f3.json
@@ -363,42 +363,48 @@
   },
   {
     "type": "impl",
-    "name": "userImpl",
-    "interface_name": "flippyflop::models::Iuser"
+    "name": "initializable_modelImpl",
+    "interface_name": "origami_token::components::security::initializable::Iinitializable_model"
   },
   {
-    "type": "struct",
-    "name": "flippyflop::models::User",
-    "members": [
+    "type": "enum",
+    "name": "core::bool",
+    "variants": [
       {
-        "name": "identity",
-        "type": "core::starknet::contract_address::ContractAddress"
+        "name": "False",
+        "type": "()"
       },
       {
-        "name": "last_message",
-        "type": "core::byte_array::ByteArray"
-      },
+        "name": "True",
+        "type": "()"
+      }
+    ]
+  },
+  {
+    "type": "struct",
+    "name": "origami_token::components::security::initializable::InitializableModel",
+    "members": [
       {
-        "name": "hovering_tile_x",
-        "type": "core::integer::u32"
+        "name": "token",
+        "type": "core::starknet::contract_address::ContractAddress"
       },
       {
-        "name": "hovering_tile_y",
-        "type": "core::integer::u32"
+        "name": "initialized",
+        "type": "core::bool"
       }
     ]
   },
   {
     "type": "interface",
-    "name": "flippyflop::models::Iuser",
+    "name": "origami_token::components::security::initializable::Iinitializable_model",
     "items": [
       {
         "type": "function",
         "name": "ensure_abi",
         "inputs": [
           {
             "name": "model",
-            "type": "flippyflop::models::User"
+            "type": "origami_token::components::security::initializable::InitializableModel"
           }
         ],
         "outputs": [],
@@ -408,7 +414,7 @@
   },
   {
     "type": "event",
-    "name": "flippyflop::models::user::Event",
+    "name": "origami_token::components::security::initializable::initializable_model::Event",
     "kind": "enum",
     "variants": []
   }

diff --git a/manifests/dev/base/contracts/flippyflop-actions-4407e5f5.toml b/manifests/dev/base/contracts/flippyflop-actions-4407e5f5.toml
@@ -1,6 +1,6 @@
 kind = "DojoContract"
-class_hash = "0x4fa3910c27263d26c4d80eb86df119104c9becb29bebaead963e657bd400950"
-original_class_hash = "0x4fa3910c27263d26c4d80eb86df119104c9becb29bebaead963e657bd400950"
+class_hash = "0x5c1ec4f6bda7a3ad05182759b4c23fb2d5b40c97ae8da92dbff7317e51c7331"
+original_class_hash = "0x5c1ec4f6bda7a3ad05182759b4c23fb2d5b40c97ae8da92dbff7317e51c7331"
 base_class_hash = "0x0"
 abi = "manifests/dev/base/abis/contracts/flippyflop-actions-4407e5f5.json"
 reads = []

diff --git a/manifests/dev/base/contracts/flippyflop-game-23e1ad43.toml b/manifests/dev/base/contracts/flippyflop-game-23e1ad43.toml
@@ -0,0 +1,14 @@
+kind = "DojoContract"
+class_hash = "0x4dba281a1041e66220d62f9df916c03fc0b4c8c19014f9db368c2f5a0c15bad"
+original_class_hash = "0x4dba281a1041e66220d62f9df916c03fc0b4c8c19014f9db368c2f5a0c15bad"
+base_class_hash = "0x0"
+abi = "manifests/dev/base/abis/contracts/flippyflop-game-23e1ad43.json"
+reads = []
+writes = []
+init_calldata = []
+tag = "flippyflop-game"
+systems = [
+    "lock_game",
+    "unlock_game",
+]
+manifest_name = "flippyflop-game-23e1ad43"
diff --git a/manifests/dev/base/models/flippyflop-ERC20AllowanceModel-55d0c41e.toml b/manifests/dev/base/models/flippyflop-ERC20AllowanceModel-55d0c41e.toml
@@ -1,9 +1,9 @@
 kind = "DojoModel"
-class_hash = "0x223db7359762f6103fbdf6e05b5756c3a1a1daa8d80c782894ee506c6293491"
-original_class_hash = "0x223db7359762f6103fbdf6e05b5756c3a1a1daa8d80c782894ee506c6293491"
+class_hash = "0x491a48fb74ba9e09baa7cd0c7b518557a4c422b85bb7a72782a98ab8c89bcf2"
+original_class_hash = "0x491a48fb74ba9e09baa7cd0c7b518557a4c422b85bb7a72782a98ab8c89bcf2"
 abi = "manifests/dev/base/abis/models/flippyflop-ERC20AllowanceModel-55d0c41e.json"
 tag = "flippyflop-ERC20AllowanceModel"
-qualified_path = "flippyflop::tokens::flip::erc_20_allowance_model"
+qualified_path = "origami_token::components::token::erc20::erc20_allowance::erc_20_allowance_model"
 manifest_name = "flippyflop-ERC20AllowanceModel-55d0c41e"
 
 [[members]]

diff --git a/manifests/dev/base/models/flippyflop-ERC20BalanceModel-7866fe9f.toml b/manifests/dev/base/models/flippyflop-ERC20BalanceModel-7866fe9f.toml
@@ -1,9 +1,9 @@
 kind = "DojoModel"
-class_hash = "0x1c458889070338bf994106b5e95a3647a20fcf9d44887ffdaf5f7eb4c0e7173"
-original_class_hash = "0x1c458889070338bf994106b5e95a3647a20fcf9d44887ffdaf5f7eb4c0e7173"
+class_hash = "0x45f6ca7de5a298e2de95705cafee47fbee607c06f8791992ad3ded1d25f25cf"
+original_class_hash = "0x45f6ca7de5a298e2de95705cafee47fbee607c06f8791992ad3ded1d25f25cf"
 abi = "manifests/dev/base/abis/models/flippyflop-ERC20BalanceModel-7866fe9f.json"
 tag = "flippyflop-ERC20BalanceModel"
-qualified_path = "flippyflop::tokens::flip::erc_20_balance_model"
+qualified_path = "origami_token::components::token::erc20::erc20_balance::erc_20_balance_model"
 manifest_name = "flippyflop-ERC20BalanceModel-7866fe9f"
 
 [[members]]

diff --git a/manifests/dev/base/models/flippyflop-ERC20MetadataModel-1fc3dc07.toml b/manifests/dev/base/models/flippyflop-ERC20MetadataModel-1fc3dc07.toml
@@ -1,9 +1,9 @@
 kind = "DojoModel"
-class_hash = "0x4625d48c8f7e13db2ae84c89787171f8fa53752228ae147d3c50c8b327afab3"
-original_class_hash = "0x4625d48c8f7e13db2ae84c89787171f8fa53752228ae147d3c50c8b327afab3"
+class_hash = "0x4ba53f974c845d0048f7921668d9da6cf864ef5b79760c4d3b43c34b58ecc7c"
+original_class_hash = "0x4ba53f974c845d0048f7921668d9da6cf864ef5b79760c4d3b43c34b58ecc7c"
 abi = "manifests/dev/base/abis/models/flippyflop-ERC20MetadataModel-1fc3dc07.json"
 tag = "flippyflop-ERC20MetadataModel"
-qualified_path = "flippyflop::tokens::flip::erc_20_metadata_model"
+qualified_path = "origami_token::components::token::erc20::erc20_metadata::erc_20_metadata_model"
 manifest_name = "flippyflop-ERC20MetadataModel-1fc3dc07"
 
 [[members]]

diff --git a/manifests/dev/base/models/flippyflop-InitializableModel-4239d2f3.toml b/manifests/dev/base/models/flippyflop-InitializableModel-4239d2f3.toml
@@ -0,0 +1,17 @@
+kind = "DojoModel"
+class_hash = "0x69800345431696738834bc1aa3ade287b67e44391138f473748fbbd4c95bd9a"
+original_class_hash = "0x69800345431696738834bc1aa3ade287b67e44391138f473748fbbd4c95bd9a"
+abi = "manifests/dev/base/abis/models/flippyflop-InitializableModel-4239d2f3.json"
+tag = "flippyflop-InitializableModel"
+qualified_path = "origami_token::components::security::initializable::initializable_model"
+manifest_name = "flippyflop-InitializableModel-4239d2f3"
+
+[[members]]
+name = "token"
+type = "ContractAddress"
+key = true
+
+[[members]]
+name = "initialized"
+type = "bool"
+key = false