diff --git a/Scarb.lock b/Scarb.lock index 1b9149f8..82894273 100644 --- a/Scarb.lock +++ b/Scarb.lock @@ -144,9 +144,16 @@ dependencies = [ "openzeppelin", ] +[[package]] +name = "simple_storage" +version = "0.1.0" + [[package]] name = "simple_vault" version = "0.1.0" +dependencies = [ + "erc20", +] [[package]] name = "snforge_std" diff --git a/Scarb.toml b/Scarb.toml index b0161d18..8df8fcb2 100644 --- a/Scarb.toml +++ b/Scarb.toml @@ -12,22 +12,12 @@ test = "$(git rev-parse --show-toplevel)/scripts/test_resolver.sh" [workspace.tool.snforge] [workspace.dependencies] -<<<<<<< HEAD -starknet = ">=2.6.3" -# snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.11.0" } -openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag="v0.11.0" } -pragma_lib = { git = "https://github.com/astraly-labs/pragma-lib" } - -# [workspace.dev-dependencies] -# openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag="v0.11.0" } -======= starknet = ">=2.6.4" openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag="v0.14.0" } components = { path = "listings/applications/components" } snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.25.0" } # The latest Alexandria release supports only Cairo v2.6.0, so using explicit rev that supports Cairo v2.6.3 alexandria_storage = { git = "https://github.com/keep-starknet-strange/alexandria.git", rev="800f5ad" } ->>>>>>> main [workspace.package] description = "Collection of examples of how to use the Cairo programming language to create smart contracts on Starknet." diff --git a/listings/applications/dice_game_vrf/Scarb.toml b/listings/applications/dice_game_vrf/Scarb.toml index 69f8e1ce..fb2509c4 100644 --- a/listings/applications/dice_game_vrf/Scarb.toml +++ b/listings/applications/dice_game_vrf/Scarb.toml @@ -6,9 +6,9 @@ edition = "2023_11" [dependencies] starknet.workspace = true openzeppelin.workspace = true -pragma_lib.workspace = true +pragma_lib = { git = "https://github.com/astraly-labs/pragma-lib" } [scripts] test.workspace = true -[[target.starknet-contract]] \ No newline at end of file +[[target.starknet-contract]]