From 17ea5346a35445f058036eba7e0d993ca4f19132 Mon Sep 17 00:00:00 2001 From: andrew Date: Tue, 13 Aug 2024 23:19:56 -0500 Subject: [PATCH] remove members account and governance/declare them from scarbs --- Scarb.lock | 9 ++++----- Scarb.toml | 6 ++---- packages/presets/Scarb.toml | 2 +- packages/test_common/Scarb.toml | 2 +- packages/token/Scarb.toml | 4 ++-- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/Scarb.lock b/Scarb.lock index 8a19ce911..02b7b379c 100644 --- a/Scarb.lock +++ b/Scarb.lock @@ -30,22 +30,21 @@ dependencies = [ [[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]] diff --git a/Scarb.toml b/Scarb.toml index 548013e41..a634e75f2 100644 --- a/Scarb.toml +++ b/Scarb.toml @@ -1,7 +1,5 @@ [workspace] members = [ - "packages/account", - "packages/governance", "packages/presets", "packages/security", "packages/token", @@ -41,8 +39,8 @@ snforge_std = "0.26.0" [dependencies] starknet.workspace = true openzeppelin_access = "0.15.1" -openzeppelin_account = { path = "packages/account" } -openzeppelin_governance = { path = "packages/governance" } +openzeppelin_account = "0.15.1" +openzeppelin_governance = "0.15.1" openzeppelin_presets = { path = "packages/presets" } openzeppelin_security = { path = "packages/security" } openzeppelin_token = { path = "packages/token" } diff --git a/packages/presets/Scarb.toml b/packages/presets/Scarb.toml index 8ffe24c98..64c4261b6 100644 --- a/packages/presets/Scarb.toml +++ b/packages/presets/Scarb.toml @@ -19,7 +19,7 @@ fmt.workspace = true [dependencies] starknet.workspace = true openzeppelin_access = "0.15.1" -openzeppelin_account = { path = "../account" } +openzeppelin_account = "0.15.1" openzeppelin_introspection = "0.15.1" openzeppelin_token = { path = "../token" } openzeppelin_upgrades = { path = "../upgrades" } diff --git a/packages/test_common/Scarb.toml b/packages/test_common/Scarb.toml index e71198689..36cce584c 100644 --- a/packages/test_common/Scarb.toml +++ b/packages/test_common/Scarb.toml @@ -20,7 +20,7 @@ starknet.workspace = true snforge_std.workspace = true openzeppelin_upgrades = { path = "../upgrades" } openzeppelin_access = "0.15.1" -openzeppelin_account = { path = "../account" } +openzeppelin_account = "0.15.1" openzeppelin_token = { path = "../token" } openzeppelin_testing = { path = "../testing" } openzeppelin_utils = "0.15.1" diff --git a/packages/token/Scarb.toml b/packages/token/Scarb.toml index a88a6e33a..e45cc3f72 100644 --- a/packages/token/Scarb.toml +++ b/packages/token/Scarb.toml @@ -18,9 +18,9 @@ fmt.workspace = true [dependencies] starknet.workspace = true -openzeppelin_account = { path = "../account" } +openzeppelin_account = "0.15.1" openzeppelin_introspection = "0.15.1" -openzeppelin_governance = { path = "../governance" } +openzeppelin_governance = "0.15.1" [dev-dependencies] snforge_std.workspace = true