update

Author: CarlosLopezDeLara

cardano-lib/private/byron-genesis.json

@@ -1,36 +1,5 @@
 {
   "bootStakeholders": {
-<<<<<<< HEAD
-    "71d356c6309fa6b16d16e5325083017e64319d2e4caaa317d55e2d59": 1,
-    "784cc00ce9ca303b41dc749fe63fa0f4dcb1e5b9b769c563fe4d5f05": 1,
-    "bc4ca8899467a3a3aa9f886b0a0320c4b63f656386ddb3655aaf9da6": 1
-  },
-  "heavyDelegation": {
-    "71d356c6309fa6b16d16e5325083017e64319d2e4caaa317d55e2d59": {
-      "omega": 0,
-      "issuerPk": "i/KqaEksrWQ4ZfVt8RNenJqfE0uxafcZNeMx1XFe2o4cJqBE+8kytjb9O055kUc4zPPeTmV75HoFwEWmCFZ1hg==",
-      "delegatePk": "/SYcj4ET8sMK0xsAb5qRkdxwd7F2l1ja8uhPKm7imBoIKaroqcjTP2n6wme3Gce2m1a1B8d0GYcq6VOqln4TnA==",
-      "cert": "c856981a7d7060c0e7a6815d78ce37860298c999a1169329c82bb2aadc211606afba328a1b8aeb339919907a48e9bb5e0ce22cdedb32da87998cefee606edb06"
-    },
-    "784cc00ce9ca303b41dc749fe63fa0f4dcb1e5b9b769c563fe4d5f05": {
-      "omega": 0,
-      "issuerPk": "udZuahjp5BwLYI7785zxfyTBlh9wnivaCzOWI0UQhsgMrnDYshf6NRXkskXy9h99bkLahPooMHyPOWGk3d6aOw==",
-      "delegatePk": "ipea02AiDM0jZ9w1XDM52WCtBsrGliBf7Y0PmyeuXbHUGYPx4VJkZCG4pqV4t4RJIiKB4fNdHuAlpEAwCnT2+w==",
-      "cert": "b6f394f938df14ae2e80edf7c0eb6f16e30efd7e48cefad41d4f3424313b13decd379442c7130085eb3f3574bc5c087eb23e25ac52e2aa9d4b530647c97e6f0b"
-    },
-    "bc4ca8899467a3a3aa9f886b0a0320c4b63f656386ddb3655aaf9da6": {
-      "omega": 0,
-      "issuerPk": "0sKBx4ddFGWPfminl+I7BzmDefRAz8FEs6bIHZ4z56LuAZ/qhuQA3MjgZWLElr1ikwdIJ+EnClvPAcewKhu6OQ==",
-      "delegatePk": "xoqVp9F3I6FTULgn5NGt0evgiCesvXfDNDZAs0z9+ynUy+7Hup8jS2TX57o/NolEX+RD6neq8irF9IrdbKbEGw==",
-      "cert": "4c2b53e0d238cd43f25f5563b231530c4d11fd6654a0a3097295807e28f7e17fad7ec491dd1489c135c20ba08dc40b83481576b5e6fcf4e9185d3b1e2b292008"
-    }
-  },
-  "startTime": 1721099515,
-  "nonAvvmBalances": {
-    "2657WMsDfac5X1CBmzFo94Mkda1CKJui655wuSykKMnzNmbqw1Jb8v5b3sMUDT5YH": "4000000",
-    "2657WMsDfac5YSA2Cti1X7JCwaqHHJaDFMvNndmEvR187crLEnCLM9MF1PKKwopqm": "4000000",
-    "2657WMsDfac63MSBZvsMW8KfAmaRX5NVXTGE4PLG1PA6zso4ZSSsy5EmmgFgtbuJD": "4000000"
-=======
     "3c86ba6457aba1fb10377d41ea402c442434b2b5afa8492852562800": 1,
     "620108e54997baedd8b02cf27e70da08dabb5c385e3f85d5186072ef": 1,
     "9bd0c18724b9d517dcac4e280ae69f996d59e40747aac2c9cf73337b": 1
@@ -60,7 +29,6 @@
     "2657WMsDfac56uUNzNfzecwj4NWLAuiKtTDHbxcGiH6RELCXcuu2h3rSLySNVTW5n": "4000000",
     "2657WMsDfac57vDwxKhigpFSWyopHX2PXJvrfLkpW7eiyxSkRkd6q6PyAtwDKpysf": "4000000",
     "2657WMsDfac7nDGdmE3cYG7YyHy88Qn3Xgypm4Exa241CXt8rDZjCQKpHtF7qMPzk": "4000000"
->>>>>>> 2dbf7fd (config files for demo)
   },
   "blockVersionData": {
     "scriptVersion": 0,

cardano-lib/private/shelley-genesis.json

@@ -2,28 +2,6 @@
   "activeSlotsCoeff": 0.12,
   "epochLength": 900,
   "genDelegs": {
-<<<<<<< HEAD
-    "1bd42a3a6b19ac56bf674e714d311b8a5379fee44062adc4dd26daa6": {
-      "delegate": "a716dd3d22d92729ab6ba85a740097a88dd39f89ba6caac3097f1f6b",
-      "vrf": "8141953a8841b6ab13584d13e0281ec3b136c1121d3b6a6d698f9d9dc9781ae6"
-    },
-    "2d3fb58199d5a20730cd4e8ffa306d5e0af5614f1174cecc82e21d89": {
-      "delegate": "7cce994f993f4bca78a639a29b8c74768067ca9cb9193f914aefda2d",
-      "vrf": "52a62d8fa91a379bff6f6cf2d3837feced070c1dbcbcb611bcf622e792319696"
-    },
-    "d65cda3a7015eda13900c855f3ba7a914111198fe38657fe6aecd0f2": {
-      "delegate": "c2bfdfa112e8e08dfdc0fcac47abe757ddb319cd58b1f16966d4de26",
-      "vrf": "53d59d75df907c3b9b7f1b48845678b783b8a59b05047484aebc3b8ae434df09"
-    }
-  },
-  "initialFunds": {
-    "001d96b3d28bcecf32d2fc835692ae1a917f80a44d2699fbdd50a3b87d64a29b5d36cbb04e91b437d434441e8a93b65317808618b66dfb6972": 13333333334,
-    "0022eee7a5f73be7613f49ef150407aa1eb7ecf6f80d4f2317c36b355f199db1a0efe862a8219c32909cdcfc007c3f88a327328a7390656a5b": 13333333334,
-    "00d3ba7b259d527aa16b5e2d862ed684c6a0d52d8aa87c4cb7d96cc12973c79e6153f841d1fab8f371bfeeef01459c327b9bcefd7ee32811b3": 13333333334,
-    "60353aba7578494360a761c9a629a7894f1cf115b6bbcd45da5663d3c8": 600000000000,
-    "60c539ef3ac1f168eb57919af9bcdebae51d559cb832427b26fc8f42a4": 600000000000,
-    "60e9e83f2cc216d7c21b166a4367792b8262e86f6d1582051eade673c2": 600000000000
-=======
     "099b30f205defd483f4d362049504e785bdf989d6fdadb99ac7a37e0": {
       "delegate": "f0e778951e37ff21a5ca8f9dba8b4deb6561ca0786948f14e2364800",
       "vrf": "e208cf4ae3537cb4cd9c68c58c79b8426a06290e54948c7b36d64283fab8abfb"
@@ -44,7 +22,6 @@
     "603bed8a12180a0c0110e2529764a757b30dce349b5693ddd90c29cb2b": 600000000000,
     "60797b201c5e9c35378ddfd2df7322ac60480ebdb42230758070a43942": 600000000000,
     "60f30ca78540db7534c27b889f009a9c3c209298741b49f204d7ee1554": 600000000000
->>>>>>> 2dbf7fd (config files for demo)
   },
   "maxKESEvolutions": 60,
   "maxLovelaceSupply": 10000000000000,
@@ -79,29 +56,12 @@
   "slotsPerKESPeriod": 129600,
   "staking": {
     "pools": {
-<<<<<<< HEAD
-      "57e09cedf8ff991cf59392f9dad66c31d6ba1fe9df442f80b198da38": {
-=======
       "2a875a39553a6f688477ca9cf374fd085a5244ef45f772b28573b941": {
->>>>>>> 2dbf7fd (config files for demo)
         "cost": 0,
         "margin": 0,
         "metadata": null,
         "owners": [],
         "pledge": 0,
-<<<<<<< HEAD
-        "publicKey": "57e09cedf8ff991cf59392f9dad66c31d6ba1fe9df442f80b198da38",
-        "relays": [],
-        "rewardAccount": {
-          "credential": {
-            "keyHash": "df497ee0fceb0ca4920c79a33d51379b115cf7aa06263966afb00bd3"
-          },
-          "network": "Testnet"
-        },
-        "vrf": "0df3b3a845d95ce084c9d93e96601f1ea95b7dba7baea838458734e03c68e2ce"
-      },
-      "58b5268c0d10e0c4ec46fde2993f34ce4ffe1f8b961c62e09cedc6ec": {
-=======
         "publicKey": "2a875a39553a6f688477ca9cf374fd085a5244ef45f772b28573b941",
         "relays": [],
         "rewardAccount": {
@@ -113,25 +73,11 @@
         "vrf": "38d5736ca0b179499bcd78ee0dcc4e050b9f57470aa8067c21bb369c76b8eab3"
       },
       "ac62e449811431c22cd9f67e89af2a21ce204f59bbcd398c50089262": {
->>>>>>> 2dbf7fd (config files for demo)
         "cost": 0,
         "margin": 0,
         "metadata": null,
         "owners": [],
         "pledge": 0,
-<<<<<<< HEAD
-        "publicKey": "58b5268c0d10e0c4ec46fde2993f34ce4ffe1f8b961c62e09cedc6ec",
-        "relays": [],
-        "rewardAccount": {
-          "credential": {
-            "keyHash": "079e9ed73529129fea14d2e908969833c27225841f7007d0a91697bc"
-          },
-          "network": "Testnet"
-        },
-        "vrf": "7d31372e899fcb65ca055560cd9fcfd8c091e8fdf8f157d4a4bd4b503a7e3e4f"
-      },
-      "bd145b096611c81356cfea353ab3aca2c762d86f130f6d41b8b36111": {
-=======
         "publicKey": "ac62e449811431c22cd9f67e89af2a21ce204f59bbcd398c50089262",
         "relays": [],
         "rewardAccount": {
@@ -143,32 +89,11 @@
         "vrf": "be48b3ea967b933ec901969f98fa4b26ca4ee052aaf9f6f47e9a3377589ae789"
       },
       "d465e6fc2fe39a0f65ae8c3066c7f8ec6664a186a78cf5181be6c7ba": {
->>>>>>> 2dbf7fd (config files for demo)
         "cost": 0,
         "margin": 0,
         "metadata": null,
         "owners": [],
         "pledge": 0,
-<<<<<<< HEAD
-        "publicKey": "bd145b096611c81356cfea353ab3aca2c762d86f130f6d41b8b36111",
-        "relays": [],
-        "rewardAccount": {
-          "credential": {
-            "keyHash": "dda019aba45ea060b37d53c9cd6efce735212feb61cb05c7fda8ae1c"
-          },
-          "network": "Testnet"
-        },
-        "vrf": "aee98fa0508da076c04a34a7478c2769273260ed728327a197a703715bef1954"
-      }
-    },
-    "stake": {
-      "199db1a0efe862a8219c32909cdcfc007c3f88a327328a7390656a5b": "58b5268c0d10e0c4ec46fde2993f34ce4ffe1f8b961c62e09cedc6ec",
-      "64a29b5d36cbb04e91b437d434441e8a93b65317808618b66dfb6972": "bd145b096611c81356cfea353ab3aca2c762d86f130f6d41b8b36111",
-      "73c79e6153f841d1fab8f371bfeeef01459c327b9bcefd7ee32811b3": "57e09cedf8ff991cf59392f9dad66c31d6ba1fe9df442f80b198da38"
-    }
-  },
-  "systemStart": "2024-07-16T03:11:55.062599513Z",
-=======
         "publicKey": "d465e6fc2fe39a0f65ae8c3066c7f8ec6664a186a78cf5181be6c7ba",
         "relays": [],
         "rewardAccount": {
@@ -187,6 +112,5 @@
     }
   },
   "systemStart": "2024-07-16T04:49:20Z",
->>>>>>> 2dbf7fd (config files for demo)
   "updateQuorum": 2
 }