Skip to content

Commit

Permalink
chore: bump to fedimint rc.3 and update example.env
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kodylow
Kodylow committed Mar 29, 2024
1 parent 58f9ce9 commit 90a8c36
Show file tree
Hide file tree
Showing 5 changed files with 87 additions and 94 deletions.
68 changes: 34 additions & 34 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions example.env
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
FEDIMINT_CLIENTD_INVITE_CODE='fed1...'
# this is the invite code to the Fedi Alpha federation mutinynet,
# you can replace it with another but it's the most useful one for testing so good to at least have it
FEDIMINT_CLIENTD_INVITE_CODE='fed11qgqrgvnhwden5te0v9k8q6rp9ekh2arfdeukuet595cr2ttpd3jhq6rzve6zuer9wchxvetyd938gcewvdhk6tcqqysptkuvknc7erjgf4em3zfh90kffqf9srujn6q53d6r056e4apze5cw27h75'

# just make this a new dir called `fm_db` in the root and use the absolute path to that
FEDIMINT_CLIENTD_DB_PATH='/absolute/path/to/fm_db_dir'
FEDIMINT_CLIENTD_PASSWORD='some-secure-password-that-becomes-the-bearer-token'

FEDIMINT_CLIENTD_PASSWORD='password'
FEDIMINT_CLIENTD_BASE_URL='http://127.0.0.1:3333'
FEDIMINT_CLIENTD_ADDR='127.0.0.1:3333'
12 changes: 6 additions & 6 deletions fedimint-clientd/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ serde_json = "1.0.108"
tokio = { version = "1.34.0", features = ["full"] }
tracing = "0.1.40"
tracing-subscriber = "0.3.18"
fedimint-client = { git = "https://github.com/fedimint/fedimint", tag = "v0.3.0-rc.2" }
fedimint-core = { git = "https://github.com/fedimint/fedimint", tag = "v0.3.0-rc.2" }
fedimint-wallet-client = { git = "https://github.com/fedimint/fedimint", tag = "v0.3.0-rc.2" }
fedimint-mint-client = { git = "https://github.com/fedimint/fedimint", tag = "v0.3.0-rc.2" }
fedimint-ln-client = { git = "https://github.com/fedimint/fedimint", tag = "v0.3.0-rc.2" }
fedimint-rocksdb = { git = "https://github.com/fedimint/fedimint", tag = "v0.3.0-rc.2" }
fedimint-client = { git = "https://github.com/fedimint/fedimint", tag = "v0.3.0-rc.3" }
fedimint-core = { git = "https://github.com/fedimint/fedimint", tag = "v0.3.0-rc.3" }
fedimint-wallet-client = { git = "https://github.com/fedimint/fedimint", tag = "v0.3.0-rc.3" }
fedimint-mint-client = { git = "https://github.com/fedimint/fedimint", tag = "v0.3.0-rc.3" }
fedimint-ln-client = { git = "https://github.com/fedimint/fedimint", tag = "v0.3.0-rc.3" }
fedimint-rocksdb = { git = "https://github.com/fedimint/fedimint", tag = "v0.3.0-rc.3" }
url = "2.5.0"
lazy_static = "1.4.0"
async-utility = "0.2.0"
Expand Down
79 changes: 33 additions & 46 deletions flake.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{
description = "A fedimint client daemon for server side applications to hold, use, and manage Bitcoin";
description =
"A fedimint client daemon for server side applications to hold, use, and manage Bitcoin";

inputs = {
nixpkgs = {
url = "github:nixos/nixpkgs/nixos-23.11";
};
nixpkgs = { url = "github:nixos/nixpkgs/nixos-23.11"; };

flakebox = {
url = "github:rustshop/flakebox";
Expand All @@ -13,7 +12,7 @@

fedimint = {
url =
"github:fedimint/fedimint?rev=9d552fdf82f4af429165a1fd409615809ada4058";
"github:fedimint/fedimint?rev=c32bbe8ed8d95ae420b5879e92dda6ce48f5c914";
};

flake-utils.url = "github:numtide/flake-utils";
Expand All @@ -23,8 +22,8 @@
flake-utils.lib.eachDefaultSystem (system:
let
nixpkgs = fedimint.inputs.nixpkgs;
pkgs = import nixpkgs {
inherit system;
pkgs = import nixpkgs {
inherit system;
overlays = fedimint.overlays.fedimint;
};
lib = pkgs.lib;
Expand All @@ -47,51 +46,39 @@
};

# all standard toolchains provided by flakebox
toolchainsStd =
flakeboxLib.mkStdFenixToolchains toolchainArgs;
toolchainsStd = flakeboxLib.mkStdFenixToolchains toolchainArgs;

toolchainsNative = (pkgs.lib.getAttrs
[
"default"
]
toolchainsStd
);
toolchainsNative = (pkgs.lib.getAttrs [ "default" ] toolchainsStd);

toolchainNative = flakeboxLib.mkFenixMultiToolchain {
toolchains = toolchainsNative;
};
toolchainNative =
flakeboxLib.mkFenixMultiToolchain { toolchains = toolchainsNative; };

commonArgs = {
buildInputs = [
pkgs.openssl
] ++ lib.optionals pkgs.stdenv.isDarwin [
pkgs.darwin.apple_sdk.frameworks.SystemConfiguration
];
nativeBuildInputs = [
pkgs.pkg-config
];
buildInputs = [ pkgs.openssl ] ++ lib.optionals pkgs.stdenv.isDarwin
[ pkgs.darwin.apple_sdk.frameworks.SystemConfiguration ];
nativeBuildInputs = [ pkgs.pkg-config ];
};
outputs = (flakeboxLib.craneMultiBuild { toolchains = toolchainsStd; }) (craneLib':
let
craneLib = (craneLib'.overrideArgs {
pname = "flexbox-multibuild";
src = rustSrc;
}).overrideArgs commonArgs;
in
rec {
workspaceDeps = craneLib.buildWorkspaceDepsOnly { };
workspaceBuild =
craneLib.buildWorkspace { cargoArtifacts = workspaceDeps; };
fedimint-clientd = craneLib.buildPackageGroup
{ pname = "fedimint-clientd"; packages = [ "fedimint-clientd" ]; mainProgram = "fedimint-clientd"; };
});
in
{
outputs = (flakeboxLib.craneMultiBuild { toolchains = toolchainsStd; })
(craneLib':
let
craneLib = (craneLib'.overrideArgs {
pname = "flexbox-multibuild";
src = rustSrc;
}).overrideArgs commonArgs;
in rec {
workspaceDeps = craneLib.buildWorkspaceDepsOnly { };
workspaceBuild =
craneLib.buildWorkspace { cargoArtifacts = workspaceDeps; };
fedimint-clientd = craneLib.buildPackageGroup {
pname = "fedimint-clientd";
packages = [ "fedimint-clientd" ];
mainProgram = "fedimint-clientd";
};
});
in {
legacyPackages = outputs;
packages = {
default = outputs.fedimint-clientd;
};
devShells = fmLib.devShells // {
packages = { default = outputs.fedimint-clientd; };
devShells = fmLib.devShells // {
default = fmLib.devShells.default.overrideAttrs (prev: {
nativeBuildInputs = [
pkgs.mprocs
Expand Down
12 changes: 6 additions & 6 deletions multimint/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ anyhow = "1.0.75"
serde = "1.0.193"
serde_json = "1.0.108"
tokio = { version = "1.34.0", features = ["full"] }
fedimint-client = { git = "https://github.com/fedimint/fedimint", tag = "v0.3.0-rc.2" }
fedimint-core = { git = "https://github.com/fedimint/fedimint", tag = "v0.3.0-rc.2" }
fedimint-wallet-client = { git = "https://github.com/fedimint/fedimint", tag = "v0.3.0-rc.2" }
fedimint-mint-client = { git = "https://github.com/fedimint/fedimint", tag = "v0.3.0-rc.2" }
fedimint-ln-client = { git = "https://github.com/fedimint/fedimint", tag = "v0.3.0-rc.2" }
fedimint-rocksdb = { git = "https://github.com/fedimint/fedimint", tag = "v0.3.0-rc.2" }
fedimint-client = { git = "https://github.com/fedimint/fedimint", tag = "v0.3.0-rc.3" }
fedimint-core = { git = "https://github.com/fedimint/fedimint", tag = "v0.3.0-rc.3" }
fedimint-wallet-client = { git = "https://github.com/fedimint/fedimint", tag = "v0.3.0-rc.3" }
fedimint-mint-client = { git = "https://github.com/fedimint/fedimint", tag = "v0.3.0-rc.3" }
fedimint-ln-client = { git = "https://github.com/fedimint/fedimint", tag = "v0.3.0-rc.3" }
fedimint-rocksdb = { git = "https://github.com/fedimint/fedimint", tag = "v0.3.0-rc.3" }
futures-util = "0.3.30"
rand = "0.8.5"
tracing = "0.1.40"
Expand Down

0 comments on commit 90a8c36

Please sign in to comment.