-
Notifications
You must be signed in to change notification settings - Fork 217
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.
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
add an example daedalus-bridge #828
Changes from all commits
53b13b3
6d353be
2c84886
0838ee9
f76bf97
f7fe133
3f4d255
23d8260
6880b0c
9517d81
b4e28e1
be0adf3
bf6037e
547e655
4860168
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
{ ... }@args: | ||
|
||
let | ||
sources = import ./nix/sources.nix; | ||
iohkNix = import sources.iohk-nix (args // { nixpkgsOverride = import sources.nixpkgs args; }); | ||
niv = (import sources.niv {}).niv; | ||
jormungandrLib = import (sources.jormungandr-nix + "/lib.nix"); | ||
in | ||
iohkNix.pkgs.lib // iohkNix // { | ||
inherit sources niv jormungandrLib; | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -464,8 +464,8 @@ withJormungandr tr (JormungandrConfig stateDir block0 mPort logSeverity output e | |
startBackend (apiPort, baseUrl) = getGenesisBlockArg block0 >>= \case | ||
Right (block0H, genesisBlockArg) -> do | ||
let args = genesisBlockArg ++ | ||
[ "--config", nodeConfigFile | ||
, "--log-level", C.toLower <$> show logSeverity | ||
[ -- "--config", nodeConfigFile | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
without that, there is no way for jormungandr to sync, and daedalus cant specify its own There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Coming with #850 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. wallet should also pass |
||
"--log-level", C.toLower <$> show logSeverity | ||
] ++ map T.unpack extraArgs | ||
let cmd = Command "jormungandr" args (return ()) output | ||
let tr' = transformLauncherTrace tr | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
{ target, pkgs, haskellPackages, system, crossSystem, jormungandr, jormungandr-cli }: | ||
|
||
let | ||
commonLib = import ../lib.nix {}; | ||
pkgsCross = commonLib.getPkgs { crossSystem = pkgs.lib.systems.examples.mingwW64; }; | ||
cardano-shell = import commonLib.sources.cardano-shell { inherit system crossSystem; }; # todo, shell should accept target | ||
jormungandrConfig = builtins.toFile "config.yaml" (builtins.toJSON commonLib.jormungandrLib.defaultJormungandrConfig); | ||
in pkgs.runCommandCC "daedalus-bridge" { | ||
passthru = { | ||
node-version = jormungandr.version; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. todo, use the cardano-node version if the backend is set to cardano |
||
wallet-version = haskellPackages.cardano-wallet-jormungandr.identifier.version; | ||
}; | ||
} '' | ||
mkdir -pv $out/bin $out/config | ||
cp ${jormungandrConfig} $out/config/jormungandr-config.yaml | ||
cd $out/bin | ||
cp ${haskellPackages.cardano-wallet-jormungandr.components.exes.cardano-wallet-jormungandr}/bin/cardano-wallet-jormungandr* . | ||
cp ${cardano-shell.nix-tools.cexes.cardano-launcher.cardano-launcher}/bin/cardano-launcher* . | ||
cp ${jormungandr-cli}/bin/jcli* . | ||
#cp {nix-tools.cexes.cardano-node.cardano-node}/bin/cardano-node* . | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. todo, accept the backend param, and select the right node and wallet binaries There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. what is There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. new haskell node. Out of scope for this release. |
||
${pkgs.lib.optionalString (target == "x86_64-windows") '' | ||
echo ${jormungandr} | ||
cp ${pkgsCross.libffi}/bin/libffi-6.dll . | ||
cp ${pkgsCross.openssl.out}/lib/libeay32.dll . | ||
''} | ||
${pkgs.lib.optionalString (target == "x86_64-linux") '' | ||
chmod +w -R . | ||
for bin in cardano-launcher; do | ||
strip $bin | ||
patchelf --shrink-rpath $bin | ||
done | ||
''} | ||
'' |
This file was deleted.
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
{ | ||
"cardano-shell": { | ||
"branch": "disable-tls", | ||
"description": "Node shell, a thin layer for running the node and it's modules.", | ||
"homepage": null, | ||
"owner": "input-output-hk", | ||
"repo": "cardano-shell", | ||
"rev": "b8b07142f713119b07e40ebcb5173fb2bd304c1e", | ||
"sha256": "1j4nnsiagvv1yqfr4h9ailnnd7iw62vim1w7bc0sb5blngfjgvjr", | ||
"type": "tarball", | ||
"url": "https://github.com/input-output-hk/cardano-shell/archive/b8b07142f713119b07e40ebcb5173fb2bd304c1e.tar.gz", | ||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" | ||
}, | ||
"gitignore": { | ||
"branch": "master", | ||
"description": "Nix function for filtering local git sources", | ||
"homepage": "", | ||
"owner": "hercules-ci", | ||
"repo": "gitignore", | ||
"rev": "f9e996052b5af4032fe6150bba4a6fe4f7b9d698", | ||
"sha256": "0jrh5ghisaqdd0vldbywags20m2cxpkbbk5jjjmwaw0gr8nhsafv", | ||
"type": "tarball", | ||
"url": "https://github.com/hercules-ci/gitignore/archive/f9e996052b5af4032fe6150bba4a6fe4f7b9d698.tar.gz", | ||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" | ||
}, | ||
"iohk-nix": { | ||
"branch": "niv-snappy-choco", | ||
"description": "nix scripts shared across projects", | ||
"homepage": null, | ||
"owner": "input-output-hk", | ||
"repo": "iohk-nix", | ||
"rev": "2edd52c16a0e688d6611c03c47a89ca1f80fee91", | ||
"sha256": "0lrg2rx1agh1nnv3mwanhk964x94vx22z1g7kaia8c4bc1fy3ajj", | ||
"type": "tarball", | ||
"url": "https://github.com/input-output-hk/iohk-nix/archive/2edd52c16a0e688d6611c03c47a89ca1f80fee91.tar.gz", | ||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" | ||
}, | ||
"jormungandr-nix": { | ||
"branch": "master", | ||
"description": "jormungandr nix scripts", | ||
"homepage": null, | ||
"owner": "input-output-hk", | ||
"repo": "jormungandr-nix", | ||
"rev": "219543bce9b518e5d6ccd95f9b33e33bf98ff507", | ||
"sha256": "0l85aahvfj77kzzr0kk2il9nawxk6i26a0kx0dz1namkkqhrnrmz", | ||
"type": "tarball", | ||
"url": "https://github.com/input-output-hk/jormungandr-nix/archive/219543bce9b518e5d6ccd95f9b33e33bf98ff507.tar.gz", | ||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" | ||
}, | ||
"niv": { | ||
"branch": "iohk", | ||
"description": "Easy dependency management for Nix projects", | ||
"homepage": "https://github.com/nmattia/niv", | ||
"owner": "input-output-hk", | ||
"repo": "niv", | ||
"rev": "4229fbcf62997467c34283a2f353702359e78e5a", | ||
"sha256": "1y1h6aj0rxrrhvp9jpr6xw3zsa1l8ac25ng4xzjskr5kg620pxqr", | ||
"type": "tarball", | ||
"url": "https://github.com/input-output-hk/niv/archive/4229fbcf62997467c34283a2f353702359e78e5a.tar.gz", | ||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" | ||
}, | ||
"nixpkgs": { | ||
"branch": "nixos-19.09", | ||
"description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to", | ||
"homepage": "https://github.com/NixOS/nixpkgs", | ||
"owner": "NixOS", | ||
"repo": "nixpkgs-channels", | ||
"rev": "dbad7c7d59f12e81032bc3100e3d9fa44b6d4e70", | ||
"sha256": "1pjhslnhz4gngbclyr39x4xaicrc1sz2xy8bsrvlr3cl5qrbki2b", | ||
"type": "tarball", | ||
"url": "https://github.com/NixOS/nixpkgs-channels/archive/dbad7c7d59f12e81032bc3100e3d9fa44b6d4e70.tar.gz", | ||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this could be lowered (or undone), once we are updated to include input-output-hk/jormungandr#977
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We (We = me tomorrow) are actually going to change the start-up logic. Right now, you can't start the wallet if there's no backend to connect to, but that's bonkers. The wallet can simply wait an poll regularly until a backend shows up; so this whole timeout will go away here.Maybe not.