Add blockNumberTag

ChainAgnostic · Jul 7, 2022 · d0a20c8 · d0a20c8
1 parent b2af863
commit d0a20c8
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 7 deletions.
diff --git a/src/assetId.ts b/src/assetId.ts
@@ -8,6 +8,7 @@ export interface AssetIdParams {
   chainId: string | ChainIdParams;
   assetName: string | AssetNameParams;
   tokenId: string;
+  blockNumberTag: string;
 }
 
 export class AssetId {
@@ -27,6 +28,7 @@ export class AssetId {
   public chainId: ChainId;
   public assetName: AssetName;
   public tokenId: string;
+  public blockNumberTag: string;
 
   constructor(params: AssetIdParams | string) {
     if (typeof params === "string") {
@@ -36,6 +38,7 @@ export class AssetId {
     this.chainId = new ChainId(params.chainId);
     this.assetName = new AssetName(params.assetName);
     this.tokenId = params.tokenId;
+    this.blockNumberTag = params.blockNumberTag;
   }
 
   public toString(): string {
@@ -47,6 +50,7 @@ export class AssetId {
       chainId: this.chainId.toJSON(),
       assetName: this.assetName.toJSON(),
       tokenId: this.tokenId,
+      blockNumberTag: this.blockNumberTag,
     };
   }
 }
diff --git a/src/spec.ts b/src/spec.ts
@@ -87,12 +87,38 @@ const CAIP19AssetId: IdentifierSpec = {
   },
 };
 
+const BlockNumberTag: IdentifierSpec = {
+  name: "blockNumberTag",
+  regex: "[0-9]{1,78}|latest",
+  parameters: {
+    delimiter: "",
+    values: {
+      0: {
+        name: "blockNumberTag",
+        regex: "[0-9]{1,78}|latest",
+      },
+    },
+  },
+};
+
+const CAIP19BlockNumberTag: IdentifierSpec = {
+  name: "blockNumberTag",
+  regex: ".*",
+  parameters: {
+    delimiter: "#",
+    values: {
+      0: CAIP19AssetId,
+      2: BlockNumberTag,
+    },
+  },
+};
+
 export const CAIP = {
   "2": CAIP2,
   "10": CAIP10,
   "19": {
     assetName: AssetName,
     assetType: CAIP19AssetType,
-    assetId: CAIP19AssetId,
+    assetId: CAIP19BlockNumberTag,
   },
 };
diff --git a/src/utils.ts b/src/utils.ts
@@ -15,7 +15,7 @@ export function getParams<T>(id: string, spec: IdentifierSpec): T {
 
 export function joinParams(params: Params, spec: IdentifierSpec): string {
   return Object.values(spec.parameters.values)
-    .map(parameter => {
+    .map((parameter) => {
       const param = params[parameter.name];
       return typeof param === "string"
         ? param
@@ -40,10 +40,10 @@ export function isValidId(id: string, spec: IdentifierSpec): boolean {
   // console.log("after length");
   // console.log("before matches");
   const matches = params
-    .map((param, index) =>
-      new RegExp(spec.parameters.values[index].regex).test(param)
-    )
-    .filter(x => !!x);
+    .map((param, index) => {
+      return new RegExp(spec.parameters.values[index].regex).test(param);
+    })
+    .filter((x) => !!x);
   if (matches.length !== params.length) return false;
   // console.log("after matches");
   return true;

diff --git a/test/data/index.ts b/test/data/index.ts
@@ -50,16 +50,19 @@ export const ASSET_TYPE_NESTED_PARAMS: AssetTypeParams = {
 };
 
 // AssetType Data Points
+export const BLOCK_NUMBER_TAG = "123";
 export const TOKEN_ID = "1";
-export const ASSET_ID_STRING = `${ASSET_TYPE_STRING}/${TOKEN_ID}`;
+export const ASSET_ID_STRING = `${ASSET_TYPE_STRING}/${TOKEN_ID}#${BLOCK_NUMBER_TAG}`;
 export const ASSET_ID_PARAMS: AssetIdParams = {
   chainId: CHAIN_ID_STRING,
   assetName: ASSET_NAME_STRING,
   tokenId: TOKEN_ID,
+  blockNumberTag: BLOCK_NUMBER_TAG,
 };
 
 export const ASSET_ID_NESTED_PARAMS: AssetIdParams = {
   chainId: CHAIN_ID_PARAMS,
   assetName: ASSET_NAME_PARAMS,
   tokenId: TOKEN_ID,
+  blockNumberTag: BLOCK_NUMBER_TAG,
 };