Skip to content

Workspace inheritance #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Workspace inheritance #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c5811e
Refactor crates to take advantage of workspace inheritance.
cryptoquick Jan 3, 2024
a97bfc2
Merge branch 'master' into HB/workspace-inheritance
cryptoquick Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 44 additions & 14 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,46 @@
[workspace]
members = ["sapio"
, "sapio-contrib"
, "ctv_emulators"
, "sapio-base"
, "cli"
, "tools"
, "plugins"
, 'emulator-trait'
, 'examples/*'
, 'sapio-trait'
, 'sapio_macros'
, 'sapio-psbt'
, 'simp-pack']
exclude = ["plugin-example", "integration_tests"]
members = [
"sapio",
"sapio-contrib",
"ctv_emulators",
"sapio-base",
"cli",
"tools",
"plugins",
"emulator-trait",
"examples/*",
"sapio-trait",
"sapio_macros",
"sapio-psbt",
"simp-pack",
"batching-trait",
"nft-trait",
"plugin-example/*",
]
exclude = ["integration_tests"]
resolver = "2"

[workspace.package]
description = "A programming framework for bitcoin smart contracts."
version = "0.2.0"
license = "MPL-2.0"
authors = ["Jeremy Rubin <j@rubin.io>"]
edition = "2021"
repository = "https://github.com/sapio-lang/sapio"
homepage = "https://sapio-lang.org"

[workspace.dependencies]
sapio = { version = "*", path = "sapio" }
sapio-contrib = { version = "*", path = "sapio-contrib" }
ctv_emulators = { version = "*", path = "ctv_emulators" }
sapio-base = { version = "*", path = "sapio-base" }
cli = { version = "*", path = "cli" }
tools = { version = "*", path = "tools" }
sapio-wasm-plugin = { version = "*", path = "plugins" }
sapio-ctv-emulator-trait = { version = "*", path = "emulator-trait" }
sapio-trait = { version = "*", path = "sapio-trait" }
sapio_macros = { version = "*", path = "sapio_macros" }
sapio-psbt = { version = "*", path = "sapio-psbt" }
simp-pack = { version = "*", path = "simp-pack" }
batching-trait = { version = "*", path = "batching-trait" }
sapio-wasm-nft-trait = { version = "*", path = "nft-trait" }
31 changes: 31 additions & 0 deletions batching-trait/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
[package]
name = "batching-trait"
version = "0.1.0"
edition = "2021"

[dependencies]
serde = "1.0"
serde_derive = "1.0"
serde_json = "1.0"

sapio-base.workspace = true
sapio-ctv-emulator-trait.workspace = true
sapio-trait.workspace = true
sapio-wasm-plugin.workspace = true
sapio-wasm-plugin.features = ["client"]
sapio.workspace = true

[dependencies.schemars]
version = "0.8.0"
features = ['impl_json_schema']

[dependencies.bitcoin]
package = "sapio-bitcoin"
version = "0.28.0"
features = ['use-serde']

[dependencies.miniscript]
package = "sapio-miniscript"
version = "^7.0.0"
features = ['compiler', 'use-serde', 'use-schemars', 'serde']
optional = true
0 plugin-example/batching-trait/src/lib.rs → batching-trait/src/lib.rs
View file
Open in desktop
File renamed without changes.
34 changes: 7 additions & 27 deletions cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ repository = "https://github.com/sapio-lang/sapio"
homepage = "https://sapio-lang.org"
description = "A Command Line Interface for interacting with Sapio Contracts"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
schemars = "0.8.0"
serde_json = "1.0"
Expand All @@ -24,9 +22,13 @@ directories = "3.0.1"
rand = "^0.6"
jsonschema-valid = "0.4.0"

[dependencies.sapio-psbt]
path = "../sapio-psbt"
version = "0.1.0"
sapio-psbt.workspace = true
sapio.workspace = true
sapio-base.workspace = true
ctv_emulators.workspace = true
sapio-contrib.workspace = true
sapio-wasm-plugin.workspace = true
sapio-wasm-plugin.features = ["host"]

[dependencies.wasmer]
version = "2.2.1"
Expand All @@ -43,25 +45,3 @@ features = ['use-serde', 'rand', 'base64']
package = "sapio-miniscript"
version = "^7.0.0"
features = ['compiler', 'use-serde', 'rand', 'use-schemars', 'serde']

[dependencies.sapio]
path = "../sapio"
version = "0.2.0"

[dependencies.sapio-base]
path = "../sapio-base"
version = "0.2.0"

