make sure address is encoded using provided ss58Format

rmrk-team · Mar 1, 2022 · bafd461 · bafd461
1 parent 1da5444
commit bafd461
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 14 deletions.
diff --git a/cli/consolidate.ts b/cli/consolidate.ts
@@ -47,13 +47,19 @@ const getLiteDump = (result: ConsolidatorReturnType) => {
 const getRemarks = (
   inputData: any,
   prefixes: string[],
-  collectionFilter?: string
+  collectionFilter?: string,
+  ss58Format?: number
 ): Remark[] => {
   let blocks = inputData;
   if (collectionFilter) {
-    blocks = filterBlocksByCollection(blocks, collectionFilter, prefixes);
+    blocks = filterBlocksByCollection(
+      blocks,
+      collectionFilter,
+      prefixes,
+      ss58Format
+    );
   }
-  return getRemarksFromBlocks(blocks, prefixes);
+  return getRemarksFromBlocks(blocks, prefixes, ss58Format);
 };
 
 const consolidate = async () => {
@@ -103,7 +109,7 @@ const consolidate = async () => {
 
   console.log(`Loaded ${rawdata.length} blocks with remark calls`);
 
-  const remarks = getRemarks(rawdata, prefixes, collectionFilter);
+  const remarks = getRemarks(rawdata, prefixes, collectionFilter, ss58Format);
   const consolidator = new Consolidator(ss58Format);
   let result = await consolidator.consolidate(remarks);
 

diff --git a/cli/fetch.ts b/cli/fetch.ts
@@ -101,7 +101,8 @@ const fetch = async () => {
     extracted = filterBlocksByCollection(
       extracted,
       collectionFilter,
-      prefixToArray(args["--prefixes"] || "")
+      prefixToArray(args["--prefixes"] || ""),
+      ss58Format
     );
   }
 

diff --git a/src/listener.ts b/src/listener.ts
@@ -26,6 +26,7 @@ interface IProps {
   storageProvider?: IStorageProvider;
   storageKey?: string;
   loggerEnabled?: boolean;
+  ss58Format?: number;
 }
 
 export interface IStorageProvider {
@@ -63,6 +64,7 @@ export class RemarkListener {
   private prefixes: string[];
   private currentBlockNum: number;
   private loggerEnabled: boolean;
+  private ss58Format: number;
   public storageProvider: IStorageProvider;
   private consolidateFunction: (
     remarks: Remark[]
@@ -75,12 +77,14 @@ export class RemarkListener {
     storageProvider,
     storageKey,
     loggerEnabled = false,
+    ss58Format = 2,
   }: IProps) {
     if (!polkadotApi) {
       throw new Error(
         `"providerInterface" is missing. Please provide polkadot.js provider interface (i.e. websocket)`
       );
     }
+    this.ss58Format = ss58Format;
     this.currentBlockNum = 0;
     this.apiPromise = polkadotApi;
     this.missingBlockCalls = [];

diff --git a/src/rmrk1.0.0/classes/collection.ts b/src/rmrk1.0.0/classes/collection.ts
@@ -4,6 +4,7 @@ import { validateCollection } from "../../tools/validate-remark";
 import { getRemarkData } from "../../tools/utils";
 import { OP_TYPES, VERSION } from "../../tools/constants";
 import { Attribute } from "../../types";
+import { encodeAddress } from "@polkadot/keyring";
 
 export class Collection {
   readonly block: number;
@@ -83,7 +84,11 @@ export class Collection {
     );
   }
 
-  static fromRemark(remark: string, block = 0): Collection | string {
+  static fromRemark(
+    remark: string,
+    block = 0,
+    ss58Format?: number
+  ): Collection | string {
     try {
       validateCollection(remark);
       const [prefix, op_type, version, dataString] = remark.split("::");
@@ -92,7 +97,7 @@ export class Collection {
         block,
         obj.name,
         obj.max,
-        obj.issuer,
+        encodeAddress(obj.issuer, ss58Format),
         obj.symbol,
         obj.id,
         obj.metadata

diff --git a/src/tools/consolidator/consolidator.ts b/src/tools/consolidator/consolidator.ts
@@ -138,7 +138,7 @@ export class Consolidator {
 
     let collection;
     try {
-      collection = getCollectionFromRemark(remark);
+      collection = getCollectionFromRemark(remark, this.ss58Format);
     } catch (e: any) {
       invalidate(remark.remark, e.message);
       return true;

diff --git a/src/tools/consolidator/utils.ts b/src/tools/consolidator/utils.ts
@@ -122,8 +122,11 @@ export const getChangeIssuerEntity = (
   }
   return changeIssuerEntity;
 };
-export const getCollectionFromRemark = (remark: Remark) => {
-  const collection = C100.fromRemark(remark.remark, remark.block);
+export const getCollectionFromRemark = (
+  remark: Remark,
+  ss58Format?: number
+) => {
+  const collection = C100.fromRemark(remark.remark, remark.block, ss58Format);
   if (typeof collection === "string") {
     throw new Error(
       `[${OP_TYPES.MINT}] Dead before instantiation: ${collection}`

diff --git a/src/tools/utils.ts b/src/tools/utils.ts
@@ -129,7 +129,8 @@ const validateDecode = (value: string) => {
 
 export const getRemarksFromBlocks = (
   blocks: Block[],
-  prefixes: string[]
+  prefixes: string[],
+  ss58Format = 2
 ): Remark[] => {
   const remarks: Remark[] = [];
   for (const row of blocks) {
@@ -160,7 +161,7 @@ export const getRemarksFromBlocks = (
 
       const r: Remark = {
         block: row.block,
-        caller: call.caller,
+        caller: encodeAddress(call.caller, ss58Format),
         interaction_type: meta.type,
         version: meta.version,
         remark: remark,
@@ -354,10 +355,11 @@ export const getRemarkData = (dataString: string) => {
 export const filterBlocksByCollection = (
   blockCalls: BlockCalls[],
   collectionFilter: string,
-  prefixes: string[]
+  prefixes: string[],
+  ss58Format?: number
 ): BlockCalls[] =>
   blockCalls.filter((block) =>
-    getRemarksFromBlocks([block], prefixes).some((rmrk) =>
+    getRemarksFromBlocks([block], prefixes, ss58Format).some((rmrk) =>
       rmrk.remark.includes(collectionFilter)
     )
   );