Change base issuer

src/rmrk2.0.0/classes/base.ts

@@ -3,7 +3,6 @@ import { getRemarkData } from "../tools/utils";
 import { OP_TYPES, PREFIX, VERSION } from "../tools/constants";
 import { BaseType } from "../tools/types";
 import { Change } from "../changelog";
-import { encodeAddress } from "@polkadot/keyring";
 
 export class Base {
   readonly block: number;
@@ -41,7 +40,6 @@ export class Base {
       JSON.stringify({
         symbol: this.symbol,
         type: this.type,
-        issuer: this.issuer,
         parts: this.parts,
         themes: this.themes,
         metadata: this.metadata,
@@ -140,8 +138,8 @@ export class Base {
 
   static fromRemark(
     remark: string,
-    block?: number,
-    ss58Format?: number
+    issuer: string,
+    block?: number
   ): Base | string {
     if (!block) {
       block = 0;
@@ -153,7 +151,7 @@ export class Base {
       return new this(
         block,
         obj.symbol,
-        encodeAddress(obj.issuer, ss58Format),
+        issuer,
         obj.type,
         obj.parts,
         obj.themes,

src/rmrk2.0.0/tools/consolidator/interactions/base.ts

@@ -1,9 +1,11 @@
 import { Remark } from "../remark";
 import { OP_TYPES } from "../../constants";
 import {Base} from "../../../classes/base";
+import { encodeAddress } from "@polkadot/keyring";
 
 export const getBaseFromRemark = (remark: Remark, ss58Format?: number) => {
-  const base = Base.fromRemark(remark.remark, remark.block, ss58Format);
+  const issuer = encodeAddress(remark.caller, ss58Format);
+  const base = Base.fromRemark(remark.remark, issuer, remark.block);
   if (typeof base === "string") {
     throw new Error(`[${OP_TYPES.BASE}] Dead before instantiation: ${base}`);
   }

src/rmrk2.0.0/tools/validate-remark.ts

@@ -111,7 +111,7 @@ const EMOTEStruct = type({
 });
 
 const BaseStruct = type({
-  issuer: string(),
+  issuer: optional(string()),
   type: optional(string()),
   symbol: string(),
   parts: array(PartStruct),