Squashed 'src/secp256k1/' changes from 3d08027789..0270b14309

0270b14309 labels: actually set the label

git-subtree-dir: src/secp256k1
git-subtree-split: 0270b1430981584582645161a04a4df67cd187bb

Author: josibake

src/modules/silentpayments/main_impl.h

@@ -494,8 +494,10 @@ int secp256k1_silentpayments_recipient_scan_outputs(
         found = 0;
         for (i = 0; i < n_tx_outputs; i++) {
             if (secp256k1_xonly_pubkey_cmp(ctx, &P_output_xonly, tx_outputs[i]) == 0) {
-                found_outputs[n_found]->output = *tx_outputs[i];
+                secp256k1_xonly_pubkey_save(&found_outputs[n_found]->output, &P_output_ge);
                 secp256k1_scalar_get_b32(found_outputs[n_found]->tweak, &t_k_scalar);
+                found_outputs[n_found]->found_with_label = 0;
+                secp256k1_pubkey_save(&found_outputs[n_found]->label, &P_output_ge);
                 found = 1;
                 n_found++;
                 k++;
@@ -522,9 +524,9 @@ int secp256k1_silentpayments_recipient_scan_outputs(
 
                 label_tweak = label_lookup(&label_pubkey, label_context);
                 if (label_tweak != NULL) {
-                    found_outputs[n_found]->output = *tx_outputs[i];
+                    secp256k1_xonly_pubkey_save(&found_outputs[n_found]->output, &tx_output_ge);
                     found_outputs[n_found]->found_with_label = 1;
-                    found_outputs[n_found]->label = label_pubkey;
+                    secp256k1_pubkey_save(&found_outputs[n_found]->label, &label_ge);
                     secp256k1_scalar_get_b32(found_outputs[n_found]->tweak, &t_k_scalar);
                     if (!secp256k1_ec_seckey_tweak_add(ctx, found_outputs[n_found]->tweak, label_tweak)) {
                         return 0;
@@ -544,9 +546,9 @@ int secp256k1_silentpayments_recipient_scan_outputs(
 
                 label_tweak = label_lookup(&label_pubkey, label_context);
                 if (label_tweak != NULL) {
-                    found_outputs[n_found]->output = *tx_outputs[i];
+                    secp256k1_xonly_pubkey_save(&found_outputs[n_found]->output, &tx_output_ge);
                     found_outputs[n_found]->found_with_label = 1;
-                    found_outputs[n_found]->label = label_pubkey;
+                    secp256k1_pubkey_save(&found_outputs[n_found]->label, &label_ge);
                     secp256k1_scalar_get_b32(found_outputs[n_found]->tweak, &t_k_scalar);
                     if (!secp256k1_ec_seckey_tweak_add(ctx, found_outputs[n_found]->tweak, label_tweak)) {
                         return 0;

src/modules/silentpayments/tests_impl.h

@@ -212,12 +212,8 @@ void run_silentpayments_test_vector_receive(const struct bip352_test_vector *tes
                  * For this example, we'll just iterate through the list of pubkeys */
                 found = 0;
                 secp256k1_xonly_pubkey_serialize(CTX, xonly_print, &potential_output);
-                printf("what we generated :");
-                print_hex(xonly_print, 32);
                 for (i = 0; i < test->num_to_scan_outputs; i++) {
                     secp256k1_xonly_pubkey_serialize(CTX, xonly_print, tx_outputs[i]);
-                    printf("what is in the tx :");
-                    print_hex(xonly_print, 32);
                     if (secp256k1_xonly_pubkey_cmp(CTX, &potential_output, tx_outputs[i]) == 0) {
                         secp256k1_xonly_pubkey_serialize(CTX, found_outputs_light_client[n_found], &potential_output);
                         found = 1;