Skip to content
This repository was archived by the owner on Aug 18, 2020. It is now read-only.

Commit 9bae138

Browse files
iohk-bors[bot]mrBliss
iohk-bors[bot]
and
mrBliss
authored
Merge #81
81: Bump to 1.0.2 and update changelog r=mrBliss a=mrBliss First sync the dependencies with cardano-node-1.2.0 Co-authored-by: Thomas Winant <[email protected]>
2 parents d742b40 + a55d22a commit 9bae138

22 files changed

+120
-50
lines changed

‎ChangeLog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Revision history for cardano-byron-proxy
22

3+
## 1.0.2 -- December 2019
4+
5+
* Update to latest version of cardano-ledger, ouroboros-network,
6+
ouroboros-consensus, iohk-monitoring-framework, and cardano-shell libs.
7+
38
## 1.0.1 -- December 2019
49

510
* Update to latest version of ouroboros-network and ouroboros-consensus libs.

‎cabal.project

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -64,66 +64,73 @@ source-repository-package
6464
type: git
6565
location: https://github.com/input-output-hk/iohk-monitoring-framework
6666
subdir: iohk-monitoring
67-
tag: b310a4f0b7a80b54edfb094afd3def9eab035f46
67+
tag: 156391afaafca6b00d027fb9c03e1bd7a1f03003
6868

6969
source-repository-package
7070
type: git
7171
location: https://github.com/input-output-hk/iohk-monitoring-framework
72-
subdir: contra-tracer
73-
tag: b310a4f0b7a80b54edfb094afd3def9eab035f46
72+
subdir: contra-tracer
73+
tag: 156391afaafca6b00d027fb9c03e1bd7a1f03003
7474

7575
source-repository-package
7676
type: git
7777
location: https://github.com/input-output-hk/iohk-monitoring-framework
78-
subdir: plugins/backend-ekg
79-
tag: b310a4f0b7a80b54edfb094afd3def9eab035f46
78+
subdir: plugins/backend-ekg
79+
tag: 156391afaafca6b00d027fb9c03e1bd7a1f03003
80+
81+
source-repository-package
82+
type: git
83+
location: https://github.com/input-output-hk/iohk-monitoring-framework
84+
subdir: tracer-transformers
85+
tag: 156391afaafca6b00d027fb9c03e1bd7a1f03003
86+
8087

8188
source-repository-package
8289
type: git
8390
location: https://github.com/input-output-hk/ouroboros-network
84-
tag: 422c15be54a13170926ac402b89264d429da212c
91+
tag: cc5b89ae36da2c2584c3a633b8d75344e2e5e734
8592
subdir: io-sim
8693

8794
source-repository-package
8895
type: git
8996
location: https://github.com/input-output-hk/ouroboros-network
90-
tag: 422c15be54a13170926ac402b89264d429da212c
97+
tag: cc5b89ae36da2c2584c3a633b8d75344e2e5e734
9198
subdir: io-sim-classes
9299

93100
source-repository-package
94101
type: git
95102
location: https://github.com/input-output-hk/ouroboros-network
96-
tag: 422c15be54a13170926ac402b89264d429da212c
103+
tag: cc5b89ae36da2c2584c3a633b8d75344e2e5e734
97104
subdir: ouroboros-consensus
98105

99106
source-repository-package
100107
type: git
101108
location: https://github.com/input-output-hk/ouroboros-network
102-
tag: 422c15be54a13170926ac402b89264d429da212c
109+
tag: cc5b89ae36da2c2584c3a633b8d75344e2e5e734
103110
subdir: ouroboros-network
104111

105112
source-repository-package
106113
type: git
107114
location: https://github.com/input-output-hk/ouroboros-network
108-
tag: 422c15be54a13170926ac402b89264d429da212c
115+
tag: cc5b89ae36da2c2584c3a633b8d75344e2e5e734
109116
subdir: ouroboros-network-testing
110117

111118
source-repository-package
112119
type: git
113120
location: https://github.com/input-output-hk/ouroboros-network
114-
tag: 422c15be54a13170926ac402b89264d429da212c
121+
tag: cc5b89ae36da2c2584c3a633b8d75344e2e5e734
115122
subdir: network-mux
116123