[dependencies.ctv_emulators]
path = "../ctv_emulators"
version = "0.2.0"

[dependencies.sapio-contrib]
path = "../sapio-contrib"
version = "0.2.0"

[dependencies.sapio-wasm-plugin]
path = "../plugins"
version = "0.2.0"

features = ["host"]
12 changes: 2 additions & 10 deletions ctv_emulators/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ repository = "https://github.com/sapio-lang/sapio"
homepage = "https://sapio-lang.org"
description = "Implementation of the CTV Emulator Trait"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
tokio = { version = "1", features = ["full"] }
schemars = "0.8.0"
Expand All @@ -17,10 +16,8 @@ serde = "1.0"
serde_derive = "1.0"
rand = "0.8.1"


[dependencies.sapio-ctv-emulator-trait]
path = "../emulator-trait"
version = "0.2.0"
sapio-ctv-emulator-trait.workspace = true
sapio-base.workspace = true

[dependencies.bitcoin]
package = "sapio-bitcoin"
Expand All @@ -32,11 +29,6 @@ package = "sapio-miniscript"
version = "^7.0.0"
features = ['compiler', 'use-serde', 'rand', 'use-schemars', 'serde']

[dependencies.sapio-base]
path = "../sapio-base"
version = "0.2.0"


[lib]
name = "emulator_connect"
path = "src/lib.rs"
Expand Down
7 changes: 1 addition & 6 deletions emulator-trait/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@ repository = "https://github.com/sapio-lang/sapio"
homepage = "https://sapio-lang.org"
description = "Emulator Trait for mocking out CTV with other logic, trait separate to avoid pulling in tokio to compiler"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
schemars = "0.8.0"
serde_json = "1.0"
serde = "1.0"
serde_derive = "1.0"

sapio-base.workspace = true

[dependencies.bitcoin]
package = "sapio-bitcoin"
Expand All @@ -26,7 +25,3 @@ features = ['use-serde']
package = "sapio-miniscript"
version = "^7.0.0"
features = ['compiler', 'use-serde', 'use-schemars', 'serde']

[dependencies.sapio-base]
path = "../sapio-base"
version = "0.2.0"
18 changes: 3 additions & 15 deletions examples/dcf_mining_pool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,22 @@ authors = ["Jeremy Rubin <j@rubin.io>"]
edition = "2021"
publish = false

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]

schemars = "0.8.0"
serde_json = "1.0"
serde = "1.0"
serde_derive = "1.0"
tokio = { version = "1", features = ["full"] }
bitcoincore-rpc-async = "4.0.1-alpha.1"

sapio.workspace = true
sapio-base.workspace = true
sapio-ctv-emulator-trait.workspace = true

[dependencies.bitcoin]
package = "sapio-bitcoin"
version = "0.28.0"
features = ['use-serde', 'rand']
[dependencies.sapio]
path = "../../sapio"
version = "0.2.0"

[dependencies.sapio-base]
path = "../../sapio-base"
version = "0.2.0"


[dependencies.sapio-ctv-emulator-trait]
path = "../../emulator-trait"
version = "0.2.0"

[dependencies.miniscript]
package = "sapio-miniscript"
Expand Down
34 changes: 34 additions & 0 deletions nft-trait/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[package]
name = "sapio-wasm-nft-trait"
version = "0.1.0"
edition = "2021"

[package.metadata.wasm-pack.profile.release]
wasm-opt = false

[dependencies]
serde_json = "1.0"
serde = "1.0"
serde_derive = "1.0"

simp-pack.workspace = true
sapio.workspace = true
sapio-base.workspace = true
sapio-wasm-plugin.workspace = true
sapio-trait.workspace = true
sapio-ctv-emulator-trait.workspace = true

[dependencies.schemars]
version = "0.8.0"
features = ['impl_json_schema']

[dependencies.bitcoin]
package = "sapio-bitcoin"
version = "0.28.0"
features = ['use-serde']

[dependencies.miniscript]
package = "sapio-miniscript"
version = "^7.0.0"
features = ['compiler', 'use-serde', 'use-schemars', 'serde']
optional = true
0 plugin-example/nft-trait/src/lib.rs → nft-trait/src/lib.rs
View file
Open in desktop
File renamed without changes.
19 changes: 0 additions & 19 deletions plugin-example/Cargo.toml
View file
Open in desktop

This file was deleted.

48 changes: 0 additions & 48 deletions plugin-example/batching-trait/Cargo.toml
View file
Open in desktop

This file was deleted.

Loading