update allocations generation (#609)

* update allocations generation * upload final genesis
kadena-io · Oct 29, 2019 · ea09734 · ea09734
1 parent aaec8fd
commit ea09734
Show file tree

Hide file tree

Showing 37 changed files with 1,497 additions and 3,017 deletions.
diff --git a/allocations/Testnet-Keysets.csv b/allocations/Testnet-Keysets.csv
@@ -81,4 +81,4 @@ Coinlist Global,keys-2,5ac02d6ce804712ec5822ab9813fd483265c106da3fff60cd492584bc
 FTS_C1,keys-2,29f7107b39f6c1947f96622f689bec68e01573076d60611d3ef6b8cbc43cfa0b,7c21f7b53c816798152487024d71bfcbd47b5b80ae43594b94dd38454818aefc,1ff969945ab6088cbd3f3a6a6b97187697192763d78f27f55bdddbbc157c00c0
 CS1_C2,keys-2,96529dbb839027548912bc6a1cffb69c677ed9766350018cc8c46a3f819fe174,e53708564f1a78f6e5a9309fd8b9dd85646832e374162cd3c67420e202a7e45b,4bb6b71e2ddc61392274d18d142cdc8d4f50e54343098138f9a7d17fb562d6ea
 CS2_C0,keys-2,9a2a12ba791909a2b5e92ab3366f60f4689e5331ef285b704efa3fd83bc959f4,7bcf78f09e64e37fe4705d5abb3735496f31f04d347c138f5dd3f4ee2683a952,f54e9f2d81be422a02adb0a172f89752fc3e5f9dae435208776bd5d83a2f6f24
-ST_C1,keys-2,41a10706f58f725bbf24715c587fa0a25108a9ca150f91e9ca868100db8fae50,64fdc9e4b9ed0988f3edd43f9c17d758cba4fdd69fcd8985fb4670457c626620,9906c1fb358302a681caa0038b25baf1190678c53801e84c1d5407fc3e7dafc4
+ST_C1,keys-2,ccf6fa1fd32e58b0405f169ffb455a1a0434cfaff5b8549862821ff6b551d5b3,af818a5e8672ab93b085987b942e87aa52ff6c81bffafaf3437c01c8a41a6fa8,8746831c5580950e74aef86659c6f8f1acb7215067ed91d11fe691945f9c8b1e
diff --git a/allocations/token_payments.csv b/allocations/token_payments.csv
diff --git a/pact/genesis/mainnet/mainnet_allocations0.yaml b/pact/genesis/mainnet/mainnet_allocations0.yaml
diff --git a/pact/genesis/mainnet/mainnet_allocations1.yaml b/pact/genesis/mainnet/mainnet_allocations1.yaml
diff --git a/pact/genesis/mainnet/mainnet_allocations2.yaml b/pact/genesis/mainnet/mainnet_allocations2.yaml
diff --git a/pact/genesis/mainnet/mainnet_allocations3.yaml b/pact/genesis/mainnet/mainnet_allocations3.yaml
diff --git a/pact/genesis/mainnet/mainnet_allocations4.yaml b/pact/genesis/mainnet/mainnet_allocations4.yaml
diff --git a/pact/genesis/mainnet/mainnet_allocations5.yaml b/pact/genesis/mainnet/mainnet_allocations5.yaml
diff --git a/pact/genesis/mainnet/mainnet_allocations6.yaml b/pact/genesis/mainnet/mainnet_allocations6.yaml
diff --git a/pact/genesis/mainnet/mainnet_allocations7.yaml b/pact/genesis/mainnet/mainnet_allocations7.yaml
diff --git a/pact/genesis/mainnet/mainnet_allocations8.yaml b/pact/genesis/mainnet/mainnet_allocations8.yaml
diff --git a/pact/genesis/mainnet/mainnet_allocations9.yaml b/pact/genesis/mainnet/mainnet_allocations9.yaml
diff --git a/pact/genesis/mainnet/mainnet_keysets.yaml b/pact/genesis/mainnet/mainnet_keysets.yaml
diff --git a/pact/genesis/mainnet/testnet_keysets.yaml b/pact/genesis/mainnet/testnet_keysets.yaml
diff --git a/src/Chainweb/BlockHeader/Genesis/Development0Payload.hs b/src/Chainweb/BlockHeader/Genesis/Development0Payload.hs
diff --git a/src/Chainweb/BlockHeader/Genesis/DevelopmentNPayload.hs b/src/Chainweb/BlockHeader/Genesis/DevelopmentNPayload.hs
diff --git a/src/Chainweb/BlockHeader/Genesis/FastTimedCPM0Payload.hs b/src/Chainweb/BlockHeader/Genesis/FastTimedCPM0Payload.hs
diff --git a/src/Chainweb/BlockHeader/Genesis/FastTimedCPMNPayload.hs b/src/Chainweb/BlockHeader/Genesis/FastTimedCPMNPayload.hs
diff --git a/src/Chainweb/BlockHeader/Genesis/Mainnet0Payload.hs b/src/Chainweb/BlockHeader/Genesis/Mainnet0Payload.hs
diff --git a/src/Chainweb/BlockHeader/Genesis/Mainnet1Payload.hs b/src/Chainweb/BlockHeader/Genesis/Mainnet1Payload.hs
diff --git a/src/Chainweb/BlockHeader/Genesis/Mainnet2Payload.hs b/src/Chainweb/BlockHeader/Genesis/Mainnet2Payload.hs
diff --git a/src/Chainweb/BlockHeader/Genesis/Mainnet3Payload.hs b/src/Chainweb/BlockHeader/Genesis/Mainnet3Payload.hs
diff --git a/src/Chainweb/BlockHeader/Genesis/Mainnet4Payload.hs b/src/Chainweb/BlockHeader/Genesis/Mainnet4Payload.hs
diff --git a/src/Chainweb/BlockHeader/Genesis/Mainnet5Payload.hs b/src/Chainweb/BlockHeader/Genesis/Mainnet5Payload.hs
diff --git a/src/Chainweb/BlockHeader/Genesis/Mainnet6Payload.hs b/src/Chainweb/BlockHeader/Genesis/Mainnet6Payload.hs
diff --git a/src/Chainweb/BlockHeader/Genesis/Mainnet7Payload.hs b/src/Chainweb/BlockHeader/Genesis/Mainnet7Payload.hs
diff --git a/src/Chainweb/BlockHeader/Genesis/Mainnet8Payload.hs b/src/Chainweb/BlockHeader/Genesis/Mainnet8Payload.hs
diff --git a/src/Chainweb/BlockHeader/Genesis/Mainnet9Payload.hs b/src/Chainweb/BlockHeader/Genesis/Mainnet9Payload.hs
diff --git a/src/Chainweb/BlockHeader/Genesis/Testnet0Payload.hs b/src/Chainweb/BlockHeader/Genesis/Testnet0Payload.hs
diff --git a/src/Chainweb/BlockHeader/Genesis/TestnetNPayload.hs b/src/Chainweb/BlockHeader/Genesis/TestnetNPayload.hs
diff --git a/test/golden/development-block-hashes-expected.txt b/test/golden/development-block-hashes-expected.txt
@@ -1 +1 @@
-9FikhIq4XjzRRLTh8HFi1lLd8M5RTzNalgHBFGyQMno=8R9oBxyMdpOKPs4bLwK0hOslrAvis2SvSg0XPWD3kso=Ky4RB6PDHhIam44091vG3oa7zQ4_DBy1De7xjI4RWtc=ZPi-8-JSkTcP2ilBG-Hq54w3vUBXlQ9jkpQMxUUaYpc=cbUVWO1mfUvG3p8cZX0D0dfPg_xJAUpxRDn2hDcZFOQ=VrPZdEoQIck8wR-Xy2y2vRKq0vRGow464D8qnG-rxXY=bFJMUNXl7Chb9to2XLhhM3YE6uwLc9kp_UJJlky97Ug=y1Ygs4xfx8SfVOYgFt-QmuAMC3HS-K8ewVYyNvggVMQ=favfd269ZK16a9ZnNZytltF8Kl5SSS_il8BHyw5GQ2Q=vEwZ-FjxLD5dz7uBJAP61xzBdPqYvAg8xcR1ZOfWEbA=
+lpqta2-edjegKB2_Vs3aUjDyEZ4RsRToVFJiYwPndB4=4XOlzjI3GS7qwroOyJK_27O01FHiSpaEw4xwDoWfvr4=YRSsC77kMGE2Y6Yo5flh_pN_ITgaeJtoP3u_cQ2o8vY=CZX5UG1e_G8BXdD9UQS_JjyAGlFRA0kkhyrXkY8tVYY=r4kHAL8U2xJNeeLTyehnQvidzc_eAmjiGMNf72Fxty0=EtV8b2DULeLM4L9nZbPZjoaAFNIdbkHM-kxHb4Ea9m8=RpSJs3w5bkSGSO4J5zXG5Q_xpAjl_aJp8xynS6UbUAA=WwHL8Zv8RvIHhYcNVaOvNr_2mNHX9ka6PZVHqE-P69Y=qhCvlVOFC2QekwkqsAw-UcjrHyhomXT6LJzE3F5tuAw=fZbRTCG6k7HQf4s2CWBzDhyYOSqtbuoWJPtDjU4EJmc=
diff --git a/test/golden/empty-block-tests-expected.txt b/test/golden/empty-block-tests-expected.txt
@@ -3,6 +3,6 @@ results:
   transactions: []
   minerData: eyJhY2NvdW50IjoiTm9NaW5lciIsInByZWRpY2F0ZSI6IjwiLCJwdWJsaWMta2V5cyI6W119
   transactionsHash: lL9ztEiU-NwzrlTpBbvhT4M1l5Shsht94OwFyhBaFD0
-  outputsHash: Du2QKBzNxr50iYZ5j_hd5vKPqXdQqR0-w2IWeTBxVeU
-  payloadHash: e_baVCM2uC0dVTWKVmTy2Yzrxrp2QEvuhraj9itVm-M
-  coinbase: eyJnYXMiOjAsInJlc3VsdCI6eyJzdGF0dXMiOiJzdWNjZXNzIiwiZGF0YSI6IldyaXRlIHN1Y2NlZWRlZCJ9LCJyZXFLZXkiOiJJbVpoZG1aa01qWTVXa3N4Tm1FNVdtNU9XbmwwYkhSR09FdHNOVk5UVTE5cGJEaENTSGwzTlVkUk1sRWkiLCJsb2dzIjoiSWlvZlY0UGQwdG4zb0g3bFRId3BhempYVzdfR202RDhwdTNUa3NjZTRCcyIsIm1ldGFEYXRhIjpudWxsLCJjb250aW51YXRpb24iOm51bGwsInR4SWQiOjV9
+  outputsHash: Cl2YHZxLNavUbPqBgDHjV7QAZ8RZ_3eHG5pDNXJV5b4
+  payloadHash: PSRcpZNV1mcERMEdW49OwBZWyud9wpXvGNSDH4AAVO8
+  coinbase: eyJnYXMiOjAsInJlc3VsdCI6eyJzdGF0dXMiOiJzdWNjZXNzIiwiZGF0YSI6IldyaXRlIHN1Y2NlZWRlZCJ9LCJyZXFLZXkiOiJJbkZvUTNac1ZrOUdRekpSWld0M2EzRnpRWGN0VldOcWNraDVhRzl0V0ZRMlRFcDZSVE5HTlhSMVFYY2kiLCJsb2dzIjoiSWlvZlY0UGQwdG4zb0g3bFRId3BhempYVzdfR202RDhwdTNUa3NjZTRCcyIsIm1ldGFEYXRhIjpudWxsLCJjb250aW51YXRpb24iOm51bGwsInR4SWQiOjd9
diff --git a/test/golden/mainnet01-block-hashes-expected.txt b/test/golden/mainnet01-block-hashes-expected.txt
@@ -1 +1 @@
-Xf57vCImOmENTRUCL89nr3wB4pTVPKJ_27ZQdWh7UxM=uB-j7yxHbbFs4BVMJt_InWr4DYTDVUegjorJK4hhsEg=J6zOXRNS3wYdT7WrLIi8NfKQAIiA-zGT0AOWJOwdcbg=YZ-jD1VQ6dPfCMUB-SGtjBNlee37mE74S5xC0QljADo=ts_qTfsQXu-sNV0dvstwsuStqnFXu3MzAQs7s9sRW5A=vH88HUyUBQHyN7kBunBPdvr2HMO_LsUnx8Hx2A69VAg=wv6dPSamTlo9B_Z-9dUmec5qyAcxgZf-d3IiblaXYHw=DMPwij7o4nKJkw40LqBFHUmQCMFAQRJqoGLlFDeCX2Q=hxawF59uR_h6w96D6JwnGnNk1PU4InzK906HqTju68s=jJOEHvKpklFqsK2JB9ufDAX0llUXI320Xhv2v7cQP0c=
+spaecQH89vDouwU2kdGoOJ4rNTfGxEkwLo30YeTOr6w=x8d9fLLe70VpSDRp4ZgDboWVSPf6hMKclbTsYpzRFaI=0R1kZ-T9ZwAuH6rtaTzkGWeY733mqySIv6qoKqiVDAg=PLlb4WQOQrv2na2UQOmwn57rSZc7fNQ0Hh6QQB2nd2c=DxRxh2XObeQox1HtsPlfnq-eNlJwVDHFwi4xJtHaFHI=rt4QHbK_Ct0uRO920FRvMxum95cJ4HCg5-a-9oMA1sk=fdl7MFKeP3627iD5Y3cvwdjePix_vX1JYIrfSbpL7NY=qfb8fUvB2XORuRQAkUEtkL0awLj4p-2Z7PS0Y58HqG8=uEP2gDD3cfZBeGnOqIUVcJj3u8sK2GjS1JR_ngU-v_g=CB8Ha8mDaljlt0z5xeN_G3WgMkY2ZqZSnGDekZsaEyc=
diff --git a/test/golden/new-block-0-expected.txt b/test/golden/new-block-0-expected.txt
diff --git a/test/golden/testnet02-block-hashes-expected.txt b/test/golden/testnet02-block-hashes-expected.txt
@@ -1 +1 @@
-cD590ltEOSYiqKnIwWKnEq8T9dRuxtTX5l55uyyvxiI=aszT8C30azb-0Mtx98xmcmo7aK5T9kXrytPNF1VVvlM=Acf9wIurtinInQrI0Avi3jnTLTSPaL6akberGpxn11A=Me_BfWonRQGuC9Vdvghv7agf0wWPSIpdNmAHx26LyZw=J8SzWbnIQbM10g2hY9QbVp8j0GNbdrT0XyR2bOQcGpI=RonQCpiWZQQzVkCXixsqa1w4ZecBeRCp-y9TfpFH6Ds=25WeHnqcqxH6JT8kXQM8kBjJ4mqgY0uvsol57Nkh9Tc=qiUC-zGmkJCX8w8vqWAoJMfMLZODdyrx8LRCLgKOZRU=1u9eWeMwSIvQ-JTNnHkUldOsJVYf9Ls092V5m_LDK1Q=4p4l5UqV9x0cIXyPU5RNZLRtZNyGYcl6qathJLHLp5g=
+BgkHZTPj2G3BlBv0f_Xl7yoCvD_6IclvyaTGtICM-v4=hdxzt7GzZRnAMErwCzlWvlT0z8DXr2_4cKtgNE-eTPc=MPHXvp2Q17FVf4p5xFi2HmhV7P0z99SnTEPBy6y_e-g=C8Lvh_gde_X_jizes3l0fD_v6LyxP-mNiDZHFtZgnTs=dEcmdOrW21v4Tlkfwbl4S3ncKM09dTznKAGXaWWoCqY=KznXFYYdHfNQo2flz00_vwnZNRLRAfRciZHJ34Bq0G4=tjCQk9ZDOP49nTjmCgie85hUe_VRzGGeAeo1kylpX_w=C2MYKpIDTufaUDidHnQYB6d_A5nmzM5o_IloeZAMhr8=Aen4lUxmYvtiVWlG2CL81geuGU8E1ayMjm21j-cR_Mk=72Dg6KSzubyj0jXPX8llaVkX1CEE0mwzHr7XqLayexQ=
diff --git a/tools/ea/Allocations.hs b/tools/ea/Allocations.hs
@@ -41,7 +41,6 @@ import GHC.Generics
 import Data.ByteString (ByteString)
 import qualified Data.Csv as CSV
 import Data.FileEmbed (embedFile)
-import Data.Functor (void)
 import qualified Data.Map.Strict as M
 import Data.String.Conv (toS)
 import Data.Text (Text)
@@ -58,13 +57,22 @@ import Chainweb.Utils
 -- Tx gen
 
 generateAllocations :: IO ()
-generateAllocations = void allocations
+generateAllocations
+    = allocations
+    >> mainKeysets
+    >> testKeysets
   where
+    mainKeysets = T.writeFile (prefix $ "mainnet_keysets") $
+      keysToYaml "mainnet-keysets" readMainnetKeys
+
+    testKeysets = T.writeFile (prefix $ "testnet_keysets") $
+      keysToYaml "testnet-keysets" readTestnetKeys
+
     allocations = flip M.traverseWithKey readAllocations $ \cid txs -> do
-      let ys = toYaml cid readMainnetKeys txs
-      T.writeFile (prefix $ "allocations" <> T.unpack cid) ys
+      let ys = allocToYaml cid txs
+      T.writeFile (prefix $ "mainnet_allocations" <> T.unpack cid) ys
 
-    prefix t = "pact/genesis/mainnet/mainnet_" <> t <> ".yaml"
+    prefix t = "pact/genesis/mainnet/" <> t <> ".yaml"
 
 genTxs
     :: forall a b
@@ -79,24 +87,32 @@ genTxs f bs = case CSV.decode CSV.HasHeader (toS bs) of
     Right as -> fmap f as
 
 
-toYaml :: Text -> Vector AllocationKeyTx -> Vector AllocationTx -> Text
-toYaml cid ks as = T.concat
+keysToYaml :: Text -> Vector AllocationKeyTx -> Text
+keysToYaml nonce ks = T.concat
     [ "code: |-\n"
     , go f ks
-    , "\n"
-    , go g as
     , "\ndata:\n"
-    , go h ks
-    , "\nnonce: " <> "mainnet-genesis-" <> cid
+    , go g ks
+    , "\nnonce: " <> nonce
     , "\nkeyPairs: []\n"
     ]
   where
     go k = V.foldl1' (<>) . V.map k
     wrap tx = "  " <> tx <> "\n"
-
     f = wrap . _allocationKeyTx
-    g = wrap . _allocationTx
-    h = wrap . _allocationKeyData
+    g = wrap . _allocationKeyData
+
+allocToYaml :: Text -> Vector AllocationTx -> Text
+allocToYaml cid as = T.concat
+    [ "code: |-\n"
+    , go f as
+    , "\nnonce: " <> "mainnet-genesis-allocations" <> cid
+    , "\nkeyPairs: []\n"
+    ]
+  where
+    go k = V.foldl1' (<>) . V.map k
+    wrap tx = "  " <> tx <> "\n"
+    f = wrap . _allocationTx
 
 
 readAllocations :: M.Map Text (Vector AllocationTx)

diff --git a/tools/ea/Ea.hs b/tools/ea/Ea.hs
@@ -97,9 +97,9 @@ main = do
     putStrLn "Done."
   where
     cc = [fungibleAsset, coinContract, gasPayer]
-    devDefaults = cc <> [devNs]
-    prodDefaults = cc <> [prodNs]
-    mainnetDefaults = cc <> [prodNs, testAllocations]
+    devDefaults = cc <> [devNs, testnetAllocations, testnetKeysets]
+    prodDefaults = cc <> [prodNs, testnetAllocations, testnetKeysets]
+    mainnetDefaults = cc <> [prodNs, mainnetKeysets]
 
     chain0 =
       [ (Development, "Development", devDefaults <> [devAllocations, dev0Grants])
@@ -194,8 +194,14 @@ mainAllocations8 = "pact/genesis/mainnet/mainnet_allocations8.yaml"
 mainAllocations9 :: FilePath
 mainAllocations9 = "pact/genesis/mainnet/mainnet_allocations9.yaml"
 
-testAllocations :: FilePath
-testAllocations = "pact/genesis/mainnet/test-allocations.yaml"
+testnetKeysets :: FilePath
+testnetKeysets = "pact/genesis/mainnet/testnet_keysets.yaml"
+
+mainnetKeysets :: FilePath
+mainnetKeysets = "pact/genesis/mainnet/mainnet_keysets.yaml"
+
+testnetAllocations :: FilePath
+testnetAllocations = "pact/genesis/mainnet/test-allocations.yaml"
 
 ---------------------
 -- Payload Generation
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		9FikhIq4XjzRRLTh8HFi1lLd8M5RTzNalgHBFGyQMno=8R9oBxyMdpOKPs4bLwK0hOslrAvis2SvSg0XPWD3kso=Ky4RB6PDHhIam44091vG3oa7zQ4_DBy1De7xjI4RWtc=ZPi-8-JSkTcP2ilBG-Hq54w3vUBXlQ9jkpQMxUUaYpc=cbUVWO1mfUvG3p8cZX0D0dfPg_xJAUpxRDn2hDcZFOQ=VrPZdEoQIck8wR-Xy2y2vRKq0vRGow464D8qnG-rxXY=bFJMUNXl7Chb9to2XLhhM3YE6uwLc9kp_UJJlky97Ug=y1Ygs4xfx8SfVOYgFt-QmuAMC3HS-K8ewVYyNvggVMQ=favfd269ZK16a9ZnNZytltF8Kl5SSS_il8BHyw5GQ2Q=vEwZ-FjxLD5dz7uBJAP61xzBdPqYvAg8xcR1ZOfWEbA=
		lpqta2-edjegKB2_Vs3aUjDyEZ4RsRToVFJiYwPndB4=4XOlzjI3GS7qwroOyJK_27O01FHiSpaEw4xwDoWfvr4=YRSsC77kMGE2Y6Yo5flh_pN_ITgaeJtoP3u_cQ2o8vY=CZX5UG1e_G8BXdD9UQS_JjyAGlFRA0kkhyrXkY8tVYY=r4kHAL8U2xJNeeLTyehnQvidzc_eAmjiGMNf72Fxty0=EtV8b2DULeLM4L9nZbPZjoaAFNIdbkHM-kxHb4Ea9m8=RpSJs3w5bkSGSO4J5zXG5Q_xpAjl_aJp8xynS6UbUAA=WwHL8Zv8RvIHhYcNVaOvNr_2mNHX9ka6PZVHqE-P69Y=qhCvlVOFC2QekwkqsAw-UcjrHyhomXT6LJzE3F5tuAw=fZbRTCG6k7HQf4s2CWBzDhyYOSqtbuoWJPtDjU4EJmc=
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Xf57vCImOmENTRUCL89nr3wB4pTVPKJ_27ZQdWh7UxM=uB-j7yxHbbFs4BVMJt_InWr4DYTDVUegjorJK4hhsEg=J6zOXRNS3wYdT7WrLIi8NfKQAIiA-zGT0AOWJOwdcbg=YZ-jD1VQ6dPfCMUB-SGtjBNlee37mE74S5xC0QljADo=ts_qTfsQXu-sNV0dvstwsuStqnFXu3MzAQs7s9sRW5A=vH88HUyUBQHyN7kBunBPdvr2HMO_LsUnx8Hx2A69VAg=wv6dPSamTlo9B_Z-9dUmec5qyAcxgZf-d3IiblaXYHw=DMPwij7o4nKJkw40LqBFHUmQCMFAQRJqoGLlFDeCX2Q=hxawF59uR_h6w96D6JwnGnNk1PU4InzK906HqTju68s=jJOEHvKpklFqsK2JB9ufDAX0llUXI320Xhv2v7cQP0c=
		spaecQH89vDouwU2kdGoOJ4rNTfGxEkwLo30YeTOr6w=x8d9fLLe70VpSDRp4ZgDboWVSPf6hMKclbTsYpzRFaI=0R1kZ-T9ZwAuH6rtaTzkGWeY733mqySIv6qoKqiVDAg=PLlb4WQOQrv2na2UQOmwn57rSZc7fNQ0Hh6QQB2nd2c=DxRxh2XObeQox1HtsPlfnq-eNlJwVDHFwi4xJtHaFHI=rt4QHbK_Ct0uRO920FRvMxum95cJ4HCg5-a-9oMA1sk=fdl7MFKeP3627iD5Y3cvwdjePix_vX1JYIrfSbpL7NY=qfb8fUvB2XORuRQAkUEtkL0awLj4p-2Z7PS0Y58HqG8=uEP2gDD3cfZBeGnOqIUVcJj3u8sK2GjS1JR_ngU-v_g=CB8Ha8mDaljlt0z5xeN_G3WgMkY2ZqZSnGDekZsaEyc=
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		cD590ltEOSYiqKnIwWKnEq8T9dRuxtTX5l55uyyvxiI=aszT8C30azb-0Mtx98xmcmo7aK5T9kXrytPNF1VVvlM=Acf9wIurtinInQrI0Avi3jnTLTSPaL6akberGpxn11A=Me_BfWonRQGuC9Vdvghv7agf0wWPSIpdNmAHx26LyZw=J8SzWbnIQbM10g2hY9QbVp8j0GNbdrT0XyR2bOQcGpI=RonQCpiWZQQzVkCXixsqa1w4ZecBeRCp-y9TfpFH6Ds=25WeHnqcqxH6JT8kXQM8kBjJ4mqgY0uvsol57Nkh9Tc=qiUC-zGmkJCX8w8vqWAoJMfMLZODdyrx8LRCLgKOZRU=1u9eWeMwSIvQ-JTNnHkUldOsJVYf9Ls092V5m_LDK1Q=4p4l5UqV9x0cIXyPU5RNZLRtZNyGYcl6qathJLHLp5g=
		BgkHZTPj2G3BlBv0f_Xl7yoCvD_6IclvyaTGtICM-v4=hdxzt7GzZRnAMErwCzlWvlT0z8DXr2_4cKtgNE-eTPc=MPHXvp2Q17FVf4p5xFi2HmhV7P0z99SnTEPBy6y_e-g=C8Lvh_gde_X_jizes3l0fD_v6LyxP-mNiDZHFtZgnTs=dEcmdOrW21v4Tlkfwbl4S3ncKM09dTznKAGXaWWoCqY=KznXFYYdHfNQo2flz00_vwnZNRLRAfRciZHJ34Bq0G4=tjCQk9ZDOP49nTjmCgie85hUe_VRzGGeAeo1kylpX_w=C2MYKpIDTufaUDidHnQYB6d_A5nmzM5o_IloeZAMhr8=Aen4lUxmYvtiVWlG2CL81geuGU8E1ayMjm21j-cR_Mk=72Dg6KSzubyj0jXPX8llaVkX1CEE0mwzHr7XqLayexQ=