add an example daedalus-bridge #828

cleverca22 · 2019-10-15T15:04:08Z

Issue Number

Overview

I have ...

Comments

rvl · 2019-10-15T22:11:34Z

Can you please explain what this PR is, and why, and how it is different from #813 which @disassembler opened?

(cherry picked from commit 051c1d2)

KtorZ · 2019-10-17T07:13:26Z

@iohk-devops ... what... is.. this... ? May we have context and rationale please?

cleverca22 · 2019-10-17T22:38:11Z

lib/core/src/Cardano/Wallet/Network.hs

@@ -176,7 +176,7 @@ waitForNetwork nw policy = do
 -- for no longer than a minute.
 defaultRetryPolicy :: Monad m => RetryPolicyM m
 defaultRetryPolicy =
-    limitRetriesByCumulativeDelay (60 * second) (exponentialBackoff 10000)
+    limitRetriesByCumulativeDelay (3600 * second) (exponentialBackoff 10000)


this could be lowered (or undone), once we are updated to include input-output-hk/jormungandr#977

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.

cleverca22 · 2019-10-17T22:40:00Z

lib/jormungandr/src/Cardano/Wallet/Jormungandr/Network.hs

@@ -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


cardano-wallet should generate a config file with trusted peers, containing IP and ID (public key) pairs

without that, there is no way for jormungandr to sync, and daedalus cant specify its own --config file, because jormungandr crashes if you give it 2 --config flags

Coming with #850

wallet should also pass --rest-listen to jormungandr (or embedit into nodeConfigFile), based on the --node-port the wallet receives

cleverca22 · 2019-10-17T22:40:33Z

nix/daedalus-bridge.nix

+  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* .


todo, accept the backend param, and select the right node and wallet binaries

what is cardano-node here?

new haskell node. Out of scope for this release.

cleverca22 · 2019-10-17T22:40:50Z

nix/daedalus-bridge.nix