117124
source-repository-package
118125
type: git
119126
location: https://github.com/input-output-hk/ouroboros-network
120-
tag: 422c15be54a13170926ac402b89264d429da212c
127+
tag: cc5b89ae36da2c2584c3a633b8d75344e2e5e734
121128
subdir: typed-protocols
122129

123130
source-repository-package
124131
type: git
125132
location: https://github.com/input-output-hk/ouroboros-network
126-
tag: 422c15be54a13170926ac402b89264d429da212c
133+
tag: cc5b89ae36da2c2584c3a633b8d75344e2e5e734
127134
subdir: typed-protocols-cbor
128135

129136
--
@@ -157,13 +164,13 @@ source-repository-package
157164
source-repository-package
158165
type: git
159166
location: https://github.com/input-output-hk/cardano-ledger
160-
tag: dbdb643722e431e4d232345a0eafdc7bdeab7b60
167+
tag: a773ba71eb9a6fb91dda2cdf6c41b2280f2acf7d
161168
subdir: cardano-ledger
162169

163170
source-repository-package
164171
type: git
165172
location: https://github.com/input-output-hk/cardano-ledger
166-
tag: dbdb643722e431e4d232345a0eafdc7bdeab7b60
173+
tag: a773ba71eb9a6fb91dda2cdf6c41b2280f2acf7d
167174
subdir: crypto
168175

169176
source-repository-package
@@ -187,7 +194,7 @@ source-repository-package
187194
type: git
188195
location: https://github.com/input-output-hk/cardano-shell
189196
subdir: cardano-shell
190-
tag: 4d26bcefc0edcd99154c85170ef028775c6dd1e0
197+
tag: bc3563c952d9f3635e1c76749b86b0a24f7e4b83
191198

192199
source-repository-package
193200
type: git

‎cardano-byron-proxy.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: cardano-byron-proxy
2-
version: 1.0.1
2+
version: 1.0.2
33
synopsis: Adapter for the Byron net
44
-- description:
55
homepage: https://github.com/input-output-hk/cardano-byron-proxy

‎cfg/logging-validator.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ defaultBackends:
1818
hasEKG: 12788
1919

2020
# if wanted, the Prometheus interface is using this port:
21-
hasPrometheus: 12798
21+
hasPrometheus:
22+
- "127.0.0.1"
23+
- 12798
2224

2325
# here we set up outputs of logging in 'katip':
2426
setupScribes:

‎cfg/logging.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ defaultBackends:
1717
hasEKG: 12789
1818

1919
# if wanted, the Prometheus interface is using this port:
20-
hasPrometheus: 12799
20+
hasPrometheus:
21+
- "127.0.0.1"
22+
- 12799
2123

2224
# here we set up outputs of logging in 'katip':
2325
setupScribes:

‎nix/.stack.nix/cardano-byron-proxy.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
flags = {};
44
package = {
55
specVersion = "1.10";
6-
identifier = { name = "cardano-byron-proxy"; version = "1.0.1"; };
6+
identifier = { name = "cardano-byron-proxy"; version = "1.0.2"; };
77
license = "Apache-2.0";
88
copyright = "(c) 2019 IOHK";
99
maintainer = "[email protected]";

‎nix/.stack.nix/cardano-crypto-wrapper.nix

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
(hsPkgs.formatting)
3434
(hsPkgs.memory)
3535
(hsPkgs.mtl)
36-
(hsPkgs.scrypt)
3736
(hsPkgs.text)
3837
];
3938
};
@@ -60,8 +59,8 @@
6059
} // {
6160
src = (pkgs.lib).mkDefault (pkgs.fetchgit {
6261
url = "https://github.com/input-output-hk/cardano-ledger";
63-
rev = "dbdb643722e431e4d232345a0eafdc7bdeab7b60";
64-
sha256 = "0vql7f53dq8zf595l3kzdzssz5801pz6z140q5fpnk38kr97s9da";
62+
rev = "a773ba71eb9a6fb91dda2cdf6c41b2280f2acf7d";
63+
sha256 = "0gbh82r9zd7k61hbj96vmh7jd2lrj4xg0hz1058qs7yraf5pjif2";
6564
});
6665
postUnpack = "sourceRoot+=/crypto; echo source root reset to \$sourceRoot";
6766
}

