diff --git a/docker/hive/docs/hive_strategy.png b/docker/hive/docs/hive_strategy.png index 18d99e33f..4add1c897 100644 Binary files a/docker/hive/docs/hive_strategy.png and b/docker/hive/docs/hive_strategy.png differ diff --git a/docker/hive/genesis-2.json b/docker/hive/genesis-2.json index 377226b93..a4cfffb1d 100644 --- a/docker/hive/genesis-2.json +++ b/docker/hive/genesis-2.json @@ -1,65 +1,65 @@ { - "config": { - "chainId": 1337, - "homesteadBlock": 0, - "eip150Block": 0, - "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000", - "eip155Block": 0, - "eip158Block": 0, - "byzantiumBlock": 0, - "constantinopleBlock": 0, - "petersburgBlock": 0, - "istanbulBlock": 0, - "muirGlacierBlock": 0, - "berlinBlock": 0, - "londonBlock": 0, - "arrowGlacierBlock": 0, - "grayGlacierBlock": 0, - "shanghaiTime": 0, - "terminalTotalDifficulty": 0, - "terminalTotalDifficultyPassed": true, - "ethash": {} - }, - "nonce": "0x0", - "timestamp": "0x0", - "extraData": "0x", - "gasLimit": "0x4c4b40", - "difficulty": "0x1", - "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", - "coinbase": "0x0000000000000000000000000000000000000000", - "alloc": { - "0000000000000000000000000000000000031ec7": { - "code": "0x608060405234801561001057600080fd5b506004361061002b5760003560e01c8063a9059cbb14610030575b600080fd5b61004a6004803603810190610045919061016a565b610060565b60405161005791906101c5565b60405180910390f35b60008273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040516100bf91906101ef565b60405180910390a36001905092915050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610101826100d6565b9050919050565b610111816100f6565b811461011c57600080fd5b50565b60008135905061012e81610108565b92915050565b6000819050919050565b61014781610134565b811461015257600080fd5b50565b6000813590506101648161013e565b92915050565b60008060408385031215610181576101806100d1565b5b600061018f8582860161011f565b92505060206101a085828601610155565b9150509250929050565b60008115159050919050565b6101bf816101aa565b82525050565b60006020820190506101da60008301846101b6565b92915050565b6101e981610134565b82525050565b600060208201905061020460008301846101e0565b9291505056fea2646970667358221220b469033f4b77b9565ee84e0a2f04d496b18160d26034d54f9487e57788fd36d564736f6c63430008120033", - "balance": "0xde0b6b3a7640000" + "config": { + "chainId": 1337, + "homesteadBlock": 0, + "eip150Block": 0, + "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "eip155Block": 0, + "eip158Block": 0, + "byzantiumBlock": 0, + "constantinopleBlock": 0, + "petersburgBlock": 0, + "istanbulBlock": 0, + "muirGlacierBlock": 0, + "berlinBlock": 0, + "londonBlock": 0, + "arrowGlacierBlock": 0, + "grayGlacierBlock": 0, + "shanghaiTime": 0, + "terminalTotalDifficulty": 0, + "terminalTotalDifficultyPassed": true, + "ethash": {} }, - "658bdf435d810c91414ec09147daa6db62406379": { - "balance": "0x487a9a304539440000" + "nonce": "0x0", + "timestamp": "0x0", + "extraData": "0x", + "gasLimit": "0x4c4b40", + "difficulty": "0x1", + "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "coinbase": "0x0000000000000000000000000000000000000000", + "alloc": { + "0000000000000000000000000000000000031ec7": { + "code": "0x608060405234801561001057600080fd5b506004361061002b5760003560e01c8063a9059cbb14610030575b600080fd5b61004a6004803603810190610045919061016a565b610060565b60405161005791906101c5565b60405180910390f35b60008273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040516100bf91906101ef565b60405180910390a36001905092915050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610101826100d6565b9050919050565b610111816100f6565b811461011c57600080fd5b50565b60008135905061012e81610108565b92915050565b6000819050919050565b61014781610134565b811461015257600080fd5b50565b6000813590506101648161013e565b92915050565b60008060408385031215610181576101806100d1565b5b600061018f8582860161011f565b92505060206101a085828601610155565b9150509250929050565b60008115159050919050565b6101bf816101aa565b82525050565b60006020820190506101da60008301846101b6565b92915050565b6101e981610134565b82525050565b600060208201905061020460008301846101e0565b9291505056fea2646970667358221220b469033f4b77b9565ee84e0a2f04d496b18160d26034d54f9487e57788fd36d564736f6c63430008120033", + "balance": "0xde0b6b3a7640000" + }, + "658bdf435d810c91414ec09147daa6db62406379": { + "balance": "0x487a9a304539440000" + }, + "aa00000000000000000000000000000000000000": { + "code": "0x6042", + "storage": { + "0x0000000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000000", + "0x0100000000000000000000000000000000000000000000000000000000000000": "0x0100000000000000000000000000000000000000000000000000000000000000", + "0x0200000000000000000000000000000000000000000000000000000000000000": "0x0200000000000000000000000000000000000000000000000000000000000000", + "0x0300000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000303" + }, + "balance": "0x1", + "nonce": "0x1" + }, + "bb00000000000000000000000000000000000000": { + "code": "0x600154600354", + "storage": { + "0x0000000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000000", + "0x0100000000000000000000000000000000000000000000000000000000000000": "0x0100000000000000000000000000000000000000000000000000000000000000", + "0x0200000000000000000000000000000000000000000000000000000000000000": "0x0200000000000000000000000000000000000000000000000000000000000000", + "0x0300000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000303" + }, + "balance": "0x2", + "nonce": "0x1" + } }, - "aa00000000000000000000000000000000000000": { - "code": "0x6042", - "storage": { - "0x0000000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000000", - "0x0100000000000000000000000000000000000000000000000000000000000000": "0x0100000000000000000000000000000000000000000000000000000000000000", - "0x0200000000000000000000000000000000000000000000000000000000000000": "0x0200000000000000000000000000000000000000000000000000000000000000", - "0x0300000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000303" - }, - "balance": "0x1", - "nonce": "0x1" - }, - "bb00000000000000000000000000000000000000": { - "code": "0x600154600354", - "storage": { - "0x0000000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000000", - "0x0100000000000000000000000000000000000000000000000000000000000000": "0x0100000000000000000000000000000000000000000000000000000000000000", - "0x0200000000000000000000000000000000000000000000000000000000000000": "0x0200000000000000000000000000000000000000000000000000000000000000", - "0x0300000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000303" - }, - "balance": "0x2", - "nonce": "0x1" - } - }, - "number": "0x0", - "gasUsed": "0x0", - "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000", - "baseFeePerGas": "0x3b9aca00" + "number": "0x0", + "gasUsed": "0x0", + "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "baseFeePerGas": "0x3b9aca00" } diff --git a/docker/hive/start.sh b/docker/hive/start.sh index 6e2a451b2..cbcac2b82 100644 --- a/docker/hive/start.sh +++ b/docker/hive/start.sh @@ -4,10 +4,10 @@ cat /genesis.json mv /genesis.json /genesis/hive-genesis.json echo "Creating the genesis file..." hive_genesis \ - -k genesis/contracts \ - --hive-genesis genesis/hive-genesis.json \ - -g genesis.json \ - -m manifest.json + -k genesis/contracts \ + --hive-genesis genesis/hive-genesis.json \ + -g genesis.json \ + -m manifest.json mv /genesis/hive-genesis.json /hive-genesis.json && rm -fr /genesis # 2. Start Katana @@ -40,9 +40,9 @@ if test -f "/chain.rlp"; then echo "Launching Hive Chain..." # THIS needs to be changed if Katana ever updates their predeployed accounts hive_chain \ - --chain-path /chain.rlp \ - --relayer-address 0xb3ff441a68610b30fd5e2abbf3a1548eb6ba6f3559f2862bf2dc757e5828ca \ - --relayer-pk 0x2bbf4f9fd0bbb2e60b0316c1fe0b76cf7a4d0198bd493ced9b8df2a3a24d68a + --chain-path /chain.rlp \ + --relayer-address 0xb3ff441a68610b30fd5e2abbf3a1548eb6ba6f3559f2862bf2dc757e5828ca \ + --relayer-pk 0x2bbf4f9fd0bbb2e60b0316c1fe0b76cf7a4d0198bd493ced9b8df2a3a24d68a fi # 3. Start the Indexer service: DNA Indexer, Indexer transformer, and MongoDB diff --git a/src/pool/staging_accounts.json b/src/pool/staging_accounts.json index 9cc37f46a..11da83152 100644 --- a/src/pool/staging_accounts.json +++ b/src/pool/staging_accounts.json @@ -1,12 +1,32 @@ [ - "0xff887caabf4c6d059cb674de16c3daef88e35256fb495201281f2315b1aae9", - "0x2a41b958300263d7eed9413753b7677d0ec158d188cd7c228388f8f6e39d14d", - "0x4d71f14cc7ec7f655aba12518d8481edc6ab6ce1e407ea3d095834d23437527", - "0x1ac126d84cc0ae4322af23c482c2c729d75333c44572180275f762c796e40ec", - "0x11413ce88b400a47b0d2a79de878a02a3deabc58900add358859447ddaffe70", - "0x255d90c70da26246972b7b4d4e75357075785e4cf9ec2077f4e829c80b7b5e8", - "0x63a049efd07342c6c2832a357820d47d1083b63382f5c3eeeac091085760119", - "0x1c790adf6e0ac5aa508a975be0b076949a016ce349502d9d253912e29a59600", - "0x71b5ba9299c9cbeb8fddb886857fdd05360140a220279ab83d2484af87388c7", - "0x62ab3080b8e201b80d767588325b4065d4269a79ac20e6ff7021337845917ce" + "0x6f644133991e779509cb319fd4c9416f949950f07a8bc3cb10916966ec1dca", + "0xc6d61dd26ec6175554977f61198b28f58a7c5f46228b7fb7b44f6f619d800", + "0x6faca0d5ce2437933257a91d95536c7cf3bfa12808f314741efd104e9a0c2d9", + "0x2cced3d1628b867e1b69216df87d869e7f5c8dd066a9114d44e2d1af3fbf2c4", + "0x30ee97c478d8a845d0d6ec0c447650ee6161817199f3d5c2a84f8a033b960b2", + "0x13b09830d3bef686db99c570df79ddfd813502cfa1d7c640ed871a0de6637ba", + "0x1e8f2ef3d53eb800432031fc3000b69b5132a2c4c0df821c20173ac8a91de6d", + "0x2523ffb01dad3d8803a4bae7e2990d74d92b201f5425f921cec2ccb92ee6f18", + "0xf6413b17b8ae645ce13e635df7dcb573086ff9558d8d9d7d2e343a250e4885", + "0x765e5f1ae2f6d796f359ea7c47c88387046d371aef1f02337921fe326fbacc2", + "0x21466caac9f9e2605100c76a0ab15e2cbc72942b876f4665fa490dd83f7a00f", + "0x28d165b48e0b523044bd790bae4cc7096d8747565b1d58691683662e12b6402", + "0x7297a3b129e3d3101bb9956338c9c64b7055556146c7ff2497caad4a831c11d", + "0x8d9da3628af39d3bb9a2155b4eb63af7791da1fd3864f93bb57130fa2b59d2", + "0x4dc2ebca0fa6de9e7f67e821e425a0f9a53cb300cc44cbd93d69c307ac536eb", + "0x6ea69b53281261da1cfde205a5e8c02db26bfa51df77419fef71014c53e03f1", + "0x3709159b0a92aefacba33401098c5b3c09240b67dd5c1d5ee9a778e6205028b", + "0x3ea725fcff7ddaffbdc1134be5ae164bcbf8155135de1d8663c5efb106c9b08", + "0x3135b4bb94b1b7c0d7a7074291d0f1d92ab57d1f61bddd0b7195f70207752ae", + "0x1eb1e028ffa31652cecb7d18311aac1a281610a535f20e7a3a82c13db226b0c", + "0x4f57bf04228bf2d2db2e0a8573c6594558a5f0b487c1229b5fe7723473afa58", + "0x2f24013ebb0911d5f27a2a2c3d07b8c73b2f36239d8325187ed25db1ce794b5", + "0x10e3a8574c22d19951d8e8715cc98a26b9ed9fe39f8e002cc82f49c189ea56c", + "0x6f823719688a9c3e54f7528d4e2a464773170365c2e8b97d699aa2cc519875e", + "0x669774f839f462c3267b1d28e9c31264e1436a48033ee0f71e77bef153cfb81", + "0x6ad46e2c0b5f52412560bb12ad77e2958d53e5f30fc5bc995101dd700e22597", + "0xe07332a9bf6f9d3ced6f3f1cb60607d01fba1f6be9da1b3650c58c8d683e06", + "0x3c320f3726b90a8e21d200eeb956f863c59c9d3744e5f5d9280c648225c7775", + "0xdc68dd15efb6b43a02a8679e4a21a9b8195cd44e6134d5034131520c55dbfa", + "0x594aa6e8d8d5ea9ea4a86681222f65975ed38c4e0f20e8493c0ad9887b3c3f4" ]