diff --git a/genesis/src/genesis_accounts.rs b/genesis/src/genesis_accounts.rs
index 7beed2dea4..193fd23a8a 100644
--- a/genesis/src/genesis_accounts.rs
+++ b/genesis/src/genesis_accounts.rs
@@ -18,227 +18,195 @@ const BATCH_ONE_UNLOCK_INFO: UnlockInfo = UnlockInfo {
 const BATCH_ONE_STAKER_INFOS: &[StakerInfo] = &[
     StakerInfo {
         name: "diligent bridge",
-        staker: "ab22196afde08a090a3721eb20e3e1ea84d36e14d1a3f0815b236b300d9d33ef",
-        withdrawer: "a2a7ae9098f862f4b3ba7d102d174de5e84a560444c39c035f3eeecce442eadc",
+        staker: "BwwM47pLHwUgjJXKQKVNiRfGhtPNWfNLH27na2HJQHhd",
         sol: 6_250_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "four wish",
-        staker: "6a56514c29f6b1de4d46164621d6bd25b337a711f569f9283c1143c7e8fb546e",
-        withdrawer: "b420af728f58d9f269d6e07fbbaecf6ed6535e5348538e3f39f2710351f2b940",
+        staker: "8A6ZEEW2odkqXNjTWHNG6tUk7uj6zCzHueTyEr9pM1tH",
         sol: 10_000_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "simple friends",
-        staker: "ddf2e4c81eafae2d68ac99171b066c87bddb168d6b7c07333cd951f36640163d",
-        withdrawer: "312fa06ccf1b671b26404a34136161ed2aba9e66f248441b4fddb5c592fde560",
+        staker: "D89HyaBmr2WmrTehsfkQrY23wCXcDfsFnN9gMfUXHaDd",
         sol: 1_250_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "noxious leather",
-        staker: "0cbf98cd35ceff84ca72b752c32cc3eeee4f765ca1bef1140927ebf5c6e74339",
-        withdrawer: "467e06fa25a9e06824eedc926ce431947ed99c728bed36be54561354c1330959",
+        staker: "FwPvDpvUmnco1CSfwXQDTbUbuhG5eP7h2vgCKYKVL7at",
         sol: 6_250_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "worthless direction",
-        staker: "ef1562bf9edfd0f5e62530cce4244e8de544a3a30075a2cd5c9074edfbcbe78a",
-        withdrawer: "2ab26abb9d8131a30a4a63446125cf961ece4b926c31cce0eb84da4eac3f836e",
+        staker: "4K16iBoC9kAQRT8pUEKeD2h9WEx1zsRgEmJFssXcXmqq",
         sol: 12_500_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "historical company",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "rmLpENW4V6QNeEhdJJVxo9Xt99oKgNUFZS4Y4375amW",
         sol: 322_850.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "callous money",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "5kAztE3XtrpeyGZZxckSUt3ZWojNTmph1QSC9S2682z4",
         sol: 5_927_155.25,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "outstanding jump",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "H6HMVuDR8XCw3EuhLvFG4EciVvGo76Agq1kSBL2ozoDs",
         sol: 625_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "feeble toes",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "3sfv8tk5ZSDBWbTkFkvFxCvJUyW5yDJUu6VMJcUARQWq",
         sol: 750_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "disillusioned deer",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 1_250_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "unwritten songs",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 4_250_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "overt dime",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 500_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "slow committee",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 625_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "curvy twig",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 625_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "gamy scissors",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 250_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "mushy key",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 1_250_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "marked silver",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 250_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "free sock",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 625_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "tremendous meeting",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 1_250_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "panoramic cloth",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 625_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "normal kick",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 2_500_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "unbecoming observation",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 250_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "cut beginner",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 250_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "alcoholic button",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 625_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "old-fashioned clover",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 750_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "expensive underwear",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 2_500_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "like dust",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 5_000_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "rapid straw",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 5_850_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "windy trousers",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 2_579_350.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "dramatic veil",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 3_611_110.50,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "incandescent skin",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 3_000_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "spiky love",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 3_250_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
 ];
 
@@ -254,192 +222,165 @@ const BATCH_TWO_STAKER_INFOS: &[StakerInfo] = &[
     // 2nd batch
     StakerInfo {
         name: "macabre note",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 4_000_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "alcoholic letter",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 4_000_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "heady trucks",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 4_000_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "ten support",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 1_000_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "foregoing middle",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 800_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "ludicrous destruction",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 4_000_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "numberless wheel",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 4_000_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "short powder",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 4_000_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "cut name",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 4_000_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "six fly",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 4_000_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "mindless pickle",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 100_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "marked rabbit",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 38_741.36,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "jagged doctor",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 711_258.64,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "truthful pollution",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 1_587_300.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "unkempt activity",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 2_222_220.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "ritzy view",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 40_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "remarkable plant",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 300_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "busy value",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 100_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "imperfect slave",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 222_065.84,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "uneven drawer",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 400_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "far behavior",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 4_000_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "abaft memory",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 400_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "poor glove",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 2_000_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "strange iron",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 2_000_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "nonstop rail",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 1_000_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "milky bait",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 400_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "wandering start",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 1_200_000.0,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
 ];
 // 30 "month" schedule is 1/5th at 6 months
@@ -454,150 +395,129 @@ pub const BATCH_THREE_STAKER_INFOS: &[StakerInfo] = &[
     // 3rd batch
     StakerInfo {
         name: "dusty dress",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 1_212_121.21,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "godly bed",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 151_515.15,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "innocent property",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 227_272.73,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "responsible bikes",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 3_030_303.03,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "learned market",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 3_030_303.03,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "jumpy school",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 303_030.30,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "sticky houses",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 1_515_151.52,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "bustling basketball",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 1_515_152.52,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "ordinary dad",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 606_060.61,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "absurd bat",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 90_909.09,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "cloudy ocean",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 67_945.45,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "black-and-white fold",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 757_575.76,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "stale part",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 45_454.55,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "available health",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 2_797_575.76,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "afraid visitor",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 481_818.18,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "arrogant front",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 151_515.15,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "juvenile zinc",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 151_515.15,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "disturbed box",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 303_030.30,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "disagreeable skate",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 454_545.45,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "miscreant sidewalk",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 75_757.58,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
     StakerInfo {
         name: "shy play",
-        staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-        withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+        staker: "P1aceHo1derPubkey11111111111111111111111111",
         sol: 303_030.30,
-        custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+        custodian: "11111111111111111111111111111111",
     },
 ];
 
diff --git a/genesis/src/main.rs b/genesis/src/main.rs
index e678c0e1d1..8e2647d103 100644
--- a/genesis/src/main.rs
+++ b/genesis/src/main.rs
@@ -1,16 +1,9 @@
 //! A command-line executable for generating the chain's genesis config.
 
-mod address_generator;
-mod genesis_accounts;
-mod stakes;
-mod unlocks;
-mod validators;
-
-use crate::genesis_accounts::add_genesis_accounts;
 use clap::{crate_description, crate_name, value_t, value_t_or_exit, App, Arg, ArgMatches};
 use solana_clap_utils::input_parsers::pubkey_of;
 use solana_clap_utils::input_validators::is_valid_percentage;
-use solana_genesis::Base64Account;
+use solana_genesis::{genesis_accounts::add_genesis_accounts, Base64Account};
 use solana_ledger::{blocktree::create_new_ledger, poh::compute_hashes_per_tick};
 use solana_sdk::{
     account::Account,
diff --git a/genesis/src/stakes.rs b/genesis/src/stakes.rs
index 1934e03928..d97c092ba4 100644
--- a/genesis/src/stakes.rs
+++ b/genesis/src/stakes.rs
@@ -15,7 +15,6 @@ use solana_stake_program::stake_state::{
 pub struct StakerInfo {
     pub name: &'static str,
     pub staker: &'static str,
-    pub withdrawer: &'static str,
     pub sol: f64,
     pub custodian: &'static str,
 }
@@ -44,11 +43,16 @@ pub fn create_and_add_stakes(
     // the largest each stake account should be, in lamports
     granularity: u64,
 ) -> u64 {
-    let authorized = Authorized {
-        staker: Pubkey::new(&hex::decode(staker_info.staker).expect("hex")),
-        withdrawer: Pubkey::new(&hex::decode(staker_info.withdrawer).expect("hex")),
-    };
-    let custodian = Pubkey::new(&hex::decode(staker_info.custodian).expect("hex"));
+    let authorized = Authorized::auto(
+        &staker_info
+            .staker
+            .parse::<Pubkey>()
+            .expect("invalid staker"),
+    );
+    let custodian = staker_info
+        .custodian
+        .parse::<Pubkey>()
+        .expect("invalid custodian");
 
     let total_lamports = sol_to_lamports(staker_info.sol);
 
@@ -176,6 +180,38 @@ mod tests {
                     <= StakeState::get_rent_exempt_reserve(&genesis_config.rent)));
     }
 
+    //    #[ignore]
+    //    #[test]
+    //    fn hex_test_keys_to_bs58() {
+    //    vec![
+    //        "ab22196afde08a090a3721eb20e3e1ea84d36e14d1a3f0815b236b300d9d33ef", // CX2sgoat51bnDgCN2YeesrTcscgVhnhWnwxtWEEEqBs4
+    //        "a2a7ae9098f862f4b3ba7d102d174de5e84a560444c39c035f3eeecce442eadc", // BwwM47pLHwUgjJXKQKVNiRfGhtPNWfNLH27na2HJQHhd
+    //        "6a56514c29f6b1de4d46164621d6bd25b337a711f569f9283c1143c7e8fb546e", // 8A6ZEEW2odkqXNjTWHNG6tUk7uj6zCzHueTyEr9pM1tH
+    //        "b420af728f58d9f269d6e07fbbaecf6ed6535e5348538e3f39f2710351f2b940", // D89HyaBmr2WmrTehsfkQrY23wCXcDfsFnN9gMfUXHaDd
+    //        "ddf2e4c81eafae2d68ac99171b066c87bddb168d6b7c07333cd951f36640163d", // FwPvDpvUmnco1CSfwXQDTbUbuhG5eP7h2vgCKYKVL7at
+    //        "312fa06ccf1b671b26404a34136161ed2aba9e66f248441b4fddb5c592fde560", // 4K16iBoC9kAQRT8pUEKeD2h9WEx1zsRgEmJFssXcXmqq
+    //        "0cbf98cd35ceff84ca72b752c32cc3eeee4f765ca1bef1140927ebf5c6e74339", // rmLpENW4V6QNeEhdJJVxo9Xt99oKgNUFZS4Y4375amW
+    //        "467e06fa25a9e06824eedc926ce431947ed99c728bed36be54561354c1330959", // 5kAztE3XtrpeyGZZxckSUt3ZWojNTmph1QSC9S2682z4
+    //        "ef1562bf9edfd0f5e62530cce4244e8de544a3a30075a2cd5c9074edfbcbe78a", // H6HMVuDR8XCw3EuhLvFG4EciVvGo76Agq1kSBL2ozoDs
+    //        "2ab26abb9d8131a30a4a63446125cf961ece4b926c31cce0eb84da4eac3f836e", // 3sfv8tk5ZSDBWbTkFkvFxCvJUyW5yDJUu6VMJcUARQWq
+    //    ]
+    //    .iter()
+    //    .for_each(|_hex| {
+    //        print(
+    //            "\n\"{}\", // {:?}",
+    //            hex,
+    //            Pubkey::new(&hex::decode(hex).unwrap())
+    //        );
+    //    });
+    //    println();
+    // println(
+    //     "{:?}",
+    //     "P1aceHo1derPubkey11111111111111111111111111"
+    //         .parse::<Pubkey>()
+    //         .unwrap()
+    // );
+    //}
+
     #[test]
     fn test_create_stakes() {
         // 2 unlocks
@@ -199,10 +235,9 @@ mod tests {
             },
             &StakerInfo {
                 name: "fun",
-                staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-                withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+                staker: "P1aceHo1derPubkey11111111111111111111111111",
                 sol: lamports_to_sol(total_lamports),
-                custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+                custodian: "11111111111111111111111111111111",
             },
             &UnlockInfo {
                 cliff_fraction: 0.5,
@@ -225,10 +260,9 @@ mod tests {
             },
             &StakerInfo {
                 name: "fun",
-                staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-                withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+                staker: "P1aceHo1derPubkey11111111111111111111111111",
                 sol: lamports_to_sol(total_lamports),
-                custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+                custodian: "11111111111111111111111111111111",
             },
             &UnlockInfo {
                 cliff_fraction: 0.5,
@@ -251,10 +285,9 @@ mod tests {
             },
             &StakerInfo {
                 name: "fun",
-                staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-                withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+                staker: "P1aceHo1derPubkey11111111111111111111111111",
                 sol: lamports_to_sol(total_lamports),
-                custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+                custodian: "11111111111111111111111111111111",
             },
             &UnlockInfo {
                 cliff_fraction: 0.5,
@@ -276,10 +309,9 @@ mod tests {
             },
             &StakerInfo {
                 name: "fun",
-                staker: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
-                withdrawer: "cafebabedeadbeef000000000000000000000000000000000000000000000000",
+                staker: "P1aceHo1derPubkey11111111111111111111111111",
                 sol: lamports_to_sol(total_lamports),
-                custodian: "0000000000000000000000000000000000000000000000000000000000000000",
+                custodian: "11111111111111111111111111111111",
             },
             &UnlockInfo {
                 cliff_fraction: 0.5,
diff --git a/genesis/src/validators.rs b/genesis/src/validators.rs
index 8e9840d84a..941b08da25 100644
--- a/genesis/src/validators.rs
+++ b/genesis/src/validators.rs
@@ -32,8 +32,8 @@ pub fn create_and_add_validator(
     // information about this validator
     validator_info: &ValidatorInfo,
 ) -> u64 {
-    let node: Pubkey = validator_info.node.parse().expect("invalide node");
-    let vote: Pubkey = validator_info.vote.parse().expect("invalide vote");
+    let node: Pubkey = validator_info.node.parse().expect("invalid node");
+    let vote: Pubkey = validator_info.vote.parse().expect("invalid vote");
     let node_lamports = sol_to_lamports(validator_info.node_sol);
 
     // node is the system account from which votes will be issued