‎nix/.stack.nix/cardano-ledger.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@
117117
} // {
118118
src = (pkgs.lib).mkDefault (pkgs.fetchgit {
119119
url = "https://github.com/input-output-hk/cardano-ledger";
120-
rev = "dbdb643722e431e4d232345a0eafdc7bdeab7b60";
121-
sha256 = "0vql7f53dq8zf595l3kzdzssz5801pz6z140q5fpnk38kr97s9da";
120+
rev = "a773ba71eb9a6fb91dda2cdf6c41b2280f2acf7d";
121+
sha256 = "0gbh82r9zd7k61hbj96vmh7jd2lrj4xg0hz1058qs7yraf5pjif2";
122122
});
123123
postUnpack = "sourceRoot+=/cardano-ledger; echo source root reset to \$sourceRoot";
124124
}

‎nix/.stack.nix/cardano-shell.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
} // {
6262
src = (pkgs.lib).mkDefault (pkgs.fetchgit {
6363
url = "https://github.com/input-output-hk/cardano-shell";
64-
rev = "4d26bcefc0edcd99154c85170ef028775c6dd1e0";
65-
sha256 = "1vl1sf8labbak51ms6bxnfvda476v99lbjmzmkr9xr9zv5974pnr";
64+
rev = "bc3563c952d9f3635e1c76749b86b0a24f7e4b83";
65+
sha256 = "0c4f394h0wshcly6vcghvg5m6zd1i7s3a9kb1xlg7na4hn4y4a2v";
6666
});
6767
postUnpack = "sourceRoot+=/cardano-shell; echo source root reset to \$sourceRoot";
6868
}

‎nix/.stack.nix/contra-tracer.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
} // {
2525
src = (pkgs.lib).mkDefault (pkgs.fetchgit {
2626
url = "https://github.com/input-output-hk/iohk-monitoring-framework";
27-
rev = "4956b32f039579a0e7e4fd10793f65b4c77d9044";
28-
sha256 = "03lyb2m4i6p7rpjqarnhsx21nx48fwk6rzsrx15k6274a4bv0pix";
27+
rev = "156391afaafca6b00d027fb9c03e1bd7a1f03003";
28+
sha256 = "1g76sy52rfzl9gisn0rk5kh0vb5d3xnnyrb3ln6izswwc3r2d289";
2929
});
3030
postUnpack = "sourceRoot+=/contra-tracer; echo source root reset to \$sourceRoot";
3131
}

‎nix/.stack.nix/default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
iohk-monitoring = ./iohk-monitoring.nix;
3737
contra-tracer = ./contra-tracer.nix;
3838
lobemo-backend-ekg = ./lobemo-backend-ekg.nix;
39+
tracer-transformers = ./tracer-transformers.nix;
3940
cardano-binary = ./cardano-binary.nix;
4041
cardano-binary-test = ./cardano-binary-test.nix;
4142
cardano-crypto-class = ./cardano-crypto-class.nix;

‎nix/.stack.nix/io-sim-classes.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
} // {
3030
src = (pkgs.lib).mkDefault (pkgs.fetchgit {
3131
url = "https://github.com/input-output-hk/ouroboros-network";
32-
rev = "422c15be54a13170926ac402b89264d429da212c";
33-
sha256 = "1z6iq38aiyln9b6j81dc3whma8rg33yrqchhy490kk5whdd77hpx";
32+
rev = "cc5b89ae36da2c2584c3a633b8d75344e2e5e734";
33+
sha256 = "083by550rr3n31b2cwhrqnqlr8x6n1k19arrj3q9mz3mbl4al4wx";
3434
});
3535
postUnpack = "sourceRoot+=/io-sim-classes; echo source root reset to \$sourceRoot";
3636
}

