diff --git a/Cargo.lock b/Cargo.lock index b2aa597e95..30a3fee62d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4508,7 +4508,7 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "dojo-bindgen" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "assert_matches", @@ -4531,15 +4531,16 @@ dependencies = [ [[package]] name = "dojo-contracts" -version = "1.1.2" +version = "1.2.0" [[package]] name = "dojo-examples-spawn-and-move" -version = "1.1.2" +version = "1.2.0" [[package]] name = "dojo-lang" version = "1.1.2" +source = "git+https://github.com/dojoengine/dojo?rev=86bb5ae#86bb5aea7c2210d31ba16ecdfd45146aa665cd5e" dependencies = [ "anyhow", "cairo-lang-defs", @@ -4560,8 +4561,7 @@ dependencies = [ [[package]] name = "dojo-lang" -version = "1.1.2" -source = "git+https://github.com/dojoengine/dojo?rev=86bb5ae#86bb5aea7c2210d31ba16ecdfd45146aa665cd5e" +version = "1.2.0" dependencies = [ "anyhow", "cairo-lang-defs", @@ -4571,7 +4571,7 @@ dependencies = [ "cairo-lang-semantic", "cairo-lang-syntax", "cairo-lang-utils", - "dojo-types 1.1.2 (git+https://github.com/dojoengine/dojo?rev=86bb5ae)", + "dojo-types 1.2.0", "itertools 0.12.1", "serde", "smol_str", @@ -4582,16 +4582,16 @@ dependencies = [ [[package]] name = "dojo-language-server" -version = "1.1.2" +version = "1.2.0" dependencies = [ "cairo-lang-language-server", "clap", - "dojo-lang 1.1.2", + "dojo-lang 1.2.0", ] [[package]] name = "dojo-metrics" -version = "1.1.2" +version = "1.2.0" dependencies = [ "hyper 0.14.30", "jemalloc-ctl", @@ -4607,7 +4607,7 @@ dependencies = [ [[package]] name = "dojo-test-utils" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "assert_fs", @@ -4632,6 +4632,7 @@ dependencies = [ [[package]] name = "dojo-types" version = "1.1.2" +source = "git+https://github.com/dojoengine/dojo?rev=86bb5ae#86bb5aea7c2210d31ba16ecdfd45146aa665cd5e" dependencies = [ "anyhow", "cainome 0.4.11", @@ -4652,8 +4653,7 @@ dependencies = [ [[package]] name = "dojo-types" -version = "1.1.2" -source = "git+https://github.com/dojoengine/dojo?rev=86bb5ae#86bb5aea7c2210d31ba16ecdfd45146aa665cd5e" +version = "1.2.0" dependencies = [ "anyhow", "cainome 0.4.11", @@ -4674,7 +4674,7 @@ dependencies = [ [[package]] name = "dojo-utils" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "assert_matches", @@ -4692,13 +4692,13 @@ dependencies = [ [[package]] name = "dojo-world" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "async-trait", "cainome 0.4.11", "cairo-lang-starknet-classes", - "dojo-types 1.1.2", + "dojo-types 1.2.0", "futures", "hex", "hex-literal", @@ -4719,7 +4719,7 @@ dependencies = [ [[package]] name = "dojo-world-abigen" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "cainome 0.4.11", @@ -7926,7 +7926,7 @@ dependencies = [ [[package]] name = "katana" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "assert_matches", @@ -7958,7 +7958,7 @@ dependencies = [ [[package]] name = "katana-cairo" -version = "1.1.2" +version = "1.2.0" dependencies = [ "cairo-lang-casm", "cairo-lang-runner", @@ -7973,7 +7973,7 @@ dependencies = [ [[package]] name = "katana-chain-spec" -version = "1.1.2" +version = "1.2.0" dependencies = [ "alloy-primitives", "anyhow", @@ -7996,7 +7996,7 @@ dependencies = [ [[package]] name = "katana-cli" -version = "1.1.2" +version = "1.2.0" dependencies = [ "alloy-primitives", "anyhow", @@ -8026,7 +8026,7 @@ dependencies = [ [[package]] name = "katana-codecs" -version = "1.1.2" +version = "1.2.0" dependencies = [ "bytes", "katana-primitives", @@ -8034,7 +8034,7 @@ dependencies = [ [[package]] name = "katana-codecs-derive" -version = "1.1.2" +version = "1.2.0" dependencies = [ "proc-macro2", "quote", @@ -8044,7 +8044,7 @@ dependencies = [ [[package]] name = "katana-core" -version = "1.1.2" +version = "1.2.0" dependencies = [ "alloy-primitives", "alloy-provider 0.4.2", @@ -8084,7 +8084,7 @@ dependencies = [ [[package]] name = "katana-db" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "arbitrary", @@ -8111,7 +8111,7 @@ dependencies = [ [[package]] name = "katana-executor" -version = "1.1.2" +version = "1.2.0" dependencies = [ "alloy-primitives", "anyhow", @@ -8139,7 +8139,7 @@ dependencies = [ [[package]] name = "katana-feeder-gateway" -version = "1.1.2" +version = "1.2.0" dependencies = [ "katana-primitives", "katana-rpc-types", @@ -8154,7 +8154,7 @@ dependencies = [ [[package]] name = "katana-grpc" -version = "1.1.2" +version = "1.2.0" dependencies = [ "tonic 0.11.0", "tonic-build 0.11.0", @@ -8163,7 +8163,7 @@ dependencies = [ [[package]] name = "katana-messaging" -version = "1.1.2" +version = "1.2.0" dependencies = [ "alloy-contract 0.4.2", "alloy-network 0.4.2", @@ -8192,7 +8192,7 @@ dependencies = [ [[package]] name = "katana-node" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "clap", @@ -8236,7 +8236,7 @@ dependencies = [ [[package]] name = "katana-node-bindings" -version = "1.1.2" +version = "1.2.0" dependencies = [ "regex", "serde", @@ -8251,7 +8251,7 @@ dependencies = [ [[package]] name = "katana-pipeline" -version = "1.1.2" +version = "1.2.0" dependencies = [ "async-trait", "futures", @@ -8265,7 +8265,7 @@ dependencies = [ [[package]] name = "katana-pool" -version = "1.1.2" +version = "1.2.0" dependencies = [ "futures", "futures-util", @@ -8281,7 +8281,7 @@ dependencies = [ [[package]] name = "katana-primitives" -version = "1.1.2" +version = "1.2.0" dependencies = [ "alloy-primitives", "anyhow", @@ -8315,7 +8315,7 @@ dependencies = [ [[package]] name = "katana-provider" -version = "1.1.2" +version = "1.2.0" dependencies = [ "alloy-primitives", "anyhow", @@ -8344,7 +8344,7 @@ dependencies = [ [[package]] name = "katana-rpc" -version = "1.1.2" +version = "1.2.0" dependencies = [ "alloy", "alloy-primitives", @@ -8391,7 +8391,7 @@ dependencies = [ [[package]] name = "katana-rpc-api" -version = "1.1.2" +version = "1.2.0" dependencies = [ "jsonrpsee", "katana-core", @@ -8402,7 +8402,7 @@ dependencies = [ [[package]] name = "katana-rpc-types" -version = "1.1.2" +version = "1.2.0" dependencies = [ "alloy-primitives", "anyhow", @@ -8430,7 +8430,7 @@ dependencies = [ [[package]] name = "katana-rpc-types-builder" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "katana-executor", @@ -8442,7 +8442,7 @@ dependencies = [ [[package]] name = "katana-runner" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "assert_fs", @@ -8455,7 +8455,7 @@ dependencies = [ [[package]] name = "katana-runner-macro" -version = "1.1.2" +version = "1.2.0" dependencies = [ "proc-macro2", "quote", @@ -8464,7 +8464,7 @@ dependencies = [ [[package]] name = "katana-slot-controller" -version = "1.1.2" +version = "1.2.0" dependencies = [ "alloy-primitives", "anyhow", @@ -8482,7 +8482,7 @@ dependencies = [ [[package]] name = "katana-stage" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "async-trait", @@ -8506,7 +8506,7 @@ dependencies = [ [[package]] name = "katana-tasks" -version = "1.1.2" +version = "1.2.0" dependencies = [ "futures", "rayon", @@ -8519,7 +8519,7 @@ dependencies = [ [[package]] name = "katana-trie" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "bitvec", @@ -12462,7 +12462,7 @@ dependencies = [ "derive_builder", "dialoguer", "directories", - "dojo-lang 1.1.2 (git+https://github.com/dojoengine/dojo?rev=86bb5ae)", + "dojo-lang 1.1.2", "dunce", "flate2", "fs4", @@ -13286,7 +13286,7 @@ dependencies = [ [[package]] name = "sozo" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "async-trait", @@ -13300,7 +13300,7 @@ dependencies = [ "colored", "dojo-bindgen", "dojo-test-utils", - "dojo-types 1.1.2", + "dojo-types 1.2.0", "dojo-utils", "dojo-world", "katana-rpc-api", @@ -13332,7 +13332,7 @@ dependencies = [ [[package]] name = "sozo-ops" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "assert_fs", @@ -13341,7 +13341,7 @@ dependencies = [ "colored", "colored_json", "dojo-test-utils", - "dojo-types 1.1.2", + "dojo-types 1.2.0", "dojo-utils", "dojo-world", "futures", @@ -13364,7 +13364,7 @@ dependencies = [ [[package]] name = "sozo-scarbext" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "camino", @@ -13377,7 +13377,7 @@ dependencies = [ [[package]] name = "sozo-signers" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "starknet", @@ -13385,7 +13385,7 @@ dependencies = [ [[package]] name = "sozo-walnut" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "clap", @@ -14841,7 +14841,7 @@ dependencies = [ [[package]] name = "torii" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "clap", @@ -14852,7 +14852,7 @@ dependencies = [ [[package]] name = "torii-cli" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "assert_matches", @@ -14868,12 +14868,12 @@ dependencies = [ [[package]] name = "torii-client" -version = "1.1.2" +version = "1.2.0" dependencies = [ "async-trait", "camino", "crypto-bigint", - "dojo-types 1.1.2", + "dojo-types 1.2.0", "dojo-world", "futures", "futures-util", @@ -14896,7 +14896,7 @@ dependencies = [ [[package]] name = "torii-graphql" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "async-graphql", @@ -14907,7 +14907,7 @@ dependencies = [ "chrono", "convert_case 0.6.0", "dojo-test-utils", - "dojo-types 1.1.2", + "dojo-types 1.2.0", "dojo-utils", "dojo-world", "katana-runner", @@ -14937,13 +14937,13 @@ dependencies = [ [[package]] name = "torii-grpc" -version = "1.1.2" +version = "1.2.0" dependencies = [ "cainome 0.4.11", "camino", "crypto-bigint", "dojo-test-utils", - "dojo-types 1.1.2", + "dojo-types 1.2.0", "dojo-utils", "dojo-world", "futures", @@ -14985,7 +14985,7 @@ dependencies = [ [[package]] name = "torii-indexer" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "async-trait", @@ -14996,7 +14996,7 @@ dependencies = [ "crypto-bigint", "data-url", "dojo-test-utils", - "dojo-types 1.1.2", + "dojo-types 1.2.0", "dojo-utils", "dojo-world", "futures-channel", @@ -15026,11 +15026,11 @@ dependencies = [ [[package]] name = "torii-relay" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "chrono", - "dojo-types 1.1.2", + "dojo-types 1.2.0", "dojo-world", "futures", "indexmap 2.5.0", @@ -15060,7 +15060,7 @@ dependencies = [ [[package]] name = "torii-runner" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "assert_matches", @@ -15070,7 +15070,7 @@ dependencies = [ "chrono", "ctrlc", "dojo-metrics", - "dojo-types 1.1.2", + "dojo-types 1.2.0", "dojo-utils", "dojo-world", "either", @@ -15108,7 +15108,7 @@ dependencies = [ [[package]] name = "torii-server" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "async-trait", @@ -15142,7 +15142,7 @@ dependencies = [ [[package]] name = "torii-sqlite" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "async-trait", @@ -15153,7 +15153,7 @@ dependencies = [ "crypto-bigint", "data-url", "dojo-test-utils", - "dojo-types 1.1.2", + "dojo-types 1.2.0", "dojo-utils", "dojo-world", "futures-channel", @@ -15181,11 +15181,11 @@ dependencies = [ [[package]] name = "torii-typed-data" -version = "1.1.2" +version = "1.2.0" dependencies = [ "cainome 0.4.11", "crypto-bigint", - "dojo-types 1.1.2", + "dojo-types 1.2.0", "indexmap 2.5.0", "serde", "serde_json", @@ -15531,7 +15531,7 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "types-test" -version = "1.1.2" +version = "1.2.0" [[package]] name = "u256-literal" @@ -15833,7 +15833,7 @@ dependencies = [ [[package]] name = "verify_db_balances" -version = "1.1.2" +version = "1.2.0" dependencies = [ "clap", "num-traits 0.2.19", @@ -16914,7 +16914,7 @@ checksum = "9d422e8e38ec76e2f06ee439ccc765e9c6a9638b9e7c9f2e8255e4d41e8bd852" [[package]] name = "xtask-generate-test-db" -version = "1.1.2" +version = "1.2.0" dependencies = [ "anyhow", "dojo-test-utils", diff --git a/Cargo.toml b/Cargo.toml index be0e9d381d..8c4bdab7af 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,7 +58,7 @@ edition = "2021" license = "Apache-2.0" license-file = "LICENSE" repository = "https://github.com/dojoengine/dojo/" -version = "1.1.2" +version = "1.2.0" [profile.performance] codegen-units = 1 diff --git a/crates/dojo/core-cairo-test/Scarb.lock b/crates/dojo/core-cairo-test/Scarb.lock index c2ae6068f3..ec1399403b 100644 --- a/crates/dojo/core-cairo-test/Scarb.lock +++ b/crates/dojo/core-cairo-test/Scarb.lock @@ -3,7 +3,7 @@ version = 1 [[package]] name = "dojo" -version = "1.1.2" +version = "1.2.0" dependencies = [ "dojo_plugin", ] diff --git a/crates/dojo/core/Scarb.lock b/crates/dojo/core/Scarb.lock index 4c1d964c68..87b70e86cc 100644 --- a/crates/dojo/core/Scarb.lock +++ b/crates/dojo/core/Scarb.lock @@ -3,7 +3,7 @@ version = 1 [[package]] name = "dojo" -version = "1.1.2" +version = "1.2.0" dependencies = [ "dojo_plugin", ] diff --git a/crates/dojo/core/Scarb.toml b/crates/dojo/core/Scarb.toml index 045a28a7b8..7326f58c07 100644 --- a/crates/dojo/core/Scarb.toml +++ b/crates/dojo/core/Scarb.toml @@ -3,7 +3,7 @@ cairo-version = "=2.9.2" edition = "2024_07" description = "The Dojo Core library for autonomous worlds." name = "dojo" -version = "1.1.2" +version = "1.2.0" [dependencies] starknet = "=2.9.2" diff --git a/crates/torii/types-test/Scarb.lock b/crates/torii/types-test/Scarb.lock index cfeedf54cb..252b75e929 100644 --- a/crates/torii/types-test/Scarb.lock +++ b/crates/torii/types-test/Scarb.lock @@ -3,7 +3,7 @@ version = 1 [[package]] name = "dojo" -version = "1.1.2" +version = "1.2.0" dependencies = [ "dojo_plugin", ] @@ -14,7 +14,7 @@ version = "2.9.2" [[package]] name = "types_test" -version = "1.1.2" +version = "1.2.0" dependencies = [ "dojo", ] diff --git a/crates/torii/types-test/Scarb.toml b/crates/torii/types-test/Scarb.toml index fd2f29779f..23abfb1a55 100644 --- a/crates/torii/types-test/Scarb.toml +++ b/crates/torii/types-test/Scarb.toml @@ -2,7 +2,7 @@ cairo-version = "=2.9.2" edition = "2024_07" name = "types_test" -version = "1.1.2" +version = "1.2.0" [cairo] sierra-replace-ids = true diff --git a/examples/simple/Scarb.lock b/examples/simple/Scarb.lock index a98f8e2b05..41060ebad4 100644 --- a/examples/simple/Scarb.lock +++ b/examples/simple/Scarb.lock @@ -3,7 +3,7 @@ version = 1 [[package]] name = "dojo" -version = "1.1.2" +version = "1.2.0" dependencies = [ "dojo_plugin", ] diff --git a/examples/simple/manifest_dev.json b/examples/simple/manifest_dev.json index 2ae5267d66..b6e91aa63b 100644 --- a/examples/simple/manifest_dev.json +++ b/examples/simple/manifest_dev.json @@ -1,7 +1,7 @@ { "world": { - "class_hash": "0x2361c106e790c1d1bff8c9f73c9d84e9e3ac94b2d8df6db4ddd55e82c33a9b4", - "address": "0x1fdfa7a4dc649d4203d5669fb8086474a686458ea86f95027c7b9a5f10d43bb", + "class_hash": "0x7c9469d45a9cdbab775035afb48e1fa73fb35ab059fcb9dfb0a301aa973e783", + "address": "0x60ad048d25c5f97abf3056d86a06ee6df6e0c62ce2e8e2d84c010c37f4ce13c", "seed": "simple", "name": "simple", "entrypoints": [ @@ -11,6 +11,7 @@ "register_event", "register_model", "register_contract", + "register_library", "init_contract", "upgrade_event", "upgrade_model", @@ -78,6 +79,10 @@ { "name": "Unregistered", "type": "()" + }, + { + "name": "Library", + "type": "(core::starknet::class_hash::ClassHash, core::felt252)" } ] }, @@ -362,6 +367,34 @@ ], "state_mutability": "external" }, + { + "type": "function", + "name": "register_library", + "inputs": [ + { + "name": "namespace", + "type": "core::byte_array::ByteArray" + }, + { + "name": "class_hash", + "type": "core::starknet::class_hash::ClassHash" + }, + { + "name": "name", + "type": "core::byte_array::ByteArray" + }, + { + "name": "version", + "type": "core::byte_array::ByteArray" + } + ], + "outputs": [ + { + "type": "core::starknet::class_hash::ClassHash" + } + ], + "state_mutability": "external" + }, { "type": "function", "name": "init_contract", @@ -965,6 +998,28 @@ } ] }, + { + "type": "event", + "name": "dojo::world::world_contract::world::LibraryRegistered", + "kind": "struct", + "members": [ + { + "name": "name", + "type": "core::byte_array::ByteArray", + "kind": "key" + }, + { + "name": "namespace", + "type": "core::byte_array::ByteArray", + "kind": "key" + }, + { + "name": "class_hash", + "type": "core::starknet::class_hash::ClassHash", + "kind": "data" + } + ] + }, { "type": "event", "name": "dojo::world::world_contract::world::EventEmitted", @@ -1206,6 +1261,11 @@ "type": "dojo::world::world_contract::world::ContractInitialized", "kind": "nested" }, + { + "name": "LibraryRegistered", + "type": "dojo::world::world_contract::world::LibraryRegistered", + "kind": "nested" + }, { "name": "EventEmitted", "type": "dojo::world::world_contract::world::EventEmitted", @@ -1252,7 +1312,7 @@ }, "contracts": [ { - "address": "0x6bd026832b87c2374e80a6cc81cda814d5a6438a090422ea9965d9c6f5a11b", + "address": "0x68ebbbaa05b52fca16f3094070276fbf58feaaee2c439dfc3ef81ef0efcd2ce", "class_hash": "0x4f8b513b49ec2fdb194efa3a8d041aef0e66346a6e8a9a999b1f4eb2fb17045", "abi": [ { @@ -1510,7 +1570,7 @@ ] }, { - "address": "0x927d206ade2170c687f3587b2ea656b7b39e4422c75f00ae7051ba32a32b78", + "address": "0x1bcadbe4bda190754bb85a2288471802193e54581f4bbf3edce20418027b5c2", "class_hash": "0x61abffb3fd1eee27cba6298be11b8252c21eb3f69c8730ff44e9859e173cfb8", "abi": [ { @@ -1686,7 +1746,7 @@ ] }, { - "address": "0x7c62d68fcd656d72eb64ad6375a1907f3be1afec52caac3b742e53a26d069d8", + "address": "0x323d7847eb5698860601cf6dccd1ac95c6629eb1aa057b8ef704ffb38770e6", "class_hash": "0x4f8b513b49ec2fdb194efa3a8d041aef0e66346a6e8a9a999b1f4eb2fb17045", "abi": [ { @@ -1944,6 +2004,7 @@ ] } ], + "libraries": [], "models": [ { "members": [], @@ -1971,5 +2032,6 @@ "tag": "ns-EH", "selector": "0x4c6c7772b19b700cf97d078d02a419670d11d2b689a7a3647eac311b2817ced" } - ] + ], + "external_contracts": [] } \ No newline at end of file diff --git a/examples/spawn-and-move/Scarb.lock b/examples/spawn-and-move/Scarb.lock index 73741ac1ef..76cc04479f 100644 --- a/examples/spawn-and-move/Scarb.lock +++ b/examples/spawn-and-move/Scarb.lock @@ -17,7 +17,7 @@ dependencies = [ [[package]] name = "dojo" -version = "1.1.2" +version = "1.2.0" dependencies = [ "dojo_plugin", ] @@ -31,7 +31,7 @@ dependencies = [ [[package]] name = "dojo_examples" -version = "1.1.2" +version = "1.2.0" dependencies = [ "armory", "bestiary", diff --git a/examples/spawn-and-move/Scarb.toml b/examples/spawn-and-move/Scarb.toml index dd61af41d9..d0e9238b51 100644 --- a/examples/spawn-and-move/Scarb.toml +++ b/examples/spawn-and-move/Scarb.toml @@ -1,7 +1,7 @@ [package] cairo-version = "=2.9.2" name = "dojo_examples" -version = "1.1.2" +version = "1.2.0" # Use the prelude with the less imports as possible # from corelib. edition = "2024_07" diff --git a/examples/spawn-and-move/manifest_dev.json b/examples/spawn-and-move/manifest_dev.json index de2f5c41a8..bf526fa79b 100644 --- a/examples/spawn-and-move/manifest_dev.json +++ b/examples/spawn-and-move/manifest_dev.json @@ -2221,7 +2221,7 @@ ], "libraries": [ { - "class_hash": "0x18e785a7f62e106c199d15b41e756a2ba8a89f5d229f31a5b7e8971f7529a69", + "class_hash": "0x5d656902fe69f699ebbe0af587d01a46ecdb166daf10c70a6cf0b27555ee7fe", "abi": [ { "type": "impl", @@ -2297,17 +2297,6 @@ } ], "state_mutability": "view" - }, - { - "type": "function", - "name": "test", - "inputs": [], - "outputs": [ - { - "type": "core::integer::u8" - } - ], - "state_mutability": "view" } ] }, diff --git a/examples/spawn-and-move/src/actions.cairo b/examples/spawn-and-move/src/actions.cairo index 7ba26404d9..e9b7128deb 100644 --- a/examples/spawn-and-move/src/actions.cairo +++ b/examples/spawn-and-move/src/actions.cairo @@ -246,6 +246,7 @@ mod tests { spawn_test_world, NamespaceDef, TestResource, ContractDefTrait, ContractDef, WorldStorageTestTrait, }; + use dojo_examples::lib_math::simple_math; use super::{actions, IActionsDispatcher, IActionsDispatcherTrait}; use crate::dungeon::dungeon; @@ -259,6 +260,7 @@ mod tests { TestResource::Model(m_Moves::TEST_CLASS_HASH), TestResource::Event(actions::e_Moved::TEST_CLASS_HASH), TestResource::Contract(actions::TEST_CLASS_HASH), + TestResource::Library((simple_math::TEST_CLASS_HASH, @"simple_math", @"0_1_0")), ] .span(), }; @@ -329,6 +331,7 @@ mod tests { assert( initial_position.vec.x == 10 && initial_position.vec.y == 10, 'wrong initial position', ); + assert(initial_moves.remaining == 99, 'wrong initial moves'); actions_system.move(Direction::Right(())); diff --git a/examples/spawn-and-move/src/lib_math.cairo b/examples/spawn-and-move/src/lib_math.cairo index 6fcf16bcc3..a94fd9827a 100644 --- a/examples/spawn-and-move/src/lib_math.cairo +++ b/examples/spawn-and-move/src/lib_math.cairo @@ -2,7 +2,6 @@ pub trait SimpleMath { /// Decrements the value, saturating at 0. fn decrement_saturating(self: @T, value: u8) -> u8; - fn test(self: @T) -> u8; } #[dojo::library] @@ -13,14 +12,7 @@ pub mod simple_math { #[abi(embed_v0)] impl SimpleMathImpl of SimpleMath { fn decrement_saturating(self: @ContractState, value: u8) -> u8 { - let mut v = value; - v.saturating_sub(1); - - v - } - - fn test(self: @ContractState) -> u8 { - 2 + value.saturating_sub(1) } } } diff --git a/spawn-and-move-db.tar.gz b/spawn-and-move-db.tar.gz index ab4c279bcb..1cb7657011 100644 Binary files a/spawn-and-move-db.tar.gz and b/spawn-and-move-db.tar.gz differ diff --git a/types-test-db.tar.gz b/types-test-db.tar.gz index 08cb9d273a..73f19f9e7d 100644 Binary files a/types-test-db.tar.gz and b/types-test-db.tar.gz differ