Skip to content

Update to Rust Edition 2021 #263

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

Merged
merged 6 commits into from
Jan 4, 2024
Merged

Update to Rust Edition 2021 #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
390b89e
Edition 2021 updates
cryptoquick Jan 3, 2024
86427ec
Update workspace resolver to version to 2
cryptoquick Jan 3, 2024
6acaf04
Set example publish to false. Catchall for workspace member examples.
cryptoquick Jan 3, 2024
aa1b221
Trailing whitespace.
cryptoquick Jan 3, 2024
272ace6
Add small examples README.
cryptoquick Jan 3, 2024
74d7ccf
Add plugin example README.
cryptoquick Jan 3, 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
3 changes: 2 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ members = ["sapio"
, "tools"
, "plugins"
, 'emulator-trait'
, 'examples/dcf_mining_pool'
, 'examples/*'
, 'sapio-trait'
, 'sapio_macros'
, 'sapio-psbt'
, 'simp-pack']
exclude = ["plugin-example", "integration_tests"]
resolver = "2"
4 changes: 2 additions & 2 deletions cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "sapio-cli"
version = "0.2.0"
license = "MPL-2.0"
authors = ["Jeremy Rubin <j@rubin.io>"]
edition = "2018"
edition = "2021"
repository = "https://github.com/sapio-lang/sapio"
homepage = "https://sapio-lang.org"
description = "A Command Line Interface for interacting with Sapio Contracts"
Expand All @@ -21,7 +21,7 @@ lazy_static = "1.4.0"
bitcoincore-rpc-async = "4.0.1-alpha.1"
tokio = { version = "1", features = ["full"] }
directories = "3.0.1"
rand="^0.6"
rand = "^0.6"
jsonschema-valid = "0.4.0"

[dependencies.sapio-psbt]
Expand Down
8 changes: 3 additions & 5 deletions ctv_emulators/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "ctv_emulators"
version = "0.2.0"
license = "MPL-2.0"
authors = ["Jeremy Rubin <j@rubin.io>"]
edition = "2018"
edition = "2021"
repository = "https://github.com/sapio-lang/sapio"
homepage = "https://sapio-lang.org"
description = "Implementation of the CTV Emulator Trait"
Expand All @@ -19,7 +19,7 @@ rand = "0.8.1"


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

[dependencies.bitcoin]
Expand All @@ -33,12 +33,10 @@ version = "^7.0.0"
features = ['compiler', 'use-serde', 'rand', 'use-schemars', 'serde']

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




[lib]
name = "emulator_connect"
path = "src/lib.rs"
Expand Down
2 changes: 1 addition & 1 deletion docs/learn-sapio/book.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ src = "src"
title = "Designing Bitcoin Contracts with Sapio"

[rust]
edition=2018
edition = "2021"

[output.html]
mathjax-support = true
Expand Down
5 changes: 2 additions & 3 deletions emulator-trait/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "sapio-ctv-emulator-trait"
version = "0.2.0"
license = "MPL-2.0"
authors = ["Jeremy Rubin <j@rubin.io>"]
edition = "2018"
edition = "2021"
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"
Expand All @@ -28,6 +28,5 @@ version = "^7.0.0"
features = ['compiler', 'use-serde', 'use-schemars', 'serde']

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

3 changes: 3 additions & 0 deletions examples/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Sapio Server Examples

To run server examples, use `cargo run --package`; e.g. `cargo run --package dcf_mining_pool`
7 changes: 3 additions & 4 deletions examples/dcf_mining_pool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
name = "dcf_mining_pool"
version = "0.2.0"
authors = ["Jeremy Rubin <j@rubin.io>"]
edition = "2018"
edition = "2021"
publish = false

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

Expand All @@ -29,14 +30,12 @@ path = "../../sapio-base"
version = "0.2.0"



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

[dependencies.miniscript]
package = "sapio-miniscript"
version = "^7.0.0"
features = ['compiler', 'use-serde', 'rand', 'use-schemars', 'serde']
optional = true

7 changes: 3 additions & 4 deletions integration_tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "sapio_integration_tests"
version = "0.2.0"
authors = ["Jeremy Rubin <j@rubin.io>"]
edition = "2018"
edition = "2021"

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

Expand All @@ -25,7 +25,7 @@ path = "../sapio"
path = "../ctv_emulators"

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

[dependencies.bitcoin]
Expand All @@ -39,6 +39,5 @@ version = "^7.0.0"
features = ['compiler', 'use-serde', 'rand', 'use-schemars', 'serde']

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

7 changes: 7 additions & 0 deletions plugin-example/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Sapio Plugin Examples

To run plugin examples, you must first have zig and wasm-pack installed.

Then run: `CC="zig cc" wasm-pack build`
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure that Zig is required, but doesn't seem like the worst idea to use it as CC. Can you say more on why?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was something I was told... I can try validating that assumption


For more, see the docs: https://learn.sapio-lang.org/ch01-01-installation.html#local-quickstart
8 changes: 4 additions & 4 deletions plugin-example/batching-trait/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "batching-trait"
version = "0.1.0"
edition = "2018"
edition = "2021"

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

Expand All @@ -28,11 +28,11 @@ version = "0.2.0"


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

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

