passing test

Author: diogorac

inc/transaction.h

@@ -36,7 +36,7 @@ typedef struct {
   char id[65];
 } BIGCHAIN_TX;
 
-void bigchain_fulfill_and_serialize(BIGCHAIN_TX *tx, uint8_t *json_tx, uint16_t maxlen, uint8_t *sig);
+void bigchain_fulfill_and_serialize(BIGCHAIN_TX *tx, uint8_t *json_tx, uint16_t maxlen, uint8_t *sig, uint8_t *pubkey);
 void bigchain_sign_transaction(uint8_t *json_tx, uint16_t len, uint8_t *priv_key, uint8_t *pub_key, uint8_t *sig);
 char* bigchain_build_json_inputs(BIGCHAIN_INPUT *inputs, uint8_t num_inputs, char *json_obj);
 char* bigchain_build_json_outputs(BIGCHAIN_OUTPUT *outputs, uint8_t num_outputs, char *json_obj);

src/transaction.c

@@ -1,26 +1,61 @@
 #include "transaction.h"
 
+#ifndef MIN
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
+#endif
 
-void bigchain_fulfill_and_serialize(BIGCHAIN_TX *tx, uint8_t *json_tx, uint16_t maxlen, uint8_t *sig)
+void der_encode_fulfill(uint8_t *pubkey, uint8_t *sig, uint8_t *fulfill)
+{
+  uint16_t offset = 4;
+
+  fulfill[0] = 0xA4;
+  fulfill[1] = 0x64;
+  fulfill[2] = 0x80;
+  fulfill[3] = 0x20;
+
+  memcpy( fulfill + offset, pubkey, 32);
+  offset += 32;
+
+  fulfill[offset++] = 0x81;
+  fulfill[offset++] = 0x40;
+  memcpy( fulfill + offset, sig, 64);
+}
+
+void bigchain_fulfill_and_serialize(BIGCHAIN_TX *tx, uint8_t *json_tx, uint16_t maxlen, uint8_t *sig, uint8_t *pubkey)
 {
   char fulfillment[256] = {0};
+  uint8_t der[256] = {0};
+
+  der_encode_fulfill(pubkey, sig, der);
+  
+  bintob64(fulfillment, der, 4 + 32 + 2 + 64);
+
+  uint16_t size = strlen(fulfillment);
+  for(uint16_t i=0; i < size; i++)
+  {
+    if(fulfillment[i] == '+')
+      fulfillment[i] = '-';
+    else if(fulfillment[i] == '/')
+      fulfillment[i] = '_';
+  }
 
-  bintob64(fulfillment, sig, 64);
+  for(uint16_t i = size; i > 1; i--)
+  {
+    if(fulfillment[i] == '=')
+      fulfillment[i] = '\0';
+    else
+      break;
+  }
+  
   memcpy(tx->inputs[0].fulfillment, fulfillment, strlen(fulfillment));
 
   memset(json_tx, 0, maxlen);
   bigchain_build_json_tx(tx, json_tx);
 
-  // sha3_256((const unsigned char*)json_tx, MIN(maxlen, strlen(json_tx)), tx->id);
-  sha3_256((const unsigned char*)json_tx, strlen(json_tx), tx->id);
-
-  // 1. derencode sig
-  // 2. base64 encode
-  // 3. remove == from b64 str
-
+  sha3_256((const unsigned char*)json_tx, MIN(maxlen, strlen(json_tx)), tx->id);
+  
   memset(json_tx, 0, maxlen);
   bigchain_build_json_tx(tx, json_tx);
-
 }
 
 /*

tests/test_sig.c

@@ -101,18 +101,14 @@ void test_bigchain_build_json_tx(void) {
 
   char sig[128] = {0};
   bigchain_sign_transaction((uint8_t*)json, strlen(json), (uint8_t*)privkey, (uint8_t*)pubkey,  (uint8_t*)sig);
-  bigchain_fulfill_and_serialize(&tx, json, 6000, sig);
+  bigchain_fulfill_and_serialize(&tx, (uint8_t*)json, 6000, (uint8_t*)sig, (uint8_t*)pubkey);
 
   // Base64
   char fullfil[] = "pGSAIFVOiXAbbcqbKGEfs2FBcTouGFICDo6ooC4n2kDvrMwlgUCNMaKJ6aV03acNBqcYCffEWAcNQdhxS1o7beb6Ispxft0Ymgv2-oUlOFAeT6KeP65wLs_SOSKrLRaAIA_U75kC";
+  uint8_t transaction_id[] = {0xeb,0x39,0x0d,0x15,0x7b,0xc9,0x8d,0xba,0x07,0x26,0x46,0x31,0x11,0xc7,0x31,0x9a,0x28,0x13,0x2d,0x62,0x3b,0x29,0x7b,0x97,0xa9,0x1c,0x96,0x1d,0x1a,0xe1,0xe9,0x07};
 
   TEST_ASSERT_EQUAL(0, memcmp(tx.inputs->fulfillment, fullfil, 137));
-
-  // memcpy(tx.inputs->fulfillment, fullfil, 137);  memset(json,0,6000);
-  // //id 
-  // bigchain_build_json_tx(&tx, json);
-
-
+  TEST_ASSERT_EQUAL(0, memcmp(tx.id, transaction_id, 32));
 
 }