+  jormungandrConfig = builtins.toFile "config.yaml" (builtins.toJSON commonLib.jormungandrLib.defaultJormungandrConfig);
+in pkgs.runCommandCC "daedalus-bridge" {
+  passthru = {
+    node-version = jormungandr.version;


todo, use the cardano-node version if the backend is set to cardano

@disassembler

862: jormungandr launch: use --rest-listen instead of generating config.yaml r=KtorZ a=rvl Relates to #832 and #848. Supersedes #850. # Overview `cardano-wallet-jormungandr launch` specifies the REST API port and storage directory. The user provides the rest of the Jörmungandr configuration (e.g. trusted peers). # Comments The Jörmungandr P2P listen address, port, and log level are no longer configured by cardano-wallet. 864: nix: Provide derivations for Daedalus installer r=KtorZ a=rvl Relates to #863. Based on #828. # Overview - @disassembler @cleverca22 It's not exactly the same as before but should work ok I think. - Adds source filtering to avoid unnecessary rebuilds. # Comments To build: ``` nix-build -A cardano-wallet-jormungandr nix-build release.nix -A daedalus-jormungandr.windows -o daedalus-jormungandr-windows nix-build release.nix -A daedalus-jormungandr.macos -o daedalus-jormungandr-macos nix-build release.nix -A daedalus-jormungandr.linux -o daedalus-jormungandr-linux ``` Note that `daedalus-jormungandr.{windows,macos,linux}` from `release.nix` reference the same `cardano-wallet-jormungandr` derivation, only with different `system` or `crossSystem` arguments. So Daedalus may also import from `default.nix` rather than `release.nix`. Co-authored-by: Rodney Lorrimar <[email protected]> Co-authored-by: KtorZ <[email protected]>

@disassembler

864: nix: Provide derivations for Daedalus installer r=KtorZ a=rvl Relates to #863. Based on #828. # Overview - @disassembler @cleverca22 It's not exactly the same as before but should work ok I think. - Adds source filtering to avoid unnecessary rebuilds. # Comments To build: ``` nix-build -A cardano-wallet-jormungandr nix-build release.nix -A daedalus-jormungandr.windows -o daedalus-jormungandr-windows nix-build release.nix -A daedalus-jormungandr.macos -o daedalus-jormungandr-macos nix-build release.nix -A daedalus-jormungandr.linux -o daedalus-jormungandr-linux ``` Note that `daedalus-jormungandr.{windows,macos,linux}` from `release.nix` reference the same `cardano-wallet-jormungandr` derivation, only with different `system` or `crossSystem` arguments. So Daedalus may also import from `default.nix` rather than `release.nix`. Co-authored-by: Rodney Lorrimar <[email protected]>

@disassembler

862: jormungandr launch: use --rest-listen instead of generating config.yaml r=KtorZ a=rvl Relates to #832 and #848. Supersedes #850. # Overview `cardano-wallet-jormungandr launch` specifies the REST API port and storage directory. The user provides the rest of the Jörmungandr configuration (e.g. trusted peers). # Comments The Jörmungandr P2P listen address, port, and log level are no longer configured by cardano-wallet. 864: nix: Provide derivations for Daedalus installer r=KtorZ a=rvl Relates to #863. Based on #828. # Overview - @disassembler @cleverca22 It's not exactly the same as before but should work ok I think. - Adds source filtering to avoid unnecessary rebuilds. # Comments To build: ``` nix-build -A cardano-wallet-jormungandr nix-build release.nix -A daedalus-jormungandr.windows -o daedalus-jormungandr-windows nix-build release.nix -A daedalus-jormungandr.macos -o daedalus-jormungandr-macos nix-build release.nix -A daedalus-jormungandr.linux -o daedalus-jormungandr-linux ``` Note that `daedalus-jormungandr.{windows,macos,linux}` from `release.nix` reference the same `cardano-wallet-jormungandr` derivation, only with different `system` or `crossSystem` arguments. So Daedalus may also import from `default.nix` rather than `release.nix`. 878: Support for legacy UTxO witness in Jörmungandr r=KtorZ a=KtorZ # Issue Number  #779 # Overview  - [x] I have extended `mkStdTx` so that it would properly handle transactions coming from a `RndKey` and construct `legacy-utxo` witnesses for it. # Comments  Jörmungandr doesn't implement creating legacy utxo witnesses from jcli ... [jcli/src/jcli_app/transaction/mk_witness.rs](https://github.com/input-output-hk/jormungandr/blob/master/jcli/src/jcli_app/transaction/mk_witness.rs#L78-L82) ```rust WitnessType::OldUTxO => { // TODO unimplemented!() let _secret_key: SecretKey<Ed25519Bip32> = self.secret()?; Err(Error::MakeWitnessLegacyUtxoUnsupported)?; unimplemented!() } ``` so I had to construct them by hand according to: - The format defined in [chain-impl-mockchain#witnesses](https://github.com/input-output-hk/chain-libs/blob/incentive/chain-impl-mockchain/doc/format.md#witnesses) - The format from the source (double checking it matches the doc..) [chain-impl-mockchain/src/transaction/witness.rs](https://github.com/input-output-hk/chain-libs/blob/incentive/chain-impl-mockchain/src/transaction/witness.rs#L173-L176) It'd be nice to review our golden if / when the constructor for the witness type gets updated.  879: Porting the rest of forget pending tx integration tests to CLI r=KtorZ a=paweljakubas # Issue Number  #836 # Overview  - [x] I have ported the rest of forgetting pending tx integration tests to CLI # Comments   Co-authored-by: Rodney Lorrimar <[email protected]> Co-authored-by: KtorZ <[email protected]> Co-authored-by: Pawel Jakubas <[email protected]>

@disassembler

862: jormungandr launch: use --rest-listen instead of generating config.yaml r=KtorZ a=rvl Relates to #832 and #848. Supersedes #850. # Overview `cardano-wallet-jormungandr launch` specifies the REST API port and storage directory. The user provides the rest of the Jörmungandr configuration (e.g. trusted peers). # Comments The Jörmungandr P2P listen address, port, and log level are no longer configured by cardano-wallet. 864: nix: Provide derivations for Daedalus installer r=KtorZ a=rvl Relates to #863. Based on #828. # Overview - @disassembler @cleverca22 It's not exactly the same as before but should work ok I think. - Adds source filtering to avoid unnecessary rebuilds. # Comments To build: ``` nix-build -A cardano-wallet-jormungandr nix-build release.nix -A daedalus-jormungandr.windows -o daedalus-jormungandr-windows nix-build release.nix -A daedalus-jormungandr.macos -o daedalus-jormungandr-macos nix-build release.nix -A daedalus-jormungandr.linux -o daedalus-jormungandr-linux ``` Note that `daedalus-jormungandr.{windows,macos,linux}` from `release.nix` reference the same `cardano-wallet-jormungandr` derivation, only with different `system` or `crossSystem` arguments. So Daedalus may also import from `default.nix` rather than `release.nix`. 878: Support for legacy UTxO witness in Jörmungandr r=KtorZ a=KtorZ # Issue Number  #779 # Overview  - [x] I have extended `mkStdTx` so that it would properly handle transactions coming from a `RndKey` and construct `legacy-utxo` witnesses for it. # Comments  Jörmungandr doesn't implement creating legacy utxo witnesses from jcli ... [jcli/src/jcli_app/transaction/mk_witness.rs](https://github.com/input-output-hk/jormungandr/blob/master/jcli/src/jcli_app/transaction/mk_witness.rs#L78-L82) ```rust WitnessType::OldUTxO => { // TODO unimplemented!() let _secret_key: SecretKey<Ed25519Bip32> = self.secret()?; Err(Error::MakeWitnessLegacyUtxoUnsupported)?; unimplemented!() } ``` so I had to construct them by hand according to: - The format defined in [chain-impl-mockchain#witnesses](https://github.com/input-output-hk/chain-libs/blob/incentive/chain-impl-mockchain/doc/format.md#witnesses) - The format from the source (double checking it matches the doc..) [chain-impl-mockchain/src/transaction/witness.rs](https://github.com/input-output-hk/chain-libs/blob/incentive/chain-impl-mockchain/src/transaction/witness.rs#L173-L176) It'd be nice to review our golden if / when the constructor for the witness type gets updated.  879: Porting the rest of forget pending tx integration tests to CLI r=KtorZ a=paweljakubas # Issue Number  #836 # Overview  - [x] I have ported the rest of forgetting pending tx integration tests to CLI # Comments   Co-authored-by: Rodney Lorrimar <[email protected]> Co-authored-by: KtorZ <[email protected]> Co-authored-by: Pawel Jakubas <[email protected]>

@disassembler

862: jormungandr launch: use --rest-listen instead of generating config.yaml r=KtorZ a=rvl Relates to #832 and #848. Supersedes #850. # Overview `cardano-wallet-jormungandr launch` specifies the REST API port and storage directory. The user provides the rest of the Jörmungandr configuration (e.g. trusted peers). # Comments The Jörmungandr P2P listen address, port, and log level are no longer configured by cardano-wallet. 864: nix: Provide derivations for Daedalus installer r=KtorZ a=rvl Relates to #863. Based on #828. # Overview - @disassembler @cleverca22 It's not exactly the same as before but should work ok I think. - Adds source filtering to avoid unnecessary rebuilds. # Comments To build: ``` nix-build -A cardano-wallet-jormungandr nix-build release.nix -A daedalus-jormungandr.windows -o daedalus-jormungandr-windows nix-build release.nix -A daedalus-jormungandr.macos -o daedalus-jormungandr-macos nix-build release.nix -A daedalus-jormungandr.linux -o daedalus-jormungandr-linux ``` Note that `daedalus-jormungandr.{windows,macos,linux}` from `release.nix` reference the same `cardano-wallet-jormungandr` derivation, only with different `system` or `crossSystem` arguments. So Daedalus may also import from `default.nix` rather than `release.nix`. Co-authored-by: Rodney Lorrimar <[email protected]> Co-authored-by: KtorZ <[email protected]>

@disassembler

864: nix: Provide derivations for Daedalus installer r=KtorZ a=rvl Relates to #863. Based on #828. # Overview - @disassembler @cleverca22 It's not exactly the same as before but should work ok I think. - Adds source filtering to avoid unnecessary rebuilds. # Comments To build: ``` nix-build -A cardano-wallet-jormungandr nix-build release.nix -A daedalus-jormungandr.windows -o daedalus-jormungandr-windows nix-build release.nix -A daedalus-jormungandr.macos -o daedalus-jormungandr-macos nix-build release.nix -A daedalus-jormungandr.linux -o daedalus-jormungandr-linux ``` Note that `daedalus-jormungandr.{windows,macos,linux}` from `release.nix` reference the same `cardano-wallet-jormungandr` derivation, only with different `system` or `crossSystem` arguments. So Daedalus may also import from `default.nix` rather than `release.nix`. Co-authored-by: Rodney Lorrimar <[email protected]>

cleverca22 requested a review from disassembler October 15, 2019 15:04

cleverca22 force-pushed the daedalus-bridge branch 4 times, most recently from afc8204 to 93e6b2b Compare October 15, 2019 15:49

disassembler force-pushed the daedalus-bridge branch from 8397e15 to ce313f1 Compare October 15, 2019 19:17

KtorZ assigned iohk-devops Oct 16, 2019

rvl and others added 9 commits October 16, 2019 14:38

nix: Refactor windows release dist

53b13b3

(cherry picked from commit 051c1d2)

switch to niv/19.09

6d353be

add shell with niv

2c84886

window release fixes and 0.5.6 bump

0838ee9

add an example daedalus-bridge

f76bf97

clean-up tasks

f7fe133

bump iohk-nix

3f4d255

update to the launcher without tls generation

23d8260

include jcli in the daedalus-bridge

6880b0c

cleverca22 force-pushed the daedalus-bridge branch from 9649a3a to 6880b0c Compare October 16, 2019 17:39

cleverca22 added 4 commits October 16, 2019 15:24

dont use the generated config file

9517d81

update launcher to not set DAEDALUS_CONFIG

b4e28e1

update jormungandr-nix

be0adf3

wait an hour for the node to start

bf6037e

expose node and wallet versions as attributes of the bridge

547e655

cleverca22 changed the base branch from windows-wallet to master October 17, 2019 22:35

cleverca22 commented Oct 17, 2019

View reviewed changes

update shell

4860168

rvl mentioned this pull request Oct 18, 2019

nix: Provide derivations for Daedalus installer #864

Merged

disassembler closed this Oct 22, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add an example daedalus-bridge #828

add an example daedalus-bridge #828

cleverca22 commented Oct 15, 2019

rvl commented Oct 15, 2019

KtorZ commented Oct 17, 2019

cleverca22 Oct 17, 2019 •

edited

Loading

KtorZ Oct 17, 2019 •

edited

Loading

cleverca22 Oct 17, 2019

KtorZ Oct 17, 2019

cleverca22 Oct 17, 2019

cleverca22 Oct 17, 2019

KtorZ Oct 17, 2019

disassembler Oct 18, 2019

cleverca22 Oct 17, 2019

add an example daedalus-bridge #828

add an example daedalus-bridge #828

Conversation

cleverca22 commented Oct 15, 2019

Issue Number

Overview

Comments

rvl commented Oct 15, 2019

KtorZ commented Oct 17, 2019

cleverca22 Oct 17, 2019 • edited Loading

Choose a reason for hiding this comment

KtorZ Oct 17, 2019 • edited Loading

Choose a reason for hiding this comment

cleverca22 Oct 17, 2019

Choose a reason for hiding this comment

KtorZ Oct 17, 2019

Choose a reason for hiding this comment

cleverca22 Oct 17, 2019

Choose a reason for hiding this comment

cleverca22 Oct 17, 2019

Choose a reason for hiding this comment

KtorZ Oct 17, 2019

Choose a reason for hiding this comment

disassembler Oct 18, 2019

Choose a reason for hiding this comment

cleverca22 Oct 17, 2019

Choose a reason for hiding this comment

cleverca22 Oct 17, 2019 •

edited

Loading

KtorZ Oct 17, 2019 •

edited

Loading