Merge pull request #7154 from BitGo/WIN-7458

fix(sdk-coin-iota): update transaction and block hash validation

Author: parasgarg-bitgo

modules/sdk-coin-iota/package.json

@@ -43,6 +43,7 @@
     "@bitgo/sdk-core": "^36.10.1",
     "@bitgo/statics": "^58.2.0",
     "@iota/iota-sdk": "^1.6.0",
+    "@iota/bcs": "^1.2.0",
     "bignumber.js": "^9.1.2"
   },
   "devDependencies": {

modules/sdk-coin-iota/src/lib/constants.ts

@@ -1,7 +1,7 @@
 export const IOTA_ADDRESS_LENGTH = 64;
-export const IOTA_TRANSACTION_ID_LENGTH = 64;
-export const IOTA_BLOCK_ID_LENGTH = 64;
-export const IOTA_SIGNATURE_LENGTH = 128;
+export const IOTA_TRANSACTION_DIGEST_LENGTH = 32;
+export const IOTA_BLOCK_DIGEST_LENGTH = 32;
+export const IOTA_SIGNATURE_LENGTH = 64;
 export const ADDRESS_BYTES_LENGTH = 32;
 export const AMOUNT_BYTES_LENGTH = 8;
 export const SECONDS_PER_WEEK = 7 * 24 * 60 * 60; // 1 week in seconds

modules/sdk-coin-iota/src/lib/utils.ts

@@ -1,11 +1,12 @@
-import { BaseUtils, isValidEd25519PublicKey, isValidEd25519SecretKey } from '@bitgo/sdk-core';
+import { BaseUtils, isValidEd25519PublicKey, isValidEd25519SecretKey, isBase58 } from '@bitgo/sdk-core';
 import {
   IOTA_ADDRESS_LENGTH,
-  IOTA_BLOCK_ID_LENGTH,
+  IOTA_BLOCK_DIGEST_LENGTH,
   IOTA_SIGNATURE_LENGTH,
-  IOTA_TRANSACTION_ID_LENGTH,
+  IOTA_TRANSACTION_DIGEST_LENGTH,
 } from './constants';
 import { Ed25519PublicKey } from '@iota/iota-sdk/keypairs/ed25519';
+import { fromBase64 } from '@iota/bcs';
 
 export class Utils implements BaseUtils {
   /** @inheritdoc */
@@ -15,7 +16,7 @@ export class Utils implements BaseUtils {
 
   /** @inheritdoc */
   isValidBlockId(hash: string): boolean {
-    return this.isValidHex(hash, IOTA_BLOCK_ID_LENGTH);
+    return isBase58(hash, IOTA_BLOCK_DIGEST_LENGTH);
   }
 
   /** @inheritdoc */
@@ -30,12 +31,12 @@ export class Utils implements BaseUtils {
 
   /** @inheritdoc */
   isValidSignature(signature: string): boolean {
-    return this.isValidHex(signature, IOTA_SIGNATURE_LENGTH);
+    return fromBase64(signature).length === IOTA_SIGNATURE_LENGTH;
   }
 
   /** @inheritdoc */
   isValidTransactionId(txId: string): boolean {
-    return this.isValidHex(txId, IOTA_TRANSACTION_ID_LENGTH);
+    return isBase58(txId, IOTA_TRANSACTION_DIGEST_LENGTH);
   }
 
   isValidHex(value: string, length: number): boolean {

modules/sdk-coin-iota/test/unit/utils.ts

@@ -4,7 +4,7 @@ import utils from '../../src/lib/utils';
 
 describe('Iota util library', function () {
   describe('isValidAddress', function () {
-    it('should succeed to validate raw transactoin', function () {
+    it('should succeed to validate addresses', function () {
       for (const address of testData.addresses.validAddresses) {
         should.equal(utils.isValidAddress(address), true);
       }
@@ -28,4 +28,28 @@ describe('Iota util library', function () {
     // without 0x prefix
     should.equal(true, utils.isValidPublicKey('b2051899478edeb36a79d1d16dfec56dc3a6ebd29fbbbb4a4ef2dfaf46043355'));
   });
+
+  it('is valid tx id', function () {
+    should.equal(
+      false,
+      utils.isValidTransactionId('0xff86b121181a43d03df52e8930785af3dda944ec87654cdba3a378ff518cd75b')
+    );
+    should.equal(false, utils.isValidTransactionId('BftEk3BeKUWTj9uzVGntd4Ka16QZG8hUnr6KsAb7q7b53t'));
+    should.equal(true, utils.isValidTransactionId('BftEk3BeKUWTj9uzVGntd4Ka16QZG8hUnr6KsAb7q7bt'));
+  });
+
+  it('is valid block id', function () {
+    should.equal(false, utils.isValidBlockId('0x9ac6a0c313c4a0563a169dad29f1d018647683be54a314ed229a2693293dfc98'));
+    should.equal(false, utils.isValidBlockId('GZXZvvLS3ZnuE4E9CxQJJ2ij5xeNsvUXdAK56VrPCQKrPz'));
+    should.equal(true, utils.isValidBlockId('GZXZvvLS3ZnuE4E9CxQJJ2ij5xeNsvUXdAKVrPCQKrPz'));
+  });
+
+  it('is valid signature', function () {
+    should.equal(false, utils.isValidSignature('0x9ac6a0c313c4a0563a169dad29f1d018647683be54a314ed229a2693293dfc98'));
+    should.equal(false, utils.isValidSignature('goppBTDgLuBbcU5tP90n3igvZGHmcE23HCoxLfdJwOCcbyztVh9r0TPacJRXmjZ6'));
+    should.equal(
+      true,
+      utils.isValidSignature('iXrcUjgQgpYUsa7O90KZicdTmIdJSjB99+tJW6l6wPCqI/lUTou6sQ2sLoZgC0n4qQKX+vFDz+lBIXl7J/ZgCg==')
+    );
+  });
 });

yarn.lock

@@ -2971,7 +2971,7 @@
   resolved "https://registry.npmjs.org/@inquirer/type/-/type-3.0.8.tgz#efc293ba0ed91e90e6267f1aacc1c70d20b8b4e8"
   integrity sha512-lg9Whz8onIHRthWaN1Q9EGLa/0LFJjyM8mEUbL1eTi6yMGvBf8gvyDLtxSXztQsxMvhxxNpJYrwa1YHdq+w4Jw==
 
-"@iota/bcs@1.2.0":
+"@iota/bcs@1.2.0", "@iota/bcs@^1.2.0":
   version "1.2.0"
   resolved "https://registry.npmjs.org/@iota/bcs/-/bcs-1.2.0.tgz"
   integrity sha512-QdRSR0KpJ87tdjVNmM/j0+0DvE0aTxHIa02337iluaOsMqtJ8OdgUCfSyLduC/3qS+8tJE+UB1KOw55tF+sN2w==