Merge pull request #42 from KeystoneHQ/add-version-to-multi-accounts

Add version field to crypto multi account
KeystoneHQ · Sep 28, 2023 · 7d64aa9 · 7d64aa9
2 parents 5a02ef0 + f5db43b
commit 7d64aa9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/__tests__/extended/CryptoMultiAccounts.test.ts b/__tests__/extended/CryptoMultiAccounts.test.ts
@@ -23,21 +23,22 @@ describe("CryptoMultiAccount", () => {
       Buffer.from("e9181cf3", "hex"),
       [cryptoHDKey],
       "keystone",
-      "28475c8d80f6c06bafbe46a7d1750f3fcf2565f7"
+      "28475c8d80f6c06bafbe46a7d1750f3fcf2565f7",
+      "1.0.2"
     );
     const hex = multiAccounts.toCBOR().toString("hex");
     expect(hex).toBe(
-      "a4011ae9181cf30281d9012fa203582102eae4b876a8696134b868f88cc2f51f715f2dbedb7446b8e6edf3d4541c4eb67b06d90130a10188182cf51901f5f500f500f503686b657973746f6e6504782832383437356338643830663663303662616662653436613764313735306633666366323536356637"
+      "a5011ae9181cf30281d9012fa203582102eae4b876a8696134b868f88cc2f51f715f2dbedb7446b8e6edf3d4541c4eb67b06d90130a10188182cf51901f5f500f500f503686b657973746f6e65047828323834373563386438306636633036626166626534366137643137353066336663663235363566370565312e302e32"
     );
     const ur = multiAccounts.toUREncoder(1000).nextPart();
     expect(ur).toBe(
-      "ur:crypto-multi-accounts/oxadcywlcscewfaolytaaddloeaxhdclaowdverokopdinhseeroisyalksaykctjshedprnuyjyfgrovawewftyghceglrpkgamtaaddyoyadlocsdwykcfadykykaeykaeykaxisjeihkkjkjyjljtihaaksdeeyeteeemeciaetieetdyiyeniadyenidhsiyidiheeenhsemieehemecdyiyeoiyiaiyeyeceneciyemwydrlpjt"
+      "ur:crypto-multi-accounts/onadcywlcscewfaolytaaddloeaxhdclaowdverokopdinhseeroisyalksaykctjshedprnuyjyfgrovawewftyghceglrpkgamtaaddyoyadlocsdwykcfadykykaeykaeykaxisjeihkkjkjyjljtihaaksdeeyeteeemeciaetieetdyiyeniadyenidhsiyidiheeenhsemieehemecdyiyeoiyiaiyeyeceneciyemahihehdmdydmeyksrlzmdi"
     );
   });
 
   it("should decode CryptoMultiAccount", () => {
     const hex =
-      "a4011ae9181cf30281d9012fa203582102eae4b876a8696134b868f88cc2f51f715f2dbedb7446b8e6edf3d4541c4eb67b06d90130a10188182cf51901f5f500f500f503686b657973746f6e6504782832383437356338643830663663303662616662653436613764313735306633666366323536356637";
+      "a5011ae9181cf30281d9012fa203582102eae4b876a8696134b868f88cc2f51f715f2dbedb7446b8e6edf3d4541c4eb67b06d90130a10188182cf51901f5f500f500f503686b657973746f6e65047828323834373563386438306636633036626166626534366137643137353066336663663235363566370565312e302e32";
     const cryptoMultiAccounts = CryptoMultiAccounts.fromCBOR(
       Buffer.from(hex, "hex")
     );
@@ -54,5 +55,8 @@ describe("CryptoMultiAccount", () => {
     expect(cryptoMultiAccounts.getDeviceId()).toBe(
       "28475c8d80f6c06bafbe46a7d1750f3fcf2565f7"
     );
+    expect(cryptoMultiAccounts.getVersion()).toBe(
+      "1.0.2"
+    );
   });
 });
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keystonehq/bc-ur-registry",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "A JS implementation of Uniform Resources(UR) Registry specification from Blockchain Commons",
   "publishConfig": {
     "access": "public"

diff --git a/src/extended/CryptoMultiAccounts.ts b/src/extended/CryptoMultiAccounts.ts
@@ -8,6 +8,7 @@ enum Keys {
   keys,
   device,
   deviceId,
+  version,
 }
 
 export class CryptoMultiAccounts extends RegistryItem {
@@ -17,7 +18,8 @@ export class CryptoMultiAccounts extends RegistryItem {
     private masterFingerprint: Buffer,
     private keys: CryptoHDKey[],
     private device?: string,
-    private deviceId?: string
+    private deviceId?: string,
+    private version?: string
   ) {
     super();
   }
@@ -26,6 +28,7 @@ export class CryptoMultiAccounts extends RegistryItem {
   public getKeys = () => this.keys;
   public getDevice = () => this.device;
   public getDeviceId = () => this.deviceId;
+  public getVersion = () => this.version;
 
   public toDataItem = (): DataItem => {
     const map: DataItemMap = {};
@@ -45,6 +48,9 @@ export class CryptoMultiAccounts extends RegistryItem {
     if (this.deviceId) {
       map[Keys.deviceId] = this.deviceId;
     }
+    if (this.version) {
+      map[Keys.version] = this.version;
+    }
     return new DataItem(map);
   };
 
@@ -59,7 +65,8 @@ export class CryptoMultiAccounts extends RegistryItem {
     const cryptoHDKeys = keys.map((item) => CryptoHDKey.fromDataItem(item));
     const device = map[Keys.device];
     const deviceId = map[Keys.deviceId];
-    return new CryptoMultiAccounts(masterFingerprint, cryptoHDKeys, device, deviceId);
+    const version = map[Keys.version];
+    return new CryptoMultiAccounts(masterFingerprint, cryptoHDKeys, device, deviceId, version);
   };
 
   public static fromCBOR = (_cborPayload: Buffer) => {