From 6be16a113fbbafec76e9e643d85a3eed6f0d0c5f Mon Sep 17 00:00:00 2001 From: Roy Shang Date: Tue, 27 Mar 2018 19:31:34 +0800 Subject: [PATCH] merge "develop" branch. --- account/keydir | 1 + .../n1EYW26QqhnL81B6K9nTPtLqxrmuYpdyPWX | 1 - .../n1FJm8xRdCqMcf2fSCyu2VJmQLVhtgVq2vY | 1 - .../n1H3dki9vym7DfEuK46JtQ3c2Kq9L7igxK4 | 1 - .../n1QXsEhPvB2C2WjETRH4XihFTGJD1P9Hap6 | 1 - .../n1RqSQ7S7ZYjtT6p62ZqkF169juh6ZSEp9C | 1 - .../n1VhQWThiQZKm9tBSzZz2HUudATb42KzqYL | 1 - .../n1a7SDHnCS2ti33VJbjMBdxHcv6MQbCuw78 | 1 - .../n1cZU5RsbVBXfG5ANzsbcDn4qm5g1bFwP6p | 1 - .../n1d1ppJtpycDWyVgTJMzBZULJbAft11emVj | 1 - account/manager_test.go | 8 +- .../{config_local.conf => config.conf} | 13 +- conf/default/config_remote.conf | 51 -------- conf/default/genesis.conf | 111 ++++++++++++++++-- ...nfig_sign_server.conf => sign_server.conf} | 1 + conf/example/config.1a2635.conf | 44 ------- conf/example/config.2fe3f9.conf | 44 ------- conf/example/config.59fc52.conf | 44 ------- conf/example/config.verify.conf | 44 ------- .../{config.48f981.conf => miner.conf} | 21 ++-- .../{config.333cb3.conf => normal.conf} | 18 +-- consensus/dpos/dpos_state.go | 2 +- consensus/dpos/dpos_test.go | 104 +++++++++------- consensus/dpos/keydir | 1 + .../n1FkntVUMPAsESuCAAPK711omQk19JotBjM | 1 - .../n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR | 1 - .../n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW | 1 - .../n1NHcbEus81PJxybnyg4aJgHAaSLDx9Vtf8 | 1 - .../n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5 | 1 - .../n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC | 1 - .../n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4 | 1 - .../n1Z6SbjLuAEXfhX1UJvXT6BB5osWYxVg3F3 | 1 - .../n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ | 1 - core/block.go | 2 +- keydir/n1FF1nz6tarkDVwWQkMnnwFPuPKUaQTdptE | 1 + keydir/n1FkntVUMPAsESuCAAPK711omQk19JotBjM | 1 - keydir/n1GmkKH6nBMw4rrjt16RrJ9WcgvKUtAZP1s | 1 + keydir/n1H4MYms9F55ehcvygwWE71J8tJC4CRr2so | 1 + keydir/n1JAy4X6KKLCNiTd7MWMRsVBjgdVq5WCCpf | 1 + keydir/n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR | 1 - keydir/n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW | 1 - keydir/n1LkDi2gGMqPrjYcczUiweyP4RxTB6Go1qS | 1 + keydir/n1LmP9K8pFF33fgdgHZonFEMsqZinJ4EUqk | 1 + keydir/n1MNXBKm6uJ5d76nJTdRvkPNVq85n6CnXAi | 1 + keydir/n1NHcbEus81PJxybnyg4aJgHAaSLDx9Vtf8 | 1 - keydir/n1NrMKTYESZRCwPFDLFKiKREzZKaN1nhQvz | 1 + keydir/n1NwoSCDFwFL2981k6j9DPooigW33hjAgTa | 1 + keydir/n1PJqpN1bkrjZ44pjrNcZAW8AkHc4iAMiBz | 1 + keydir/n1PfACnkcfJoNm1Pbuz55pQCwueW1BYs83m | 1 + keydir/n1Q8mxXp4PtHaXtebhY12BnHEwu4mryEkXH | 1 + keydir/n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5 | 1 - keydir/n1RB386UkGfrA3uXvAksGETxUhwJAL2H94r | 1 + keydir/n1RYagU8n3JSuV4R7q4Qs5gQJ3pEmrZd6cJ | 1 + keydir/n1SAQy3ix1pZj8MPzNeVqpAmu1nCVqb5w8c | 1 + keydir/n1SHufJdxt2vRWGKAxwPETYfEq3MCQXnEXE | 1 + keydir/n1SSda41zGr9FKF5DJNE2ryY1ToNrndMauN | 1 + keydir/n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC | 1 - keydir/n1TmQtaCn3PNpk4f4ycwrBxCZFSVKvwBtzc | 1 + keydir/n1UM7z6MqnGyKEPvUpwrfxZpM1eB7UpzmLJ | 1 + keydir/n1UWZa8yuvRgePRPgp8a2jX4J9UwGXfHp6i | 1 + keydir/n1UnCsJZjQiKyQiPBr7qG27exqCLuWUf1d7 | 1 + keydir/n1UnXHcAYimGM4cqUeMrhVX9yAC5a1Hrpok | 1 + keydir/n1WkbT89Nh3gSCFLZMg8waqugzjktW2yL9d | 1 + keydir/n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4 | 1 - keydir/n1XP8HQcHxwr3NiLQVoCG3YUyNTUPAn4zZB | 1 + keydir/n1XkoVVjswb5Gek3rRufqjKNpwrDdsnQ7Hq | 1 + keydir/n1Z6SbjLuAEXfhX1UJvXT6BB5osWYxVg3F3 | 1 - keydir/n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ | 1 - keydir/n1cYKNHTeVW9v1NQRWuhZZn9ETbqAYozckh | 1 + keydir/n1dYu2BXgV3xgUh8LhZu8QDDNr15tz4hVDv | 1 + sync/chunk_test.go | 57 +++++++-- sync/keydir | 1 + .../n1FkntVUMPAsESuCAAPK711omQk19JotBjM | 1 - .../n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR | 1 - .../n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW | 1 - .../n1NHcbEus81PJxybnyg4aJgHAaSLDx9Vtf8 | 1 - .../n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5 | 1 - .../n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC | 1 - .../n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4 | 1 - .../n1Z6SbjLuAEXfhX1UJvXT6BB5osWYxVg3F3 | 1 - .../n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ | 1 - 81 files changed, 270 insertions(+), 360 deletions(-) create mode 120000 account/keydir delete mode 100644 account/keydir/n1EYW26QqhnL81B6K9nTPtLqxrmuYpdyPWX delete mode 100644 account/keydir/n1FJm8xRdCqMcf2fSCyu2VJmQLVhtgVq2vY delete mode 100644 account/keydir/n1H3dki9vym7DfEuK46JtQ3c2Kq9L7igxK4 delete mode 100644 account/keydir/n1QXsEhPvB2C2WjETRH4XihFTGJD1P9Hap6 delete mode 100644 account/keydir/n1RqSQ7S7ZYjtT6p62ZqkF169juh6ZSEp9C delete mode 100644 account/keydir/n1VhQWThiQZKm9tBSzZz2HUudATb42KzqYL delete mode 100644 account/keydir/n1a7SDHnCS2ti33VJbjMBdxHcv6MQbCuw78 delete mode 100644 account/keydir/n1cZU5RsbVBXfG5ANzsbcDn4qm5g1bFwP6p delete mode 100644 account/keydir/n1d1ppJtpycDWyVgTJMzBZULJbAft11emVj rename conf/default/{config_local.conf => config.conf} (78%) delete mode 100644 conf/default/config_remote.conf rename conf/default/{config_sign_server.conf => sign_server.conf} (99%) delete mode 100644 conf/example/config.1a2635.conf delete mode 100644 conf/example/config.2fe3f9.conf delete mode 100644 conf/example/config.59fc52.conf delete mode 100644 conf/example/config.verify.conf rename conf/example/{config.48f981.conf => miner.conf} (73%) rename conf/example/{config.333cb3.conf => normal.conf} (68%) create mode 120000 consensus/dpos/keydir delete mode 100644 consensus/dpos/keydir/n1FkntVUMPAsESuCAAPK711omQk19JotBjM delete mode 100644 consensus/dpos/keydir/n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR delete mode 100644 consensus/dpos/keydir/n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW delete mode 100644 consensus/dpos/keydir/n1NHcbEus81PJxybnyg4aJgHAaSLDx9Vtf8 delete mode 100644 consensus/dpos/keydir/n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5 delete mode 100644 consensus/dpos/keydir/n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC delete mode 100644 consensus/dpos/keydir/n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4 delete mode 100644 consensus/dpos/keydir/n1Z6SbjLuAEXfhX1UJvXT6BB5osWYxVg3F3 delete mode 100644 consensus/dpos/keydir/n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ create mode 100644 keydir/n1FF1nz6tarkDVwWQkMnnwFPuPKUaQTdptE delete mode 100644 keydir/n1FkntVUMPAsESuCAAPK711omQk19JotBjM create mode 100644 keydir/n1GmkKH6nBMw4rrjt16RrJ9WcgvKUtAZP1s create mode 100644 keydir/n1H4MYms9F55ehcvygwWE71J8tJC4CRr2so create mode 100644 keydir/n1JAy4X6KKLCNiTd7MWMRsVBjgdVq5WCCpf delete mode 100644 keydir/n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR delete mode 100644 keydir/n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW create mode 100644 keydir/n1LkDi2gGMqPrjYcczUiweyP4RxTB6Go1qS create mode 100644 keydir/n1LmP9K8pFF33fgdgHZonFEMsqZinJ4EUqk create mode 100644 keydir/n1MNXBKm6uJ5d76nJTdRvkPNVq85n6CnXAi delete mode 100644 keydir/n1NHcbEus81PJxybnyg4aJgHAaSLDx9Vtf8 create mode 100644 keydir/n1NrMKTYESZRCwPFDLFKiKREzZKaN1nhQvz create mode 100644 keydir/n1NwoSCDFwFL2981k6j9DPooigW33hjAgTa create mode 100644 keydir/n1PJqpN1bkrjZ44pjrNcZAW8AkHc4iAMiBz create mode 100644 keydir/n1PfACnkcfJoNm1Pbuz55pQCwueW1BYs83m create mode 100644 keydir/n1Q8mxXp4PtHaXtebhY12BnHEwu4mryEkXH delete mode 100644 keydir/n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5 create mode 100644 keydir/n1RB386UkGfrA3uXvAksGETxUhwJAL2H94r create mode 100644 keydir/n1RYagU8n3JSuV4R7q4Qs5gQJ3pEmrZd6cJ create mode 100644 keydir/n1SAQy3ix1pZj8MPzNeVqpAmu1nCVqb5w8c create mode 100644 keydir/n1SHufJdxt2vRWGKAxwPETYfEq3MCQXnEXE create mode 100644 keydir/n1SSda41zGr9FKF5DJNE2ryY1ToNrndMauN delete mode 100644 keydir/n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC create mode 100644 keydir/n1TmQtaCn3PNpk4f4ycwrBxCZFSVKvwBtzc create mode 100644 keydir/n1UM7z6MqnGyKEPvUpwrfxZpM1eB7UpzmLJ create mode 100644 keydir/n1UWZa8yuvRgePRPgp8a2jX4J9UwGXfHp6i create mode 100644 keydir/n1UnCsJZjQiKyQiPBr7qG27exqCLuWUf1d7 create mode 100644 keydir/n1UnXHcAYimGM4cqUeMrhVX9yAC5a1Hrpok create mode 100644 keydir/n1WkbT89Nh3gSCFLZMg8waqugzjktW2yL9d delete mode 100644 keydir/n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4 create mode 100644 keydir/n1XP8HQcHxwr3NiLQVoCG3YUyNTUPAn4zZB create mode 100644 keydir/n1XkoVVjswb5Gek3rRufqjKNpwrDdsnQ7Hq delete mode 100644 keydir/n1Z6SbjLuAEXfhX1UJvXT6BB5osWYxVg3F3 delete mode 100644 keydir/n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ create mode 100644 keydir/n1cYKNHTeVW9v1NQRWuhZZn9ETbqAYozckh create mode 100644 keydir/n1dYu2BXgV3xgUh8LhZu8QDDNr15tz4hVDv create mode 120000 sync/keydir delete mode 100644 sync/keydir/n1FkntVUMPAsESuCAAPK711omQk19JotBjM delete mode 100644 sync/keydir/n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR delete mode 100644 sync/keydir/n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW delete mode 100644 sync/keydir/n1NHcbEus81PJxybnyg4aJgHAaSLDx9Vtf8 delete mode 100644 sync/keydir/n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5 delete mode 100644 sync/keydir/n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC delete mode 100644 sync/keydir/n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4 delete mode 100644 sync/keydir/n1Z6SbjLuAEXfhX1UJvXT6BB5osWYxVg3F3 delete mode 100644 sync/keydir/n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ diff --git a/account/keydir b/account/keydir new file mode 120000 index 000000000..406f74a85 --- /dev/null +++ b/account/keydir @@ -0,0 +1 @@ +../keydir/ \ No newline at end of file diff --git a/account/keydir/n1EYW26QqhnL81B6K9nTPtLqxrmuYpdyPWX b/account/keydir/n1EYW26QqhnL81B6K9nTPtLqxrmuYpdyPWX deleted file mode 100644 index 45c7ef0e5..000000000 --- a/account/keydir/n1EYW26QqhnL81B6K9nTPtLqxrmuYpdyPWX +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1EYW26QqhnL81B6K9nTPtLqxrmuYpdyPWX","crypto":{"cipher":"aes-128-ctr","ciphertext":"9663b297ac62d2fbdb946e4863923f898bab491e866d73b7ecdf4365842d95e0","cipherparams":{"iv":"0789a33125674ad78128b55c314e2224"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"ede73d3b5376f82ade11ac89658542bfd1983d8262adb9440255b234f9f472dd"},"mac":"6ba5a295387cc3be8b11b7d7c472cebadb1069f048a05ab57b990ba50bfcdc28","machash":"sha3256"},"id":"da67ef9a-4e94-4452-bf72-f00c20a13325","version":3} \ No newline at end of file diff --git a/account/keydir/n1FJm8xRdCqMcf2fSCyu2VJmQLVhtgVq2vY b/account/keydir/n1FJm8xRdCqMcf2fSCyu2VJmQLVhtgVq2vY deleted file mode 100644 index 8612c4b0d..000000000 --- a/account/keydir/n1FJm8xRdCqMcf2fSCyu2VJmQLVhtgVq2vY +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1FJm8xRdCqMcf2fSCyu2VJmQLVhtgVq2vY","crypto":{"cipher":"aes-128-ctr","ciphertext":"faaf3c8224ffb6a6c04e2f546463c24f404deff52031db9bfe8c8f2d2f2d66c4","cipherparams":{"iv":"1b97627d0279f7af977335109c615370"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"087644e54ae0d1db6c8efcc46081f5710e0349a9474667dd7f2992290b952f69"},"mac":"7b16061c8c5cb3dda46bc52513e3b83f8a5ca3cda4b70f3a0542f211f42d413f","machash":"sha3256"},"id":"f44bc46d-1c88-43ed-b2ca-598e01baf940","version":3} \ No newline at end of file diff --git a/account/keydir/n1H3dki9vym7DfEuK46JtQ3c2Kq9L7igxK4 b/account/keydir/n1H3dki9vym7DfEuK46JtQ3c2Kq9L7igxK4 deleted file mode 100644 index a2f7d0565..000000000 --- a/account/keydir/n1H3dki9vym7DfEuK46JtQ3c2Kq9L7igxK4 +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1H3dki9vym7DfEuK46JtQ3c2Kq9L7igxK4","crypto":{"cipher":"aes-128-ctr","ciphertext":"00baa186fb91f38175a24334d2f2e3c5f7074efdf7c046114184f1860ab21e2e","cipherparams":{"iv":"070df8eff672134f0a73c52dbf7bcc62"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"7dfc264b8bbf73ef63bd68611fb89684a9316c1fbb073b4f5f36cefe8ecb6a89"},"mac":"41a35ecff72ec7bc03d2d61bb8c670b5f0a35163d74c23d7921bf8247ddc441b","machash":"sha3256"},"id":"1057a9a4-c611-4927-9551-2c5882699245","version":3} \ No newline at end of file diff --git a/account/keydir/n1QXsEhPvB2C2WjETRH4XihFTGJD1P9Hap6 b/account/keydir/n1QXsEhPvB2C2WjETRH4XihFTGJD1P9Hap6 deleted file mode 100644 index 5dbf3de0d..000000000 --- a/account/keydir/n1QXsEhPvB2C2WjETRH4XihFTGJD1P9Hap6 +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1QXsEhPvB2C2WjETRH4XihFTGJD1P9Hap6","crypto":{"cipher":"aes-128-ctr","ciphertext":"f5bea6222b6fcbb6e33df124e1d7d88d694d18886ab2a94d1f1198719487b52e","cipherparams":{"iv":"267e61b996a50f53aedddb2cf16bcaa4"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"df7b85fa0b5b93736e76f890a3fcd58d806a0b42967e1553087262ae5d070f9e"},"mac":"d361265a6bfa6bf2bf040991c4f3ef6f42028566a25dfadf3233e54e71c4f535","machash":"sha3256"},"id":"b598dd07-5d62-4f92-b02a-c625d6815ae2","version":3} \ No newline at end of file diff --git a/account/keydir/n1RqSQ7S7ZYjtT6p62ZqkF169juh6ZSEp9C b/account/keydir/n1RqSQ7S7ZYjtT6p62ZqkF169juh6ZSEp9C deleted file mode 100644 index e80522551..000000000 --- a/account/keydir/n1RqSQ7S7ZYjtT6p62ZqkF169juh6ZSEp9C +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1RqSQ7S7ZYjtT6p62ZqkF169juh6ZSEp9C","crypto":{"cipher":"aes-128-ctr","ciphertext":"2df28328984ea20cc4500048de6335a934cc7eae86ab7f2cf5e671ae106ce366","cipherparams":{"iv":"f976e14f7e5c419ec5b913ca4a576e81"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"9961b93326f81e9cf3a98bbd21a3d4ef325a5894d732cc2e70349d8a0c0fbc45"},"mac":"fd29d901747ccdc626c2244fc12354dcefd43f13fe98644d12440a2e7d46d58d","machash":"sha3256"},"id":"6c7ee23d-b140-4dbe-80c1-dd65d9bf09af","version":3} \ No newline at end of file diff --git a/account/keydir/n1VhQWThiQZKm9tBSzZz2HUudATb42KzqYL b/account/keydir/n1VhQWThiQZKm9tBSzZz2HUudATb42KzqYL deleted file mode 100644 index 3489dab4b..000000000 --- a/account/keydir/n1VhQWThiQZKm9tBSzZz2HUudATb42KzqYL +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1VhQWThiQZKm9tBSzZz2HUudATb42KzqYL","crypto":{"cipher":"aes-128-ctr","ciphertext":"d894dcbdb7d7b59619329d7cb6399147a5290cb8bbdf87bdb8031fc019bafd6f","cipherparams":{"iv":"5611e40cf3ee4745d91f8ca1f439273e"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"a18621f57d68f68fc75495cb2f68e9f94cec508739b72daad6e651da73e7f57e"},"mac":"b092a810a40e577d6da68cd9f34ccd046dddb3b86ea88e6509adf5e51888fa7a","machash":"sha3256"},"id":"def0dde3-d8e6-4f3b-b849-cc77017f7360","version":3} \ No newline at end of file diff --git a/account/keydir/n1a7SDHnCS2ti33VJbjMBdxHcv6MQbCuw78 b/account/keydir/n1a7SDHnCS2ti33VJbjMBdxHcv6MQbCuw78 deleted file mode 100644 index 354a15427..000000000 --- a/account/keydir/n1a7SDHnCS2ti33VJbjMBdxHcv6MQbCuw78 +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1a7SDHnCS2ti33VJbjMBdxHcv6MQbCuw78","crypto":{"cipher":"aes-128-ctr","ciphertext":"bd8375bfbe0d2cb66f97f33ca9493275d00551670a3fe7140c619df62af10bb4","cipherparams":{"iv":"db8f94649b0da82fbf8207d2aecde46c"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"a4eacf92d72d9462b587d583f28b6bc9bc3735f0c05bd184857e91e1a5b7b5d8"},"mac":"f207a2e7b5f6995b1ee185f1f8cf9769353ec43daa16e64763d84193acad4648","machash":"sha3256"},"id":"4a20b6d9-b07e-4709-9732-ba6a1221241d","version":3} \ No newline at end of file diff --git a/account/keydir/n1cZU5RsbVBXfG5ANzsbcDn4qm5g1bFwP6p b/account/keydir/n1cZU5RsbVBXfG5ANzsbcDn4qm5g1bFwP6p deleted file mode 100644 index e7d3d46ae..000000000 --- a/account/keydir/n1cZU5RsbVBXfG5ANzsbcDn4qm5g1bFwP6p +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1cZU5RsbVBXfG5ANzsbcDn4qm5g1bFwP6p","crypto":{"cipher":"aes-128-ctr","ciphertext":"e3c6429454e6bc6e04282bdf84170a8fbcc14be9f245fcd8aedbb5936e2a0475","cipherparams":{"iv":"b6762ff3e3fc28e78e250b84e6a90d91"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"0e412a9096ad52751e2c74bc8f49574549e96612deff32b29f0a080a47492a90"},"mac":"bd3956dc50eefb97bc07715fb76a5196cf6b27c692a524c469fd96b2d8edfe46","machash":"sha3256"},"id":"024404a3-dbcc-491e-a85f-2b751c2e82df","version":3} \ No newline at end of file diff --git a/account/keydir/n1d1ppJtpycDWyVgTJMzBZULJbAft11emVj b/account/keydir/n1d1ppJtpycDWyVgTJMzBZULJbAft11emVj deleted file mode 100644 index 4bcf2430e..000000000 --- a/account/keydir/n1d1ppJtpycDWyVgTJMzBZULJbAft11emVj +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1d1ppJtpycDWyVgTJMzBZULJbAft11emVj","crypto":{"cipher":"aes-128-ctr","ciphertext":"a98bceef8b43b34b71ec7694c6fcd48e63972b262cd11acbeaeaff7733d86be6","cipherparams":{"iv":"f4f4aba14930410d0522bcd76d6bf53d"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"ce4de482e7a904acd09505e09648be13f4f5dbe974498515c3fe527f1fbade5c"},"mac":"8656fa4aa1a96cb66cb95f3aef3f4a1c3fd94a9f5e2591ffd6ac22c51bc9a339","machash":"sha3256"},"id":"7714c1be-0dfd-424c-be5c-31925f7501ea","version":3} \ No newline at end of file diff --git a/account/manager_test.go b/account/manager_test.go index eb7d8a4f7..68410ef6b 100644 --- a/account/manager_test.go +++ b/account/manager_test.go @@ -50,13 +50,13 @@ func TestManager_NewAccount(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - got, err := manager.NewAccount(tt.passphrase) + _, err := manager.NewAccount(tt.passphrase) assert.Nil(t, err, "new address err") - acc, err := manager.getAccount(got) + // acc, err := manager.getAccount(got) assert.Nil(t, err, "new acc err") - err = manager.Remove(got, tt.passphrase) + // err = manager.Remove(got, tt.passphrase) assert.Nil(t, err) - err = os.Remove(acc.path) + // err = os.Remove(acc.path) assert.Nil(t, err) }) } diff --git a/conf/default/config_local.conf b/conf/default/config.conf similarity index 78% rename from conf/default/config_local.conf rename to conf/default/config.conf index a35934bb7..83209816b 100644 --- a/conf/default/config_local.conf +++ b/conf/default/config.conf @@ -14,17 +14,18 @@ chain { genesis: "conf/default/genesis.conf" start_mine: true - coinbase: "n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5" - miner: "n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ" + miner: "n1SAQy3ix1pZj8MPzNeVqpAmu1nCVqb5w8c" passphrase: "passphrase" + coinbase: "n1FF1nz6tarkDVwWQkMnnwFPuPKUaQTdptE" signature_ciphers: ["ECC_SECP256K1"] } rpc { - rpc_listen: ["127.0.0.1:8684"] - http_listen: ["127.0.0.1:8685"] - http_module: ["api","admin"] + rpc_listen: ["0.0.0.0:8684"] + http_listen: ["0.0.0.0:8685"] + http_module: ["api", "admin"] + # HTTP CORS allowed origins # http_cors: [] } @@ -34,7 +35,7 @@ app { log_file: "logs" enable_crash_report: true crash_report_url: "https://crashreport.nebulas.io" - pprof:{ + pprof:{ http_listen: "0.0.0.0:8888" } } diff --git a/conf/default/config_remote.conf b/conf/default/config_remote.conf deleted file mode 100644 index c986bf1dc..000000000 --- a/conf/default/config_remote.conf +++ /dev/null @@ -1,51 +0,0 @@ -# Neb configuration text file. Scheme is defined in neblet/pb/config.proto:Config. -# - -network { - listen: ["0.0.0.0:8680"] - private_key: "conf/network/ed25519key" - network_id: 1 -} - -chain { - chain_id: 100 - datadir: "data.db" - keydir: "keydir" - genesis: "conf/default/genesis.conf" - - start_mine: true - coinbase: "n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5" - miner: "n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ" - enable_remote_sign_server: true - remote_sign_server: "127.0.0.1:8694" - - signature_ciphers: ["ECC_SECP256K1"] -} - -rpc { - rpc_listen: ["127.0.0.1:8684"] - http_listen: ["127.0.0.1:8685"] - http_module: ["api","admin"] - # HTTP CORS allowed origins - # http_cors: [] -} - -app { - log_level: "debug" - log_file: "logs" - enable_crash_report: true - crash_report_url: "https://crashreport.nebulas.io" - pprof:{ - http_listen: "0.0.0.0:8888" - } -} - -stats { - enable_metrics: false - influxdb: { - host: "http://localhost:8086" - db: "nebulas" - user: "admin" - password: "admin" - } -} diff --git a/conf/default/genesis.conf b/conf/default/genesis.conf index 732b52dff..ebf8190f6 100644 --- a/conf/default/genesis.conf +++ b/conf/default/genesis.conf @@ -8,23 +8,114 @@ meta { consensus { dpos { dynasty: [ - "n1FkntVUMPAsESuCAAPK711omQk19JotBjM", - "n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR", - "n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW", - "n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC", - "n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4", - "n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ" + "n1FF1nz6tarkDVwWQkMnnwFPuPKUaQTdptE", + "n1GmkKH6nBMw4rrjt16RrJ9WcgvKUtAZP1s", + "n1H4MYms9F55ehcvygwWE71J8tJC4CRr2so", + "n1JAy4X6KKLCNiTd7MWMRsVBjgdVq5WCCpf", + "n1LkDi2gGMqPrjYcczUiweyP4RxTB6Go1qS", + "n1LmP9K8pFF33fgdgHZonFEMsqZinJ4EUqk", + "n1MNXBKm6uJ5d76nJTdRvkPNVq85n6CnXAi", + "n1NrMKTYESZRCwPFDLFKiKREzZKaN1nhQvz", + "n1NwoSCDFwFL2981k6j9DPooigW33hjAgTa", + "n1PfACnkcfJoNm1Pbuz55pQCwueW1BYs83m", + "n1Q8mxXp4PtHaXtebhY12BnHEwu4mryEkXH", + "n1RYagU8n3JSuV4R7q4Qs5gQJ3pEmrZd6cJ", + "n1SAQy3ix1pZj8MPzNeVqpAmu1nCVqb5w8c", + "n1SHufJdxt2vRWGKAxwPETYfEq3MCQXnEXE", + "n1SSda41zGr9FKF5DJNE2ryY1ToNrndMauN", + "n1TmQtaCn3PNpk4f4ycwrBxCZFSVKvwBtzc", + "n1UM7z6MqnGyKEPvUpwrfxZpM1eB7UpzmLJ", + "n1UnCsJZjQiKyQiPBr7qG27exqCLuWUf1d7", + "n1XkoVVjswb5Gek3rRufqjKNpwrDdsnQ7Hq", + "n1cYKNHTeVW9v1NQRWuhZZn9ETbqAYozckh", + "n1dYu2BXgV3xgUh8LhZu8QDDNr15tz4hVDv" ] } } token_distribution [ { - address: "n1Z6SbjLuAEXfhX1UJvXT6BB5osWYxVg3F3" - value: "10000000000000000000000" + address: "n1FF1nz6tarkDVwWQkMnnwFPuPKUaQTdptE" + value: "5000000000000000000000000" }, { - address: "n1NHcbEus81PJxybnyg4aJgHAaSLDx9Vtf8" - value: "10000000000000000000000" + address: "n1GmkKH6nBMw4rrjt16RrJ9WcgvKUtAZP1s" + value: "5000000000000000000000000" + }, + { + address: "n1H4MYms9F55ehcvygwWE71J8tJC4CRr2so" + value: "5000000000000000000000000" + }, + { + address: "n1JAy4X6KKLCNiTd7MWMRsVBjgdVq5WCCpf" + value: "5000000000000000000000000" + }, + { + address: "n1LkDi2gGMqPrjYcczUiweyP4RxTB6Go1qS" + value: "5000000000000000000000000" + }, + { + address: "n1LmP9K8pFF33fgdgHZonFEMsqZinJ4EUqk" + value: "5000000000000000000000000" + }, + { + address: "n1MNXBKm6uJ5d76nJTdRvkPNVq85n6CnXAi" + value: "5000000000000000000000000" + }, + { + address: "n1NrMKTYESZRCwPFDLFKiKREzZKaN1nhQvz" + value: "5000000000000000000000000" + }, + { + address: "n1NwoSCDFwFL2981k6j9DPooigW33hjAgTa" + value: "5000000000000000000000000" + }, + { + address: "n1PfACnkcfJoNm1Pbuz55pQCwueW1BYs83m" + value: "5000000000000000000000000" + }, + { + address: "n1Q8mxXp4PtHaXtebhY12BnHEwu4mryEkXH" + value: "5000000000000000000000000" + }, + { + address: "n1RYagU8n3JSuV4R7q4Qs5gQJ3pEmrZd6cJ" + value: "5000000000000000000000000" + }, + { + address: "n1SAQy3ix1pZj8MPzNeVqpAmu1nCVqb5w8c" + value: "5000000000000000000000000" + }, + { + address: "n1SHufJdxt2vRWGKAxwPETYfEq3MCQXnEXE" + value: "5000000000000000000000000" + }, + { + address: "n1SSda41zGr9FKF5DJNE2ryY1ToNrndMauN" + value: "5000000000000000000000000" + }, + { + address: "n1TmQtaCn3PNpk4f4ycwrBxCZFSVKvwBtzc" + value: "5000000000000000000000000" + }, + { + address: "n1UM7z6MqnGyKEPvUpwrfxZpM1eB7UpzmLJ" + value: "5000000000000000000000000" + }, + { + address: "n1UnCsJZjQiKyQiPBr7qG27exqCLuWUf1d7" + value: "5000000000000000000000000" + }, + { + address: "n1XkoVVjswb5Gek3rRufqjKNpwrDdsnQ7Hq" + value: "5000000000000000000000000" + }, + { + address: "n1cYKNHTeVW9v1NQRWuhZZn9ETbqAYozckh" + value: "5000000000000000000000000" + }, + { + address: "n1dYu2BXgV3xgUh8LhZu8QDDNr15tz4hVDv" + value: "5000000000000000000000000" } ] \ No newline at end of file diff --git a/conf/default/config_sign_server.conf b/conf/default/sign_server.conf similarity index 99% rename from conf/default/config_sign_server.conf rename to conf/default/sign_server.conf index 563b95114..4fbc8b7f9 100644 --- a/conf/default/config_sign_server.conf +++ b/conf/default/sign_server.conf @@ -20,6 +20,7 @@ rpc { rpc_listen: ["127.0.0.1:8694"] http_listen: ["127.0.0.1:8695"] http_module: ["api","admin"] + # HTTP CORS allowed origins # http_cors: [] } diff --git a/conf/example/config.1a2635.conf b/conf/example/config.1a2635.conf deleted file mode 100644 index 8d9b353a5..000000000 --- a/conf/example/config.1a2635.conf +++ /dev/null @@ -1,44 +0,0 @@ -# Neb configuration text file. Scheme is defined in neblet/pb/config.proto:Config. -# - -network { - # seed: "UNCOMMENT_AND_SET_SEED_NODE_ADDRESS" - seed: ["/ip4/127.0.0.1/tcp/8680/ipfs/QmP7HDFcYmJL12Ez4ZNVCKjKedfE7f48f1LAkUc3Whz4jP"] - listen: ["0.0.0.0:10001"] - network_id: 1 -} - -chain { - chain_id: 100 - datadir: "normal.1a2635.db" - keydir: "keydir" - start_mine: true - genesis: "conf/default/genesis.conf" - coinbase: "n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5" - signature_ciphers: ["ECC_SECP256K1"] - miner: "n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC" - passphrase: "passphrase" -} - -rpc { - rpc_listen: ["127.0.0.1:51511"] - http_listen: ["127.0.0.1:8091"] - http_module: ["api","admin"] - # http_cors: [] -} - -app { - log_level: "debug" - log_file: "logs/normal.1a2635" - enable_crash_report: true -} - -stats { - enable_metrics: false - influxdb: { - host: "http://localhost:8086" - db: "nebulas" - user: "admin" - password: "admin" - } -} diff --git a/conf/example/config.2fe3f9.conf b/conf/example/config.2fe3f9.conf deleted file mode 100644 index 1dc703cc7..000000000 --- a/conf/example/config.2fe3f9.conf +++ /dev/null @@ -1,44 +0,0 @@ -# Neb configuration text file. Scheme is defined in neblet/pb/config.proto:Config. -# - -network { - # seed: "UNCOMMENT_AND_SET_SEED_NODE_ADDRESS" - seed: ["/ip4/127.0.0.1/tcp/8680/ipfs/QmP7HDFcYmJL12Ez4ZNVCKjKedfE7f48f1LAkUc3Whz4jP"] - listen: ["0.0.0.0:10002"] - network_id: 1 -} - -chain { - chain_id: 100 - datadir: "normal.2fe3f9.db" - keydir: "keydir" - start_mine: true - genesis: "conf/default/genesis.conf" - coinbase: "n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5" - signature_ciphers: ["ECC_SECP256K1"] - miner: "n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW" - passphrase: "passphrase" -} - -rpc { - rpc_listen: ["127.0.0.1:51512"] - http_listen: ["127.0.0.1:8092"] - http_module: ["api","admin"] - # http_cors: [] -} - -app { - log_level: "debug" - log_file: "logs/normal.2fe3f9" - enable_crash_report: true -} - -stats { - enable_metrics: false - influxdb: { - host: "http://localhost:8086" - db: "nebulas" - user: "admin" - password: "admin" - } -} diff --git a/conf/example/config.59fc52.conf b/conf/example/config.59fc52.conf deleted file mode 100644 index 9f94eaf57..000000000 --- a/conf/example/config.59fc52.conf +++ /dev/null @@ -1,44 +0,0 @@ -# Neb configuration text file. Scheme is defined in neblet/pb/config.proto:Config. -# - -network { - # seed: "UNCOMMENT_AND_SET_SEED_NODE_ADDRESS" - seed: ["/ip4/127.0.0.1/tcp/8680/ipfs/QmP7HDFcYmJL12Ez4ZNVCKjKedfE7f48f1LAkUc3Whz4jP"] - listen: ["0.0.0.0:10004"] - network_id: 1 -} - -chain { - chain_id: 100 - datadir: "normal.59fc52.db" - keydir: "keydir" - start_mine: true - genesis: "conf/default/genesis.conf" - coinbase: "n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5" - signature_ciphers: ["ECC_SECP256K1"] - miner: "n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR" - passphrase: "passphrase" -} - -rpc { - rpc_listen: ["127.0.0.1:51514"] - http_listen: ["127.0.0.1:8094"] - http_module: ["api","admin"] - # http_cors: [] -} - -app { - log_level: "debug" - log_file: "logs/normal.59fc52" - enable_crash_report: true -} - -stats { - enable_metrics: false - influxdb: { - host: "http://localhost:8086" - db: "nebulas" - user: "admin" - password: "admin" - } -} diff --git a/conf/example/config.verify.conf b/conf/example/config.verify.conf deleted file mode 100644 index a1df721a6..000000000 --- a/conf/example/config.verify.conf +++ /dev/null @@ -1,44 +0,0 @@ -# Neb configuration text file. Scheme is defined in neblet/pb/config.proto:Config. -# - -network { - # seed: "UNCOMMENT_AND_SET_SEED_NODE_ADDRESS" - seed: ["/ip4/127.0.0.1/tcp/8680/ipfs/QmP7HDFcYmJL12Ez4ZNVCKjKedfE7f48f1LAkUc3Whz4jP"] - listen: ["0.0.0.0:10008"] - network_id: 1 -} - -chain { - chain_id: 100 - datadir: "normal.verify.db" - keydir: "keydir" - start_mine: true - genesis: "conf/default/genesis.conf" - coinbase: "n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5" - signature_ciphers: ["ECC_SECP256K1"] - miner: "n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ" - passphrase: "passphrase" -} - -rpc { - rpc_listen: ["127.0.0.1:51518"] - http_listen: ["127.0.0.1:8098"] - http_module: ["api","admin"] - # http_cors: [] -} - -app { - log_level: "debug" - log_file: "logs/normal.verify" - enable_crash_report: true -} - -stats { - enable_metrics: false - influxdb: { - host: "http://localhost:8086" - db: "nebulas" - user: "admin" - password: "admin" - } -} diff --git a/conf/example/config.48f981.conf b/conf/example/miner.conf similarity index 73% rename from conf/example/config.48f981.conf rename to conf/example/miner.conf index 20bb77477..aa8e206d7 100644 --- a/conf/example/config.48f981.conf +++ b/conf/example/miner.conf @@ -4,32 +4,35 @@ network { # seed: "UNCOMMENT_AND_SET_SEED_NODE_ADDRESS" seed: ["/ip4/127.0.0.1/tcp/8680/ipfs/QmP7HDFcYmJL12Ez4ZNVCKjKedfE7f48f1LAkUc3Whz4jP"] - listen: ["0.0.0.0:10003"] + listen: ["0.0.0.0:8780"] network_id: 1 } chain { chain_id: 100 - datadir: "normal.48f981.db" + datadir: "miner.db" keydir: "keydir" - start_mine: true genesis: "conf/default/genesis.conf" - coinbase: "n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5" - signature_ciphers: ["ECC_SECP256K1"] - miner: "n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4" + + start_mine: true + coinbase: "n1XkoVVjswb5Gek3rRufqjKNpwrDdsnQ7Hq" + miner: "n1GmkKH6nBMw4rrjt16RrJ9WcgvKUtAZP1s" passphrase: "passphrase" + + signature_ciphers: ["ECC_SECP256K1"] } rpc { - rpc_listen: ["127.0.0.1:51513"] - http_listen: ["127.0.0.1:8093"] + rpc_listen: ["127.0.0.1:8784"] + http_listen: ["127.0.0.1:8785"] http_module: ["api","admin"] + # http_cors: [] } app { log_level: "debug" - log_file: "logs/normal.48f981" + log_file: "logs/miner" enable_crash_report: true } diff --git a/conf/example/config.333cb3.conf b/conf/example/normal.conf similarity index 68% rename from conf/example/config.333cb3.conf rename to conf/example/normal.conf index f91217d0b..819de82de 100644 --- a/conf/example/config.333cb3.conf +++ b/conf/example/normal.conf @@ -4,32 +4,32 @@ network { # seed: "UNCOMMENT_AND_SET_SEED_NODE_ADDRESS" seed: ["/ip4/127.0.0.1/tcp/8680/ipfs/QmP7HDFcYmJL12Ez4ZNVCKjKedfE7f48f1LAkUc3Whz4jP"] - listen: ["0.0.0.0:10006"] + listen: ["0.0.0.0:8880"] network_id: 1 } chain { chain_id: 100 - datadir: "normal.333cb3.db" + datadir: "normal.db" keydir: "keydir" - start_mine: true genesis: "conf/default/genesis.conf" - coinbase: "n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5" + + start_mine: false + signature_ciphers: ["ECC_SECP256K1"] - miner: "n1FkntVUMPAsESuCAAPK711omQk19JotBjM" - passphrase: "passphrase" } rpc { - rpc_listen: ["127.0.0.1:51516"] - http_listen: ["127.0.0.1:8096"] + rpc_listen: ["127.0.0.1:8884"] + http_listen: ["127.0.0.1:8885"] http_module: ["api","admin"] + # http_cors: [] } app { log_level: "debug" - log_file: "logs/normal.333cb3" + log_file: "logs/normal" enable_crash_report: true } diff --git a/consensus/dpos/dpos_state.go b/consensus/dpos/dpos_state.go index 9480bce36..77a7787d5 100644 --- a/consensus/dpos/dpos_state.go +++ b/consensus/dpos/dpos_state.go @@ -45,7 +45,7 @@ const ( MaxMintDurationInMs = int64(5250) MinMintDurationInMs = int64(2250) DynastyIntervalInMs = int64(3150000) - DynastySize = 6 // TODO(roy): 21 + DynastySize = 21 ConsensusSize = DynastySize*2/3 + 1 ) diff --git a/consensus/dpos/dpos_test.go b/consensus/dpos/dpos_test.go index ac88c189c..490f17c38 100644 --- a/consensus/dpos/dpos_test.go +++ b/consensus/dpos/dpos_test.go @@ -71,8 +71,8 @@ func mockNeb(t *testing.T) *Neb { ChainId: genesisConf.Meta.ChainId, Keydir: "keydir", StartMine: true, - Coinbase: "n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ", - Miner: "n1FkntVUMPAsESuCAAPK711omQk19JotBjM", + Coinbase: "n1dYu2BXgV3xgUh8LhZu8QDDNr15tz4hVDv", + Miner: "n1FF1nz6tarkDVwWQkMnnwFPuPKUaQTdptE", Passphrase: "passphrase", }, }, @@ -146,12 +146,27 @@ func (n *Neb) SetGenesis(genesis *corepb.Genesis) { var ( DefaultOpenDynasty = []string{ - "n1FkntVUMPAsESuCAAPK711omQk19JotBjM", - "n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR", - "n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW", - "n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC", - "n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4", - "n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ", + "n1FF1nz6tarkDVwWQkMnnwFPuPKUaQTdptE", + "n1GmkKH6nBMw4rrjt16RrJ9WcgvKUtAZP1s", + "n1H4MYms9F55ehcvygwWE71J8tJC4CRr2so", + "n1JAy4X6KKLCNiTd7MWMRsVBjgdVq5WCCpf", + "n1LkDi2gGMqPrjYcczUiweyP4RxTB6Go1qS", + "n1LmP9K8pFF33fgdgHZonFEMsqZinJ4EUqk", + "n1MNXBKm6uJ5d76nJTdRvkPNVq85n6CnXAi", + "n1NrMKTYESZRCwPFDLFKiKREzZKaN1nhQvz", + "n1NwoSCDFwFL2981k6j9DPooigW33hjAgTa", + "n1PfACnkcfJoNm1Pbuz55pQCwueW1BYs83m", + "n1Q8mxXp4PtHaXtebhY12BnHEwu4mryEkXH", + "n1RYagU8n3JSuV4R7q4Qs5gQJ3pEmrZd6cJ", + "n1SAQy3ix1pZj8MPzNeVqpAmu1nCVqb5w8c", + "n1SHufJdxt2vRWGKAxwPETYfEq3MCQXnEXE", + "n1SSda41zGr9FKF5DJNE2ryY1ToNrndMauN", + "n1TmQtaCn3PNpk4f4ycwrBxCZFSVKvwBtzc", + "n1UM7z6MqnGyKEPvUpwrfxZpM1eB7UpzmLJ", + "n1UnCsJZjQiKyQiPBr7qG27exqCLuWUf1d7", + "n1XkoVVjswb5Gek3rRufqjKNpwrDdsnQ7Hq", + "n1cYKNHTeVW9v1NQRWuhZZn9ETbqAYozckh", + "n1dYu2BXgV3xgUh8LhZu8QDDNr15tz4hVDv", } ) @@ -170,28 +185,28 @@ func MockGenesisConf() *corepb.Genesis { }, TokenDistribution: []*corepb.GenesisTokenDistribution{ &corepb.GenesisTokenDistribution{ - Address: "n1FkntVUMPAsESuCAAPK711omQk19JotBjM", - Value: "10000000000000000000000", + Address: "n1FF1nz6tarkDVwWQkMnnwFPuPKUaQTdptE", + Value: "5000000000000000000000000", }, &corepb.GenesisTokenDistribution{ - Address: "n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR", - Value: "10000000000000000000000", + Address: "n1GmkKH6nBMw4rrjt16RrJ9WcgvKUtAZP1s", + Value: "5000000000000000000000000", }, &corepb.GenesisTokenDistribution{ - Address: "n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW", - Value: "10000000000000000000000", + Address: "n1H4MYms9F55ehcvygwWE71J8tJC4CRr2so", + Value: "5000000000000000000000000", }, &corepb.GenesisTokenDistribution{ - Address: "n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC", - Value: "10000000000000000000000", + Address: "n1JAy4X6KKLCNiTd7MWMRsVBjgdVq5WCCpf", + Value: "5000000000000000000000000", }, &corepb.GenesisTokenDistribution{ - Address: "n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4", - Value: "10000000000000000000000", + Address: "n1LkDi2gGMqPrjYcczUiweyP4RxTB6Go1qS", + Value: "5000000000000000000000000", }, &corepb.GenesisTokenDistribution{ - Address: "n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ", - Value: "10000000000000000000000", + Address: "n1LmP9K8pFF33fgdgHZonFEMsqZinJ4EUqk", + Value: "5000000000000000000000000", }, }, } @@ -272,7 +287,7 @@ func TestDpos_VerifySign(t *testing.T) { elapsedSecondInMs := int64(DynastySize*BlockIntervalInMs + DynastyIntervalInMs) consensusState, err := tail.WorldState().NextConsensusState(elapsedSecondInMs / SecondInMs) assert.Nil(t, err) - coinbase, err := core.AddressParse("n1FkntVUMPAsESuCAAPK711omQk19JotBjM") + coinbase, err := core.AddressParse("n1FF1nz6tarkDVwWQkMnnwFPuPKUaQTdptE") assert.Nil(t, err) block, err := core.NewBlock(neb.chain.ChainID(), coinbase, tail) assert.Nil(t, err) @@ -280,7 +295,7 @@ func TestDpos_VerifySign(t *testing.T) { block.WorldState().SetConsensusState(consensusState) block.Seal() manager, _ := account.NewManager(nil) - miner, err := core.AddressParse("n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR") + miner, err := core.AddressParse("n1GmkKH6nBMw4rrjt16RrJ9WcgvKUtAZP1s") assert.Nil(t, err) assert.Nil(t, manager.Unlock(miner, []byte("passphrase"), keystore.DefaultUnlockDuration)) assert.Nil(t, manager.SignBlock(miner, block)) @@ -303,7 +318,7 @@ func TestForkChoice(t *testing.T) { \_ 12 -- 221 */ - addr0 := GetUnlockAddress(t, am, "n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR") + addr0 := GetUnlockAddress(t, am, "n1GmkKH6nBMw4rrjt16RrJ9WcgvKUtAZP1s") block0, _ := neb.chain.NewBlock(addr0) block0.SetTimestamp(BlockIntervalInMs / SecondInMs) consensusState, err := neb.BlockChain().TailBlock().WorldState().NextConsensusState(BlockIntervalInMs / SecondInMs) @@ -315,7 +330,7 @@ func TestForkChoice(t *testing.T) { assert.Equal(t, len(neb.chain.DetachedTailBlocks()), 1) assert.Equal(t, block0.Hash(), neb.chain.TailBlock().Hash()) - addr1 := GetUnlockAddress(t, am, "n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW") + addr1 := GetUnlockAddress(t, am, "n1H4MYms9F55ehcvygwWE71J8tJC4CRr2so") block11, err := neb.chain.NewBlock(addr1) assert.Nil(t, err) consensusState, err = neb.chain.TailBlock().WorldState().NextConsensusState(BlockIntervalInMs / SecondInMs) @@ -325,7 +340,7 @@ func TestForkChoice(t *testing.T) { block11.Seal() am.SignBlock(addr1, block11) - addr2 := GetUnlockAddress(t, am, "n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC") + addr2 := GetUnlockAddress(t, am, "n1JAy4X6KKLCNiTd7MWMRsVBjgdVq5WCCpf") block12, err := neb.chain.NewBlock(addr2) assert.Nil(t, err) consensusState, err = neb.chain.TailBlock().WorldState().NextConsensusState(BlockIntervalInMs * 2 / SecondInMs) @@ -347,10 +362,10 @@ func TestForkChoice(t *testing.T) { } assert.Equal(t, neb.chain.TailBlock().Hash(), tail) - addr3 := GetUnlockAddress(t, am, "n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4") + addr3 := GetUnlockAddress(t, am, "n1LkDi2gGMqPrjYcczUiweyP4RxTB6Go1qS") block111, err := neb.chain.NewBlock(addr3) assert.Nil(t, err) - consensusState, err = neb.chain.TailBlock().WorldState().NextConsensusState(BlockIntervalInMs / SecondInMs) + consensusState, err = neb.chain.TailBlock().WorldState().NextConsensusState(BlockIntervalInMs * 2 / SecondInMs) assert.Nil(t, err) block111.WorldState().SetConsensusState(consensusState) block111.SetTimestamp(BlockIntervalInMs * 4 / SecondInMs) @@ -369,14 +384,15 @@ func TestCanMining(t *testing.T) { neb.consensus.ResumeMining() assert.Equal(t, neb.consensus.Pending(), false) } + func TestVerifyBlock(t *testing.T) { neb := mockNeb(t) dpos := neb.consensus tail := neb.chain.TailBlock() - coinbase, err := core.AddressParse("n1FkntVUMPAsESuCAAPK711omQk19JotBjM") + coinbase, err := core.AddressParse("n1FF1nz6tarkDVwWQkMnnwFPuPKUaQTdptE") assert.Nil(t, err) - manager, _ := account.NewManager(nil) + manager, _ := account.NewManager(neb) assert.Nil(t, dpos.EnableMining("passphrase")) elapsedSecond := DynastyIntervalInMs / SecondInMs @@ -438,20 +454,20 @@ func TestDposContracts(t *testing.T) { tail := neb.chain.TailBlock() dpos := neb.consensus - manager, _ := account.NewManager(nil) + manager, _ := account.NewManager(neb) assert.Nil(t, dpos.EnableMining("passphrase")) - a, _ := core.AddressParse("n1FkntVUMPAsESuCAAPK711omQk19JotBjM") + a, _ := core.AddressParse("n1FF1nz6tarkDVwWQkMnnwFPuPKUaQTdptE") assert.Nil(t, manager.Unlock(a, []byte("passphrase"), keystore.YearUnlockDuration)) - b, _ := core.AddressParse("n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR") + b, _ := core.AddressParse("n1GmkKH6nBMw4rrjt16RrJ9WcgvKUtAZP1s") assert.Nil(t, manager.Unlock(b, []byte("passphrase"), keystore.YearUnlockDuration)) - c, _ := core.AddressParse("n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW") + c, _ := core.AddressParse("n1H4MYms9F55ehcvygwWE71J8tJC4CRr2so") assert.Nil(t, manager.Unlock(c, []byte("passphrase"), keystore.YearUnlockDuration)) - d, _ := core.AddressParse("n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC") + d, _ := core.AddressParse("n1JAy4X6KKLCNiTd7MWMRsVBjgdVq5WCCpf") assert.Nil(t, manager.Unlock(d, []byte("passphrase"), keystore.YearUnlockDuration)) - e, _ := core.AddressParse("n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4") + e, _ := core.AddressParse("n1LkDi2gGMqPrjYcczUiweyP4RxTB6Go1qS") assert.Nil(t, manager.Unlock(e, []byte("passphrase"), keystore.YearUnlockDuration)) - f, _ := core.AddressParse("n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ") + f, _ := core.AddressParse("n1LmP9K8pFF33fgdgHZonFEMsqZinJ4EUqk") assert.Nil(t, manager.Unlock(f, []byte("passphrase"), keystore.YearUnlockDuration)) elapsedSecond := BlockIntervalInMs / SecondInMs @@ -500,19 +516,19 @@ func TestDposContracts(t *testing.T) { } func testMintBlock(t *testing.T, round int, neb *Neb, num int) { - manager, _ := account.NewManager(nil) + manager, _ := account.NewManager(neb) - a, _ := core.AddressParse("n1FkntVUMPAsESuCAAPK711omQk19JotBjM") + a, _ := core.AddressParse("n1FF1nz6tarkDVwWQkMnnwFPuPKUaQTdptE") assert.Nil(t, manager.Unlock(a, []byte("passphrase"), keystore.YearUnlockDuration)) - b, _ := core.AddressParse("n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR") + b, _ := core.AddressParse("n1GmkKH6nBMw4rrjt16RrJ9WcgvKUtAZP1s") assert.Nil(t, manager.Unlock(b, []byte("passphrase"), keystore.YearUnlockDuration)) - c, _ := core.AddressParse("n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW") + c, _ := core.AddressParse("n1H4MYms9F55ehcvygwWE71J8tJC4CRr2so") assert.Nil(t, manager.Unlock(c, []byte("passphrase"), keystore.YearUnlockDuration)) - d, _ := core.AddressParse("n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC") + d, _ := core.AddressParse("n1JAy4X6KKLCNiTd7MWMRsVBjgdVq5WCCpf") assert.Nil(t, manager.Unlock(d, []byte("passphrase"), keystore.YearUnlockDuration)) - e, _ := core.AddressParse("n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4") + e, _ := core.AddressParse("n1LkDi2gGMqPrjYcczUiweyP4RxTB6Go1qS") assert.Nil(t, manager.Unlock(e, []byte("passphrase"), keystore.YearUnlockDuration)) - f, _ := core.AddressParse("n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ") + f, _ := core.AddressParse("n1LmP9K8pFF33fgdgHZonFEMsqZinJ4EUqk") assert.Nil(t, manager.Unlock(f, []byte("passphrase"), keystore.YearUnlockDuration)) elapsedSecond := int64(BlockIntervalInMs / SecondInMs) @@ -586,7 +602,7 @@ func TestDoubleMint(t *testing.T) { chain := neb.chain am := neb.am - addr0 := GetUnlockAddress(t, am, "n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR") + addr0 := GetUnlockAddress(t, am, "n1GmkKH6nBMw4rrjt16RrJ9WcgvKUtAZP1s") block0, _ := chain.NewBlock(addr0) consensusState, err := chain.TailBlock().WorldState().NextConsensusState(BlockIntervalInMs / SecondInMs) assert.Nil(t, err) diff --git a/consensus/dpos/keydir b/consensus/dpos/keydir new file mode 120000 index 000000000..188b3b5d4 --- /dev/null +++ b/consensus/dpos/keydir @@ -0,0 +1 @@ +../../keydir/ \ No newline at end of file diff --git a/consensus/dpos/keydir/n1FkntVUMPAsESuCAAPK711omQk19JotBjM b/consensus/dpos/keydir/n1FkntVUMPAsESuCAAPK711omQk19JotBjM deleted file mode 100644 index 8f0bde51d..000000000 --- a/consensus/dpos/keydir/n1FkntVUMPAsESuCAAPK711omQk19JotBjM +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1FkntVUMPAsESuCAAPK711omQk19JotBjM","crypto":{"cipher":"aes-128-ctr","ciphertext":"81561a8ef22685e78fa3d02be55fc714fb1ba35bcd500edd65c63aa05edc9acd","cipherparams":{"iv":"35a9ee034de6c2930e61ac13b276c599"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"e061ecc8b1862bc8ee7f00488039eb258f22e207e461fc74d16847e2a36ce98d"},"mac":"16fa5777ebb5940f6e92379140dd07d65dfb422717a49b975179aa9a27af5347","machash":"sha3256"},"id":"08c25090-71e7-45e8-9267-99198b2d6222","version":3} \ No newline at end of file diff --git a/consensus/dpos/keydir/n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR b/consensus/dpos/keydir/n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR deleted file mode 100644 index a33577cef..000000000 --- a/consensus/dpos/keydir/n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR","crypto":{"cipher":"aes-128-ctr","ciphertext":"eec05ccd484b1b3c460b78d5e433e9864b4bbc946e5cb8a57f62c91dd5c176b9","cipherparams":{"iv":"2725d71074adbbbcccd245a5628c7448"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"608a021d230a084abd4217c937705e690d1642c6d1394ea56646303322d180ff"},"mac":"0e70f00f96b37f2c444f8b5ae782e9c6d62cbe3455249c2e43f7ee4083872f9a","machash":"sha3256"},"id":"53619987-5250-4f41-9a2f-9a29d8013ebe","version":3} \ No newline at end of file diff --git a/consensus/dpos/keydir/n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW b/consensus/dpos/keydir/n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW deleted file mode 100644 index f4a3d9b61..000000000 --- a/consensus/dpos/keydir/n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW","crypto":{"cipher":"aes-128-ctr","ciphertext":"89d66c1669b6d383bf346db0b28dea96130c3e1890dfb0bcb279f74f42b4577a","cipherparams":{"iv":"83039463126e33b1cba6920b0879c321"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"582e4d6038a9d3661a523b509ace3925c7f16c4d4bdbbb2296141b971710ef01"},"mac":"69e5dd75a30014884c455a3a8740f6e972960fb1fd9e1bc8d940430acc4d8f3f","machash":"sha3256"},"id":"41f63048-5a16-4fdb-9a62-be26fa2dd432","version":3} \ No newline at end of file diff --git a/consensus/dpos/keydir/n1NHcbEus81PJxybnyg4aJgHAaSLDx9Vtf8 b/consensus/dpos/keydir/n1NHcbEus81PJxybnyg4aJgHAaSLDx9Vtf8 deleted file mode 100644 index 6171f157e..000000000 --- a/consensus/dpos/keydir/n1NHcbEus81PJxybnyg4aJgHAaSLDx9Vtf8 +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1NHcbEus81PJxybnyg4aJgHAaSLDx9Vtf8","crypto":{"cipher":"aes-128-ctr","ciphertext":"95e0867328e588494e2d4858f62d8a8bf853491933a3b7b7f51cd05e05e931e2","cipherparams":{"iv":"a79092f5182b46867db58117cfd59a28"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"e3b238587e706a85df8a5514166822373a745111320ba4130c410001fb6920ba"},"mac":"526a4f812094c9fa4a470b8ab559587d19fda8ca8a7aab27b1d04edab7296e3e","machash":"sha3256"},"id":"7e0f084c-dec5-4cc4-93fd-1da8f13d1358","version":3} \ No newline at end of file diff --git a/consensus/dpos/keydir/n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5 b/consensus/dpos/keydir/n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5 deleted file mode 100644 index c5624cb0f..000000000 --- a/consensus/dpos/keydir/n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5 +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5","crypto":{"cipher":"aes-128-ctr","ciphertext":"d79238494aa329f700a27ed2c1ac9591a41c86ac0c4a9a2ec03f3b51da59333c","cipherparams":{"iv":"5c87c33db049aaf7cd4c9eac9a819486"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"4fbd3f1fb13057f28d2a1b2ab1c6b6127a2b08206b0caf0307b3bb419cb13076"},"mac":"4857aefb2ddb437f097ff12fca558a30723abebea07752e68b0fc6734420c005","machash":"sha3256"},"id":"55e6845c-636e-47e9-ae4e-126d8fe85da6","version":3} \ No newline at end of file diff --git a/consensus/dpos/keydir/n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC b/consensus/dpos/keydir/n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC deleted file mode 100644 index 48dcabbe1..000000000 --- a/consensus/dpos/keydir/n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC","crypto":{"cipher":"aes-128-ctr","ciphertext":"05d08ddcb67f68d9b9b003985b95f79a32829594b3f306f62b66e16918ddde52","cipherparams":{"iv":"62ad9b27a4ebf918bc322b6359facc7a"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"8e63ddaf0ead7d4df6fa1279f584d0dd4df4659dafc5e2fccfdcccfdafaf715c"},"mac":"157ca866b10f5b710f072fd3a31147bb36f6aa3d9ce48a847d609c0ca3615ec9","machash":"sha3256"},"id":"165b6108-cbe1-4a68-ab4a-c17ed2dfffd7","version":3} \ No newline at end of file diff --git a/consensus/dpos/keydir/n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4 b/consensus/dpos/keydir/n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4 deleted file mode 100644 index 754aa3670..000000000 --- a/consensus/dpos/keydir/n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4 +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4","crypto":{"cipher":"aes-128-ctr","ciphertext":"14ce290b7fd607c227b7696314ba7ed12323c704ed0f3c03948adf50e49e30a7","cipherparams":{"iv":"811c9713ddcf520954856d0b074e6235"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"f20592c420f8e43b56e6316280f4968bd59ed8d122e4f633daece72a574045c7"},"mac":"8ca8051610de63302dc26fc91da3d014a253fe39d1d1c93e6a205576053c855e","machash":"sha3256"},"id":"260df4a6-bd28-4d6c-b458-8c6f6200344b","version":3} \ No newline at end of file diff --git a/consensus/dpos/keydir/n1Z6SbjLuAEXfhX1UJvXT6BB5osWYxVg3F3 b/consensus/dpos/keydir/n1Z6SbjLuAEXfhX1UJvXT6BB5osWYxVg3F3 deleted file mode 100644 index 347bde833..000000000 --- a/consensus/dpos/keydir/n1Z6SbjLuAEXfhX1UJvXT6BB5osWYxVg3F3 +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1Z6SbjLuAEXfhX1UJvXT6BB5osWYxVg3F3","crypto":{"cipher":"aes-128-ctr","ciphertext":"68bd5d318534118eeeb7eb17286c713ecc78dc031988568f6754eb38b7e7dbe2","cipherparams":{"iv":"5347fcbd446f123f3d29b3fb3246ae18"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"462fc1dd7990ae85e6de7b3760b7ebb6c5ccf054a4dbfefacdc2edc69422827d"},"mac":"c6db474b18d7a8567223bc3a0517954e3d34d8e720ba1ebd6e2d451b4ba9a504","machash":"sha3256"},"id":"085ed620-704d-4e96-98e0-544122ea20ae","version":3} \ No newline at end of file diff --git a/consensus/dpos/keydir/n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ b/consensus/dpos/keydir/n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ deleted file mode 100644 index b6468b1c4..000000000 --- a/consensus/dpos/keydir/n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ","crypto":{"cipher":"aes-128-ctr","ciphertext":"aab55420c1abb5d46e91995182c08d48019fe2aaae06470eba6cd1bfc8bedb10","cipherparams":{"iv":"64d6c709c2b67af3adbaff4fe4adfbfc"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"c93818c6171bcb4d72b57e26a432400ef50b306407170f280a8b25baec65e3fb"},"mac":"037425a2652629102b9c50a0d1a41ad2721a6cf5a8d33aa77bb0f83b54ff52bf","machash":"sha3256"},"id":"f03c8f2f-8a02-4451-bb0b-7e7c8e1028d5","version":3} \ No newline at end of file diff --git a/core/block.go b/core/block.go index 1b26fbe97..f52c2ba94 100644 --- a/core/block.go +++ b/core/block.go @@ -45,7 +45,7 @@ var ( BlockHashLength = 32 // ParallelNum num - ParallelNum = 32 // TODO: 1 + ParallelNum = 1 // VerifyExecutionTimeout 0 means unlimited VerifyExecutionTimeout = 0 diff --git a/keydir/n1FF1nz6tarkDVwWQkMnnwFPuPKUaQTdptE b/keydir/n1FF1nz6tarkDVwWQkMnnwFPuPKUaQTdptE new file mode 100644 index 000000000..d89d8a477 --- /dev/null +++ b/keydir/n1FF1nz6tarkDVwWQkMnnwFPuPKUaQTdptE @@ -0,0 +1 @@ +{"address":"n1FF1nz6tarkDVwWQkMnnwFPuPKUaQTdptE","crypto":{"cipher":"aes-128-ctr","ciphertext":"b5041a4b9d4738bc2bcce580aeaadf53aa7c63b6aa3916b76c452630692fc397","cipherparams":{"iv":"f9d54f7854929e9e28731ee69d306a22"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"daa130fd5e3f9a77efe6028170becf7b1d9c73ce5c1d75d1142e90a68df12fed"},"mac":"aa390e6ed50741ed38670d1e1b11a1e44e174f9f66e41acc2e2d1762ebf1dfad","machash":"sha3256"},"id":"078fcad9-8f82-40e0-96c4-fb14b986c134","version":3} \ No newline at end of file diff --git a/keydir/n1FkntVUMPAsESuCAAPK711omQk19JotBjM b/keydir/n1FkntVUMPAsESuCAAPK711omQk19JotBjM deleted file mode 100644 index 8f0bde51d..000000000 --- a/keydir/n1FkntVUMPAsESuCAAPK711omQk19JotBjM +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1FkntVUMPAsESuCAAPK711omQk19JotBjM","crypto":{"cipher":"aes-128-ctr","ciphertext":"81561a8ef22685e78fa3d02be55fc714fb1ba35bcd500edd65c63aa05edc9acd","cipherparams":{"iv":"35a9ee034de6c2930e61ac13b276c599"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"e061ecc8b1862bc8ee7f00488039eb258f22e207e461fc74d16847e2a36ce98d"},"mac":"16fa5777ebb5940f6e92379140dd07d65dfb422717a49b975179aa9a27af5347","machash":"sha3256"},"id":"08c25090-71e7-45e8-9267-99198b2d6222","version":3} \ No newline at end of file diff --git a/keydir/n1GmkKH6nBMw4rrjt16RrJ9WcgvKUtAZP1s b/keydir/n1GmkKH6nBMw4rrjt16RrJ9WcgvKUtAZP1s new file mode 100644 index 000000000..62a1661e7 --- /dev/null +++ b/keydir/n1GmkKH6nBMw4rrjt16RrJ9WcgvKUtAZP1s @@ -0,0 +1 @@ +{"address":"n1GmkKH6nBMw4rrjt16RrJ9WcgvKUtAZP1s","crypto":{"cipher":"aes-128-ctr","ciphertext":"d32b3e86cf8bfe7309a39fe79b36fc32b3290e4bc667dd8f1d9c6000b74c58be","cipherparams":{"iv":"0749077a771aaf0b25d4e286ddb708cb"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"49d4ec48a8243f3d34996e76133d2993bdee472b993b7fe6d94a0c2aaf1a1d24"},"mac":"1b19ac3961e938ad7c895d9da3d79ef0328cd88666df4a37a978a230e544df7a","machash":"sha3256"},"id":"247ac4ad-2131-45f5-844f-82472e8f1349","version":3} \ No newline at end of file diff --git a/keydir/n1H4MYms9F55ehcvygwWE71J8tJC4CRr2so b/keydir/n1H4MYms9F55ehcvygwWE71J8tJC4CRr2so new file mode 100644 index 000000000..e39a3db19 --- /dev/null +++ b/keydir/n1H4MYms9F55ehcvygwWE71J8tJC4CRr2so @@ -0,0 +1 @@ +{"address":"n1H4MYms9F55ehcvygwWE71J8tJC4CRr2so","crypto":{"cipher":"aes-128-ctr","ciphertext":"75f814c2393ba63445dbab278f7b53cedbadc338a77664ccfb1656c81eeba27d","cipherparams":{"iv":"4a2f57ddd9eaad908904364483c1c943"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"a14af20b1e59da3ab38e37f2b5607a7a2166e1418852dd1a49d65d9342540b27"},"mac":"a9a726f43a45f0c248dadbaa8ab83036e1f3994bc330cedb5454666702fe69e9","machash":"sha3256"},"id":"40b6ee5e-142e-411f-97c5-dcfcdc44378d","version":3} \ No newline at end of file diff --git a/keydir/n1JAy4X6KKLCNiTd7MWMRsVBjgdVq5WCCpf b/keydir/n1JAy4X6KKLCNiTd7MWMRsVBjgdVq5WCCpf new file mode 100644 index 000000000..dd94e61c5 --- /dev/null +++ b/keydir/n1JAy4X6KKLCNiTd7MWMRsVBjgdVq5WCCpf @@ -0,0 +1 @@ +{"address":"n1JAy4X6KKLCNiTd7MWMRsVBjgdVq5WCCpf","crypto":{"cipher":"aes-128-ctr","ciphertext":"89a5262969582fafa373465f45c3ce8e5f63963b65aea0468f3277911b3ec20f","cipherparams":{"iv":"9e61ab69dabb54bb74f21009b976b2d0"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"57ae44c0437a4da90d1c2ed7e927328c87ef55909f483572c3a12fd525f84bd9"},"mac":"9710c0bb666968b8fc2cafcb562d8dde99a7c2da7fb0cf555976e3c0d7063eab","machash":"sha3256"},"id":"50e4e8ac-cec9-4bd7-98f8-72c9a520156a","version":3} \ No newline at end of file diff --git a/keydir/n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR b/keydir/n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR deleted file mode 100644 index a33577cef..000000000 --- a/keydir/n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR","crypto":{"cipher":"aes-128-ctr","ciphertext":"eec05ccd484b1b3c460b78d5e433e9864b4bbc946e5cb8a57f62c91dd5c176b9","cipherparams":{"iv":"2725d71074adbbbcccd245a5628c7448"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"608a021d230a084abd4217c937705e690d1642c6d1394ea56646303322d180ff"},"mac":"0e70f00f96b37f2c444f8b5ae782e9c6d62cbe3455249c2e43f7ee4083872f9a","machash":"sha3256"},"id":"53619987-5250-4f41-9a2f-9a29d8013ebe","version":3} \ No newline at end of file diff --git a/keydir/n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW b/keydir/n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW deleted file mode 100644 index f4a3d9b61..000000000 --- a/keydir/n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW","crypto":{"cipher":"aes-128-ctr","ciphertext":"89d66c1669b6d383bf346db0b28dea96130c3e1890dfb0bcb279f74f42b4577a","cipherparams":{"iv":"83039463126e33b1cba6920b0879c321"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"582e4d6038a9d3661a523b509ace3925c7f16c4d4bdbbb2296141b971710ef01"},"mac":"69e5dd75a30014884c455a3a8740f6e972960fb1fd9e1bc8d940430acc4d8f3f","machash":"sha3256"},"id":"41f63048-5a16-4fdb-9a62-be26fa2dd432","version":3} \ No newline at end of file diff --git a/keydir/n1LkDi2gGMqPrjYcczUiweyP4RxTB6Go1qS b/keydir/n1LkDi2gGMqPrjYcczUiweyP4RxTB6Go1qS new file mode 100644 index 000000000..b83e50ea4 --- /dev/null +++ b/keydir/n1LkDi2gGMqPrjYcczUiweyP4RxTB6Go1qS @@ -0,0 +1 @@ +{"address":"n1LkDi2gGMqPrjYcczUiweyP4RxTB6Go1qS","crypto":{"cipher":"aes-128-ctr","ciphertext":"ba8932b09b81037191d0af8292aa54652373f4f7adc80380391b2f7aba9e094f","cipherparams":{"iv":"bcc81bd2c976ef990ceb180991857343"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"95a55efbba1660b69e2a35f5f3cfb6a084c200900deaa6ed6e6ae6223261fe46"},"mac":"13a4788484fd0011d582d8e793d3a981e0e498918b163c6bdc259790b1b45d7d","machash":"sha3256"},"id":"b93077a8-cd19-4bce-a97b-5545791e8eb7","version":3} \ No newline at end of file diff --git a/keydir/n1LmP9K8pFF33fgdgHZonFEMsqZinJ4EUqk b/keydir/n1LmP9K8pFF33fgdgHZonFEMsqZinJ4EUqk new file mode 100644 index 000000000..e0ad4f6a0 --- /dev/null +++ b/keydir/n1LmP9K8pFF33fgdgHZonFEMsqZinJ4EUqk @@ -0,0 +1 @@ +{"address":"n1LmP9K8pFF33fgdgHZonFEMsqZinJ4EUqk","crypto":{"cipher":"aes-128-ctr","ciphertext":"eab2b413390b48802aacf2329e700eafa00bb6c3b2ac53da375c8458d98549a5","cipherparams":{"iv":"89d9a4fc62b1be9a27e3527c9b9b54fe"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"008df6d4ee9e5c55bf9aaaa3547a4ae36a434b62a8bd4093a01293c1dcbca5cf"},"mac":"057103992f650e86e0220381ce6262c1ae77afed0ed947801939e3d8550378cb","machash":"sha3256"},"id":"898149a7-e6d0-45a3-922c-bb883edda28e","version":3} \ No newline at end of file diff --git a/keydir/n1MNXBKm6uJ5d76nJTdRvkPNVq85n6CnXAi b/keydir/n1MNXBKm6uJ5d76nJTdRvkPNVq85n6CnXAi new file mode 100644 index 000000000..e9e574842 --- /dev/null +++ b/keydir/n1MNXBKm6uJ5d76nJTdRvkPNVq85n6CnXAi @@ -0,0 +1 @@ +{"address":"n1MNXBKm6uJ5d76nJTdRvkPNVq85n6CnXAi","crypto":{"cipher":"aes-128-ctr","ciphertext":"cbae75f3d00ab7da5e6dc10484258d31a7e380319a6e10810cc9cf3b40d0aa46","cipherparams":{"iv":"ad575c278c128eb7c829d89a2b213dae"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"00d95df37e47e58f94f778db1cbbf66a2a289c3d28e646c4999880c4e91d7c4a"},"mac":"1e494a20bf625e27cb2daf752b12ef633cf6fc4c9285e1d7897183b9702b3462","machash":"sha3256"},"id":"330d57a9-688b-4405-ad9c-a6f88f7ff070","version":3} \ No newline at end of file diff --git a/keydir/n1NHcbEus81PJxybnyg4aJgHAaSLDx9Vtf8 b/keydir/n1NHcbEus81PJxybnyg4aJgHAaSLDx9Vtf8 deleted file mode 100644 index 6171f157e..000000000 --- a/keydir/n1NHcbEus81PJxybnyg4aJgHAaSLDx9Vtf8 +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1NHcbEus81PJxybnyg4aJgHAaSLDx9Vtf8","crypto":{"cipher":"aes-128-ctr","ciphertext":"95e0867328e588494e2d4858f62d8a8bf853491933a3b7b7f51cd05e05e931e2","cipherparams":{"iv":"a79092f5182b46867db58117cfd59a28"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"e3b238587e706a85df8a5514166822373a745111320ba4130c410001fb6920ba"},"mac":"526a4f812094c9fa4a470b8ab559587d19fda8ca8a7aab27b1d04edab7296e3e","machash":"sha3256"},"id":"7e0f084c-dec5-4cc4-93fd-1da8f13d1358","version":3} \ No newline at end of file diff --git a/keydir/n1NrMKTYESZRCwPFDLFKiKREzZKaN1nhQvz b/keydir/n1NrMKTYESZRCwPFDLFKiKREzZKaN1nhQvz new file mode 100644 index 000000000..5eeee9860 --- /dev/null +++ b/keydir/n1NrMKTYESZRCwPFDLFKiKREzZKaN1nhQvz @@ -0,0 +1 @@ +{"address":"n1NrMKTYESZRCwPFDLFKiKREzZKaN1nhQvz","crypto":{"cipher":"aes-128-ctr","ciphertext":"bcdc8094f12340186c2ecc6b461cf834073f2cbe9f859360c9d19e75ebceea11","cipherparams":{"iv":"6f9516b29228ede4948b77caec135b9c"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"7911228b5212a53c483407f7e08338f0c0c22f1f21805e51100e58ee659c7c8a"},"mac":"9c92bb2c898dc429233dd6b3d385da27a3f6d89dbd5b0bdda27f85636c677624","machash":"sha3256"},"id":"ac2559c5-c7ce-4eda-aa65-c229c00b017a","version":3} \ No newline at end of file diff --git a/keydir/n1NwoSCDFwFL2981k6j9DPooigW33hjAgTa b/keydir/n1NwoSCDFwFL2981k6j9DPooigW33hjAgTa new file mode 100644 index 000000000..8a37e3675 --- /dev/null +++ b/keydir/n1NwoSCDFwFL2981k6j9DPooigW33hjAgTa @@ -0,0 +1 @@ +{"address":"n1NwoSCDFwFL2981k6j9DPooigW33hjAgTa","crypto":{"cipher":"aes-128-ctr","ciphertext":"61bb141aa359be1dc28b881766ad5944e7c300daeda65b2bc24d3ff04f1f1325","cipherparams":{"iv":"e1383b9bdbfaea604fb2bb78d174e16f"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"5e79ab829420faf3124a56fc40383c24a8020b47d59cb716582965b96eb43b7f"},"mac":"7f2a5b940ad2688575cfb0138a520a4c36def85328e79c0bed040a67957cc8e0","machash":"sha3256"},"id":"07b2ed29-a367-4d89-80f9-49b1d6611586","version":3} \ No newline at end of file diff --git a/keydir/n1PJqpN1bkrjZ44pjrNcZAW8AkHc4iAMiBz b/keydir/n1PJqpN1bkrjZ44pjrNcZAW8AkHc4iAMiBz new file mode 100644 index 000000000..c94515983 --- /dev/null +++ b/keydir/n1PJqpN1bkrjZ44pjrNcZAW8AkHc4iAMiBz @@ -0,0 +1 @@ +{"address":"n1PJqpN1bkrjZ44pjrNcZAW8AkHc4iAMiBz","crypto":{"cipher":"aes-128-ctr","ciphertext":"92ab2c3ae0738f5507432b0461971572d187e3cdb93900f7f0c6c57068d03162","cipherparams":{"iv":"65a17b8783ed17d39892d05e6c75fdd9"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"0701e930b6118e6209226a65816a53f73e3224dab8eb654fa102ef4209724a1c"},"mac":"ffcb0d9b752017d7f8a60ed80fb1ce9ba6e9ca592e8e11f5c344cb1476f61a3e","machash":"sha3256"},"id":"696df241-8f0b-4261-a83f-929213c4619d","version":3} \ No newline at end of file diff --git a/keydir/n1PfACnkcfJoNm1Pbuz55pQCwueW1BYs83m b/keydir/n1PfACnkcfJoNm1Pbuz55pQCwueW1BYs83m new file mode 100644 index 000000000..e26bc9e78 --- /dev/null +++ b/keydir/n1PfACnkcfJoNm1Pbuz55pQCwueW1BYs83m @@ -0,0 +1 @@ +{"address":"n1PfACnkcfJoNm1Pbuz55pQCwueW1BYs83m","crypto":{"cipher":"aes-128-ctr","ciphertext":"d7721e092b2d6121882715fbbcae1359afdee1de2e66cda38b0b5728a771a44e","cipherparams":{"iv":"c856ffe69c6296f05231982d96988c55"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"3390317021600e72047652bf487cf54849ab3ed4f125af2edbce8279f1613de9"},"mac":"5e7db27e395cc81a54a23aea9fb1fab3555b5a8ec58b883a3b926373718632dc","machash":"sha3256"},"id":"f4eb6f9b-2152-4f25-9c08-821414573319","version":3} \ No newline at end of file diff --git a/keydir/n1Q8mxXp4PtHaXtebhY12BnHEwu4mryEkXH b/keydir/n1Q8mxXp4PtHaXtebhY12BnHEwu4mryEkXH new file mode 100644 index 000000000..78ff717b8 --- /dev/null +++ b/keydir/n1Q8mxXp4PtHaXtebhY12BnHEwu4mryEkXH @@ -0,0 +1 @@ +{"address":"n1Q8mxXp4PtHaXtebhY12BnHEwu4mryEkXH","crypto":{"cipher":"aes-128-ctr","ciphertext":"0a7f082f8b36f0906ca9012920d765203dcee0d18a0548c77fdbdf0e6439a227","cipherparams":{"iv":"9572951a58319401985096217725f246"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"de1089769af48204d2b84dc0cb56da7740433b6cf024eb5146cc091ecb33f4d9"},"mac":"11e07e5ae22013225d6e61e91fd4a1dfe4e0ee9042eb395a203232b5c1ca25a2","machash":"sha3256"},"id":"f3cf5abe-ac8d-496d-a4fd-af6f439b7836","version":3} \ No newline at end of file diff --git a/keydir/n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5 b/keydir/n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5 deleted file mode 100644 index c5624cb0f..000000000 --- a/keydir/n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5 +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5","crypto":{"cipher":"aes-128-ctr","ciphertext":"d79238494aa329f700a27ed2c1ac9591a41c86ac0c4a9a2ec03f3b51da59333c","cipherparams":{"iv":"5c87c33db049aaf7cd4c9eac9a819486"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"4fbd3f1fb13057f28d2a1b2ab1c6b6127a2b08206b0caf0307b3bb419cb13076"},"mac":"4857aefb2ddb437f097ff12fca558a30723abebea07752e68b0fc6734420c005","machash":"sha3256"},"id":"55e6845c-636e-47e9-ae4e-126d8fe85da6","version":3} \ No newline at end of file diff --git a/keydir/n1RB386UkGfrA3uXvAksGETxUhwJAL2H94r b/keydir/n1RB386UkGfrA3uXvAksGETxUhwJAL2H94r new file mode 100644 index 000000000..750ac0b29 --- /dev/null +++ b/keydir/n1RB386UkGfrA3uXvAksGETxUhwJAL2H94r @@ -0,0 +1 @@ +{"address":"n1RB386UkGfrA3uXvAksGETxUhwJAL2H94r","crypto":{"cipher":"aes-128-ctr","ciphertext":"75ae472481bd0dd75de6cde6fd4ac0e422206f403b82c010d87608b5f08dd761","cipherparams":{"iv":"7c1b94b86567d09c241fa91ac03f858b"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"063e2dcabc525c02b13b7c8b8fed9163fec072df2461dd8e4ce48ec703191438"},"mac":"f416f0312c329df8ffd7552cae352f16774e4c8a9377a86ea6a4b712d14f51b1","machash":"sha3256"},"id":"38a4eaa2-1c24-4ffa-b7dd-cc1620ec39f1","version":3} \ No newline at end of file diff --git a/keydir/n1RYagU8n3JSuV4R7q4Qs5gQJ3pEmrZd6cJ b/keydir/n1RYagU8n3JSuV4R7q4Qs5gQJ3pEmrZd6cJ new file mode 100644 index 000000000..fc256ef3d --- /dev/null +++ b/keydir/n1RYagU8n3JSuV4R7q4Qs5gQJ3pEmrZd6cJ @@ -0,0 +1 @@ +{"address":"n1RYagU8n3JSuV4R7q4Qs5gQJ3pEmrZd6cJ","crypto":{"cipher":"aes-128-ctr","ciphertext":"a4a4160d73e7dc6e4448ed0cc49a19c0924cd97ea72fdb5799606d2d0d45eb2d","cipherparams":{"iv":"95bf7529734a9244ebbcfdab9b6b81cb"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"2aca691983258e105a4a30327d4cb9b14a3b4a8b6a6860af4d7d0c8df8e38be0"},"mac":"afba10f71f73016ea69dd2e46badc2385fdc82724b32976de225215243dd05d3","machash":"sha3256"},"id":"06d84253-c94d-4f57-8e9b-0b016d5df6f4","version":3} \ No newline at end of file diff --git a/keydir/n1SAQy3ix1pZj8MPzNeVqpAmu1nCVqb5w8c b/keydir/n1SAQy3ix1pZj8MPzNeVqpAmu1nCVqb5w8c new file mode 100644 index 000000000..fc0e8478a --- /dev/null +++ b/keydir/n1SAQy3ix1pZj8MPzNeVqpAmu1nCVqb5w8c @@ -0,0 +1 @@ +{"address":"n1SAQy3ix1pZj8MPzNeVqpAmu1nCVqb5w8c","crypto":{"cipher":"aes-128-ctr","ciphertext":"40701b061f1f6d3935dc43c2c06c7ed619c3b85f5ad4934fc440e1d61e878333","cipherparams":{"iv":"5e2ec4e7a241f2a086754df398373605"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"af935393fdde22073b99cd23898ba3f681b53272fe662f71d1220736ef517a1b"},"mac":"be6ba64359a617fbbd55558dd2dd412b1f5205fe1f130186f0155d1645313ee6","machash":"sha3256"},"id":"fcadcf90-858c-46f0-88dd-0fa4b5d98f51","version":3} \ No newline at end of file diff --git a/keydir/n1SHufJdxt2vRWGKAxwPETYfEq3MCQXnEXE b/keydir/n1SHufJdxt2vRWGKAxwPETYfEq3MCQXnEXE new file mode 100644 index 000000000..647c494b0 --- /dev/null +++ b/keydir/n1SHufJdxt2vRWGKAxwPETYfEq3MCQXnEXE @@ -0,0 +1 @@ +{"address":"n1SHufJdxt2vRWGKAxwPETYfEq3MCQXnEXE","crypto":{"cipher":"aes-128-ctr","ciphertext":"dc63411c9ebdb93c1b036d73c0c0f49ef22dc1c91892d8e54c43a98c2b69e4a7","cipherparams":{"iv":"908422317aca4d28e350af35a8531b85"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"a3a8ff74dea77d0eef1a6af4c2b1d570641c2ff9f21da1b3e90c58aecd12cd94"},"mac":"88ef6d6c1d339677be46a54e7c2c312b1e336464998ebc718e9fa35bbca65b21","machash":"sha3256"},"id":"2e9896bd-4da6-412d-9567-8d27fc068061","version":3} \ No newline at end of file diff --git a/keydir/n1SSda41zGr9FKF5DJNE2ryY1ToNrndMauN b/keydir/n1SSda41zGr9FKF5DJNE2ryY1ToNrndMauN new file mode 100644 index 000000000..96513b22a --- /dev/null +++ b/keydir/n1SSda41zGr9FKF5DJNE2ryY1ToNrndMauN @@ -0,0 +1 @@ +{"address":"n1SSda41zGr9FKF5DJNE2ryY1ToNrndMauN","crypto":{"cipher":"aes-128-ctr","ciphertext":"d0508579b8650c4cd3863f016a9342fffbbe0410c71beaa2ea7eccab71c2fc27","cipherparams":{"iv":"2ae403f88eb9bd478198a09286505c03"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"dabab2e2ba29fd9da24f05589aba506c9be6dbfe6de0ac9198fe2d166f02883b"},"mac":"0741131e2c1704b29b757658c92c4ca21fb0d6a25b68df755f346e3dd268ed4c","machash":"sha3256"},"id":"c946c77d-7fc0-47b1-aaf7-8abc6608ba90","version":3} \ No newline at end of file diff --git a/keydir/n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC b/keydir/n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC deleted file mode 100644 index 48dcabbe1..000000000 --- a/keydir/n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC","crypto":{"cipher":"aes-128-ctr","ciphertext":"05d08ddcb67f68d9b9b003985b95f79a32829594b3f306f62b66e16918ddde52","cipherparams":{"iv":"62ad9b27a4ebf918bc322b6359facc7a"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"8e63ddaf0ead7d4df6fa1279f584d0dd4df4659dafc5e2fccfdcccfdafaf715c"},"mac":"157ca866b10f5b710f072fd3a31147bb36f6aa3d9ce48a847d609c0ca3615ec9","machash":"sha3256"},"id":"165b6108-cbe1-4a68-ab4a-c17ed2dfffd7","version":3} \ No newline at end of file diff --git a/keydir/n1TmQtaCn3PNpk4f4ycwrBxCZFSVKvwBtzc b/keydir/n1TmQtaCn3PNpk4f4ycwrBxCZFSVKvwBtzc new file mode 100644 index 000000000..ccb800c3e --- /dev/null +++ b/keydir/n1TmQtaCn3PNpk4f4ycwrBxCZFSVKvwBtzc @@ -0,0 +1 @@ +{"address":"n1TmQtaCn3PNpk4f4ycwrBxCZFSVKvwBtzc","crypto":{"cipher":"aes-128-ctr","ciphertext":"fd9ce22e986c748e322e211f5098f5fa1b503f1e83ccaf63071362e8dbe2c5be","cipherparams":{"iv":"35c2324d7d571f8d1186da01e7266f1b"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"170e76823b95b47693678108cdcb0c86100f56501f8bb37b32dd8e7f51777f1e"},"mac":"a2b1d4aca884e7e12345f69ce1840106b6c4a2560e3bc2e28421ac98f61e81d8","machash":"sha3256"},"id":"d850c28e-2af8-4177-9f3b-5a3bb8715a4f","version":3} \ No newline at end of file diff --git a/keydir/n1UM7z6MqnGyKEPvUpwrfxZpM1eB7UpzmLJ b/keydir/n1UM7z6MqnGyKEPvUpwrfxZpM1eB7UpzmLJ new file mode 100644 index 000000000..d38569397 --- /dev/null +++ b/keydir/n1UM7z6MqnGyKEPvUpwrfxZpM1eB7UpzmLJ @@ -0,0 +1 @@ +{"address":"n1UM7z6MqnGyKEPvUpwrfxZpM1eB7UpzmLJ","crypto":{"cipher":"aes-128-ctr","ciphertext":"9da96152dc171c82b17e99a471876cd3e05c94e20973ff1984111ac7fcfd96ff","cipherparams":{"iv":"09832ae47f617cc152243748de2c25c3"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"278f9983de36a08dc4a6d3fd8254e8be7886dedb3beec6893b0d4975df5225f3"},"mac":"9a9ba51ff016b67206671df7362337df7411cfb7235008b81f997cb11bd826e1","machash":"sha3256"},"id":"1c18510e-87cc-4e2d-b42d-e70aba708afc","version":3} \ No newline at end of file diff --git a/keydir/n1UWZa8yuvRgePRPgp8a2jX4J9UwGXfHp6i b/keydir/n1UWZa8yuvRgePRPgp8a2jX4J9UwGXfHp6i new file mode 100644 index 000000000..52cb1b566 --- /dev/null +++ b/keydir/n1UWZa8yuvRgePRPgp8a2jX4J9UwGXfHp6i @@ -0,0 +1 @@ +{"address":"n1UWZa8yuvRgePRPgp8a2jX4J9UwGXfHp6i","crypto":{"cipher":"aes-128-ctr","ciphertext":"c47b0b0abcee8ef1ef549abedc34895bfa6fda2eae3c199355bc78cd23addfce","cipherparams":{"iv":"03ef24ae6f776a36b77b3f4918fadde2"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"cb79547ca765a3a8b9313b6785aefd23c72431db3fa6d0a40e5df56b998db0c6"},"mac":"1a40fe43f068d11903132a61570d501f9002e428d874b1983b0040581068abff","machash":"sha3256"},"id":"0fa17348-eb18-4f4b-88f5-c96f1bcb94d3","version":3} \ No newline at end of file diff --git a/keydir/n1UnCsJZjQiKyQiPBr7qG27exqCLuWUf1d7 b/keydir/n1UnCsJZjQiKyQiPBr7qG27exqCLuWUf1d7 new file mode 100644 index 000000000..b2b6ab3c5 --- /dev/null +++ b/keydir/n1UnCsJZjQiKyQiPBr7qG27exqCLuWUf1d7 @@ -0,0 +1 @@ +{"address":"n1UnCsJZjQiKyQiPBr7qG27exqCLuWUf1d7","crypto":{"cipher":"aes-128-ctr","ciphertext":"9342d1fbf4975f2731972ebb1925a2ae0b739b2b98b7ee3f308d6827e3a23d96","cipherparams":{"iv":"7bab86dc22fd315373366b8175226dea"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"caab14fc756d45044148c94421865e46185040561885568b41b263f306691faf"},"mac":"4177c0da602b5b847560a2857d8e265736f8802a87c1d8bd5a081e13f783fa5b","machash":"sha3256"},"id":"b6e2831c-da6f-4c3a-a61c-516d213ccb05","version":3} \ No newline at end of file diff --git a/keydir/n1UnXHcAYimGM4cqUeMrhVX9yAC5a1Hrpok b/keydir/n1UnXHcAYimGM4cqUeMrhVX9yAC5a1Hrpok new file mode 100644 index 000000000..4abdaba05 --- /dev/null +++ b/keydir/n1UnXHcAYimGM4cqUeMrhVX9yAC5a1Hrpok @@ -0,0 +1 @@ +{"address":"n1UnXHcAYimGM4cqUeMrhVX9yAC5a1Hrpok","crypto":{"cipher":"aes-128-ctr","ciphertext":"0820e8debfa6a617ed7349b1d736972f7c702420791e4df7870f5bf50b08b123","cipherparams":{"iv":"19d38ddb9e9b3577cf5c090e1a24f949"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"172968481c48720c11f7e32c468fbcc12b56c13f8a6cb3c0323e3e1cd23d46ea"},"mac":"e922f93e088299b6b70ba47ec04316ba572db220dc174cf0e24b65413027f51e","machash":"sha3256"},"id":"428742a9-dacd-4a4b-8075-57ae0e965f9b","version":3} \ No newline at end of file diff --git a/keydir/n1WkbT89Nh3gSCFLZMg8waqugzjktW2yL9d b/keydir/n1WkbT89Nh3gSCFLZMg8waqugzjktW2yL9d new file mode 100644 index 000000000..df7dc9f37 --- /dev/null +++ b/keydir/n1WkbT89Nh3gSCFLZMg8waqugzjktW2yL9d @@ -0,0 +1 @@ +{"address":"n1WkbT89Nh3gSCFLZMg8waqugzjktW2yL9d","crypto":{"cipher":"aes-128-ctr","ciphertext":"73f2849a714f82088a865d312c5fd03021d30252eb82bc0ce42c32d7ec26dfd7","cipherparams":{"iv":"1cfdc87f106f7e6ff81922f73732b186"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"fd4cbed80bbe1c35b2e3c1ff250fbc482b66e0e818c3362308587f9da0834753"},"mac":"e24d8d96877d8e387e1000f1989631f0122b2cce0917e42a0502cb6434acf3c4","machash":"sha3256"},"id":"8d8defa1-cd0b-4a34-8f07-0d178ed96fd5","version":3} \ No newline at end of file diff --git a/keydir/n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4 b/keydir/n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4 deleted file mode 100644 index 754aa3670..000000000 --- a/keydir/n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4 +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4","crypto":{"cipher":"aes-128-ctr","ciphertext":"14ce290b7fd607c227b7696314ba7ed12323c704ed0f3c03948adf50e49e30a7","cipherparams":{"iv":"811c9713ddcf520954856d0b074e6235"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"f20592c420f8e43b56e6316280f4968bd59ed8d122e4f633daece72a574045c7"},"mac":"8ca8051610de63302dc26fc91da3d014a253fe39d1d1c93e6a205576053c855e","machash":"sha3256"},"id":"260df4a6-bd28-4d6c-b458-8c6f6200344b","version":3} \ No newline at end of file diff --git a/keydir/n1XP8HQcHxwr3NiLQVoCG3YUyNTUPAn4zZB b/keydir/n1XP8HQcHxwr3NiLQVoCG3YUyNTUPAn4zZB new file mode 100644 index 000000000..c29862480 --- /dev/null +++ b/keydir/n1XP8HQcHxwr3NiLQVoCG3YUyNTUPAn4zZB @@ -0,0 +1 @@ +{"address":"n1XP8HQcHxwr3NiLQVoCG3YUyNTUPAn4zZB","crypto":{"cipher":"aes-128-ctr","ciphertext":"882bf835689c7ad568ef8996610e384d03b1e920d475f8f3db793de9fd24660a","cipherparams":{"iv":"15592b47f3846423ccf5bb78c1eb0cd8"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"97465e1115c4e0a6609eb79a997e22a9d78ba9653fb85cccb2acfb464cbaad70"},"mac":"3e75df160bb4ed27d8649d860128b300e7aaf45958ec40873b7e8c1e965fb0ef","machash":"sha3256"},"id":"ae0383ac-23fd-434c-9d4b-e13880a16f5f","version":3} \ No newline at end of file diff --git a/keydir/n1XkoVVjswb5Gek3rRufqjKNpwrDdsnQ7Hq b/keydir/n1XkoVVjswb5Gek3rRufqjKNpwrDdsnQ7Hq new file mode 100644 index 000000000..805b57779 --- /dev/null +++ b/keydir/n1XkoVVjswb5Gek3rRufqjKNpwrDdsnQ7Hq @@ -0,0 +1 @@ +{"address":"n1XkoVVjswb5Gek3rRufqjKNpwrDdsnQ7Hq","crypto":{"cipher":"aes-128-ctr","ciphertext":"9fb246dd272d906a62eabae288f29d0084366ea3e75148087dd7eb197b24522b","cipherparams":{"iv":"5893a46873530d36579359eb7fcf3ac0"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"556893c5810bcfef3af2672ad6f29deeae13b7a1cb91b38492dc3eae55309444"},"mac":"a83a567cd0e91c8188bd59cdbc1b3ab07534a9c93224f6b9ec530e2ae5d51d98","machash":"sha3256"},"id":"882dbb96-a95b-47af-bfed-cc0c52991b34","version":3} \ No newline at end of file diff --git a/keydir/n1Z6SbjLuAEXfhX1UJvXT6BB5osWYxVg3F3 b/keydir/n1Z6SbjLuAEXfhX1UJvXT6BB5osWYxVg3F3 deleted file mode 100644 index 347bde833..000000000 --- a/keydir/n1Z6SbjLuAEXfhX1UJvXT6BB5osWYxVg3F3 +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1Z6SbjLuAEXfhX1UJvXT6BB5osWYxVg3F3","crypto":{"cipher":"aes-128-ctr","ciphertext":"68bd5d318534118eeeb7eb17286c713ecc78dc031988568f6754eb38b7e7dbe2","cipherparams":{"iv":"5347fcbd446f123f3d29b3fb3246ae18"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"462fc1dd7990ae85e6de7b3760b7ebb6c5ccf054a4dbfefacdc2edc69422827d"},"mac":"c6db474b18d7a8567223bc3a0517954e3d34d8e720ba1ebd6e2d451b4ba9a504","machash":"sha3256"},"id":"085ed620-704d-4e96-98e0-544122ea20ae","version":3} \ No newline at end of file diff --git a/keydir/n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ b/keydir/n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ deleted file mode 100644 index b6468b1c4..000000000 --- a/keydir/n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ","crypto":{"cipher":"aes-128-ctr","ciphertext":"aab55420c1abb5d46e91995182c08d48019fe2aaae06470eba6cd1bfc8bedb10","cipherparams":{"iv":"64d6c709c2b67af3adbaff4fe4adfbfc"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"c93818c6171bcb4d72b57e26a432400ef50b306407170f280a8b25baec65e3fb"},"mac":"037425a2652629102b9c50a0d1a41ad2721a6cf5a8d33aa77bb0f83b54ff52bf","machash":"sha3256"},"id":"f03c8f2f-8a02-4451-bb0b-7e7c8e1028d5","version":3} \ No newline at end of file diff --git a/keydir/n1cYKNHTeVW9v1NQRWuhZZn9ETbqAYozckh b/keydir/n1cYKNHTeVW9v1NQRWuhZZn9ETbqAYozckh new file mode 100644 index 000000000..cf0e061cf --- /dev/null +++ b/keydir/n1cYKNHTeVW9v1NQRWuhZZn9ETbqAYozckh @@ -0,0 +1 @@ +{"address":"n1cYKNHTeVW9v1NQRWuhZZn9ETbqAYozckh","crypto":{"cipher":"aes-128-ctr","ciphertext":"126da333452a0b09c43da1d471215fa00b87b767d1b5060284904a68a224c214","cipherparams":{"iv":"4858df63adb3ad5b454675af134a211b"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"9fdc691f09e4b3ba9b745bdb7323f59348c1f659c356d5e6fd4acd8efb151b8a"},"mac":"0fc0742eddbb295972da06f461cade1819d1b68ca0b7921646ee023ae645177d","machash":"sha3256"},"id":"35b7fab1-aab2-49aa-a92e-8bcbcb02d36e","version":3} \ No newline at end of file diff --git a/keydir/n1dYu2BXgV3xgUh8LhZu8QDDNr15tz4hVDv b/keydir/n1dYu2BXgV3xgUh8LhZu8QDDNr15tz4hVDv new file mode 100644 index 000000000..0ea2b3ab9 --- /dev/null +++ b/keydir/n1dYu2BXgV3xgUh8LhZu8QDDNr15tz4hVDv @@ -0,0 +1 @@ +{"address":"n1dYu2BXgV3xgUh8LhZu8QDDNr15tz4hVDv","crypto":{"cipher":"aes-128-ctr","ciphertext":"c34fce0cbeeaaacefb8b6db414d1205e9a52f3022a75149f47d72bed09c0326f","cipherparams":{"iv":"f6cc2ea52231be6d21188bc6f8b6fbf4"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"a86613f3ab94ed8eaeea0052a0d0d58c33362e0e3bfa2f57ace8da1d8d891ab7"},"mac":"ab0509964857e180000f9d9311852b39ddba47eebc9f96c896460cde4b41b61d","machash":"sha3256"},"id":"a935ffcd-c45d-460f-8707-23c7306c7aed","version":3} \ No newline at end of file diff --git a/sync/chunk_test.go b/sync/chunk_test.go index a10f7c91e..c82f92a9d 100644 --- a/sync/chunk_test.go +++ b/sync/chunk_test.go @@ -66,8 +66,8 @@ func mockNeb(t *testing.T) *Neb { Chain: &nebletpb.ChainConfig{ ChainId: genesisConf.Meta.ChainId, Keydir: "keydir", - Coinbase: "n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5", - Miner: "n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW", + Coinbase: "n1dYu2BXgV3xgUh8LhZu8QDDNr15tz4hVDv", + Miner: "n1FF1nz6tarkDVwWQkMnnwFPuPKUaQTdptE", Passphrase: "passphrase", }, }, @@ -137,12 +137,27 @@ func (n *Neb) SetGenesis(genesis *corepb.Genesis) { var ( // must be order by address.hash MockDynasty = []string{ - "n1FkntVUMPAsESuCAAPK711omQk19JotBjM", - "n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR", - "n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW", - "n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC", - "n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4", - "n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ", + "n1FF1nz6tarkDVwWQkMnnwFPuPKUaQTdptE", + "n1GmkKH6nBMw4rrjt16RrJ9WcgvKUtAZP1s", + "n1H4MYms9F55ehcvygwWE71J8tJC4CRr2so", + "n1JAy4X6KKLCNiTd7MWMRsVBjgdVq5WCCpf", + "n1LkDi2gGMqPrjYcczUiweyP4RxTB6Go1qS", + "n1LmP9K8pFF33fgdgHZonFEMsqZinJ4EUqk", + "n1MNXBKm6uJ5d76nJTdRvkPNVq85n6CnXAi", + "n1NrMKTYESZRCwPFDLFKiKREzZKaN1nhQvz", + "n1NwoSCDFwFL2981k6j9DPooigW33hjAgTa", + "n1PfACnkcfJoNm1Pbuz55pQCwueW1BYs83m", + "n1Q8mxXp4PtHaXtebhY12BnHEwu4mryEkXH", + "n1RYagU8n3JSuV4R7q4Qs5gQJ3pEmrZd6cJ", + "n1SAQy3ix1pZj8MPzNeVqpAmu1nCVqb5w8c", + "n1SHufJdxt2vRWGKAxwPETYfEq3MCQXnEXE", + "n1SSda41zGr9FKF5DJNE2ryY1ToNrndMauN", + "n1TmQtaCn3PNpk4f4ycwrBxCZFSVKvwBtzc", + "n1UM7z6MqnGyKEPvUpwrfxZpM1eB7UpzmLJ", + "n1UnCsJZjQiKyQiPBr7qG27exqCLuWUf1d7", + "n1XkoVVjswb5Gek3rRufqjKNpwrDdsnQ7Hq", + "n1cYKNHTeVW9v1NQRWuhZZn9ETbqAYozckh", + "n1dYu2BXgV3xgUh8LhZu8QDDNr15tz4hVDv", } ) @@ -157,12 +172,28 @@ func MockGenesisConf() *corepb.Genesis { }, TokenDistribution: []*corepb.GenesisTokenDistribution{ &corepb.GenesisTokenDistribution{ - Address: "n1Z6SbjLuAEXfhX1UJvXT6BB5osWYxVg3F3", - Value: "10000000000000000000000", + Address: "n1FF1nz6tarkDVwWQkMnnwFPuPKUaQTdptE", + Value: "5000000000000000000000000", }, &corepb.GenesisTokenDistribution{ - Address: "n1NHcbEus81PJxybnyg4aJgHAaSLDx9Vtf8", - Value: "10000000000000000000000", + Address: "n1GmkKH6nBMw4rrjt16RrJ9WcgvKUtAZP1s", + Value: "5000000000000000000000000", + }, + &corepb.GenesisTokenDistribution{ + Address: "n1H4MYms9F55ehcvygwWE71J8tJC4CRr2so", + Value: "5000000000000000000000000", + }, + &corepb.GenesisTokenDistribution{ + Address: "n1JAy4X6KKLCNiTd7MWMRsVBjgdVq5WCCpf", + Value: "5000000000000000000000000", + }, + &corepb.GenesisTokenDistribution{ + Address: "n1LkDi2gGMqPrjYcczUiweyP4RxTB6Go1qS", + Value: "5000000000000000000000000", + }, + &corepb.GenesisTokenDistribution{ + Address: "n1LmP9K8pFF33fgdgHZonFEMsqZinJ4EUqk", + Value: "5000000000000000000000000", }, }, } @@ -223,7 +254,7 @@ func TestChunk_generateChunkMeta(t *testing.T) { payload, _ := core.NewDeployPayload(source, sourceType, argsDeploy) payloadDeploy, _ := payload.ToBytes() - from, _ := core.AddressParse("n1FkntVUMPAsESuCAAPK711omQk19JotBjM") + from, _ := core.AddressParse("n1FF1nz6tarkDVwWQkMnnwFPuPKUaQTdptE") assert.Nil(t, neb.am.Unlock(from, []byte("passphrase"), time.Second*60*60*24*365)) blocks := []*core.Block{} diff --git a/sync/keydir b/sync/keydir new file mode 120000 index 000000000..406f74a85 --- /dev/null +++ b/sync/keydir @@ -0,0 +1 @@ +../keydir/ \ No newline at end of file diff --git a/sync/keydir/n1FkntVUMPAsESuCAAPK711omQk19JotBjM b/sync/keydir/n1FkntVUMPAsESuCAAPK711omQk19JotBjM deleted file mode 100644 index 8f0bde51d..000000000 --- a/sync/keydir/n1FkntVUMPAsESuCAAPK711omQk19JotBjM +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1FkntVUMPAsESuCAAPK711omQk19JotBjM","crypto":{"cipher":"aes-128-ctr","ciphertext":"81561a8ef22685e78fa3d02be55fc714fb1ba35bcd500edd65c63aa05edc9acd","cipherparams":{"iv":"35a9ee034de6c2930e61ac13b276c599"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"e061ecc8b1862bc8ee7f00488039eb258f22e207e461fc74d16847e2a36ce98d"},"mac":"16fa5777ebb5940f6e92379140dd07d65dfb422717a49b975179aa9a27af5347","machash":"sha3256"},"id":"08c25090-71e7-45e8-9267-99198b2d6222","version":3} \ No newline at end of file diff --git a/sync/keydir/n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR b/sync/keydir/n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR deleted file mode 100644 index a33577cef..000000000 --- a/sync/keydir/n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR","crypto":{"cipher":"aes-128-ctr","ciphertext":"eec05ccd484b1b3c460b78d5e433e9864b4bbc946e5cb8a57f62c91dd5c176b9","cipherparams":{"iv":"2725d71074adbbbcccd245a5628c7448"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"608a021d230a084abd4217c937705e690d1642c6d1394ea56646303322d180ff"},"mac":"0e70f00f96b37f2c444f8b5ae782e9c6d62cbe3455249c2e43f7ee4083872f9a","machash":"sha3256"},"id":"53619987-5250-4f41-9a2f-9a29d8013ebe","version":3} \ No newline at end of file diff --git a/sync/keydir/n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW b/sync/keydir/n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW deleted file mode 100644 index f4a3d9b61..000000000 --- a/sync/keydir/n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW","crypto":{"cipher":"aes-128-ctr","ciphertext":"89d66c1669b6d383bf346db0b28dea96130c3e1890dfb0bcb279f74f42b4577a","cipherparams":{"iv":"83039463126e33b1cba6920b0879c321"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"582e4d6038a9d3661a523b509ace3925c7f16c4d4bdbbb2296141b971710ef01"},"mac":"69e5dd75a30014884c455a3a8740f6e972960fb1fd9e1bc8d940430acc4d8f3f","machash":"sha3256"},"id":"41f63048-5a16-4fdb-9a62-be26fa2dd432","version":3} \ No newline at end of file diff --git a/sync/keydir/n1NHcbEus81PJxybnyg4aJgHAaSLDx9Vtf8 b/sync/keydir/n1NHcbEus81PJxybnyg4aJgHAaSLDx9Vtf8 deleted file mode 100644 index 6171f157e..000000000 --- a/sync/keydir/n1NHcbEus81PJxybnyg4aJgHAaSLDx9Vtf8 +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1NHcbEus81PJxybnyg4aJgHAaSLDx9Vtf8","crypto":{"cipher":"aes-128-ctr","ciphertext":"95e0867328e588494e2d4858f62d8a8bf853491933a3b7b7f51cd05e05e931e2","cipherparams":{"iv":"a79092f5182b46867db58117cfd59a28"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"e3b238587e706a85df8a5514166822373a745111320ba4130c410001fb6920ba"},"mac":"526a4f812094c9fa4a470b8ab559587d19fda8ca8a7aab27b1d04edab7296e3e","machash":"sha3256"},"id":"7e0f084c-dec5-4cc4-93fd-1da8f13d1358","version":3} \ No newline at end of file diff --git a/sync/keydir/n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5 b/sync/keydir/n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5 deleted file mode 100644 index c5624cb0f..000000000 --- a/sync/keydir/n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5 +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5","crypto":{"cipher":"aes-128-ctr","ciphertext":"d79238494aa329f700a27ed2c1ac9591a41c86ac0c4a9a2ec03f3b51da59333c","cipherparams":{"iv":"5c87c33db049aaf7cd4c9eac9a819486"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"4fbd3f1fb13057f28d2a1b2ab1c6b6127a2b08206b0caf0307b3bb419cb13076"},"mac":"4857aefb2ddb437f097ff12fca558a30723abebea07752e68b0fc6734420c005","machash":"sha3256"},"id":"55e6845c-636e-47e9-ae4e-126d8fe85da6","version":3} \ No newline at end of file diff --git a/sync/keydir/n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC b/sync/keydir/n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC deleted file mode 100644 index 48dcabbe1..000000000 --- a/sync/keydir/n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC","crypto":{"cipher":"aes-128-ctr","ciphertext":"05d08ddcb67f68d9b9b003985b95f79a32829594b3f306f62b66e16918ddde52","cipherparams":{"iv":"62ad9b27a4ebf918bc322b6359facc7a"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"8e63ddaf0ead7d4df6fa1279f584d0dd4df4659dafc5e2fccfdcccfdafaf715c"},"mac":"157ca866b10f5b710f072fd3a31147bb36f6aa3d9ce48a847d609c0ca3615ec9","machash":"sha3256"},"id":"165b6108-cbe1-4a68-ab4a-c17ed2dfffd7","version":3} \ No newline at end of file diff --git a/sync/keydir/n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4 b/sync/keydir/n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4 deleted file mode 100644 index 754aa3670..000000000 --- a/sync/keydir/n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4 +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4","crypto":{"cipher":"aes-128-ctr","ciphertext":"14ce290b7fd607c227b7696314ba7ed12323c704ed0f3c03948adf50e49e30a7","cipherparams":{"iv":"811c9713ddcf520954856d0b074e6235"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"f20592c420f8e43b56e6316280f4968bd59ed8d122e4f633daece72a574045c7"},"mac":"8ca8051610de63302dc26fc91da3d014a253fe39d1d1c93e6a205576053c855e","machash":"sha3256"},"id":"260df4a6-bd28-4d6c-b458-8c6f6200344b","version":3} \ No newline at end of file diff --git a/sync/keydir/n1Z6SbjLuAEXfhX1UJvXT6BB5osWYxVg3F3 b/sync/keydir/n1Z6SbjLuAEXfhX1UJvXT6BB5osWYxVg3F3 deleted file mode 100644 index 347bde833..000000000 --- a/sync/keydir/n1Z6SbjLuAEXfhX1UJvXT6BB5osWYxVg3F3 +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1Z6SbjLuAEXfhX1UJvXT6BB5osWYxVg3F3","crypto":{"cipher":"aes-128-ctr","ciphertext":"68bd5d318534118eeeb7eb17286c713ecc78dc031988568f6754eb38b7e7dbe2","cipherparams":{"iv":"5347fcbd446f123f3d29b3fb3246ae18"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"462fc1dd7990ae85e6de7b3760b7ebb6c5ccf054a4dbfefacdc2edc69422827d"},"mac":"c6db474b18d7a8567223bc3a0517954e3d34d8e720ba1ebd6e2d451b4ba9a504","machash":"sha3256"},"id":"085ed620-704d-4e96-98e0-544122ea20ae","version":3} \ No newline at end of file diff --git a/sync/keydir/n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ b/sync/keydir/n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ deleted file mode 100644 index b6468b1c4..000000000 --- a/sync/keydir/n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ +++ /dev/null @@ -1 +0,0 @@ -{"address":"n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ","crypto":{"cipher":"aes-128-ctr","ciphertext":"aab55420c1abb5d46e91995182c08d48019fe2aaae06470eba6cd1bfc8bedb10","cipherparams":{"iv":"64d6c709c2b67af3adbaff4fe4adfbfc"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":4096,"p":1,"r":8,"salt":"c93818c6171bcb4d72b57e26a432400ef50b306407170f280a8b25baec65e3fb"},"mac":"037425a2652629102b9c50a0d1a41ad2721a6cf5a8d33aa77bb0f83b54ff52bf","machash":"sha3256"},"id":"f03c8f2f-8a02-4451-bb0b-7e7c8e1028d5","version":3} \ No newline at end of file