cw20-merkle-airdrop: change hashing to sha256 #374
Conversation
| ``` | ||
|
|
||
| **Generate proof:** | ||
| ```shell | ||
| merkle-airdrop-cli generateProofs --file ../testdata/airdrop_stage_2.json \ | ||
| merkle-airdrop-cli generateProofs --file ../testdata/airdrop_stage_2_list.json \ |
There was a problem hiding this comment.
Ah, did you use the output of these as input to rust tests?
It does look like you have a place to generate test vectors.
| if (hashBuf < proofBuf) { | ||
| hashBuf = keccak256(Buffer.concat([hashBuf, proofBuf])); | ||
| hashBuf = Buffer.from(sha256(Buffer.concat([hashBuf, proofBuf]).toString())); |
There was a problem hiding this comment.
why type does sha256 return? Why Buffer.from(sha256(a).toString())?
Seems like there may be an easier way to transform it.
(Also if using Buffer.from, I think best to specify the input type. I think the default is hex, but let's be specific)
There was a problem hiding this comment.
sha256 returns CryptoJS/WordArray which is hard to work with. Only toString method available.
There was a problem hiding this comment.
Well, best you could do with what you got.
| @@ -16,6 +15,7 @@ use crate::msg::{ | |||
| MerkleRootResponse, MigrateMsg, QueryMsg, | |||
| }; | |||
| use crate::state::{Config, CLAIM, CONFIG, LATEST_STAGE, MERKLE_ROOT}; | |||
| use sha2::Digest; | |||
There was a problem hiding this comment.
I'd move this up, same line where sha3 was
| @@ -359,9 +360,33 @@ mod tests { | |||
| ); | |||
| } | |||
|
|
|||
| const TEST_DATA_1: &str = "./testdata/airdrop_stage_1_test_data.json"; | |||
There was a problem hiding this comment.
Looking above, I don't see the command that generates these test data.
Can you please add this to the README of the ts side (or a comment here)?
| proofs: Vec<String>, | ||
| } | ||
|
|
||
| fn read_test_data(path: &str) -> Encoded { |
There was a problem hiding this comment.
There is a nice trick you can use...
Replace:
const TEST_DATA_1: &str = "./testdata/airdrop_stage_1_test_data.json";
let test_data = read_test_data(TEST_DATA_1);with
const TEST_DATA_1: &[u8] = include_bytes!("./testdata/airdrop_stage_1_test_data.json");
let test_data: Encoded = from_slice(TEST_DATA_1).unwrap();Then you can remove read_test_data.
| "280777995d054081cbf208bccb70f8d736c1766b81d90a1fd21cd97d2d83a5cc".to_string(), | ||
| "3946ea1758a5a2bf55bae1186168ad35aa0329805bc8bff1ca3d51345faec04a".to_string(), | ||
| ], | ||
| proof: test_data.proofs, |
There was a problem hiding this comment.
Nice to use this from those files.
|
Merging now, helper.ts works contract works. I will leave the rest to CosmJS DevRel person for learning content! |
No description provided.