Skip to content

Commit

Permalink
Merge pull request #337 from fedimint/wo/fedimint-rc5
Browse files Browse the repository at this point in the history
chore: bump fedimint to 0.2.0-rc5
  • Loading branch information
wbobeirne committed Dec 5, 2023
2 parents f614b2c + b218087 commit 2a65c4a
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ From root repo directory:

## Referencing Fedimint

The docker containers and devimint are for specific releases or commits of `fedimint/fedimint`. At present, the reference commit-hash is `bbe587845935517df8a36b9b2a6b98fa4bc1e19e`
The docker containers and devimint are for specific releases or commits of `fedimint/fedimint`. At present, the reference commit-hash is `24113a64b270bf2ecb49b8f4554ba975025711db`

### Running with local Fedimint

Expand All @@ -209,6 +209,6 @@ This will put binaries in `fedimint/target/debug` at the front of your `$PATH`.
You can officially bump the referenced version of Fedimint using the following steps:

1. Locate a desired hash from [Fedimint](https://github.com/fedimint/fedimint/commits/master)
2. Find and replace all instances of the current reference commit hash: `bbe587845935517df8a36b9b2a6b98fa4bc1e19e`
2. Find and replace all instances of the current reference commit hash: `24113a64b270bf2ecb49b8f4554ba975025711db`
3. Run `nix flake update` at the root of the repo
4. Restart your nix shell and validate the reference, then commit to complete bump
10 changes: 5 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3'
services:
fedimintd_1:
# Snapshot of Fedimint after AlephBFT was merged: https://github.com/fedimint/fedimint/pull/3313
image: fedimint/fedimintd:bbe587845935517df8a36b9b2a6b98fa4bc1e19e
image: fedimint/fedimintd:24113a64b270bf2ecb49b8f4554ba975025711db
environment:
- FM_DATA_DIR=/data
- FM_BIND_P2P=0.0.0.0:18173
Expand All @@ -21,7 +21,7 @@ services:

gatewayd_1:
# Snapshot of Fedimint after AlephBFT was merged: https://github.com/fedimint/fedimint/pull/3313
image: fedimint/gatewayd:bbe587845935517df8a36b9b2a6b98fa4bc1e19e
image: fedimint/gatewayd:24113a64b270bf2ecb49b8f4554ba975025711db
command: gatewayd lnd
environment:
# Path to folder containing gateway config and data files
Expand Down Expand Up @@ -61,7 +61,7 @@ services:

fedimintd_2:
# Snapshot of Fedimint after AlephBFT was merged: https://github.com/fedimint/fedimint/pull/3313
image: fedimint/fedimintd:bbe587845935517df8a36b9b2a6b98fa4bc1e19e
image: fedimint/fedimintd:24113a64b270bf2ecb49b8f4554ba975025711db
environment:
- FM_DATA_DIR=/data
- FM_BIND_P2P=0.0.0.0:18173
Expand All @@ -85,7 +85,7 @@ services:

fedimintd_3:
# Snapshot of Fedimint after AlephBFT was merged: https://github.com/fedimint/fedimint/pull/3313
image: fedimint/fedimintd:bbe587845935517df8a36b9b2a6b98fa4bc1e19e
image: fedimint/fedimintd:24113a64b270bf2ecb49b8f4554ba975025711db
environment:
- FM_DATA_DIR=/data
- FM_BIND_P2P=0.0.0.0:18174
Expand All @@ -103,7 +103,7 @@ services:

fedimintd_4:
# Snapshot of Fedimint after AlephBFT was merged: https://github.com/fedimint/fedimint/pull/3313
image: fedimint/fedimintd:bbe587845935517df8a36b9b2a6b98fa4bc1e19e
image: fedimint/fedimintd:24113a64b270bf2ecb49b8f4554ba975025711db
environment:
- FM_DATA_DIR=/data
- FM_BIND_P2P=0.0.0.0:18175
Expand Down
20 changes: 10 additions & 10 deletions flake.lock

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

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
flake-utils.url = "github:numtide/flake-utils";
fedimint = {
url = "github:fedimint/fedimint?rev=bbe587845935517df8a36b9b2a6b98fa4bc1e19e";
url = "github:fedimint/fedimint?rev=24113a64b270bf2ecb49b8f4554ba975025711db";
};
};
outputs = { self, nixpkgs, flake-utils, fedimint }:
Expand Down

0 comments on commit 2a65c4a

Please sign in to comment.