Export v3 keystore using lower address (#72)

* feat: export with lower address * testcase: change import v3 keystore json with loweraddress
consenlabs · Mar 6, 2024 · da3b02e · da3b02e
1 parent 84fe2f8
commit da3b02e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/token-core/tcx-migration/src/migration.rs b/token-core/tcx-migration/src/migration.rs
@@ -110,7 +110,12 @@ impl LegacyKeystore {
         let sec_key = Secp256k1PrivateKey::from_slice(private_key)?;
         let pub_key = TypedPublicKey::Secp256k1(sec_key.public_key());
         let coin_info = coin_info_from_param("ETHEREUM", "", "", CurveType::SECP256k1.as_str())?;
-        let address = EthAddress::from_public_key(&pub_key, &coin_info)?.to_string();
+        let checksumed_address = EthAddress::from_public_key(&pub_key, &coin_info)?.to_string();
+        let address = checksumed_address
+            .to_lowercase()
+            .strip_prefix("0x")
+            .unwrap()
+            .to_string();
         let id = uuid::Uuid::new_v4().to_string();
         Ok(LegacyKeystore {
             version: 3,
@@ -491,18 +496,15 @@ mod tests {
         let json: Value = serde_json::from_str(&keystore_json).expect("json");
 
         assert_eq!(json["version"], 3);
-        assert_eq!(
-            json["address"],
-            "0x6031564e7b2F5cc33737807b2E58DaFF870B590b"
-        );
+        assert_eq!(json["address"], "6031564e7b2f5cc33737807b2e58daff870b590b");
     }
 
     #[test]
     fn test_address_not_match() {
         let private_key_bytes = Vec::from_hex_auto(TEST_PRIVATE_KEY).unwrap();
         let mut v3_keystore =
             LegacyKeystore::new_v3(&private_key_bytes, TEST_PASSWORD).expect("v3 keystore");
-        v3_keystore.address = Some("0x6031564e7b2F5cc33737807b2E58DaFF870B5900".to_string()); //wrong address
+        v3_keystore.address = Some("6031564e7b2f5cc33737807b2e58daff870b5900".to_string()); //wrong address
         let validate_result = v3_keystore.validate_v3(TEST_PASSWORD);
         assert_eq!(
             validate_result.err().unwrap().to_string(),

diff --git a/token-core/tcx/tests/import_test.rs b/token-core/tcx/tests/import_test.rs
@@ -1148,7 +1148,7 @@ pub fn test_import_hex_private_key() {
         assert_eq!(export_result.id, import_result.id);
         assert!(export_result
             .json
-            .contains("0x6031564e7b2F5cc33737807b2E58DaFF870B590b"));
+            .contains("6031564e7b2f5cc33737807b2e58daff870b590b"));
     })
 }
 
@@ -1221,7 +1221,7 @@ pub fn test_import_v3_keystore_json() {
                   },
                   "mac": "2adc6da2f5f183e528a063b36ebeddaf0d3a90269ef797b99dc143d58ba3bb58"
                 },
-                "address": "0x6031564e7b2F5cc33737807b2E58DaFF870B590b"
+                "address": "6031564e7b2f5cc33737807b2e58daff870b590b"
               }
               "#;
         let param: ExistsJsonParam = ExistsJsonParam {
@@ -1271,6 +1271,6 @@ pub fn test_import_v3_keystore_json() {
         assert!(export_result
             .json
             .to_string()
-            .contains("0x6031564e7b2F5cc33737807b2E58DaFF870B590b"));
+            .contains("6031564e7b2f5cc33737807b2e58daff870b590b"));
     })
 }
diff --git a/token-core/test-data/.gitignore b/token-core/test-data/.gitignore
@@ -15,4 +15,5 @@
 !testnet-identity
 !testnet-identity/*
 !migrate-duplication-fixtures
-!migrate-duplication-fixtures/wallets/**
+!migrate-duplication-fixtures/wallets/**
+wallets/_migrated.json