Skip to content

Commit 25c2ff4

Browse files
authored
Merge branch 'develop' into chore/ddw-1180-trigger-darwin-manually
2 parents e6f98cf + 4808849 commit 25c2ff4

File tree

5 files changed

+18
-16
lines changed

5 files changed

+18
-16
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
### Chores
1212

13+
- Update `cardano-node` to 1.35.4 for the Preview network respin ([PR 3082](https://github.com/input-output-hk/daedalus/pull/3082))
1314
- Updated new Catalyst API URL ([PR 3087](https://github.com/input-output-hk/daedalus/pull/3087))
1415
- Fixed Storybook state for General stories ([PR 3064](https://github.com/input-output-hk/daedalus/pull/3064))
1516

CODE-OF-CONDUCT.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
See [Code of Conduct](https://github.com/input-output-hk/cardano-engineering-handbook/blob/main/CODE-OF-CONDUCT.md)

nix/sources.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"cardano-node": {
3-
"branch": "tags/1.35.3",
3+
"branch": "tags/1.35.4",
44
"description": null,
55
"homepage": null,
66
"owner": "input-output-hk",
77
"repo": "cardano-node",
8-
"rev": "950c4e222086fed5ca53564e642434ce9307b0b9",
9-
"sha256": "020fwimsm24yblr1fmnwx240wj8r3x715p89cpjgnnd8axwf32p0",
8+
"rev": "ebc7be471b30e5931b35f9bbc236d21c375b91bb",
9+
"sha256": "1j01m2cp2vdcl26zx9xmipr551v3b2rz9kfn9ik8byfwj1z7652r",
1010
"type": "tarball",
11-
"url": "https://github.com/input-output-hk/cardano-node/archive/950c4e222086fed5ca53564e642434ce9307b0b9.tar.gz",
11+
"url": "https://github.com/input-output-hk/cardano-node/archive/ebc7be471b30e5931b35f9bbc236d21c375b91bb.tar.gz",
1212
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
1313
},
1414
"cardano-shell": {
@@ -24,15 +24,15 @@
2424
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
2525
},
2626
"cardano-wallet": {
27-
"branch": "v2022-10-06",
27+
"branch": "v2022-12-14",
2828
"description": "Official Wallet Backend & API for Cardano decentralized",
2929
"homepage": null,
3030
"owner": "input-output-hk",
3131
"repo": "cardano-wallet",
32-
"rev": "2130fe0acf19fa218cef8de4ef325ae9078e356e",
33-
"sha256": "0d0wk6n7vij4qkp2qml5qdghk41dvm1078ps48673waf4cxjxaz0",
32+
"rev": "bbf11d4feefd5b770fb36717ec5c4c5c112aca87",
33+
"sha256": "1gvxmyclarklajifbyi2l8zwc1gqhbdps73rl9if9a3mpn5xngcp",
3434
"type": "tarball",
35-
"url": "https://github.com/input-output-hk/cardano-wallet/archive/2130fe0acf19fa218cef8de4ef325ae9078e356e.tar.gz",
35+
"url": "https://github.com/input-output-hk/cardano-wallet/archive/bbf11d4feefd5b770fb36717ec5c4c5c112aca87.tar.gz",
3636
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
3737
},
3838
"cardano-world": {
@@ -41,10 +41,10 @@
4141
"homepage": null,
4242
"owner": "input-output-hk",
4343
"repo": "cardano-world",
44-
"rev": "7561fe35ee8c532f2666f0627d49ea6e107e0e3f",
45-
"sha256": "1sxf611cnqlwc3sz10nnxjip2w9j7ii9n42zby90j409sx40mg7g",
44+
"rev": "a0a315100ee320395be97fcc83f46678d5a7fb6e",
45+
"sha256": "08scj58jixs15sjidhjfw93y3vyqp3vmbjmlrc4hpp5q5xwri3k6",
4646
"type": "tarball",
47-
"url": "https://github.com/input-output-hk/cardano-world/archive/7561fe35ee8c532f2666f0627d49ea6e107e0e3f.tar.gz",
47+
"url": "https://github.com/input-output-hk/cardano-world/archive/a0a315100ee320395be97fcc83f46678d5a7fb6e.tar.gz",
4848
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
4949
},
5050
"flake-compat": {

source/main/environment.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ const isDevelopment = checkIsDevelopment(NETWORK);
5353
const analyticsFeatureEnabled = true;
5454
const keepLocalClusterRunning = process.env.KEEP_LOCAL_CLUSTER_RUNNING;
5555
const API_VERSION = process.env.API_VERSION || 'dev';
56-
const NODE_VERSION = '1.35.3'; // TODO: pick up this value from process.env
56+
const NODE_VERSION = '1.35.4'; // TODO: pick up this value from process.env
5757

5858
const mainProcessID = get(process, 'ppid', '-');
5959
const rendererProcessID = process.pid;

source/renderer/app/api/api.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2403,11 +2403,11 @@ export default class AdaApi {
24032403
stake
24042404
);
24052405
const stakePools = response
2406-
.filter(({ metadata }: AdaApiStakePool) => metadata !== undefined)
2407-
.filter(({ flags }: AdaApiStakePool) => !flags.includes('delisted'))
24082406
.filter(
2409-
({ margin }: AdaApiStakePool) =>
2410-
margin !== undefined && margin.quantity < 100
2407+
(stakePool: AdaApiStakePool) =>
2408+
!!stakePool?.metadata &&
2409+
!stakePool?.flags?.includes('delisted') &&
2410+
stakePool?.margin?.quantity < 100
24112411
)
24122412
.map(_createStakePoolFromServerData);
24132413
logger.debug('AdaApi::getStakePools success', {

0 commit comments

Comments
 (0)