Extract Http-Bridge specifics into a dedicated package

.buildkite/benchmark.sh

@@ -7,13 +7,13 @@ echo "--- Build code and benchmarks"
 stack build --bench --no-run-benchmarks
 
 echo "+++ Run benchmarks - $NETWORK"
-stack bench cardano-wallet-core:restore --interleaved-output --ba "$NETWORK +RTS -N2 -qg -A1m -I0 -T -M8G -h -RTS"
+stack bench cardano-wallet-http-bridge:restore --interleaved-output --ba "$NETWORK +RTS -N2 -qg -A1m -I0 -T -M8G -h -RTS"
 
-ARTIFACT=lib/core/restore.hp
+ARTIFACT=lib/http-bridge/restore
 
-hp2pretty $ARTIFACT
+hp2pretty $ARTIFACT.hp
 
 if [ -n "${BUILDKITE:-}" ]; then
-  buildkite-agent artifact upload $ARTIFACT
-  printf '\033]1338;url='"artifact://restore.svg"';alt='"Heap profile"'\a\n'
+  buildkite-agent artifact upload $ARTIFACT.svg
+  printf '\033]1338;url='"artifact://$ARTIFACT.svg"';alt='"Heap profile"'\a\n'
 fi

.travis.yml

@@ -64,7 +64,7 @@ jobs:
     name: "Compiling"
     script:
     - mkdir -p ~/.local/bin
-    - travis_retry curl -L -o cardano-node-simple.tar.gz https://raw.githubusercontent.com/input-output-hk/cardano-wallet/master/lib/core/test/data/cardano-node-simple/cardano-node-simple-3.0.1.tar.gz
+    - travis_retry curl -L -o cardano-node-simple.tar.gz https://raw.githubusercontent.com/input-output-hk/cardano-wallet/KtorZ/extract-http-bridge/lib/http-bridge/test/data/cardano-node-simple/cardano-node-simple-3.0.1.tar.gz
     - tar xzf cardano-node-simple.tar.gz -C $HOME/.local/bin
     - cardano-node-simple --version
     - test "$(cardano-http-bridge --version)" = "cardano-http-bridge 0.0.1" || travis_retry cargo install --force --branch cardano-wallet-integration --git https://github.com/KtorZ/cardano-http-bridge.git
@@ -93,14 +93,14 @@ jobs:
     script:
     - export NETWORK=mainnet
     - tar xzf $STACK_WORK_CACHE
-    - stack --no-terminal test cardano-wallet-core:unit
+    - stack --no-terminal test cardano-wallet-http-bridge:unit
 
   - stage: checks 🔬
     name: "Tests (testnet)"
     script:
     - export NETWORK=testnet
     - tar xzf $STACK_WORK_CACHE
-    - travis_retry curl -L -o hermes-testnet.tar.gz https://raw.githubusercontent.com/input-output-hk/cardano-wallet/master/lib/core/test/data/cardano-http-bridge/hermes-testnet.tar.gz
+    - travis_retry curl -L -o hermes-testnet.tar.gz https://raw.githubusercontent.com/input-output-hk/cardano-wallet/KtorZ/extract-http-bridge/lib/http-bridge/test/data/cardano-http-bridge/hermes-testnet.tar.gz
     - tar xzf hermes-testnet.tar.gz -C $HOME
     - stack --no-terminal test --coverage
     - tar czf $STACK_WORK_CACHE .stack-work lib/**/.stack-work

.weeder.yaml

@@ -1,5 +1,5 @@
 - package:
-  - name: cardano-wallet-core
+  - name: cardano-wallet-http-bridge
   - section:
     - name: test:integration
     - message:
@@ -26,11 +26,11 @@
       - module:
         - name: Spec
         - identifier: main
-
 - package:
   - name: cardano-wallet-launcher
   - section:
     - name: library
     - message:
       - name: Module not compiled
       - module: Cardano.Launcher.Windows
+

cardano-wallet.cabal

@@ -33,6 +33,7 @@ executable cardano-wallet
       base
     , cardano-wallet-cli
     , cardano-wallet-core
+    , cardano-wallet-http-bridge
     , docopt
     , servant-server
     , text
@@ -57,7 +58,7 @@ executable cardano-wallet-launcher
   build-depends:
       base
     , cardano-wallet-cli
-    , cardano-wallet-core
+    , cardano-wallet-http-bridge
     , cardano-wallet-launcher
     , docopt
     , fmt

exe/wallet/Main.hs

@@ -32,7 +32,7 @@ import Cardano.Wallet.Api
     ( Api )
 import Cardano.Wallet.Api.Server
     ( server )
-import Cardano.Wallet.Compatibility
+import Cardano.Wallet.Compatibility.HttpBridge
     ( HttpBridge )
 import Cardano.Wallet.Primitive.AddressDerivation
     ( FromMnemonic (..), Passphrase (..) )

lib/core/cardano-wallet-core.cabal

