Merge pull request #6034

a574899 chaincodes: abstract away more chaincode behavior [squashme] replace struct CCainCode with a typedef uint256 ChainCode (Cory Fields)
8cf1485 Abstract chaincodes into CChainCode (Pieter Wuille)

diff --cc src/key.cpp
index 49941d6c7c634770f5ae1e9f02e77af1fd5a5c93,308d43ea347fef3f6be3160b41acb5afef8af708..b772dff333c6efc72cc8a6ddfa7adedcc3ec6391
--- 1/src/key.cpp
--- 2/src/key.cpp
+++ b/src/key.cpp
@@@ -124,9 -138,9 +124,9 @@@ bool CKey::Derive(CKey& keyChild, Chain
          assert(begin() + 32 == end());
          BIP32Hash(cc, nChild, 0, begin(), out);
      }
-     memcpy(ccChild, out+32, 32);
+     memcpy(ccChild.begin(), out+32, 32);
      memcpy((unsigned char*)keyChild.begin(), begin(), 32);
 -    bool ret = secp256k1_ec_privkey_tweak_add((unsigned char*)keyChild.begin(), out);
 +    bool ret = secp256k1_ec_privkey_tweak_add(secp256k1_context, (unsigned char*)keyChild.begin(), out);
      UnlockObject(out);
      keyChild.fCompressed = true;
      keyChild.fValid = ret;

diff --cc src/key.h
Simple merge