diff --git a/Cargo.lock b/Cargo.lock index 33f3845..e6de9da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -93,7 +93,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -133,7 +133,7 @@ checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -155,7 +155,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -166,7 +166,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -212,7 +212,7 @@ dependencies = [ "http 1.1.0", "http-body 1.0.0", "http-body-util", - "hyper 1.3.0", + "hyper 1.3.1", "hyper-util", "itoa", "matchit", @@ -265,7 +265,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -376,7 +376,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -791,7 +791,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -802,7 +802,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -1026,7 +1026,7 @@ dependencies = [ "lazy_static", "lightning-invoice", "lnurl-rs", - "multimint 0.3.0", + "multimint", "reqwest 0.12.3", "serde", "serde_json", @@ -1101,7 +1101,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -1463,7 +1463,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -1797,9 +1797,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f24ce812868d86d19daa79bf3bf9175bc44ea323391147a5e3abde2a283871b" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", @@ -1837,7 +1837,7 @@ checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" dependencies = [ "futures-util", "http 1.1.0", - "hyper 1.3.0", + "hyper 1.3.1", "hyper-util", "rustls 0.22.3", "rustls-pki-types", @@ -1857,7 +1857,7 @@ dependencies = [ "futures-util", "http 1.1.0", "http-body 1.0.0", - "hyper 1.3.0", + "hyper 1.3.1", "pin-project-lite", "socket2", "tokio", @@ -1936,7 +1936,7 @@ dependencies = [ "autocfg", "impl-tools-lib", "proc-macro-error", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -1948,7 +1948,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -2387,28 +2387,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "multimint" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a926e1ecf3b97aa2bf98d30de76032c7dcfa12b04ba957c985bd7a11c612f0be" -dependencies = [ - "anyhow", - "fedimint-client", - "fedimint-core", - "fedimint-ln-client", - "fedimint-mint-client", - "fedimint-rocksdb", - "fedimint-wallet-client", - "futures-util", - "hex", - "rand", - "serde", - "serde_json", - "tokio", - "tracing", -] - [[package]] name = "multimint" version = "0.3.1" @@ -2676,7 +2654,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -2745,9 +2723,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56dea16b0a29e94408b9aa5e2940a4eedbd128a1ba20e8f7ae60fd3d465af0e" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -2935,7 +2913,7 @@ dependencies = [ "http 1.1.0", "http-body 1.0.0", "http-body-util", - "hyper 1.3.0", + "hyper 1.3.1", "hyper-rustls 0.26.0", "hyper-util", "ipnet", @@ -3200,9 +3178,9 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" dependencies = [ "serde_derive", ] @@ -3218,13 +3196,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -3392,7 +3370,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -3414,9 +3392,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.59" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -3494,7 +3472,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -3590,7 +3568,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -3760,7 +3738,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -3917,7 +3895,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -3974,7 +3952,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", "wasm-bindgen-shared", ] @@ -4008,7 +3986,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4288,7 +4266,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] diff --git a/fedimint-clientd/Cargo.toml b/fedimint-clientd/Cargo.toml index f78e871..3e30765 100644 --- a/fedimint-clientd/Cargo.toml +++ b/fedimint-clientd/Cargo.toml @@ -38,6 +38,5 @@ time = { version = "0.3.25", features = ["formatting"] } chrono = "0.4.31" futures-util = "0.3.30" clap = { version = "3", features = ["derive", "env"] } -multimint = { version = "0.3.0" } -# multimint = { path = "../multimint" } +multimint = { version="0.3.1", path = "../multimint" } axum-otel-metrics = "0.8.0" diff --git a/flake.nix b/flake.nix index ff1a76b..1bfbad6 100644 --- a/flake.nix +++ b/flake.nix @@ -33,25 +33,26 @@ paths = [ "Cargo.toml" "Cargo.lock" ".cargo" "src" ]; }; - toolchainArgs = let llvmPackages = pkgs.llvmPackages_11; - in { - extraRustFlags = "--cfg tokio_unstable"; + toolchainArgs = + let llvmPackages = pkgs.llvmPackages_11; + in { + extraRustFlags = "--cfg tokio_unstable"; - components = [ "rustc" "cargo" "clippy" "rust-analyzer" "rust-src" ]; + components = [ "rustc" "cargo" "clippy" "rust-analyzer" "rust-src" ]; - args = { - nativeBuildInputs = - [ pkgs.wasm-bindgen-cli pkgs.geckodriver pkgs.wasm-pack ] - ++ lib.optionals (!pkgs.stdenv.isDarwin) [ pkgs.firefox ]; + args = { + nativeBuildInputs = + [ pkgs.wasm-bindgen-cli pkgs.geckodriver pkgs.wasm-pack ] + ++ lib.optionals (!pkgs.stdenv.isDarwin) [ pkgs.firefox ]; + }; + } // lib.optionalAttrs pkgs.stdenv.isDarwin { + # on Darwin newest stdenv doesn't seem to work + # linking rocksdb + stdenv = pkgs.clang11Stdenv; + clang = llvmPackages.clang; + libclang = llvmPackages.libclang.lib; + clang-unwrapped = llvmPackages.clang-unwrapped; }; - } // lib.optionalAttrs pkgs.stdenv.isDarwin { - # on Darwin newest stdenv doesn't seem to work - # linking rocksdb - stdenv = pkgs.clang11Stdenv; - clang = llvmPackages.clang; - libclang = llvmPackages.libclang.lib; - clang-unwrapped = llvmPackages.clang-unwrapped; - }; # all standard toolchains provided by flakebox toolchainsStd = flakeboxLib.mkStdFenixToolchains toolchainArgs; @@ -73,17 +74,32 @@ pname = "flexbox-multibuild"; src = rustSrc; }).overrideArgs commonArgs; - in rec { + in + rec { workspaceDeps = craneLib.buildWorkspaceDepsOnly { }; + workspaceBuild = craneLib.buildWorkspace { cargoArtifacts = workspaceDeps; }; + fedimint-clientd = craneLib.buildPackageGroup { pname = "fedimint-clientd"; - packages = [ "fedimint-clientd" ]; + packages = [ + "fedimint-clientd" + ]; mainProgram = "fedimint-clientd"; }; + + fedimint-clientd-docker = pkgs.dockerTools.buildLayeredImage { + name = "fedimint-clientd"; + contents = [ fedimint-clientd ]; + config = { + Cmd = [ "${fedimint-clientd}/bin/fedimint-clientd" ]; + }; + }; + }); - in { + in + { legacyPackages = outputs; packages = { default = outputs.fedimint-clientd; }; devShells = flakeboxLib.mkShells {