From 150c770e4eea21729c3c9cbf0f433070314bf966 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 25 Nov 2013 15:37:49 +0100 Subject: [PATCH] xprvnode -> hdnode, add hdnode_from_pub function --- bip32.c | 35 ++++++++++++++++++++++++++--------- bip32.h | 14 +++++++++----- tests.c | 29 ++++++++++++++--------------- 3 files changed, 49 insertions(+), 29 deletions(-) diff --git a/bip32.c b/bip32.c index 331dc2977..491543215 100644 --- a/bip32.c +++ b/bip32.c @@ -5,7 +5,19 @@ #include "ecdsa.h" #include "bip32.h" -void xprv_from_seed(uint8_t *seed, int seed_len, XprvNode *out) +void hdnode_from_pub(uint32_t version, uint32_t depth, uint32_t fingerprint, uint32_t child_num, uint8_t *chain_code, uint8_t *public_key, HDNode *out) +{ + out->version = version; + out->depth = depth; + out->fingerprint = fingerprint; + out->child_num = child_num; + memcpy(out->chain_code, chain_code, 32); + memcpy(out->public_key, public_key, 33); + memset(out->private_key, 0, 32); + hdnode_fill_address(out, 0x00); +} + +void hdnode_from_seed(uint8_t *seed, int seed_len, HDNode *out) { out->version = 0x0488ADE4; // main-net out->depth = 0; @@ -14,19 +26,20 @@ void xprv_from_seed(uint8_t *seed, int seed_len, XprvNode *out) // this can be done because private_key[32] and chain_code[32] // form a continuous 64 byte block in the memory hmac_sha512((uint8_t *)"Bitcoin seed", 12, seed, seed_len, out->private_key); - xprv_fill_public(out); + hdnode_fill_public_key(out); + hdnode_fill_address(out, 0x00); } -void xprv_descent(XprvNode *inout, uint32_t i) +void hdnode_descent(HDNode *inout, uint32_t i) { uint8_t data[1 + 32 + 4]; bignum256 a, b; - if (i & 0x80000000) { + if (i & 0x80000000) { // private derivation data[0] = 0; memcpy(data + 1, inout->private_key, 32); - } else { - ecdsa_get_public_key33(inout->private_key, data); + } else { // public derivation + memcpy(data, inout->public_key, 33); } write_be(data + 33, i); @@ -43,12 +56,16 @@ void xprv_descent(XprvNode *inout, uint32_t i) inout->child_num = i; bn_write_be(&a, inout->private_key); - xprv_fill_public(inout); + hdnode_fill_public_key(inout); + hdnode_fill_address(inout, 0x00); } -void xprv_fill_public(XprvNode *xprv) +void hdnode_fill_public_key(HDNode *xprv) { - const uint8_t version = 0x00; ecdsa_get_public_key33(xprv->private_key, xprv->public_key); +} + +void hdnode_fill_address(HDNode *xprv, uint8_t version) +{ ecdsa_get_address(xprv->public_key, version, xprv->address); } diff --git a/bip32.h b/bip32.h index fe2a28b94..ef49b950e 100644 --- a/bip32.h +++ b/bip32.h @@ -12,14 +12,18 @@ typedef struct { uint8_t chain_code[32]; // form a continuous 64 byte block uint8_t public_key[33]; char address[35]; -} XprvNode; +} HDNode; -void xprv_from_seed(uint8_t *seed, int seed_len, XprvNode *out); +void hdnode_from_pub(uint32_t version, uint32_t depth, uint32_t fingerprint, uint32_t child_num, uint8_t *chain_code, uint8_t *public_key, HDNode *out); -#define xprv_descent_prime(X, I) xprv_descent((X), ((I) | 0x80000000)) +void hdnode_from_seed(uint8_t *seed, int seed_len, HDNode *out); -void xprv_descent(XprvNode *inout, uint32_t i); +#define hdnode_descent_prime(X, I) hdnode_descent((X), ((I) | 0x80000000)) -void xprv_fill_public(XprvNode *xprv); +void hdnode_descent(HDNode *inout, uint32_t i); + +void hdnode_fill_public_key(HDNode *xprv); + +void hdnode_fill_address(HDNode *xprv, uint8_t version); #endif diff --git a/tests.c b/tests.c index 034387911..d3cc280a8 100644 --- a/tests.c +++ b/tests.c @@ -74,10 +74,10 @@ char *tohex(const uint8_t *bin, size_t l) // test vector 1 from https://en.bitcoin.it/wiki/BIP_0032_TestVectors START_TEST(test_bip32_vector_1) { - XprvNode node; + HDNode node; // init m - xprv_from_seed(fromhex("000102030405060708090a0b0c0d0e0f"), 16, &node); + hdnode_from_seed(fromhex("000102030405060708090a0b0c0d0e0f"), 16, &node); // [Chain m] ck_assert_mem_eq(node.chain_code, fromhex("873dff81c02f525623fd1fe5167eac3a55a049de3d314bb42ee227ffed37d508"), 32); @@ -86,36 +86,35 @@ START_TEST(test_bip32_vector_1) ck_assert_str_eq(node.address, "15mKKb2eos1hWa6tisdPwwDC1a5J1y9nma"); // [Chain m/0'] - xprv_descent_prime(&node, 0); + hdnode_descent_prime(&node, 0); ck_assert_mem_eq(node.chain_code, fromhex("47fdacbd0f1097043b78c63c20c34ef4ed9a111d980047ad16282c7ae6236141"), 32); ck_assert_mem_eq(node.private_key, fromhex("edb2e14f9ee77d26dd93b4ecede8d16ed408ce149b6cd80b0715a2d911a0afea"), 32); ck_assert_mem_eq(node.public_key, fromhex("035a784662a4a20a65bf6aab9ae98a6c068a81c52e4b032c0fb5400c706cfccc56"), 33); ck_assert_str_eq(node.address, "19Q2WoS5hSS6T8GjhK8KZLMgmWaq4neXrh"); // [Chain m/0'/1] - xprv_descent(&node, 1); + hdnode_descent(&node, 1); ck_assert_mem_eq(node.chain_code, fromhex("2a7857631386ba23dacac34180dd1983734e444fdbf774041578e9b6adb37c19"), 32); ck_assert_mem_eq(node.private_key, fromhex("3c6cb8d0f6a264c91ea8b5030fadaa8e538b020f0a387421a12de9319dc93368"), 32); ck_assert_mem_eq(node.public_key, fromhex("03501e454bf00751f24b1b489aa925215d66af2234e3891c3b21a52bedb3cd711c"), 33); ck_assert_str_eq(node.address, "1JQheacLPdM5ySCkrZkV66G2ApAXe1mqLj"); // [Chain m/0'/1/2'] - xprv_descent_prime(&node, 2); + hdnode_descent_prime(&node, 2); ck_assert_mem_eq(node.chain_code, fromhex("04466b9cc8e161e966409ca52986c584f07e9dc81f735db683c3ff6ec7b1503f"), 32); ck_assert_mem_eq(node.private_key, fromhex("cbce0d719ecf7431d88e6a89fa1483e02e35092af60c042b1df2ff59fa424dca"), 32); ck_assert_mem_eq(node.public_key, fromhex("0357bfe1e341d01c69fe5654309956cbea516822fba8a601743a012a7896ee8dc2"), 33); ck_assert_str_eq(node.address, "1NjxqbA9aZWnh17q1UW3rB4EPu79wDXj7x"); // [Chain m/0'/1/2'/2] - xprv_descent(&node, 2); + hdnode_descent(&node, 2); ck_assert_mem_eq(node.chain_code, fromhex("cfb71883f01676f587d023cc53a35bc7f88f724b1f8c2892ac1275ac822a3edd"), 32); ck_assert_mem_eq(node.private_key, fromhex("0f479245fb19a38a1954c5c7c0ebab2f9bdfd96a17563ef28a6a4b1a2a764ef4"), 32); ck_assert_mem_eq(node.public_key, fromhex("02e8445082a72f29b75ca48748a914df60622a609cacfce8ed0e35804560741d29"), 33); ck_assert_str_eq(node.address, "1LjmJcdPnDHhNTUgrWyhLGnRDKxQjoxAgt"); - // [Chain m/0'/1/2'/2/1000000000] - xprv_descent(&node, 1000000000); + hdnode_descent(&node, 1000000000); ck_assert_mem_eq(node.chain_code, fromhex("c783e67b921d2beb8f6b389cc646d7263b4145701dadd2161548a8b078e65e9e"), 32); ck_assert_mem_eq(node.private_key, fromhex("471b76e389e528d6de6d816857e012c5455051cad6660850e58372a6c3e6e7c8"), 32); ck_assert_mem_eq(node.public_key, fromhex("022a471424da5e657499d1ff51cb43c47481a03b1e77f951fe64cec9f5a48f7011"), 33); @@ -126,10 +125,10 @@ END_TEST // test vector 2 from https://en.bitcoin.it/wiki/BIP_0032_TestVectors START_TEST(test_bip32_vector_2) { - XprvNode node; + HDNode node; // init m - xprv_from_seed(fromhex("fffcf9f6f3f0edeae7e4e1dedbd8d5d2cfccc9c6c3c0bdbab7b4b1aeaba8a5a29f9c999693908d8a8784817e7b7875726f6c696663605d5a5754514e4b484542"), 64, &node); + hdnode_from_seed(fromhex("fffcf9f6f3f0edeae7e4e1dedbd8d5d2cfccc9c6c3c0bdbab7b4b1aeaba8a5a29f9c999693908d8a8784817e7b7875726f6c696663605d5a5754514e4b484542"), 64, &node); // [Chain m] ck_assert_mem_eq(node.chain_code, fromhex("60499f801b896d83179a4374aeb7822aaeaceaa0db1f85ee3e904c4defbd9689"), 32); @@ -138,35 +137,35 @@ START_TEST(test_bip32_vector_2) ck_assert_str_eq(node.address, "1JEoxevbLLG8cVqeoGKQiAwoWbNYSUyYjg"); // [Chain m/0] - xprv_descent(&node, 0); + hdnode_descent(&node, 0); ck_assert_mem_eq(node.chain_code, fromhex("f0909affaa7ee7abe5dd4e100598d4dc53cd709d5a5c2cac40e7412f232f7c9c"), 32); ck_assert_mem_eq(node.private_key, fromhex("abe74a98f6c7eabee0428f53798f0ab8aa1bd37873999041703c742f15ac7e1e"), 32); ck_assert_mem_eq(node.public_key, fromhex("02fc9e5af0ac8d9b3cecfe2a888e2117ba3d089d8585886c9c826b6b22a98d12ea"), 33); ck_assert_str_eq(node.address, "19EuDJdgfRkwCmRzbzVBHZWQG9QNWhftbZ"); // [Chain m/0/2147483647'] - xprv_descent_prime(&node, 2147483647); + hdnode_descent_prime(&node, 2147483647); ck_assert_mem_eq(node.chain_code, fromhex("be17a268474a6bb9c61e1d720cf6215e2a88c5406c4aee7b38547f585c9a37d9"), 32); ck_assert_mem_eq(node.private_key, fromhex("877c779ad9687164e9c2f4f0f4ff0340814392330693ce95a58fe18fd52e6e93"), 32); ck_assert_mem_eq(node.public_key, fromhex("03c01e7425647bdefa82b12d9bad5e3e6865bee0502694b94ca58b666abc0a5c3b"), 33); ck_assert_str_eq(node.address, "1Lke9bXGhn5VPrBuXgN12uGUphrttUErmk"); // [Chain m/0/2147483647'/1] - xprv_descent(&node, 1); + hdnode_descent(&node, 1); ck_assert_mem_eq(node.chain_code, fromhex("f366f48f1ea9f2d1d3fe958c95ca84ea18e4c4ddb9366c336c927eb246fb38cb"), 32); ck_assert_mem_eq(node.private_key, fromhex("704addf544a06e5ee4bea37098463c23613da32020d604506da8c0518e1da4b7"), 32); ck_assert_mem_eq(node.public_key, fromhex("03a7d1d856deb74c508e05031f9895dab54626251b3806e16b4bd12e781a7df5b9"), 33); ck_assert_str_eq(node.address, "1BxrAr2pHpeBheusmd6fHDP2tSLAUa3qsW"); // [Chain m/0/2147483647'/1/2147483646'] - xprv_descent_prime(&node, 2147483646); + hdnode_descent_prime(&node, 2147483646); ck_assert_mem_eq(node.chain_code, fromhex("637807030d55d01f9a0cb3a7839515d796bd07706386a6eddf06cc29a65a0e29"), 32); ck_assert_mem_eq(node.private_key, fromhex("f1c7c871a54a804afe328b4c83a1c33b8e5ff48f5087273f04efa83b247d6a2d"), 32); ck_assert_mem_eq(node.public_key, fromhex("02d2b36900396c9282fa14628566582f206a5dd0bcc8d5e892611806cafb0301f0"), 33); ck_assert_str_eq(node.address, "15XVotxCAV7sRx1PSCkQNsGw3W9jT9A94R"); // [Chain m/0/2147483647'/1/2147483646'/2] - xprv_descent(&node, 2); + hdnode_descent(&node, 2); ck_assert_mem_eq(node.chain_code, fromhex("9452b549be8cea3ecb7a84bec10dcfd94afe4d129ebfd3b3cb58eedf394ed271"), 32); ck_assert_mem_eq(node.private_key, fromhex("bb7d39bdb83ecf58f2fd82b6d918341cbef428661ef01ab97c28a4842125ac23"), 32); ck_assert_mem_eq(node.public_key, fromhex("024d902e1a2fc7a8755ab5b694c575fce742c48d9ff192e63df5193e4c7afe1f9c"), 33);