Merge remote-tracking branch 'origin/main' into erc721

NethermindEth · Oct 24, 2024 · fef0cd3 · fef0cd3
2 parents aa3c4a2 + 024cd07
commit fef0cd3
Show file tree

Hide file tree

Showing 100 changed files with 3,201 additions and 1,050 deletions.
diff --git a/.tool-versions b/.tool-versions
@@ -1,2 +1,2 @@
 scarb 2.8.2
-starknet-foundry 0.30.0
+starknet-foundry 0.30.0
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -112,7 +112,6 @@ version.workspace = true
 
 [dependencies]
 starknet.workspace = true
-snforge_std.workspace = true
 # Uncomment the following lines if you want to use additional dependencies:
 # OpenZeppelin:
 # openzeppelin.workspace = true
@@ -122,6 +121,7 @@ snforge_std.workspace = true
 
 [dev-dependencies]
 assert_macros.workspace = true
+snforge_std.workspace = true
 
 [scripts]
 test.workspace = true
@@ -200,7 +200,7 @@ c
 Then, in the markdown file, you can use the following syntax to include only the code between the delimiting comments:
 
 ````markdown
-````rust
+````cairo
 {{#include ../../listings/path/to/listing/src/contract.cairo:anchor_name}}
 \```
 ````
@@ -215,7 +215,7 @@ b
 Using `#rustdoc_include` you can have the same result, but users can expand the code in the book to see the whole file (used for showing tests):
 
 ````markdown
-````rust
+````cairo
 {{#rustdoc_include ../../listings/path/to/listing/src/contract.cairo:anchor_name}}
 \```
 ````

diff --git a/Scarb.toml b/Scarb.toml
@@ -27,6 +27,7 @@ homepage = "https://www.nethermind.io/"
 license = "MIT"
 authors = ["julio4", "msaug"]
 version = "0.1.0"
+edition = "2024_07"
 
 [tool]
 snforge.workspace = true
diff --git a/book.toml b/book.toml
@@ -8,13 +8,19 @@ title = "Starknet by Example"
 [build]
 extra-watch-dirs = ["listings", "po"]
 
-[preprocessor.gettext]
+[preprocessor.cairo]
 after = ["links"]
 
+[preprocessor.gettext]
+after = ["cairo"]
+
 [preprocessor.last-changed]
 command = "mdbook-last-changed"
 renderer = ["html"]
 
+[output.html.code.hidelines]
+cairo = "# "
+
 [output.html]
 git-repository-url = "https://github.com/NethermindEth/StarknetByExample"
 edit-url-template = "https://github.com/NethermindEth/StarknetByExample/edit/main/{path}"

diff --git a/listings/advanced-concepts/ecdsa_verification/Scarb.toml b/listings/advanced-concepts/ecdsa_verification/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ecdsa_verification"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true

diff --git a/listings/advanced-concepts/hash_solidity_compatible/Scarb.toml b/listings/advanced-concepts/hash_solidity_compatible/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
 name = "hash_solidity_compatible"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true

diff --git a/listings/advanced-concepts/hash_trait/Scarb.toml b/listings/advanced-concepts/hash_trait/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
 name = "hash_trait"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true

diff --git a/listings/advanced-concepts/library_calls/Scarb.toml b/listings/advanced-concepts/library_calls/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
 name = "library_calls"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true

diff --git a/listings/advanced-concepts/simple_account/Scarb.toml b/listings/advanced-concepts/simple_account/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
 name = "simple_account"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true

diff --git a/listings/advanced-concepts/store_using_packing/Scarb.toml b/listings/advanced-concepts/store_using_packing/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
 name = "store_using_packing"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true

diff --git a/listings/advanced-concepts/struct_as_mapping_key/Scarb.toml b/listings/advanced-concepts/struct_as_mapping_key/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
 name = "struct_as_mapping_key"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true

diff --git a/listings/advanced-concepts/write_to_any_slot/Scarb.toml b/listings/advanced-concepts/write_to_any_slot/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
 name = "write_to_any_slot"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true

diff --git a/listings/applications/advanced_factory/Scarb.toml b/listings/applications/advanced_factory/Scarb.toml
@@ -1,20 +1,19 @@
 [package]
 name = "advanced_factory"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true
 components.workspace = true
-snforge_std.workspace = true
 crowdfunding = { path = "../crowdfunding" }
 
 [dev-dependencies]
 assert_macros.workspace = true
+snforge_std.workspace = true
 
 [scripts]
 test.workspace = true
 
 [[target.starknet-contract]]
-casm = true
 build-external-contracts = ["crowdfunding::campaign::Campaign"]
diff --git a/listings/applications/coin_flip/Scarb.toml b/listings/applications/coin_flip/Scarb.toml
@@ -1,18 +1,16 @@
 [package]
 name = "coin_flip"
 version.workspace = true
-edition = "2024_07"
-
-[lib]
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true
 openzeppelin.workspace = true
 pragma_lib.workspace = true
-snforge_std.workspace = true
 
 [dev-dependencies]
 assert_macros.workspace = true
+snforge_std.workspace = true
 
 [scripts]
 test.workspace = true

diff --git a/listings/applications/components/Scarb.toml b/listings/applications/components/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
 name = "components"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [lib]
 

diff --git a/listings/applications/components_dependencies/Scarb.toml b/listings/applications/components_dependencies/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
 name = "components_dependencies"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true

diff --git a/listings/applications/constant_product_amm/Scarb.toml b/listings/applications/constant_product_amm/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
 name = "constant_product_amm"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true

diff --git a/listings/applications/crowdfunding/Scarb.toml b/listings/applications/crowdfunding/Scarb.toml
@@ -1,18 +1,18 @@
 [package]
 name = "crowdfunding"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [lib]
 
 [dependencies]
 starknet.workspace = true
 openzeppelin.workspace = true
 components.workspace = true
-snforge_std.workspace = true
 
 [dev-dependencies]
 assert_macros.workspace = true
+snforge_std.workspace = true
 
 [scripts]
 test.workspace = true

diff --git a/listings/applications/erc20/Scarb.toml b/listings/applications/erc20/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
 name = "erc20"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [lib]
 

diff --git a/listings/applications/merkle_tree/Scarb.toml b/listings/applications/merkle_tree/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
 name = "merkle_tree"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true

diff --git a/listings/applications/nft_dutch_auction/Scarb.toml b/listings/applications/nft_dutch_auction/Scarb.toml
@@ -1,15 +1,15 @@
 [package]
 name = "nft_dutch_auction"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [dependencies]
 erc20 = { path = "../erc20" }
 starknet.workspace = true
-snforge_std.workspace = true
 
 [dev-dependencies]
 assert_macros.workspace = true
+snforge_std.workspace = true
 
 [scripts]
 test.workspace = true

diff --git a/listings/applications/simple_storage_starknetjs/Scarb.toml b/listings/applications/simple_storage_starknetjs/Scarb.toml
@@ -1,9 +1,7 @@
 [package]
 name = "simple_storage"
 version.workspace = true
-edition = "2024_07"
-
-[lib]
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true

diff --git a/listings/applications/simple_vault/Scarb.toml b/listings/applications/simple_vault/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
 name = "simple_vault"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true

diff --git a/listings/applications/staking/Scarb.toml b/listings/applications/staking/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
 name = "staking"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true

diff --git a/listings/applications/timelock/Scarb.toml b/listings/applications/timelock/Scarb.toml
@@ -1,19 +1,18 @@
 [package]
 name = "timelock"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true
-snforge_std.workspace = true
 openzeppelin.workspace = true
 components.workspace = true
 
 [dev-dependencies]
 assert_macros.workspace = true
+snforge_std.workspace = true
 
 [scripts]
 test.workspace = true
 
 [[target.starknet-contract]]
-casm = true
diff --git a/listings/applications/upgradeable_contract/Scarb.toml b/listings/applications/upgradeable_contract/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
 name = "upgradeable_contract"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true

diff --git a/listings/getting-started/bytearray/Scarb.toml b/listings/getting-started/bytearray/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bytearray"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true

diff --git a/listings/getting-started/cairo_cheatsheet/Scarb.toml b/listings/getting-started/cairo_cheatsheet/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
 name = "cairo_cheatsheet"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true

diff --git a/listings/getting-started/calling_other_contracts/Scarb.toml b/listings/getting-started/calling_other_contracts/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
 name = "calling_other_contracts"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true

diff --git a/listings/getting-started/constructor/Scarb.toml b/listings/getting-started/constructor/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
 name = "constructor"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true

diff --git a/listings/getting-started/counter/Scarb.toml b/listings/getting-started/counter/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
 name = "counter"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true

diff --git a/listings/getting-started/custom_type_serde/Scarb.toml b/listings/getting-started/custom_type_serde/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
 name = "custom_type_serde"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true

diff --git a/listings/getting-started/errors/Scarb.toml b/listings/getting-started/errors/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
 name = "errors"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true

diff --git a/listings/getting-started/events/Scarb.toml b/listings/getting-started/events/Scarb.toml
@@ -1,7 +1,7 @@
 [package]
 name = "events"
 version.workspace = true
-edition = "2024_07"
+edition.workspace = true
 
 [dependencies]
 starknet.workspace = true