Skip to content

Commit

Permalink
remove toml and scarb lock changes
Browse files Browse the repository at this point in the history
  • Loading branch information
andrew-fleming committed Aug 14, 2024
1 parent 17ea534 commit 2f8a93d
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 31 deletions.
30 changes: 18 additions & 12 deletions Scarb.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
15 changes: 11 additions & 4 deletions Scarb.toml
Original file line number Diff line number Diff line change
@@ -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",
]
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/access/Scarb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/account/Scarb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/governance/Scarb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions packages/presets/Scarb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }

Expand Down
6 changes: 3 additions & 3 deletions packages/test_common/Scarb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
6 changes: 3 additions & 3 deletions packages/token/Scarb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2f8a93d

Please sign in to comment.