‎nix/.stack.nix/iohk-monitoring.nix

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
(hsPkgs.text)
4444
(hsPkgs.time)
4545
(hsPkgs.time-units)
46+
(hsPkgs.tracer-transformers)
4647
(hsPkgs.transformers)
4748
(hsPkgs.unordered-containers)
4849
(hsPkgs.vector)
@@ -80,6 +81,7 @@
8081
(hsPkgs.text)
8182
(hsPkgs.time)
8283
(hsPkgs.time-units)
84+
(hsPkgs.tracer-transformers)
8385
(hsPkgs.transformers)
8486
(hsPkgs.unordered-containers)
8587
(hsPkgs.vector)
@@ -93,8 +95,8 @@
9395
} // {
9496
src = (pkgs.lib).mkDefault (pkgs.fetchgit {
9597
url = "https://github.com/input-output-hk/iohk-monitoring-framework";
96-
rev = "4956b32f039579a0e7e4fd10793f65b4c77d9044";
97-
sha256 = "03lyb2m4i6p7rpjqarnhsx21nx48fwk6rzsrx15k6274a4bv0pix";
98+
rev = "156391afaafca6b00d027fb9c03e1bd7a1f03003";
99+
sha256 = "1g76sy52rfzl9gisn0rk5kh0vb5d3xnnyrb3ln6izswwc3r2d289";
98100
});
99101
postUnpack = "sourceRoot+=/iohk-monitoring; echo source root reset to \$sourceRoot";
100102
}

‎nix/.stack.nix/lobemo-backend-ekg.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
} // {
3838
src = (pkgs.lib).mkDefault (pkgs.fetchgit {
3939
url = "https://github.com/input-output-hk/iohk-monitoring-framework";
40-
rev = "4956b32f039579a0e7e4fd10793f65b4c77d9044";
41-
sha256 = "03lyb2m4i6p7rpjqarnhsx21nx48fwk6rzsrx15k6274a4bv0pix";
40+
rev = "156391afaafca6b00d027fb9c03e1bd7a1f03003";
41+
sha256 = "1g76sy52rfzl9gisn0rk5kh0vb5d3xnnyrb3ln6izswwc3r2d289";
4242
});
4343
postUnpack = "sourceRoot+=/plugins/backend-ekg; echo source root reset to \$sourceRoot";
4444
}

‎nix/.stack.nix/network-mux.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
} // {
6666
src = (pkgs.lib).mkDefault (pkgs.fetchgit {
6767
url = "https://github.com/input-output-hk/ouroboros-network";
68-
rev = "422c15be54a13170926ac402b89264d429da212c";
69-
sha256 = "1z6iq38aiyln9b6j81dc3whma8rg33yrqchhy490kk5whdd77hpx";
68+
rev = "cc5b89ae36da2c2584c3a633b8d75344e2e5e734";
69+
sha256 = "083by550rr3n31b2cwhrqnqlr8x6n1k19arrj3q9mz3mbl4al4wx";
7070
});
7171
postUnpack = "sourceRoot+=/network-mux; echo source root reset to \$sourceRoot";
7272
}

‎nix/.stack.nix/ouroboros-consensus.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@
190190
} // {
191191
src = (pkgs.lib).mkDefault (pkgs.fetchgit {
192192
url = "https://github.com/input-output-hk/ouroboros-network";
193-
rev = "422c15be54a13170926ac402b89264d429da212c";
194-
sha256 = "1z6iq38aiyln9b6j81dc3whma8rg33yrqchhy490kk5whdd77hpx";
193+
rev = "cc5b89ae36da2c2584c3a633b8d75344e2e5e734";
194+
sha256 = "083by550rr3n31b2cwhrqnqlr8x6n1k19arrj3q9mz3mbl4al4wx";
195195
});
196196
postUnpack = "sourceRoot+=/ouroboros-consensus; echo source root reset to \$sourceRoot";
197197
}

‎nix/.stack.nix/ouroboros-network.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@
138138
} // {
139139
src = (pkgs.lib).mkDefault (pkgs.fetchgit {
140140
url = "https://github.com/input-output-hk/ouroboros-network";
141-
rev = "422c15be54a13170926ac402b89264d429da212c";
142-
sha256 = "1z6iq38aiyln9b6j81dc3whma8rg33yrqchhy490kk5whdd77hpx";
141+
rev = "cc5b89ae36da2c2584c3a633b8d75344e2e5e734";
142+
sha256 = "083by550rr3n31b2cwhrqnqlr8x6n1k19arrj3q9mz3mbl4al4wx";
143143
});
144144
postUnpack = "sourceRoot+=/ouroboros-network; echo source root reset to \$sourceRoot";
145145
}

