diff --git a/README.md b/README.md index 463d1ef5260..fe695e39b5a 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ See **Installation Instructions** for each available [release](https://github.co > > | cardano-wallet | jörmungandr (compatible versions) | cardano-node (compatible versions) > | --- | --- | --- -> | `master` branch | [v0.9.0](https://github.com/input-output-hk/jormungandr/releases/tag/v0.9.0) | [1.15.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.15.1) +> | `master` branch | [v0.9.0](https://github.com/input-output-hk/jormungandr/releases/tag/v0.9.0) | [e28c1d3](https://github.com/input-output-hk/cardano-node/commit/e28c1d37832af9c4ec50bb5c64aa83c37dc4aa89) > | [v2020-06-05](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2020-06-05) | [v0.8.18](https://github.com/input-output-hk/jormungandr/releases/tag/v0.8.18) | [1.13.0](https://github.com/input-output-hk/cardano-node/releases/tag/1.13.0) > | [v2020-05-06](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2020-05-06) | [v0.8.18](https://github.com/input-output-hk/jormungandr/releases/tag/v0.8.18) | [1.11.0](https://github.com/input-output-hk/cardano-node/releases/tag/1.11.0) > | [v2020-04-28](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2020-04-28) | [v0.8.18](https://github.com/input-output-hk/jormungandr/releases/tag/v0.8.18) | [1.11.0](https://github.com/input-output-hk/cardano-node/releases/tag/1.11.0) diff --git a/lib/shelley/src/Cardano/Wallet/Shelley/Launch.hs b/lib/shelley/src/Cardano/Wallet/Shelley/Launch.hs index 9d5ae884504..5f2c8ce844e 100644 --- a/lib/shelley/src/Cardano/Wallet/Shelley/Launch.hs +++ b/lib/shelley/src/Cardano/Wallet/Shelley/Launch.hs @@ -940,44 +940,44 @@ takeFaucet dir = takeMVar faucets >>= \case -- | List of faucets also referenced in the shelley 'genesis.yaml' faucets :: MVar [(String, Aeson.Value)] faucets = unsafePerformIO $ newMVar - [ ( "cea1b041dd5465be636b5b88805571f83537bd503bc4db447f088d942673736c#0" + [ ( "58d43bf3c30fe33bfac9e66c1f32acb41269d33194c4e926083d4008198c7f5e#0" , Aeson.object - [ "type" .= Aeson.String "Genesis UTxO signing key" + [ "type" .= Aeson.String "GenesisUTxOSigningKey_ed25519" , "description" .= Aeson.String "Genesis initial UTxO key" , "cborHex" .= Aeson.String - "5820db101b5f4cc53ca1d61f7505b23c05b1b58de0b9f509c4dfede4348549dbaa9d" + "5820b63dcef93c9309a264c2942d774cf8a752e4abcef36776b28dbcd57dd2a6c2b6" ] ) - , ( "fa271c369d4d9a6b78e18f9d554730ef9978847ecb187c064cb9c8d56c2092cd#0" + , ( "d021a0b60be98fce5214488f1cd0590b542d6ac7d3aa2d8bdd3a33531fd18cec#0" , Aeson.object - [ "type" .= Aeson.String "Genesis UTxO signing key" + [ "type" .= Aeson.String "GenesisUTxOSigningKey_ed25519" , "description" .= Aeson.String "Genesis initial UTxO key" , "cborHex" .= Aeson.String - "582061e08f3e8ac1afbf0434fca2bb4aa6484270d8dd3e251c049006aab368a74a7e" + "58202dc882a6ebf9c8beb9f30f595c597f4a9d4856b11eed576bd5ab2e1779f40cd5" ] ) - , ( "672d7558074f02c662b11a4ff761ec3a24c94a18b319033af5f9f22a03b8891b#0" + , ( "28dd1a860627fe2577eb5f0a994ccd0292cc27add634bf8a7b4e7222bbce0af8#0" , Aeson.object - [ "type" .= Aeson.String "Genesis UTxO signing key" + [ "type" .= Aeson.String "GenesisUTxOSigningKey_ed25519" , "description" .= Aeson.String "Genesis initial UTxO key" , "cborHex" .= Aeson.String - "58204054ff827451cad61241450a09ea80c9d0658398f588ff976393ae8eacb859fe" + "582003b5b3158de3a20886cbedbbbc566006d0d411d23c373a43fe817634e9390478" ] ) - , ( "ca97dc6662a21f1b7ea0790c380d13dad84386cbb7f731c7ba3982a8d105267b#0" + , ( "306c27331900ae1c3d0dc31bba1c37365f594b9e1017048c6ccac054ec1b12b2#0" , Aeson.object - [ "type" .= Aeson.String "Genesis UTxO signing key" + [ "type" .= Aeson.String "GenesisUTxOSigningKey_ed25519" , "description" .= Aeson.String "Genesis initial UTxO key" , "cborHex" .= Aeson.String - "58204a7a8e7a1ba0d33c407dc3ceda225c605287cfb0e3b51d9eba3822abd6aa75ca" + "582022be977fea1ff0843059d7a202cc9d84678d8c7ea2f295844d6acc4312c29882" ] ) - , ( "cfc08d97636877d94cd19a246e72d191bc3905712bbab8cdbb1aa240fc09be3c#0" + , ( "d8db9002194b5974607361958cac10a7e75d0aee65186db22bbe76a389e9fb4b#0" , Aeson.object - [ "type" .= Aeson.String "Genesis UTxO signing key" + [ "type" .= Aeson.String "GenesisUTxOSigningKey_ed25519" , "description" .= Aeson.String "Genesis initial UTxO key" , "cborHex" .= Aeson.String - "5820e96f612fbff3df3d8eef4ea3a07e3dc98769020545ced0167998a85a4cc50aa7" + "5820200137ab31e7a081481f926ca5a31b52f4cca4388c3b9c1c52fdb75c2d9fb5be" ] ) ] @@ -988,19 +988,19 @@ operators = unsafePerformIO $ newMVar [ ( PoolId $ unsafeFromHex "c7258ccc42a43b653aaf2f80dde3120df124ebc3a79353eed782267f78d04739" , Aeson.object - [ "type" .= Aeson.String "Node operator verification key" + [ "type" .= Aeson.String "StakePoolVerificationKey_ed25519" , "description" .= Aeson.String "Stake pool operator key" , "cborHex" .= Aeson.String "5820a12804d805eff46c691da5b11eb703cbf7463983e325621b41ac5b24e4b51887" ] , Aeson.object - [ "type" .= Aeson.String "Node operator signing key" + [ "type" .= Aeson.String "StakePoolSigningKey_ed25519" , "description" .= Aeson.String "Stake pool operator key" , "cborHex" .= Aeson.String "5820d8f81c455ef786f47ad9f573e49dc417e0125dfa8db986d6c0ddc03be8634dc6" ] , Aeson.object - [ "type" .= Aeson.String "Node operational certificate issue counter" + [ "type" .= Aeson.String "NodeOperationalCertificateIssueCounter" , "description" .= Aeson.String "Next certificate issue number: 0" , "cborHex" .= Aeson.String "82005820a12804d805eff46c691da5b11eb703cbf7463983e325621b41ac5b24e4b51887" @@ -1015,19 +1015,19 @@ operators = unsafePerformIO $ newMVar , ( PoolId $ unsafeFromHex "775af3b22eff9ff53a0bdd3ac6f8e1c5013ab68445768c476ccfc1e1c6b629b4" , Aeson.object - [ "type" .= Aeson.String "Node operator verification key" + [ "type" .= Aeson.String "StakePoolVerificationKey_ed25519" , "description" .= Aeson.String "Stake pool operator key" , "cborHex" .= Aeson.String "5820109440baecebefd92e3b933b4a717dae8d3291edee85f27ebac1f40f945ad9d4" ] , Aeson.object - [ "type" .= Aeson.String "Node operator signing key" + [ "type" .= Aeson.String "StakePoolSigningKey_ed25519" , "description" .= Aeson.String "Stake pool operator key" , "cborHex" .= Aeson.String "5820fab9d94c52b3e222ed494f84020a29ef8405228d509a924106d05ed01c923547" ] , Aeson.object - [ "type" .= Aeson.String "Node operational certificate issue counter" + [ "type" .= Aeson.String "NodeOperationalCertificateIssueCounter" , "description" .= Aeson.String "Next certificate issue number: 0" , "cborHex" .= Aeson.String "82005820109440baecebefd92e3b933b4a717dae8d3291edee85f27ebac1f40f945ad9d4" @@ -1042,19 +1042,19 @@ operators = unsafePerformIO $ newMVar , ( PoolId $ unsafeFromHex "5a7b67c7dcfa8c4c25796bea05bcdfca01590c8c7612cc537c97012bed0dec35" , Aeson.object - [ "type" .= Aeson.String "Node operator verification key" + [ "type" .= Aeson.String "StakePoolVerificationKey_ed25519" , "description" .= Aeson.String "Stake pool operator key" , "cborHex" .= Aeson.String "5820c7383d89aa33656464a7796b06616c4590d6db018b2f73640be985794db0702d" ] , Aeson.object - [ "type" .= Aeson.String "Node operator signing key" + [ "type" .= Aeson.String "StakePoolSigningKey_ed25519" , "description" .= Aeson.String "Stake pool operator key" , "cborHex" .= Aeson.String "5820047572e48be93834d6d7ddb01bb1ad889b4de5a7a1a78112f1edd46284250869" ] , Aeson.object - [ "type" .= Aeson.String "Node operational certificate issue counter" + [ "type" .= Aeson.String "NodeOperationalCertificateIssueCounter" , "description" .= Aeson.String "Next certificate issue number: 0" , "cborHex" .= Aeson.String "82005820c7383d89aa33656464a7796b06616c4590d6db018b2f73640be985794db0702d" @@ -1079,7 +1079,7 @@ operators = unsafePerformIO $ newMVar preRegisteredStakeKey :: Aeson.Value preRegisteredStakeKey = Aeson.object - [ "type" .= Aeson.String "StakingVerificationKeyShelley" + [ "type" .= Aeson.String "StakeVerificationKeyShelley_ed25519" , "description" .= Aeson.String "Free form text" , "cborHex" .= Aeson.String "5820949fc9e6b7e1e12e933ac35de5a565c9264b0ac5b631b4f5a21548bc6d65616f" diff --git a/lib/shelley/test/data/cardano-node-shelley/bft-leader.counter b/lib/shelley/test/data/cardano-node-shelley/bft-leader.counter index fb0291ac667..50a3a298b9c 100644 --- a/lib/shelley/test/data/cardano-node-shelley/bft-leader.counter +++ b/lib/shelley/test/data/cardano-node-shelley/bft-leader.counter @@ -1,5 +1,5 @@ { - "type": "Node operational certificate issue counter", + "type": "NodeOperationalCertificateIssueCounter", "description": "Next certificate issue number: 1", - "cborHex": "8201582039205260d790d39c595138bc8c5d2e474336f260ffe911fbbf714de427c50ddc" + "cborHex": "82015820479ae009754ec351dbd48b01f1e29d9e8636978a3dae754255ea9af092cb10f5" } \ No newline at end of file diff --git a/lib/shelley/test/data/cardano-node-shelley/bft-leader.kes.skey b/lib/shelley/test/data/cardano-node-shelley/bft-leader.kes.skey index 6a22b231da1..99440c3aa72 100644 --- a/lib/shelley/test/data/cardano-node-shelley/bft-leader.kes.skey +++ b/lib/shelley/test/data/cardano-node-shelley/bft-leader.kes.skey @@ -1,5 +1,5 @@ { - "type": "SKeyES TPraosStandardCrypto", + "type": "KesSigningKey_ed25519_kes_2^6", "description": "KES Signing Key", - "cborHex": "5902c0cb62016d50ac5bcf178c6e21fd86b14f5e53f351b719804d47ac9b909fec8de48aa5caefb33ede8150a1564f0fc94c0773aa285e947e79f29b427424ba504fbddc2039c07e755dfe487fbc7c77e065e6bba1d5468ae7fe91de4d513dc187a7a56cb5622bdf25fed4f5a3f29cd6eb55ae15f2ee2d5db2dc049efd938af29e9f75cd70990885cf872aa8b213a31af639ffc7b92d1070c1807459ea2f3f5861f2cbd54cfbbda4119e23785200778953a43af062762802a1e6387047546e0ce43fe0258b8126b9bd3c3875708e0085daa3e332fedcb8ddc7bf518bbf635d0bf2e9b9932106f9fba73b1ac8a3fc580c7687bd1cbee995969003a20f2a45dd17eb4038151e97b705caaa83af544c1cf7317b3ff453c427aa0ef51d2d89574e6a6c505bef0595fbe86ff25a2a78a6afae4bf2296f6acf80f59af7b9e595e0f6f8e95fc9cf64be80078307648d11d105b02a816c8c423d30a6672a0b8a610259e01f09096b4e1b9a213a1ac1363b57dae7c79d6e59fe92a04c9e5cc53abe88b9f5412687844aea8d4acc7bf5a004cb0eb606c780a7efd946d8424f19dd4faf587a957c457d9ff54dc613f5dd9fa2d93e23d1293b1edc773a33753ff461e056b39ba87625a1c8f188ee48fba2dbd85a69a4000721f8d0a95f6c62e4ae79973e626920597994bb574db1329f8a3d726bc70b7fa6aa10a8970dbea7bbed9d9053fe6ba647e373fe47d7166b5a4770781fe5aa6530eb52d4fd0b489b19a156c8b4e1612f812396079e84d88e59ba41ee4effb428e165336cc1184e5211384c83621f61d180aa68b128254424a9827387abd1a2ec5f6d1277ce6e989cad155b88eaad7ef64965530470151c8e73cd730b6a10b4a2be52f537ac20ac6b100cb7946d145f9a11e1d40eebd87e23a8c1b41a6035c8843bb08357b3d49ad2ed1c64120088e61f5f19c7b5d216bb59e99ad6b00cb5211f940eecfdc7aaf3356f5fb465f0cb06583766" + "cborHex": "590260b8ebf91bdf2dd849a24c6f6a5801e049a924c1cb80e62e81d19cdc5489f2e91d60cf3ce005f655669f19dbd15956c123968f45baab994cf51716a0f98c69f5775770290e3bdd8867139c0248b3863e9f466e3d34775c38dfeaec2725f260064cb74eafa207967945e06908c09c5a66cabe2f4bfb39f682647532310ddde3579fd21f9ef48ef17b065076345f0d4b39e86884d05c56a5728ccc3e65305729388ebf6b3123e9473b5b96637a4efca92b5bb0472373ac8c376c9085d170abdb83ce5a565652044118b5b9f2d5af613de68fd6ce74df7754f4b8ae3965db09f797e1fc9a677aaa2ac25dd4f6b59ee92feab29d6257077580fa92adcdce1fc344915f1816b1714e5e159712280c7c232b053578ddbac1fab2069a601552bdd6bc104d63b053ab1bca5d52510a3c59fbb2db7cfdaba108b58e810b57b886fde3c5e0697beb317d9483ae63c5b7473683c46b42eb25f0d943ca042cc6c1623447a1e1b22297c0176f3f7e44941440e6eef52bbff9cfe2b16e2a7714889561f5d4c9556c24bc19921df212ab6543aa774b49a82312a944e05d9a2b3a16ccb7eaafa0c4dad580b4285951fea24a70f2fb5e40ac1ca34f651cb247155787fb36a9b6aa6f3c2bd73503ba59f80f9ffdfccaf4f7dbe4d6f999d4ef44d365b3625513e627994064974580bd3534b550d4229a081f4d91bce74331c8c432a70cefe6f4e5f724a403f38c3f3a19369199f80c1f4786ce8daa4de7fd11a585057125d6cadd9eff12dc6bae2137fd41f539b9be24de168f205e2bff24ed1697c3e5da2a1113fd9d85781f7afa7b8531b80a5d57ddac2092867a29c0ccc9fa0f1bf0add9d06b952ab2" } \ No newline at end of file diff --git a/lib/shelley/test/data/cardano-node-shelley/bft-leader.kes.vkey b/lib/shelley/test/data/cardano-node-shelley/bft-leader.kes.vkey index 0392b29e164..17c3092899e 100644 --- a/lib/shelley/test/data/cardano-node-shelley/bft-leader.kes.vkey +++ b/lib/shelley/test/data/cardano-node-shelley/bft-leader.kes.vkey @@ -1,5 +1,5 @@ { - "type": "VKeyES TPraosStandardCrypto", + "type": "KesVerificationKey_ed25519_kes_2^6", "description": "KES Verification Key", - "cborHex": "5820d43e88b2f7c89bbf67209035e45e94c29455c686649375f229b26cc1677a8b4c" + "cborHex": "582038d5b2459d16301faf2d5e8878ecdb87b1f8618cba6fbee9d3f0d5139b56ee70" } \ No newline at end of file diff --git a/lib/shelley/test/data/cardano-node-shelley/bft-leader.opcert b/lib/shelley/test/data/cardano-node-shelley/bft-leader.opcert index aca54a0ca34..2459f500dd7 100644 --- a/lib/shelley/test/data/cardano-node-shelley/bft-leader.opcert +++ b/lib/shelley/test/data/cardano-node-shelley/bft-leader.opcert @@ -1,5 +1,5 @@ { - "type": "Node operational certificate", + "type": "NodeOperationalCertificate", "description": "", - "cborHex": "82845820d43e88b2f7c89bbf67209035e45e94c29455c686649375f229b26cc1677a8b4c00005840dbbd5a24304c86e0f993df75e5d8963dabfdddc4ed337c4618b5cbca3542efddfbd2c2d1ee6e8dbbc7a70c7e7bbf6a56f5e00ed49dd9ac144ca7a69c812a570b582039205260d790d39c595138bc8c5d2e474336f260ffe911fbbf714de427c50ddc" + "cborHex": "8284582038d5b2459d16301faf2d5e8878ecdb87b1f8618cba6fbee9d3f0d5139b56ee70000058401e49386fbf37e4332bf8f075e286bf92254beff425282ba00acb2053a680e8dd571a7539ac80f8c85a9e3763f4edbc1cc524ed0c28cfe8ee552e272df8c27e005820479ae009754ec351dbd48b01f1e29d9e8636978a3dae754255ea9af092cb10f5" } \ No newline at end of file diff --git a/lib/shelley/test/data/cardano-node-shelley/bft-leader.skey b/lib/shelley/test/data/cardano-node-shelley/bft-leader.skey index c41cc765762..44c4f03b9b0 100644 --- a/lib/shelley/test/data/cardano-node-shelley/bft-leader.skey +++ b/lib/shelley/test/data/cardano-node-shelley/bft-leader.skey @@ -1,5 +1,5 @@ { - "type": "Node operator signing key", + "type": "GenesisDelegateSigningKey_ed25519", "description": "Genesis delegate operator key", - "cborHex": "5820270994f865348946462dbbf688d4319eb5ec7a4e0f5295b924f1373be444f424" + "cborHex": "5820c373dfdef800c2318f1c69447f7f9e4721a4ab8c0b97f2983fba14df31c06a9b" } \ No newline at end of file diff --git a/lib/shelley/test/data/cardano-node-shelley/bft-leader.vkey b/lib/shelley/test/data/cardano-node-shelley/bft-leader.vkey index e4ac9e9a9de..6fd3472f7be 100644 --- a/lib/shelley/test/data/cardano-node-shelley/bft-leader.vkey +++ b/lib/shelley/test/data/cardano-node-shelley/bft-leader.vkey @@ -1,5 +1,5 @@ { - "type": "Node operator verification key", + "type": "GenesisDelegateVerificationKey_ed25519", "description": "Genesis delegate operator key", - "cborHex": "582039205260d790d39c595138bc8c5d2e474336f260ffe911fbbf714de427c50ddc" + "cborHex": "5820479ae009754ec351dbd48b01f1e29d9e8636978a3dae754255ea9af092cb10f5" } \ No newline at end of file diff --git a/lib/shelley/test/data/cardano-node-shelley/bft-leader.vrf.skey b/lib/shelley/test/data/cardano-node-shelley/bft-leader.vrf.skey index c8537067aa8..e36f545dfb1 100644 --- a/lib/shelley/test/data/cardano-node-shelley/bft-leader.vrf.skey +++ b/lib/shelley/test/data/cardano-node-shelley/bft-leader.vrf.skey @@ -1,5 +1,5 @@ { - "type": "SignKeyVRF PraosVRF", + "type": "VrfSigningKey_PraosVRF", "description": "VRF Signing Key", - "cborHex": "584083a5902cd76ca06fa33ca0c1f54a3b70afbd3f61adfa1b768af4a8a7b8ede7759382868eea35b76253434b232033118ada9b5d1d20cd419f0895e5cb83c6f7d5" + "cborHex": "584092f24816556fcc04368090e987671d1ceb141f44f6d92d68da7615c3474e7164ed6a6ff1ac92018dc97c04752fc25207eb1d8106d6fbe624831d4d1c1153ee18" } \ No newline at end of file diff --git a/lib/shelley/test/data/cardano-node-shelley/bft-leader.vrf.vkey b/lib/shelley/test/data/cardano-node-shelley/bft-leader.vrf.vkey index 1c6fb87d2eb..57aa4c88481 100644 --- a/lib/shelley/test/data/cardano-node-shelley/bft-leader.vrf.vkey +++ b/lib/shelley/test/data/cardano-node-shelley/bft-leader.vrf.vkey @@ -1,5 +1,5 @@ { - "type": "VerKeyVRF PraosVRF", + "type": "VrfVerificationKey_PraosVRF", "description": "VRF Verification Key", - "cborHex": "58209382868eea35b76253434b232033118ada9b5d1d20cd419f0895e5cb83c6f7d5" + "cborHex": "5820ed6a6ff1ac92018dc97c04752fc25207eb1d8106d6fbe624831d4d1c1153ee18" } \ No newline at end of file diff --git a/lib/shelley/test/data/cardano-node-shelley/genesis.yaml b/lib/shelley/test/data/cardano-node-shelley/genesis.yaml index fca61ba106d..aa357b26ae9 100644 --- a/lib/shelley/test/data/cardano-node-shelley/genesis.yaml +++ b/lib/shelley/test/data/cardano-node-shelley/genesis.yaml @@ -38,9 +38,9 @@ protocolParams: tau: 0.0 a0: 0.1 genDelegs: - d4986e098ba851648d4399b15e818e3b33191b714eb9d3b33d4d2f70: - delegate: 2e47c73dee204605f8a1e76c6bb31b7930db8e469c2e64e20cc07faa - vrf: 8a41571fbe7d6899ce39d403dbdb40d5b71d92b404b7a1f7790a3b09080d1e2c + 8ae01cab15f6235958b1147e979987bbdb90788f7c4e185f1632427a: + delegate: b7bf59bb963aa785afe220f5b0d3deb826fd0bcaeeee58cb81ab443d + vrf: 4ebcf8b4c13c24d89144d72f544d1c425b4a3aa1ace30af4eb72752e75b40d3e updateQuorum: 5 maxMajorPV: 25446 maxLovelaceSupply: 45000000000000000 @@ -63,35 +63,35 @@ initialFunds: # $ cardano-cli shelley genesis initial-addr --mainnet --verification-key-file utxo.pub # $ cardano-cli shelley genesis initial-txin --mainnet --verification-key-file utxo.pub - # txin: cea1b041dd5465be636b5b88805571f83537bd503bc4db447f088d942673736c#0 + # txin: 58d43bf3c30fe33bfac9e66c1f32acb41269d33194c4e926083d4008198c7f5e#0 # type: Genesis UTxO signing key # title: Genesis Initial UTxO Signing Key # cbor-hex: # 5820db101b5f4cc53ca1d61f7505b23c05b1b58de0b9f509c4dfede4348549dbaa9d -- 614c85a0172b371b12b9c25c10f95f520097a04746a98ecd1eb3581793: 10000000000000 +- 61e5057d4328fab0e573162d4415364add46e25ae210825ad7ee63391d: 10000000000000 - # txin: fa271c369d4d9a6b78e18f9d554730ef9978847ecb187c064cb9c8d56c2092cd#0 - # type: Genesis UTxO signing key + # txin: d021a0b60be98fce5214488f1cd0590b542d6ac7d3aa2d8bdd3a33531fd18cec#0 + # type: GenesisUTxOSigningKey_ed25519 # title: Genesis Initial UTxO Signing Key # cbor-hex: - # 582061e08f3e8ac1afbf0434fca2bb4aa6484270d8dd3e251c049006aab368a74a7e -- 615d67f3cced240a022d6fbb69e9a4dd0f63d4679b7392da7e0ba7503f: 10000000000000 + # 58202dc882a6ebf9c8beb9f30f595c597f4a9d4856b11eed576bd5ab2e1779f40cd5 +- 61e9de932d79f3ff9e041c793be1d4eb1205e10d97723fd8e737a21d96: 10000000000000 - # txin: 672d7558074f02c662b11a4ff761ec3a24c94a18b319033af5f9f22a03b8891b#0 + # txin: 28dd1a860627fe2577eb5f0a994ccd0292cc27add634bf8a7b4e7222bbce0af8#0 # xprv: # type: Genesis UTxO signing key # title: Genesis initial UTxO key # cbor-hex: - # 58204054ff827451cad61241450a09ea80c9d0658398f588ff976393ae8eacb859fe -- 61c68ea9804b0162e68ee2e9a5e71f3d10494be643327ab6274aaf0b3f: 10000000000000 + # 582003b5b3158de3a20886cbedbbbc566006d0d411d23c373a43fe817634e9390478 +- 61ca722c7639c12551e9e4b9352ee3fbc049c1b692d5a8ab8d9d1f74f5: 10000000000000 - # txin: ca97dc6662a21f1b7ea0790c380d13dad84386cbb7f731c7ba3982a8d105267b#0 + # txin: 306c27331900ae1c3d0dc31bba1c37365f594b9e1017048c6ccac054ec1b12b2#0 # xprv: # type: Genesis UTxO signing key # title: Genesis initial UTxO key # cbor-hex: - # 58204a7a8e7a1ba0d33c407dc3ceda225c605287cfb0e3b51d9eba3822abd6aa75ca -- 614d105f72fe03107047a9f72e93688ea34c45a5cf73af3e02bc8d5d4c: 10000000000000 + # 582022be977fea1ff0843059d7a202cc9d84678d8c7ea2f295844d6acc4312c29882 +- 61e5fbbb9b972b05ce0af48d9b410b850febdf36376c50aaa20ad3a026: 10000000000000 # txin: cfc08d97636877d94cd19a246e72d191bc3905712bbab8cdbb1aa240fc09be3c#0 # xprv: @@ -99,7 +99,7 @@ initialFunds: # title: Genesis initial UTxO key # cbor-hex: # 5820e96f612fbff3df3d8eef4ea3a07e3dc98769020545ced0167998a85a4cc50aa7 -- 6103c32076728a07982916b61bc95b7ffd4ca7f69c8097f3c0ffcdc4c5: 10000000000000 +- 614f03403749d2825ccb14376a1ccf60e1cc0f9e930d3aa9220880f2b6: 10000000000000 # # Byron wallets diff --git a/nix/sources.json b/nix/sources.json index c56a5f0473b..7ef9d3c8da2 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -1,14 +1,14 @@ { "cardano-node": { - "branch": "1.15.1", + "branch": "master", "description": null, "homepage": null, "owner": "input-output-hk", "repo": "cardano-node", - "rev": "712a287602797e8fd889fbf73e56a08c3d8b004a", - "sha256": "1lg1g702x5q6m8n61bfyji7pmj2gsw44mm41nxhc5rv2wk4g996c", + "rev": "e28c1d37832af9c4ec50bb5c64aa83c37dc4aa89", + "sha256": "0pyfbc8iwyanj9s74b9iqh4h23if94akg4rx7g6ndzsq35jwk2n5", "type": "tarball", - "url": "https://github.com/input-output-hk/cardano-node/archive/712a287602797e8fd889fbf73e56a08c3d8b004a.tar.gz", + "url": "https://github.com/input-output-hk/cardano-node/archive/e28c1d37832af9c4ec50bb5c64aa83c37dc4aa89.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "haskell.nix": {