Merge pull request #49 from rmrk-team/trim-recipient-whitespace-and-validate

Invalidate SEND with space in recipient, but also remove any whitespa…

Author: Yuripetusko

package.json

@@ -37,6 +37,7 @@
     "cli:run-listener": "ts-node --project tsconfig.cli.json cli/run-listener.ts",
     "cli:metadata": "ts-node --project tsconfig.cli.json cli/metadata.ts",
     "test": "jest --silent",
+    "test:watch": "jest --watch --silent",
     "test:coverage": "jest --coverage --coverageDirectory='coverage'",
     "prepublishOnly": "yarn build"
   },

src/rmrk1.0.0/classes/nft.ts

@@ -104,7 +104,7 @@ export class NFT {
     }
     return `${PREFIX}::${
       OP_TYPES.SEND
-    }::${VERSION}::${this.getId()}::${recipient}`;
+    }::${VERSION}::${this.getId()}::${recipient.replace(/\\s/g, "")}`;
   }
 
   // @todo build this out, maybe data type?

src/tools/validate-remark.ts

@@ -145,6 +145,11 @@ export const validateSend = (remark: string): any => {
 
   try {
     validateBase(remark, OP_TYPES.SEND);
+    if (/\s/g.test(recipient)) {
+      throw new Error(
+        "Invalid remark - No whitespaces are allowed in recipient"
+      );
+    }
     return assert({ id, recipient }, SENDStruct);
   } catch (error) {
     throw new Error(

test/utils/validate-send.test.ts

@@ -0,0 +1,14 @@
+import { validateNFT, validateSend } from "../../src/tools/validate-remark";
+
+describe("validation: validateSend", () => {
+  it("should be valid send", () => {
+    const remark =
+      "RMRK::SEND::1.0.0::6802213-24d573f4dfa1d7fd33-KAN-KANS-0000000000000001::dfsfsd dfsfd";
+
+    expect(() => validateSend(remark)).toThrowError(
+      "Invalid remark - No whitespaces are allowed in recipient"
+    );
+
+    expect(() => validateSend(remark.replace(/\s/g, ""))).not.toThrow();
+  });
+});