[dependencies.miniscript]
Expand All @@ -45,4 +45,4 @@ optional = true
[dependencies.sapio-wasm-plugin]
path = "../../plugins"
version = "0.2.0"
features = ["client"]
features = ["client"]
8 changes: 3 additions & 5 deletions plugin-example/clause-module-trampoline/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ name = "sapio-wasm-clause-trampoline"
version = "0.1.0"
license = "MPL-2.0"
authors = ["Jeremy Rubin <j@rubin.io>"]
edition = "2018"
edition = "2021"
repository = "https://github.com/sapio-lang/sapio"
homepage = "https://sapio-lang.org"
description = "An Example Sapio Application"

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



[dependencies]
serde_json = "1.0"
serde = "1.0"
Expand Down Expand Up @@ -44,9 +43,8 @@ crate-type = ["cdylib", "rlib"]
path = "src/plugin.rs"



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

[dependencies.miniscript]
Expand All @@ -65,5 +63,5 @@ features = ["client"]


[dependencies.sapio-trait]
path="../../sapio-trait"
path = "../../sapio-trait"
version = "0.2.0"
7 changes: 2 additions & 5 deletions plugin-example/clause-module/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ name = "sapio-wasm-clause"
version = "0.1.0"
license = "MPL-2.0"
authors = ["Jeremy Rubin <j@rubin.io>"]
edition = "2018"
edition = "2021"
repository = "https://github.com/sapio-lang/sapio"
homepage = "https://sapio-lang.org"
description = "An Example Sapio Application"

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



[dependencies]
serde_json = "1.0"
serde = "1.0"
Expand Down Expand Up @@ -44,9 +43,8 @@ crate-type = ["cdylib", "rlib"]
path = "src/plugin.rs"



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

[dependencies.miniscript]
Expand All @@ -62,4 +60,3 @@ wasm-opt = false
path = "../../plugins"
version = "0.2.0"
features = ["client"]

7 changes: 2 additions & 5 deletions plugin-example/coin_pool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ name = "sapio-wasm-coin-pool"
version = "0.1.0"
license = "MPL-2.0"
authors = ["Jeremy Rubin <j@rubin.io>"]
edition = "2018"
edition = "2021"
repository = "https://github.com/sapio-lang/sapio"
homepage = "https://sapio-lang.org"
description = "An Example Sapio Application"

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



[dependencies]
serde_json = "1.0"
serde = "1.0"
Expand Down Expand Up @@ -44,9 +43,8 @@ crate-type = ["cdylib", "rlib"]
path = "src/plugin.rs"



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

[dependencies.miniscript]
Expand All @@ -62,4 +60,3 @@ wasm-opt = false
path = "../../plugins"
version = "0.2.0"
features = ["client"]

6 changes: 2 additions & 4 deletions plugin-example/dao/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ name = "sapio-wasm-dao"
version = "0.1.0"
license = "MPL-2.0"
authors = ["Jeremy Rubin <j@rubin.io>"]
edition = "2018"
edition = "2021"
repository = "https://github.com/sapio-lang/sapio"
homepage = "https://sapio-lang.org"
description = "An Example Sapio Application"

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



[dependencies]
serde_json = "1.0"
serde = "1.0"
Expand Down Expand Up @@ -44,9 +43,8 @@ crate-type = ["cdylib", "rlib"]
path = "src/dao.rs"



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

[dependencies.miniscript]
Expand Down
7 changes: 2 additions & 5 deletions plugin-example/fedpeg/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ name = "sapio-wasm-fedpeg"
version = "0.1.0"
license = "MPL-2.0"
authors = ["Jeremy Rubin <j@rubin.io>"]
edition = "2018"
edition = "2021"
repository = "https://github.com/sapio-lang/sapio"
homepage = "https://sapio-lang.org"
description = "An Example Sapio Application"

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



[dependencies]
serde_json = "1.0"
serde = "1.0"
Expand Down Expand Up @@ -44,9 +43,8 @@ crate-type = ["cdylib", "rlib"]
path = "src/plugin.rs"



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

[dependencies.miniscript]
Expand All @@ -62,4 +60,3 @@ wasm-opt = false
path = "../../plugins"
version = "0.2.0"
features = ["client"]

9 changes: 3 additions & 6 deletions plugin-example/hanukkiah/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ name = "sapio-wasm-hanukkiah"
version = "0.1.0"
license = "MPL-2.0"
authors = ["Jeremy Rubin <j@rubin.io>"]
edition = "2018"
edition = "2021"
repository = "https://github.com/sapio-lang/sapio"
homepage = "https://sapio-lang.org"
description = "An Example Sapio Application"

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



[dependencies]
serde_json = "1.0"
serde = "1.0"
Expand Down Expand Up @@ -43,15 +42,14 @@ crate-type = ["cdylib", "rlib"]
path = "src/plugin.rs"



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

[dependencies.miniscript]
package = "sapio-miniscript"
version = "^7.0.0"
features = ['compiler', 'use-serde', 'use-schemars', 'serde']
features = ['compiler', 'use-serde', 'use-schemars', 'serde']
optional = true

[package.metadata.wasm-pack.profile.release]
Expand All @@ -61,4 +59,3 @@ wasm-opt = false
path = "../../plugins"
version = "0.2.0"
features = ["client"]

Loading