Merge pull request #263 from cryptoquick/HB/2021

Update to Rust Edition 2021
sapio-lang · Jan 4, 2024 · 9fcc1e9 · 9fcc1e9
2 parents baadc7a + 74d7ccf
commit 9fcc1e9
Show file tree

Hide file tree

Showing 35 changed files with 87 additions and 129 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -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"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -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"
@@ -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]

diff --git a/ctv_emulators/Cargo.toml b/ctv_emulators/Cargo.toml
@@ -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"
@@ -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]
@@ -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"

diff --git a/docs/learn-sapio/book.toml b/docs/learn-sapio/book.toml
@@ -6,7 +6,7 @@ src = "src"
 title = "Designing Bitcoin Contracts with Sapio"
 
 [rust]
-edition=2018
+edition = "2021"
 
 [output.html]
 mathjax-support = true

diff --git a/emulator-trait/Cargo.toml b/emulator-trait/Cargo.toml
@@ -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"
@@ -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"
-
diff --git a/examples/README.md b/examples/README.md
@@ -0,0 +1,3 @@
+# Sapio Server Examples
+
+To run server examples, use `cargo run --package`; e.g. `cargo run --package dcf_mining_pool`
diff --git a/examples/dcf_mining_pool/Cargo.toml b/examples/dcf_mining_pool/Cargo.toml
@@ -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
 
@@ -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
-
diff --git a/integration_tests/Cargo.toml b/integration_tests/Cargo.toml
@@ -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
 
@@ -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]
@@ -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"
-
diff --git a/plugin-example/README.md b/plugin-example/README.md
@@ -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`
+
+For more, see the docs: https://learn.sapio-lang.org/ch01-01-installation.html#local-quickstart
diff --git a/plugin-example/batching-trait/Cargo.toml b/plugin-example/batching-trait/Cargo.toml
@@ -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
 
@@ -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]
@@ -45,4 +45,4 @@ optional = true
 [dependencies.sapio-wasm-plugin]
 path = "../../plugins"
 version = "0.2.0"
-features = ["client"]
+features = ["client"]
diff --git a/plugin-example/clause-module-trampoline/Cargo.toml b/plugin-example/clause-module-trampoline/Cargo.toml
@@ -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"
@@ -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]
@@ -65,5 +63,5 @@ features = ["client"]
 
 
 [dependencies.sapio-trait]
-path="../../sapio-trait"
+path = "../../sapio-trait"
 version = "0.2.0"
diff --git a/plugin-example/clause-module/Cargo.toml b/plugin-example/clause-module/Cargo.toml
@@ -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"
@@ -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]
@@ -62,4 +60,3 @@ wasm-opt = false
 path = "../../plugins"
 version = "0.2.0"
 features = ["client"]
-
diff --git a/plugin-example/coin_pool/Cargo.toml b/plugin-example/coin_pool/Cargo.toml
@@ -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"
@@ -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]
@@ -62,4 +60,3 @@ wasm-opt = false
 path = "../../plugins"
 version = "0.2.0"
 features = ["client"]
-
diff --git a/plugin-example/dao/Cargo.toml b/plugin-example/dao/Cargo.toml
@@ -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"
@@ -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]

diff --git a/plugin-example/fedpeg/Cargo.toml b/plugin-example/fedpeg/Cargo.toml
@@ -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"
@@ -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]
@@ -62,4 +60,3 @@ wasm-opt = false
 path = "../../plugins"
 version = "0.2.0"
 features = ["client"]
-
diff --git a/plugin-example/hanukkiah/Cargo.toml b/plugin-example/hanukkiah/Cargo.toml
@@ -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"
@@ -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]
@@ -61,4 +59,3 @@ wasm-opt = false
 path = "../../plugins"
 version = "0.2.0"
 features = ["client"]
-