@@ -269,11 +269,7 @@ impl Keychain {
269
269
) ) ,
270
270
) {
271
271
( Ok ( genesis) , Ok ( current) ) => {
272
- trace ! (
273
- "New keychain created with the following seeds {:?}, {:?}" ,
274
- hex:: encode( genesis. as_slice( ) ) ,
275
- hex:: encode( current. as_slice( ) )
276
- ) ;
272
+ trace ! ( "Network seeds imported from legacy" ) ;
277
273
Some ( SeedsHolder { genesis, current } )
278
274
}
279
275
( Err ( e) , _) => {
@@ -428,13 +424,9 @@ impl Keychain {
428
424
}
429
425
430
426
pub fn set_consensus_seed ( & mut self , genesis : Seed , current : Seed ) {
431
- trace ! (
432
- "Consensus seeds were set to be the following {:?}, {:?}" ,
433
- genesis. as_slice( ) ,
434
- current. as_slice( )
435
- ) ;
436
427
self . consensus_seed = Some ( SeedsHolder { genesis, current } ) ;
437
428
self . save ( ) ;
429
+ trace ! ( "Consensus seeds set" ) ;
438
430
}
439
431
440
432
pub fn generate_consensus_master_keys ( & mut self ) -> Result < ( ) , EnclaveError > {
@@ -452,10 +444,6 @@ impl Keychain {
452
444
. derive_key_from_this ( & CONSENSUS_SEED_EXCHANGE_KEYPAIR_DERIVE_ORDER . to_be_bytes ( ) ) ;
453
445
let consensus_seed_exchange_keypair_genesis =
454
446
KeyPair :: from ( consensus_seed_exchange_keypair_genesis_bytes) ;
455
- trace ! (
456
- "consensus_seed_exchange_keypair_genesis: {:?}" ,
457
- hex:: encode( consensus_seed_exchange_keypair_genesis. get_pubkey( ) )
458
- ) ;
459
447
460
448
let consensus_seed_exchange_keypair_current_bytes = self
461
449
. consensus_seed
@@ -464,10 +452,6 @@ impl Keychain {
464
452
. derive_key_from_this ( & CONSENSUS_SEED_EXCHANGE_KEYPAIR_DERIVE_ORDER . to_be_bytes ( ) ) ;
465
453
let consensus_seed_exchange_keypair_current =
466
454
KeyPair :: from ( consensus_seed_exchange_keypair_current_bytes) ;
467
- trace ! (
468
- "consensus_seed_exchange_keypair_current: {:?}" ,
469
- hex:: encode( consensus_seed_exchange_keypair_current. get_pubkey( ) )
470
- ) ;
471
455
472
456
self . set_consensus_seed_exchange_keypair (
473
457
consensus_seed_exchange_keypair_genesis,
@@ -483,10 +467,6 @@ impl Keychain {
483
467
. derive_key_from_this ( & CONSENSUS_IO_EXCHANGE_KEYPAIR_DERIVE_ORDER . to_be_bytes ( ) ) ;
484
468
let consensus_io_exchange_keypair_genesis =
485
469
KeyPair :: from ( consensus_io_exchange_keypair_genesis_bytes) ;
486
- trace ! (
487
- "consensus_io_exchange_keypair_genesis: {:?}" ,
488
- hex:: encode( consensus_io_exchange_keypair_genesis. get_pubkey( ) )
489
- ) ;
490
470
491
471
let consensus_io_exchange_keypair_current_bytes = self
492
472
. consensus_seed
@@ -495,10 +475,6 @@ impl Keychain {
495
475
. derive_key_from_this ( & CONSENSUS_IO_EXCHANGE_KEYPAIR_DERIVE_ORDER . to_be_bytes ( ) ) ;
496
476
let consensus_io_exchange_keypair_current =
497
477
KeyPair :: from ( consensus_io_exchange_keypair_current_bytes) ;
498
- trace ! (
499
- "consensus_io_exchange_keypair_current: {:?}" ,
500
- hex:: encode( consensus_io_exchange_keypair_current. get_pubkey( ) )
501
- ) ;
502
478
503
479
self . set_consensus_io_exchange_keypair (
504
480
consensus_io_exchange_keypair_genesis,
@@ -513,22 +489,12 @@ impl Keychain {
513
489
. genesis
514
490
. derive_key_from_this ( & CONSENSUS_STATE_IKM_DERIVE_ORDER . to_be_bytes ( ) ) ;
515
491
516
- trace ! (
517
- "consensus_state_ikm_genesis: {:?}" ,
518
- hex:: encode( consensus_state_ikm_genesis. get( ) )
519
- ) ;
520
-
521
492
let consensus_state_ikm_current = self
522
493
. consensus_seed
523
494
. unwrap ( )
524
495
. current
525
496
. derive_key_from_this ( & CONSENSUS_STATE_IKM_DERIVE_ORDER . to_be_bytes ( ) ) ;
526
497
527
- trace ! (
528
- "consensus_state_ikm_current: {:?}" ,
529
- hex:: encode( consensus_state_ikm_current. get( ) )
530
- ) ;
531
-
532
498
self . set_consensus_state_ikm ( consensus_state_ikm_genesis, consensus_state_ikm_current) ;
533
499
534
500
// consensus_state_ikm
@@ -539,22 +505,12 @@ impl Keychain {
539
505
. genesis
540
506
. derive_key_from_this ( & CONSENSUS_CALLBACK_SECRET_DERIVE_ORDER . to_be_bytes ( ) ) ;
541
507
542
- trace ! (
543
- "consensus_callback_secret_genesis: {:?}" ,
544
- hex:: encode( consensus_state_ikm_genesis. get( ) )
545
- ) ;
546
-
547
508
let consensus_callback_secret_current = self
548
509
. consensus_seed
549
510
. unwrap ( )
550
511
. current
551
512
. derive_key_from_this ( & CONSENSUS_CALLBACK_SECRET_DERIVE_ORDER . to_be_bytes ( ) ) ;
552
513
553
- trace ! (
554
- "consensus_callback_secret_current: {:?}" ,
555
- hex:: encode( consensus_state_ikm_current. get( ) )
556
- ) ;
557
-
558
514
self . set_consensus_callback_secret (
559
515
consensus_callback_secret_genesis,
560
516
consensus_callback_secret_current,
@@ -574,9 +530,6 @@ impl Keychain {
574
530
575
531
self . initial_randomness_seed = Some ( irs) ;
576
532
self . random_encryption_key = Some ( rek) ;
577
-
578
- trace ! ( "initial_randomness_seed: {:?}" , hex:: encode( irs. get( ) ) ) ;
579
- trace ! ( "random_encryption_key: {:?}" , hex:: encode( rek. get( ) ) ) ;
580
533
}
581
534
582
535
let admin_proof_secret = self
@@ -587,11 +540,6 @@ impl Keychain {
587
540
588
541
self . admin_proof_secret = Some ( admin_proof_secret) ;
589
542
590
- trace ! (
591
- "admin_proof_secret: {:?}" ,
592
- hex:: encode( admin_proof_secret. get( ) )
593
- ) ;
594
-
595
543
let contract_key_proof_secret = self
596
544
. consensus_seed
597
545
. unwrap ( )
@@ -600,11 +548,6 @@ impl Keychain {
600
548
601
549
self . contract_key_proof_secret = Some ( contract_key_proof_secret) ;
602
550
603
- trace ! (
604
- "contract_key_proof_secret: {:?}" ,
605
- hex:: encode( contract_key_proof_secret. get( ) )
606
- ) ;
607
-
608
551
Ok ( ( ) )
609
552
}
610
553
}
0 commit comments