From 2f8a93d762858714095a1d391afffa9e21df6983 Mon Sep 17 00:00:00 2001 From: andrew Date: Tue, 13 Aug 2024 23:57:00 -0500 Subject: [PATCH] remove toml and scarb lock changes --- Scarb.lock | 30 ++++++++++++++++++------------ Scarb.toml | 15 +++++++++++---- packages/access/Scarb.toml | 4 ++-- packages/account/Scarb.toml | 4 ++-- packages/governance/Scarb.toml | 4 ++-- packages/presets/Scarb.toml | 6 +++--- packages/test_common/Scarb.toml | 6 +++--- packages/token/Scarb.toml | 6 +++--- 8 files changed, 44 insertions(+), 31 deletions(-) diff --git a/Scarb.lock b/Scarb.lock index 02b7b379c..0fa419a96 100644 --- a/Scarb.lock +++ b/Scarb.lock @@ -8,50 +8,55 @@ dependencies = [ "openzeppelin_access", "openzeppelin_account", "openzeppelin_governance", + "openzeppelin_introspection", "openzeppelin_presets", "openzeppelin_security", "openzeppelin_test_common", "openzeppelin_testing", "openzeppelin_token", "openzeppelin_upgrades", + "openzeppelin_utils", "snforge_std", ] [[package]] name = "openzeppelin_access" version = "0.15.1" -source = "registry+https://scarbs.xyz/" -checksum = "sha256:9c90539ab54d18253d656e58b75cd6334c76333e85a9e8758ba4091e53574c3c" dependencies = [ "openzeppelin_introspection", + "openzeppelin_test_common", + "openzeppelin_testing", "openzeppelin_utils", + "snforge_std", ] [[package]] name = "openzeppelin_account" version = "0.15.1" -source = "registry+https://scarbs.xyz/" -checksum = "sha256:a8959106a1223b8f47d4142ef636a1b44dcf16f6a7fc9ed1b071a3376d8ec6ee" dependencies = [ "openzeppelin_introspection", + "openzeppelin_test_common", + "openzeppelin_testing", "openzeppelin_utils", + "snforge_std", ] [[package]] name = "openzeppelin_governance" version = "0.15.1" -source = "registry+https://scarbs.xyz/" -checksum = "sha256:657045bcac71ce8eb4bf2cf3c69ff8e87f1b594d60cbaa1d0d5e581f47feb216" dependencies = [ "openzeppelin_access", "openzeppelin_introspection", + "openzeppelin_testing", + "snforge_std", ] [[package]] name = "openzeppelin_introspection" version = "0.15.1" -source = "registry+https://scarbs.xyz/" -checksum = "sha256:f5f88a3f7fd81c1cb9acb0edeea1207baade23e2e4555e8487a5c8161e584827" +dependencies = [ + "snforge_std", +] [[package]] name = "openzeppelin_presets" @@ -119,11 +124,12 @@ dependencies = [ [[package]] name = "openzeppelin_utils" version = "0.15.1" -source = "registry+https://scarbs.xyz/" -checksum = "sha256:981ebd7ddfbd9fc03515fa7790ca41c8b721ea020412651510ab63e40ebd2303" +dependencies = [ + "openzeppelin_testing", + "snforge_std", +] [[package]] name = "snforge_std" version = "0.26.0" -source = "registry+https://scarbs.xyz/" -checksum = "sha256:b4ce766f1faad1b7ca703f574cc8ed585e08b4d59bf7215d078c143f0bca6c15" +source = "git+https://github.com/foundry-rs/starknet-foundry.git?tag=v0.26.0#50eb589db65e113efe4f09241feb59b574228c7e" diff --git a/Scarb.toml b/Scarb.toml index a634e75f2..723538b4c 100644 --- a/Scarb.toml +++ b/Scarb.toml @@ -1,9 +1,14 @@ [workspace] members = [ + "packages/access", + "packages/account", + "packages/governance", + "packages/introspection", "packages/presets", "packages/security", "packages/token", "packages/upgrades", + "packages/utils", "packages/testing", "packages/test_common", ] @@ -34,17 +39,19 @@ keywords = [ [workspace.dependencies] starknet = "2.7.0" -snforge_std = "0.26.0" +snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.26.0" } [dependencies] starknet.workspace = true -openzeppelin_access = "0.15.1" -openzeppelin_account = "0.15.1" -openzeppelin_governance = "0.15.1" +openzeppelin_access = { path = "packages/access" } +openzeppelin_account = { path = "packages/account" } +openzeppelin_governance = { path = "packages/governance" } +openzeppelin_introspection = { path = "packages/introspection" } openzeppelin_presets = { path = "packages/presets" } openzeppelin_security = { path = "packages/security" } openzeppelin_token = { path = "packages/token" } openzeppelin_upgrades = { path = "packages/upgrades" } +openzeppelin_utils = { path = "packages/utils" } [dev-dependencies] snforge_std.workspace = true diff --git a/packages/access/Scarb.toml b/packages/access/Scarb.toml index d08ee83bf..ab2a11fcf 100644 --- a/packages/access/Scarb.toml +++ b/packages/access/Scarb.toml @@ -17,8 +17,8 @@ fmt.workspace = true [dependencies] starknet.workspace = true -openzeppelin_introspection = "0.15.1" -openzeppelin_utils = "0.15.1" +openzeppelin_introspection = { path = "../introspection" } +openzeppelin_utils = { path = "../utils" } [dev-dependencies] snforge_std.workspace = true diff --git a/packages/account/Scarb.toml b/packages/account/Scarb.toml index 5f330fbab..6b1734a83 100644 --- a/packages/account/Scarb.toml +++ b/packages/account/Scarb.toml @@ -17,8 +17,8 @@ fmt.workspace = true [dependencies] starknet.workspace = true -openzeppelin_introspection = "0.15.1" -openzeppelin_utils = "0.15.1" +openzeppelin_introspection = { path = "../introspection" } +openzeppelin_utils = { path = "../utils" } [dev-dependencies] snforge_std.workspace = true diff --git a/packages/governance/Scarb.toml b/packages/governance/Scarb.toml index 20b19f9e1..644641f1d 100644 --- a/packages/governance/Scarb.toml +++ b/packages/governance/Scarb.toml @@ -17,8 +17,8 @@ fmt.workspace = true [dependencies] starknet.workspace = true -openzeppelin_access = "0.15.1" -openzeppelin_introspection = "0.15.1" +openzeppelin_access = { path = "../access" } +openzeppelin_introspection = { path = "../introspection" } [dev-dependencies] snforge_std.workspace = true diff --git a/packages/presets/Scarb.toml b/packages/presets/Scarb.toml index 64c4261b6..1d1c033e2 100644 --- a/packages/presets/Scarb.toml +++ b/packages/presets/Scarb.toml @@ -18,9 +18,9 @@ fmt.workspace = true [dependencies] starknet.workspace = true -openzeppelin_access = "0.15.1" -openzeppelin_account = "0.15.1" -openzeppelin_introspection = "0.15.1" +openzeppelin_access = { path = "../access" } +openzeppelin_account = { path = "../account" } +openzeppelin_introspection = { path = "../introspection" } openzeppelin_token = { path = "../token" } openzeppelin_upgrades = { path = "../upgrades" } diff --git a/packages/test_common/Scarb.toml b/packages/test_common/Scarb.toml index 36cce584c..4a6706034 100644 --- a/packages/test_common/Scarb.toml +++ b/packages/test_common/Scarb.toml @@ -19,11 +19,11 @@ fmt.workspace = true starknet.workspace = true snforge_std.workspace = true openzeppelin_upgrades = { path = "../upgrades" } -openzeppelin_access = "0.15.1" -openzeppelin_account = "0.15.1" +openzeppelin_access = { path = "../access" } +openzeppelin_account = { path = "../account" } openzeppelin_token = { path = "../token" } openzeppelin_testing = { path = "../testing" } -openzeppelin_utils = "0.15.1" +openzeppelin_utils = { path = "../utils" } [lib] diff --git a/packages/token/Scarb.toml b/packages/token/Scarb.toml index e45cc3f72..57734bfe1 100644 --- a/packages/token/Scarb.toml +++ b/packages/token/Scarb.toml @@ -18,9 +18,9 @@ fmt.workspace = true [dependencies] starknet.workspace = true -openzeppelin_account = "0.15.1" -openzeppelin_introspection = "0.15.1" -openzeppelin_governance = "0.15.1" +openzeppelin_account = { path = "../account" } +openzeppelin_introspection = { path = "../introspection" } +openzeppelin_governance = { path = "../governance" } [dev-dependencies] snforge_std.workspace = true