‎nix/.stack.nix/tracer-transformers.nix

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }:
2+
{
3+
flags = {};
4+
package = {
5+
specVersion = "1.10";
6+
identifier = { name = "tracer-transformers"; version = "0.1.0.1"; };
7+
license = "Apache-2.0";
8+
copyright = "2019 IOHK";
9+
maintainer = "[email protected]";
10+
author = "Neil Davies, Alexander Diemand, Andreas Triantafyllos";
11+
homepage = "";
12+
url = "";
13+
synopsis = "tracer transformers and examples showing their use";
14+
description = "";
15+
buildType = "Simple";
16+
};
17+
components = {
18+
"library" = {
19+
depends = [
20+
(hsPkgs.base)
21+
(hsPkgs.contra-tracer)
22+
(hsPkgs.time)
23+
(hsPkgs.safe-exceptions)
24+
] ++ (pkgs.lib).optional (compiler.isGhc && (compiler.version).lt "8.5") (hsPkgs.contravariant);
25+
};
26+
exes = {
27+
"tracer-transfomers-example1" = {
28+
depends = [
29+
(hsPkgs.base)
30+
(hsPkgs.contra-tracer)
31+
(hsPkgs.time)
32+
(hsPkgs.tracer-transformers)
33+
];
34+
};
35+
"tracer-transfomers-example2" = {
36+
depends = [
37+
(hsPkgs.base)
38+
(hsPkgs.contra-tracer)
39+
(hsPkgs.text)
40+
(hsPkgs.tracer-transformers)
41+
];
42+
};
43+
};
44+
};
45+
} // {
46+
src = (pkgs.lib).mkDefault (pkgs.fetchgit {
47+
url = "https://github.com/input-output-hk/iohk-monitoring-framework";
48+
rev = "156391afaafca6b00d027fb9c03e1bd7a1f03003";
49+
sha256 = "1g76sy52rfzl9gisn0rk5kh0vb5d3xnnyrb3ln6izswwc3r2d289";
50+
});
51+
postUnpack = "sourceRoot+=/tracer-transformers; echo source root reset to \$sourceRoot";
52+
}

‎nix/.stack.nix/typed-protocols-cbor.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
} // {
4545
src = (pkgs.lib).mkDefault (pkgs.fetchgit {
4646
url = "https://github.com/input-output-hk/ouroboros-network";
47-
rev = "422c15be54a13170926ac402b89264d429da212c";
48-
sha256 = "1z6iq38aiyln9b6j81dc3whma8rg33yrqchhy490kk5whdd77hpx";
47+
rev = "cc5b89ae36da2c2584c3a633b8d75344e2e5e734";
48+
sha256 = "083by550rr3n31b2cwhrqnqlr8x6n1k19arrj3q9mz3mbl4al4wx";
4949
});
5050
postUnpack = "sourceRoot+=/typed-protocols-cbor; echo source root reset to \$sourceRoot";
5151
}

‎nix/.stack.nix/typed-protocols.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
} // {
4444
src = (pkgs.lib).mkDefault (pkgs.fetchgit {
4545
url = "https://github.com/input-output-hk/ouroboros-network";
46-
rev = "422c15be54a13170926ac402b89264d429da212c";
47-
sha256 = "1z6iq38aiyln9b6j81dc3whma8rg33yrqchhy490kk5whdd77hpx";
46+
rev = "cc5b89ae36da2c2584c3a633b8d75344e2e5e734";
47+
sha256 = "083by550rr3n31b2cwhrqnqlr8x6n1k19arrj3q9mz3mbl4al4wx";
4848
});
4949
postUnpack = "sourceRoot+=/typed-protocols; echo source root reset to \$sourceRoot";
5050
}

‎src/lib/Ouroboros/Byron/Proxy/Genesis/Convert.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ convertTestnetBalanceOptions tbo = Cardano.TestnetBalanceOptions
117117
-- Cardano uses a LovelacePortion, or Word64, the numerator over the
118118
-- maximum lovelace value 1e15.
119119
, Cardano.tboRichmenShare = either (error . show) id (Cardano.lovelacePortionFromDouble (CSL.tboRichmenShare tbo))
120-
, Cardano.tboUseHDAddresses = CSL.tboUseHDAddresses tbo
121120
}
122121

123122
convertFakeAvvmOptions :: CSL.FakeAvvmOptions -> Cardano.FakeAvvmOptions

0 commit comments

Comments
 (0)