@@ -36,25 +36,18 @@ library
     , base
     , base58-bytestring
     , basement
-    , binary
     , bytestring
     , cardano-crypto
-    , cborg
     , containers
     , cryptonite
     , deepseq
-    , digest
     , exceptions
     , fmt
     , generic-lens
     , http-api-data
-    , http-client
     , http-media
-    , http-types
     , memory
     , servant
-    , servant-client
-    , servant-client-core
     , servant-server
     , text
     , text-class
@@ -64,32 +57,24 @@ library
   hs-source-dirs:
       src
   exposed-modules:
-      Cardano.Environment
       Cardano.Wallet
-      Cardano.Wallet.Compatibility
       Cardano.Wallet.Api
       Cardano.Wallet.Api.Server
       Cardano.Wallet.Api.Types
-      Cardano.Wallet.Binary
-      Cardano.Wallet.Binary.Packfile
       Cardano.Wallet.CoinSelection
       Cardano.Wallet.CoinSelection.Fee
       Cardano.Wallet.CoinSelection.Policy.LargestFirst
       Cardano.Wallet.CoinSelection.Policy.Random
       Cardano.Wallet.DB
       Cardano.Wallet.DB.MVar
       Cardano.Wallet.Network
-      Cardano.Wallet.Network.HttpBridge
-      Cardano.Wallet.Network.HttpBridge.Api
       Cardano.Wallet.Primitive.AddressDerivation
       Cardano.Wallet.Primitive.AddressDiscovery
       Cardano.Wallet.Primitive.Mnemonic
       Cardano.Wallet.Primitive.Model
       Cardano.Wallet.Primitive.Types
       Cardano.Wallet.Transaction
-      Cardano.Wallet.Transaction.HttpBridge
       Data.Quantity
-      Servant.Extra.ContentTypes
   other-modules:
       Paths_cardano_wallet_core
 
@@ -111,15 +96,12 @@ test-suite unit
     , aeson
     , aeson-qq
     , async
-    , base58-bytestring
     , bytestring
     , cardano-crypto
     , cardano-wallet-core
-    , cborg
     , containers
     , cryptonite
     , deepseq
-    , digest
     , file-embed
     , fmt
     , generic-arbitrary
@@ -143,118 +125,19 @@ test-suite unit
   main-is:
       Main.hs
   other-modules:
-      Cardano.EnvironmentSpec
       Cardano.Wallet.Api.TypesSpec
       Cardano.Wallet.ApiSpec
-      Cardano.Wallet.Binary.PackfileSpec
-      Cardano.Wallet.BinarySpec
       Cardano.Wallet.CoinSelection.FeeSpec
       Cardano.Wallet.CoinSelection.Policy.LargestFirstSpec
       Cardano.Wallet.CoinSelection.Policy.RandomSpec
       Cardano.Wallet.CoinSelectionSpec
       Cardano.Wallet.DB.MVarSpec
       Cardano.Wallet.DBSpec
-      Cardano.Wallet.Network.HttpBridge.ApiSpec
-      Cardano.Wallet.Network.HttpBridgeSpec
       Cardano.Wallet.NetworkSpec
       Cardano.Wallet.Primitive.AddressDerivationSpec
       Cardano.Wallet.Primitive.AddressDiscoverySpec
       Cardano.Wallet.Primitive.MnemonicSpec
       Cardano.Wallet.Primitive.ModelSpec
       Cardano.Wallet.Primitive.TypesSpec
-      Cardano.Wallet.Primitive.SigningSpec
       Cardano.WalletSpec
       Data.QuantitySpec
-      Servant.Extra.ContentTypesSpec
-      Spec
-
-test-suite integration
-  default-language:
-      Haskell2010
-  default-extensions:
-      NoImplicitPrelude
-      OverloadedStrings
-  ghc-options:
-      -threaded -rtsopts
-      -Wall
-      -O2
-  if (!flag(development))
-    ghc-options:
-      -Werror
-  build-depends:
-      base
-    , aeson
-    , aeson-qq
-    , async
-    , bytestring
-    , cardano-wallet-core
-    , cardano-wallet-launcher
-    , cborg
-    , cryptonite
-    , exceptions
-    , generic-lens
-    , hspec
-    , hspec-core
-    , hspec-expectations-lifted
-    , http-client
-    , http-api-data
-    , http-types
-    , process
-    , template-haskell
-    , text
-    , text-class
-    , time
-    , transformers
-  type:
-     exitcode-stdio-1.0
-  hs-source-dirs:
-      test/integration
-  main-is:
-      Main.hs
-  other-modules:
-      Cardano.WalletSpec
-      Cardano.Wallet.Network.HttpBridgeSpec
-      Test.Integration.Framework.DSL
-      Test.Integration.Framework.Request
-      Test.Integration.Scenario.Wallets
-
-benchmark restore
-  default-language:
-      Haskell2010
-  default-extensions:
-      NoImplicitPrelude
-      OverloadedStrings
-  ghc-options:
-      -threaded -rtsopts
-      -Wall
-      -O2
-  if (!flag(development))
-    ghc-options:
-      -Werror
-  build-depends:
-      base
-    , async
-    , bytestring
-    , cardano-wallet-core
-    , cardano-wallet-launcher
-    , containers
-    , criterion-measurement
-    , cryptonite
-    , deepseq
-    , digest
-    , fmt
-    , generic-lens
-    , process
-    , say
-    , text
-    , text-class
-    , time
-    , transformers
-  type:
-     exitcode-stdio-1.0
-  hs-source-dirs:
-      test/bench
-  main-is:
-      Main.hs
-  other-modules:
-      Cardano.Wallet.Primitive.AddressDiscovery.Any

lib/core/src/Cardano/Wallet.hs

@@ -38,8 +38,6 @@ module Cardano.Wallet
 
 import Prelude
 
-import Cardano.Wallet.Binary
-    ( encodeSignedTx, toByteString )
 import Cardano.Wallet.CoinSelection
     ( CoinSelection (..)
     , CoinSelectionError (..)
@@ -81,7 +79,6 @@ import Cardano.Wallet.Primitive.Types
     ( Block (..)
     , Coin (..)
     , Direction (..)
-    , SignedTx (..)
     , SlotId (..)
     , Tx
     , TxId (..)
@@ -319,8 +316,7 @@ mkWalletLayer db nw tl = WalletLayer
                     throwE $ ErrSignTx e
 
     , submitTx = \wid (tx, meta, wit) -> do
-        let signed = SignedTx $ toByteString $ encodeSignedTx (tx, wit)
-        withExceptT ErrSubmitTxNetwork $ postTx nw signed
+        withExceptT ErrSubmitTxNetwork $ postTx nw (tx, wit)
         DB.withLock db $ withExceptT ErrSubmitTxNoSuchWallet $ do
             (w, _) <- _readWallet wid
             let history = Map.fromList [(txId @t tx, (tx, meta))]

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

@@ -15,9 +15,14 @@ import Cardano.Wallet.Api.Types
     )
 import Cardano.Wallet.Primitive.Types
     ( AddressState, WalletId )
+import Data.List.NonEmpty
+    ( NonEmpty ((:|)) )
+import Network.HTTP.Media
+    ( (//), (/:) )
 import Servant.API
     ( (:<|>)
     , (:>)
+    , Accept (..)
     , Capture
     , DeleteNoContent
     , Get
@@ -28,8 +33,6 @@ import Servant.API
     , QueryParam
     , ReqBody
     )
-import Servant.Extra.ContentTypes
-    ( Any )
 
 type Api = Addresses :<|> Wallets :<|> Transactions
 
@@ -109,3 +112,17 @@ type CreateTransaction = "wallets"
     :> "transactions"
     :> ReqBody '[JSON] PostTransactionData
     :> PostAccepted '[JSON] ApiTransaction
+
+{-------------------------------------------------------------------------------
+                                   Internals
+-------------------------------------------------------------------------------}
+
+-- | Any media type
+data Any
+
+instance Accept Any where
+    contentTypes _ = ("*" // "*") :|
+        -- We also 'conveniently' accept JSON format
+        [ "application" // "json"
+        , "application" // "json" /: ("charset", "utf-8")
+        ]

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

@@ -17,7 +17,7 @@ module Cardano.Wallet.Network
 import Prelude
 
 import Cardano.Wallet.Primitive.Types
-    ( Block (..), BlockHeader (..), Hash (..), SignedTx, SlotId (..) )
+    ( Block (..), BlockHeader (..), Hash (..), SlotId (..), Tx, TxWitness )
 import Control.Exception
     ( Exception )
 import Control.Monad.Trans.Except
@@ -40,7 +40,7 @@ data NetworkLayer m = NetworkLayer
         -- ^ Get the current network tip from the chain producer
 
     , postTx
-        :: SignedTx -> ExceptT ErrPostTx m ()
+        :: (Tx, [TxWitness]) -> ExceptT ErrPostTx m ()
         -- ^ Broadcast a transaction to the chain producer
     }
 

lib/core/src/Cardano/Wallet/Primitive/Types.hs

@@ -39,7 +39,6 @@ module Cardano.Wallet.Primitive.Types
     , TxMeta(..)
     , Direction(..)
     , TxStatus(..)
-    , SignedTx (..)
     , TxWitness (..)
     , txIns
 
@@ -412,10 +411,6 @@ instance Buildable Direction where
         Outgoing -> "outgoing"
         Incoming -> "incoming"
 
--- | Wrapper around the final CBOR representation of a signed tx
-newtype SignedTx = SignedTx { signedTx :: ByteString }
-    deriving (Show, Eq, Generic)
-
 data TxWitness
     = PublicKeyWitness ByteString (Hash "signature")
     | ScriptWitness ByteString